From 3845c11cbd56d18d965f54cc7d5a1679415c52c4 Mon Sep 17 00:00:00 2001
From: prashantsinalkar
Date: Fri, 8 Aug 2014 12:50:42 +0530
Subject: added hide-show for manage_comments
---
css/tbc_external_review.css | 7 ++++
js/tbc_external_review.js | 50 ++++++++++++++++++++++++-
tbc_external_review.module | 91 +++++++++++++++++++++++++++++++++++++--------
3 files changed, 131 insertions(+), 17 deletions(-)
diff --git a/css/tbc_external_review.css b/css/tbc_external_review.css
index 4bb9584..c4f1507 100755
--- a/css/tbc_external_review.css
+++ b/css/tbc_external_review.css
@@ -31,9 +31,15 @@
.error-comment {
background: tomato !important;
}
+.manages-comment {
+ background: tomato !important;
+}
.dull {
background: #424242 !important;
}
+.dulls {
+ background: #888888 !important;
+}
.toggle-hide-show {
float: right;
padding: 5px 7px;
@@ -49,6 +55,7 @@
transition: color .5s ease-out .1s;
font-weight: bold;
}
+
.toggle-hide-show:hover {
cursor: pointer;
background: #424242;
diff --git a/js/tbc_external_review.js b/js/tbc_external_review.js
index 38c5070..83cdddb 100755
--- a/js/tbc_external_review.js
+++ b/js/tbc_external_review.js
@@ -101,6 +101,30 @@ $(document).ready(function() {
e.preventDefault();
});
+ $hide_show1= $(".hide-show1");
+
+ $hide_show1.click(function(e) {
+ var preference_id = $(this).attr("manages-comment");
+ $t = $(this);
+ $.ajax({
+ url: modPath + "ajax/hide-show1/" + preference_id,
+ type: "GET",
+ dataType: "html",
+ success: function(data) {
+ $tr = $t.parents("tr:first");
+ if($tr.hasClass("dulls")) {
+ $t.parents("tr:first").removeClass("dulls");
+ $t.html("Hide");
+ } else {
+ $t.parents("tr:first").addClass("dulls");
+ $t.html("Show");
+ }
+ console.log(data);
+ },
+ });
+ e.preventDefault();
+ });
+
/* toggle hide-show */
$toggler = $(".toggle-hide-show");
$toggler.click(function() {
@@ -126,7 +150,31 @@ $(document).ready(function() {
}
});
});
-
+
+ $togglers = $(".togglers-hide-show1");
+ $togglers.click(function() {
+ var preference_id = $(this).attr("manages-comment");
+
+ $.ajax({
+ url: modPath + "ajax/togglers/" + preference_id,
+ type: "GET",
+ success: function(data) {
+ $tr = $("tr");
+ $tr.each(function() {
+ if(!$(this).hasClass("manages-comment")) {
+ if($(this).hasClass("dulls")) {
+ $(this).removeClass("dulls");
+ $(this).find(".hide-show1").html("Hide");
+ } else {
+ $(this).addClass("dulls");
+ $(this).find(".hide-show1").html("Show");
+ $("thead tr").removeClass("dulls");
+ }
+ }
+ });
+ }
+ });
+ });
var count = 1;
$more = $jq("#review-completion-form #more");
$missed = $jq("#review-completion-form #missed-list");
diff --git a/tbc_external_review.module b/tbc_external_review.module
index 8947d2d..43c0b4d 100755
--- a/tbc_external_review.module
+++ b/tbc_external_review.module
@@ -1,4 +1,6 @@
array("administer tbc_external_review"),
"type" => MENU_NORMAL_ITEM
);
+
$items["tbc_external_review/mail_comments"] = array(
"title" => "ER Mail Comments",
"page callback" => "tbc_external_review_mail_comments_all",
@@ -111,6 +114,7 @@
"access callback" => TRUE,
"type" => MENU_CALLBACK
);
+
$items["tbc_external_review/eligibility_test"] = array(
"title" => "Eligibility Test",
"page callback" => "tbc_external_review_eligibility_test_all",
@@ -533,7 +537,8 @@
if($preference_id) {
if($review) {
$query = "
- SELECT erc.*, cha.number AS chapter, exa.number AS example FROM external_review_comments erc
+ SE
+ LECT erc.*, cha.number AS chapter, exa.number AS example FROM external_review_comments erc
LEFT JOIN textbook_companion_chapter cha ON cha.id = erc.chapter_id
LEFT JOIN textbook_companion_example exa ON exa.id = erc.example_id
WHERE erc.preference_id = %d AND erc.review = %d
@@ -963,6 +968,29 @@
";
$result = db_query($query, $key);
$data .= $key;
+
+ }
+
+ else if($item == "hide-show1") {
+
+ $query = "
+ UPDATE external_review_details
+ SET hidden = !hidden
+ WHERE preference_id = %d
+ ";
+ $result = db_query($query,$key);
+ $data .= $key;
+
+ }else if($item == "togglers" && $key) {
+ $query = "
+ UPDATE external_review_details
+ SET hidden = !hidden
+ WHERE preference_id = %d
+
+ ";
+ $result = db_query($query, $key);
+ $data .= $key;
+
} else if($item == "toggle" && $key) {
$query = "
UPDATE external_review_comments
@@ -976,6 +1004,7 @@
$result = db_query($query, $key);
$data .= $key;
}
+
echo $data;
exit();
}
@@ -1351,10 +1380,11 @@
LEFT JOIN textbook_companion_proposal pro ON pre.proposal_id = pro.id
LEFT JOIN users usr_con ON usr_con.uid = pro.uid
LEFT JOIN users usr_ext ON usr_ext.uid = erc.uid
- LEFT JOIN external_review_details erd ON erd.preference_id = erc.preference_id
- ORDER BY pre.book
+ LEFT JOIN external_review_details erd ON erd.preference_id = erc.preference_id
+ ORDER BY erd.hidden
";
- $result = db_query($query);
+ $result = db_query($query);
+
$headers = array(
"Book", "Review No.",
"Status", "Contributor",
@@ -1362,25 +1392,51 @@
);
$rows = array();
while($row = db_fetch_object($result)) {
+ $hide_optionss= array(
+ /* # linking in drupal l() */
+ "fragment" => " ",
+ "external" => TRUE,
+ "attributes" => array(
+ "class" => "hide-show1",
+ "manages-comment" => "{$row->preference_id}",
+ )
+ );
$item = array(
- "{$row->book}
by {$row->author}",
- suffix($row->review),
- ($row->completed?"Completed":"Ongoing"),
- "{$row->contributor}",
- "{$row->reviewer}",
- l("View", "tbc_external_review/manage_comments/" . $row->preference_id)
+ "data" => array(
+ "{$row->book}
by {$row->author}",
+ suffix($row->review),
+ ($row->completed?"Completed":"Ongoing"),
+ "{$row->contributor}",
+ "{$row->reviewer}",
+ l("View", "tbc_external_review/manage_comments/" . $row->preference_id)
+ ),
);
- end($item);
- $key = key($item);
+
+ if($row->hidden) {
+ $item["class"] .= " dulls";
+ }
+
+ end($item["data"]);
+ $key = key($item["data"]);
if(!$row->sent) {
- $item[$key] .= " | " . l("Mail", "tbc_external_review/mail_comments/" . $row->preference_id);
+ $item["data"][$key] .= " | " . l("Mail", "tbc_external_review/mail_comments/" . $row->preference_id);
+ } else {
+ $item["data"][$key] .= " | " . "Sent";
+ }
+
+ /* hide/unhide link */
+ end($item);
+ $key= key($item["data"]);
+ if($row->hidden) {
+ $item["data"][$key] .= " | " . l("Show", "", $hide_optionss);
} else {
- $item[$key] .= " | " . "Sent";
+ $item["data"][$key] .= " | " . l("Hide", "", $hide_optionss);
}
+
array_push($rows, $item);
}
$page_content .= theme("table", $headers, $rows);
- }
+ }
return $page_content;
}
@@ -2167,4 +2223,7 @@
drupal_add_js(drupal_get_path("module", "tbc_external_review") . "/js/tbc_external_review.js");
drupal_add_js(drupal_get_path("module", "tbc_external_review") . "/js/timer.js");
}
-?>
+
+
+
+
--
cgit