fixed proposal fetch query

2 files changed, 25 insertions, 3 deletions

diff --git a/js/textbook_companion.js b/js/textbook_companion.js
index 070e960..ff9dd6e 100755
--- a/js/textbook_companion.js
+++ b/js/textbook_companion.js
@@ -124,6 +124,24 @@ $('#edit-version').change(function() {
     
 });
 
+/* hide nonaicte_proposal form textbox of other reason */
+$('#edit-other-reason-wrapper').hide();
+$(function() {
+  enable_cb();
+  $("#edit-reason-4").click(enable_cb);
+});
+
+function enable_cb() {
+  if (this.checked) {
+     $('#edit-other-reason-wrapper').show();
+  } else {
+    $('#edit-other-reason-wrapper').hide();
+  }
+}
+
+
+
+
 /* highlighting current filter [A-Z] of book search pages */
 var pathname = window.location.pathname;
 var filter = pathname.charAt(pathname.length-1);
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 835cc9e..7e117ec 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -39,9 +39,12 @@ function _proposal_all()
   while ($proposal_data = db_fetch_object($proposal_q))
   {
     /* get preference */
-    // $preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND approval_status = 1 LIMIT 1", $proposal_data->id);
-    $preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d LIMIT 1", $proposal_data->id);
+    $preference_q = db_query("SELECT * FROM textbook_companion_preference WHERE proposal_id = %d AND approval_status = 1 LIMIT 1", $proposal_data->id);   
     $preference_data = db_fetch_object($preference_q);
+    if(!$preference_data){
+          $preference_q = db_query("SELECT * FROM {textbook_companion_preference} WHERE proposal_id = %d AND pref_number = 1 LIMIT 1", $proposal_data->id);  
+          $preference_data = db_fetch_object($preference_q);
+    }
 
     $proposal_status = '';
     switch ($proposal_data->proposal_status)
@@ -53,9 +56,10 @@ function _proposal_all()
     case 4: $proposal_status = 'External'; break;
     default: $proposal_status = 'Unknown'; break;
     }
+
     $proposal_rows[] = array(
 	date('d-m-Y', $proposal_data->creation_date),
-    "{$preference_data->book} <br> <em>by {$preference_data->author}<em>",
+     "{$preference_data->book} <br> <em>by {$preference_data->author}</em>",
 	l($proposal_data->full_name, 'user/' . $proposal_data->uid),
     date('d-m-Y', $proposal_data->completion_date),
 	$proposal_status,