Update completed books table

1 files changed, 10 insertions, 9 deletions

diff --git a/tbc_details.inc b/tbc_details.inc
index 639557b..b3d7e87 100644
--- a/tbc_details.inc
+++ b/tbc_details.inc
@@ -5,12 +5,12 @@ function dwsim_tbc_completed_book_proposal_all()
 	$output = "";
 	$query = db_select('textbook_companion_preference', 'pe');
 	$query->fields('pe', array('book', 'author', 'publisher', 'year', 'id'));
-	$query->leftJoin('textbook_companion_proposal', 'po', 'pe.proposal_id = po.id');
+	$query->leftJoin('textbook_companion_proposal', 'po','pe.proposal_id = po.id');
+	$query->fields('po', array('full_name', 'university', 'completion_date'));
 	$query->condition('po.proposal_status', 3);
 	$query->condition('pe.approval_status', 1);
-	$query->orderBy('pe.year', 'DESC');
+	$query->orderBy('po.completion_date', 'DESC');
 	$result = $query->execute();
-
 	if ($result->rowCount() == 0)
 	{
 		$output .= "Work has been completed on the following books under the Textbook Companion Project. 
@@ -26,13 +26,13 @@ function dwsim_tbc_completed_book_proposal_all()
 		$i = 1;
 		while ($row = $result->fetchObject())
 		{
-			$year = date("Y", $row->year);
+			$completion_date = date("Y", $row->completion_date);
 			$preference_rows[] = array(
 				$i,
-				l($row->book, "textbook-companion/textbook-run/" . $row->id),
-				$row->author,
-				$row->publisher,
-				$row->year
+				l($row->book . ' by ' . $row->author . ', ' . $row->publisher . ', ' . $row->year, 'textbook-companion/textbook-run/' . $row->id),
+				$row->full_name,
+				$row->university,
+				$completion_date
 			);
 			$i++;
 			/*$preference_data->book . " by " . $preference_data->author . ", " . $preference_data->publisher . ", " . $preference_data->year, 'textbook-companion/textbook-run/' . $preference_data->id*/
@@ -50,4 +50,5 @@ function dwsim_tbc_completed_book_proposal_all()
 		));
 	}
 	return $output;
-}
\ No newline at end of file
+}
+