diff options
Diffstat (limited to 'manage_proposal.inc')
| -rwxr-xr-x | manage_proposal.inc | 10 |
1 files changed, 7 insertions, 3 deletions
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, |