Merge pull request #49 from Sashi20/drupal_7.x

Display completed books in tabular format

1 files changed, 11 insertions, 5 deletions

diff --git a/display_books.inc b/display_books.inc
index 829b681..97e4543 100755
--- a/display_books.inc
+++ b/display_books.inc
@@ -299,7 +299,7 @@ function _list_of_all_completed_books($category_default_value = NULL, $subcatego
     {
         $preference_q = db_query("SELECT DISTINCT pe.book, count( pe.book) c,tcbm.sub_category,tcbm.main_category as category_id,
       pe.author as author, pe.publisher as publisher, pe.year as year, pe.id as pe_id, pe.edition,
-      po.approval_date as approval_date
+      po.approval_date as approval_date, po.completion_date as completion_date, po.full_name as full_name, po.university as university
       FROM {textbook_companion_preference} pe
       LEFT JOIN textbook_companion_proposal po ON pe.proposal_id = po.id
       LEFT JOIN textbook_companion_book_main_subcategories tcbm ON pe.id = tcbm.pref_id
@@ -311,7 +311,7 @@ function _list_of_all_completed_books($category_default_value = NULL, $subcatego
     {
         $preference_q = db_query("SELECT DISTINCT (loc.category_id),count( pe.book) c, tcbm.sub_category,loc.maincategory,
       pe.book as book, pe.author as author, pe.publisher as publisher, pe.year as year, pe.id as pe_id, pe.edition,
-      po.approval_date as approval_date
+      po.approval_date as approval_date, po.completion_date as completion_date, po.full_name as full_name, po.university as university
       FROM {textbook_companion_preference} pe
       LEFT JOIN textbook_companion_proposal po ON pe.proposal_id = po.id
       LEFT JOIN textbook_companion_book_main_subcategories tcbm ON pe.id = tcbm.pref_id
@@ -325,7 +325,7 @@ function _list_of_all_completed_books($category_default_value = NULL, $subcatego
     {
         $preference_q = db_query("SELECT DISTINCT (loc.category_id),tcbm.sub_category,loc.maincategory,
       pe.book as book, pe.author as author, pe.publisher as publisher, pe.year as year, pe.id as pe_id, pe.edition,
-      po.approval_date as approval_date
+      po.approval_date as approval_date, po.completion_date as completion_date, po.full_name as full_name, po.university as university
       FROM textbook_companion_preference pe
       LEFT JOIN textbook_companion_proposal po ON pe.proposal_id = po.id
       LEFT JOIN textbook_companion_book_main_subcategories tcbm ON pe.id = tcbm.pref_id
@@ -340,7 +340,10 @@ function _list_of_all_completed_books($category_default_value = NULL, $subcatego
     {
         $proposal_rows[] = array(
             $i,
-            l($preference_data->book . " by " . $preference_data->author . ", " . $preference_data->publisher . ", " . $preference_data->year, 'textbook_run/' . $preference_data->pe_id . '/' . $preference_data->sub_category . '/' . $preference_data->category_id)
+            l($preference_data->book . " by " . $preference_data->author . ", " . $preference_data->publisher . ", " . $preference_data->year, 'textbook_run/' . $preference_data->pe_id . '/' . $preference_data->sub_category . '/' . $preference_data->category_id),
+            $preference_data->full_name,
+            $preference_data->university,
+            date("Y", $preference_data->completion_date)
         );
         $i++;
     } //$proposal_data = $proposal_q->fetchObject()
@@ -353,7 +356,10 @@ function _list_of_all_completed_books($category_default_value = NULL, $subcatego
     {
         $proposal_header = array(
             'No.',
-            'Title of the Book'
+            'Title of the Book',
+            'Contributor Name',
+            'University / Institute',
+            'Year of Completion'
         );
         $output .= theme('table', array(
             'header' => $proposal_header,