fixed missed chapter bugs, permalink changes

2 files changed, 45 insertions, 19 deletions

diff --git a/js/tbc_external_review.js b/js/tbc_external_review.js
index 14bc100..2533b17 100755
--- a/js/tbc_external_review.js
+++ b/js/tbc_external_review.js
@@ -1,3 +1,16 @@
+// Javascript format string
+// First, checks if it isn't implemented yet.
+if (!String.prototype.format) {
+  String.prototype.format = function() {
+    var args = arguments;
+    return this.replace(/{(\d+)}/g, function(match, number) { 
+      return typeof args[number] != 'undefined'
+        ? args[number]
+        : match
+      ;
+    });
+  };
+}
 $(document).ready(function() {
 
     var basePath = Drupal.settings.basePath;
@@ -122,25 +135,36 @@ $(document).ready(function() {
     $jq("#edit-missing-0").click(function() {
         $more.hide();
         $missed.hide();
+        $jq("div").filter(function() {
+            return this.id.match(/missed-list-.*/);
+        }).hide();
     });
     $jq("#edit-missing-1").click(function() {
         $more.show();
         $missed.show();
+        $jq("div").filter(function() {
+            return this.id.match(/missed-list-.*/);
+        }).show();
     });
+
     /* review complete form  */
     $more.click(function(e) {
         $dupe = $missed.clone();
+        $dupe.attr("id", "missed-list-" + count);
         $dupe.find("select[name='missed_chapter']").attr("id", "missed_chapter_" + count);
         $dupe.find("select[name='missed_chapter']").attr("name", "missed_chapters[]");
         $dupe.find("select[name='missed_example']").attr("id", "missed_example_" + count);
         $dupe.find("select[name='missed_example']").attr("name", "missed_examples[]");
         $dupe.insertBefore($more);
-        $dupe.append("<a href='#' class='delete-missed'>Delete</a>");
+        $dupe.append("<a href='#' class='delete-missed' data-target='{0}'>Delete</a>".format(count));
+        count++;
         e.preventDefault();
     });
 
     $jq("#review-completion-form").on("click", ".delete-missed", function(e) {
-        $jq(this).closest("#missed-list").remove();
+        var target = $jq(this).data("target");
+        $("#review-completion-form #missed-list-" + target).remove();
+        count--;
         e.preventDefault();
     });
 
diff --git a/tbc_external_review.module b/tbc_external_review.module
index 8ad2de5..2525bfb 100755
--- a/tbc_external_review.module
+++ b/tbc_external_review.module
@@ -71,23 +71,23 @@
             "access arguments" => array("administer tbc_external_review"),
             "type" => MENU_CALLBACK
         );
-        $items["tbc_external_review/view_status"] = array(
+        $items["tbc_external_review/manage_status"] = array(
             "title" => "ER View Status",
-            "page callback" => "tbc_external_review_view_status_all",
+            "page callback" => "tbc_external_review_manage_status_all",
             "access arguments" => array("administer tbc_external_review"),
             "weight" => 30,
             "type" => MENU_NORMAL_ITEM
         );
-        $items["tbc_external_review/view_status/all"] = array(
+        $items["tbc_external_review/manage_status/all"] = array(
             "title" => "All",
-            "page callback" => "tbc_external_review_view_status_all",
+            "page callback" => "tbc_external_review_manage_status_all",
             "access arguments" => array("administer tbc_external_review"),
             "weight" => 1,
             "type" => MENU_DEFAULT_LOCAL_TASK,
         );
-        $items["tbc_external_review/view_status/recent"] = array(
+        $items["tbc_external_review/manage_status/recent"] = array(
             "title" => "Recently Completed",
-            "page callback" => "tbc_external_review_view_status_recent_all",
+            "page callback" => "tbc_external_review_manage_status_recent_all",
             "access arguments" => array("administer tbc_external_review"),
             "weight" => 2,
             "type" => MENU_LOCAL_TASK,
@@ -674,9 +674,9 @@
     function tbc_external_review_comment_form_submit($form, &$form_state) {
         global $user;
         $v = $form_state["values"];
-        $query = "insert into {external_review_comments}
+        $query = "INSERT INTO {external_review_comments}
             (uid, preference_id, chapter_id, example_id, ncf, eit, axl, sua, sfu, sum, aci, auu, teo, amt, comment)
-            values
+            VALUES
             (%d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, %d, '%s')
         ";
         $result = db_query(
@@ -784,7 +784,7 @@
         return $books;
     }
 
-    function tbc_external_review_view_status_all() {
+    function tbc_external_review_manage_status_all() {
        $page_content = "";
         $query = "
             SELECT * from textbook_companion_preference tcp INNER JOIN external_review_details erd 
@@ -831,7 +831,7 @@
         return $page_content;
     }
 
-    function tbc_external_review_view_status_recent_all() {
+    function tbc_external_review_manage_status_recent_all() {
         $page_content = "";
         $query = "
             SELECT * FROM external_review_details erd
@@ -1156,7 +1156,7 @@
         function _missed_example() {
             $example = array();
             $example[0] = "Select Example";
-            $example = array_merge($example, range(1,50));
+            $example = array_merge($example, range(1,80));
             return $example;
         }
         $form = array();
@@ -1219,12 +1219,15 @@
                     VALUES
                     ({$preference_id}, {$user->uid}, {$_REQUEST['missed_chapter']}, {$_REQUEST['missed_example']})
                 ";
-                $i = 0;
-                foreach($_REQUEST["missed_chapters"] as $chapter){
-                    $query .= ", ({$preference_id}, {$user->uid}, {$chapter}, {$_REQUEST['missed_examples'][$i]})";
-                    $i++;
+                
+                if ($_REQUEST["missing"]) {
+                    $i = 0;
+                    foreach($_REQUEST["missed_chapters"] as $chapter){
+                        $query .= ", ({$preference_id}, {$user->uid}, {$chapter}, {$_REQUEST['missed_examples'][$i]})";
+                        $i++;
+                    }
+                    $result = db_query($query, $preference_id);
                 }
-                $result = db_query($query, $preference_id);
                 
                 if(!$result) {
                     drupal_set_message("Updation failed.", "error");
@@ -1313,7 +1316,6 @@
         }
         return $page_content;
     }
-    
 
     function tbc_external_review_test_all() {
         $page_content = "";