diff options
| -rw-r--r-- | email.inc | 11 | ||||
| -rwxr-xr-x | manage_proposal.inc | 40 | ||||
| -rw-r--r-- | proposal.inc | 16 |
3 files changed, 47 insertions, 20 deletions
@@ -121,7 +121,7 @@ Department/Branch : ' . $proposal_data->branch . ' University/Institute : ' . $proposal_data->university . ' College Teacher / Professor : ' . $proposal_data->faculty . ' Reviewer : ' . $proposal_data->reviewer . ' -Expected date of completion : ' . date('d-m-Y', $proposal_data->completion_date) . ' +Expected date of completion : ' . date('d-m-Y', $proposal_data->proposed_completion_date) . ' Your Book Preferences : @@ -242,7 +242,7 @@ Department/Branch : ' . $proposal_data->branch . ' University/Institute : ' . $proposal_data->university . ' College Teacher / Professor : ' . $proposal_data->faculty . ' Reviewer : ' . $proposal_data->reviewer . ' -Expected date of completion : ' . date('d-m-Y', $proposal_data->completion_date) . ' +Expected date of completion : ' . date('d-m-Y', $proposal_data->proposed_completion_date) . ' Your Book Preferences : @@ -370,7 +370,7 @@ Department/Branch : ' . $proposal_data->branch . ' University/Institute : ' . $proposal_data->university . ' College Teacher / Professor : ' . $proposal_data->faculty . ' Reviewer : ' . $proposal_data->reviewer . ' -Expected date of completion : ' . date('d-m-Y', $proposal_data->completion_date) . ' +Expected date of completion : ' . date('d-m-Y', $proposal_data->proposed_completion_date) . ' Your Non AICTE Book Preferences: @@ -495,7 +495,7 @@ Department/Branch : ' . $proposal_data->branch . ' University/Institute : ' . $proposal_data->university . ' College Teacher / Professor : ' . $proposal_data->faculty . ' Reviewer : ' . $proposal_data->reviewer . ' -Expected date of completion : ' . date('d-m-Y', $proposal_data->completion_date) . ' +Expected date of completion : ' . date('d-m-Y', $proposal_data->proposed_completion_date) . ' Title of the book : ' . $approved_preference_data->book . ' Author name : ' . $approved_preference_data->author . ' @@ -562,7 +562,8 @@ Department/Branch : ' . $proposal_data->branch . ' University/Institute : ' . $proposal_data->university . ' College Teacher / Professor : ' . $proposal_data->faculty . ' Reviewer : ' . $proposal_data->reviewer . ' -Expected date of completion : ' . date('d-m-Y', $proposal_data->completion_date) . ' +Proposed date of completion : ' . date('d-m-Y', $proposal_data->proposed_completion_date) . ' +Actual date of completion : ' . date('d-m-Y', $proposal_data->completion_date) . ' Title of the book : ' . $approved_preference_data->book . ' Author name : ' . $approved_preference_data->author . ' diff --git a/manage_proposal.inc b/manage_proposal.inc index 6dc4a76..0b2ac3f 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -24,7 +24,7 @@ function _proposal_pending() $pending_rows[$pending_data->id] = array( date('d-m-Y', $pending_data->creation_date), l($pending_data->full_name, 'user/' . $pending_data->uid), - date('d-m-Y', $pending_data->completion_date), + date('d-m-Y', $pending_data->proposed_completion_date), l('Approve', 'manage_proposal/approve/' . $pending_data->id) . ' | ' . l('Edit', 'manage_proposal/edit/' . $pending_data->id) ); } //$pending_data = $pending_q->fetchObject() @@ -37,7 +37,7 @@ function _proposal_pending() $pending_header = array( 'Date of Submission', 'Contributor Name', - 'Date of Completion', + 'Proposed Date of Completion', 'Action' ); $output = theme('table', array( @@ -116,6 +116,7 @@ function _proposal_all() date('d-m-Y', $proposal_data->creation_date), "{$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->proposed_completion_date), date('d-m-Y', $proposal_data->completion_date), $proposal_status, l('Status', 'manage_proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'manage_proposal/edit/' . $proposal_data->id) . _tbc_ext($proposal_status, $preference_data->id) @@ -131,7 +132,8 @@ function _proposal_all() 'Date of Submission', 'Title of the Book', 'Contributor Name', - 'Expected Date of Completion', + 'Proposed Date of Completion', + 'Actual Date of Completion', 'Status', 'Action' ); @@ -324,10 +326,15 @@ function proposal_approval_form($form, &$form_state) '#markup' => $row->reviewer, '#title' => t('Reviewer') ); + $form['proposed_completion_date'] = array( + '#type' => 'item', + '#markup' => date('d-m-Y', $row->proposed_completion_date), + '#title' => t('Proposed Date of Completion') + ); $form['completion_date'] = array( '#type' => 'item', '#markup' => date('d-m-Y', $row->completion_date), - '#title' => t('Expected Date of Completion') + '#title' => t('Actual Date of Completion') ); $form['operating_system'] = array( '#type' => 'item', @@ -677,10 +684,15 @@ function proposal_status_form($form, &$form_state) '#markup' => $proposal_data->reviewer, '#title' => t('Reviewer') ); + $form['proposed_completion_date'] = array( + '#type' => 'item', + '#markup' => date('d-m-Y', $proposal_data->proposed_completion_date), + '#title' => t('Proposed Date of Completion') + ); $form['completion_date'] = array( '#type' => 'item', '#markup' => date('d-m-Y', $proposal_data->completion_date), - '#title' => t('Expected Date of Completion') + '#title' => t('Actual Date of Completion') ); $form['operating_system'] = array( '#type' => 'item', @@ -812,7 +824,8 @@ function proposal_status_form_submit($form, &$form_state) /*db_query("UPDATE {textbook_companion_proposal} SET proposal_status = 3 WHERE id = %d", $proposal_id);*/ $query = db_update('textbook_companion_proposal'); $query->fields(array( - 'proposal_status' => 3 + 'proposal_status' => 3, + 'completion_date' => time() )); $query->condition('id', $proposal_id); $num_updated = $query->execute(); @@ -1069,6 +1082,14 @@ function proposal_edit_form($form, &$form_state, $nonaicte_book) '#maxlength' => 10, '#default_value' => date('d-m-Y', $proposal_data->completion_date) ); + $form['proposed_completion_date'] = array( + '#type' => 'textfield', + '#title' => t('Proposed Date of Completion'), + '#description' => t('Input date format should be DD-MM-YYYY. Eg: 23-03-2011'), + '#size' => 10, + '#maxlength' => 10, + '#default_value' => date('d-m-Y', $proposal_data->proposed_completion_date) + ); list($scilab, $version) = explode(' ', $proposal_data->scilab_version); $scilab_version = $version; $form['version'] = array( @@ -1427,12 +1448,14 @@ function proposal_edit_form_validate($form, &$form_state) } return; } -/***************** proposal edit from ********************/ +/***************** proposal edit from submit ********************/ function proposal_edit_form_submit($form, &$form_state) { /* completion date to timestamp */ list($d, $m, $y) = explode('-', $form_state['values']['completion_date']); $completion_date_timestamp = mktime(0, 0, 0, $m, $d, $y); + list($d, $m, $y) = explode('-', $form_state['values']['proposed_completion_date']); + $proposed_completion_date_timestamp = mktime(0, 0, 0, $m, $d, $y); $scilab_version = 'scilab ' . $form_state['values']['version']; $proposal_id = $form_state['values']['hidden_proposal_id']; $scilab_version = 'scilab ' . $form_state['values']['version']; @@ -1451,7 +1474,8 @@ function proposal_edit_form_submit($form, &$form_state) 'reviewer' => $form_state['values']['reviewer'], 'completion_date' => $completion_date_timestamp, 'operating_system' => $form_state['values']['operating_system'], - 'scilab_version' => $scilab_version + 'scilab_version' => $scilab_version, + 'proposed_completion_date' => $proposed_completion_date_timestamp, )); $query->condition('id', $proposal_id); $num_updated = $query->execute(); diff --git a/proposal.inc b/proposal.inc index 6534e71..e04eba3 100644 --- a/proposal.inc +++ b/proposal.inc @@ -1013,9 +1013,9 @@ function book_proposal_form_submit($form, &$form_state) $completion_date_timestamp = mktime(0, 0, 0, $m, $d, $y); $scilab_version = 'scilab ' . $form_state['values']['version']; $query = "INSERT INTO {textbook_companion_proposal} - (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, country, city, pincode, state, faculty, reviewer, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email, message, samplefilepath) VALUES (:uid, :approver_uid, :full_name, :mobile, :gender, :how_project, :course, :branch, :university, :country, :city, :pincode, :state, :faculty, :reviewer, :completion_date, + (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, country, city, pincode, state, faculty, reviewer, completion_date, creation_date, approval_date, proposal_status, scilab_version, operating_system, teacher_email, message, samplefilepath,proposed_completion_date) VALUES (:uid, :approver_uid, :full_name, :mobile, :gender, :how_project, :course, :branch, :university, :country, :city, :pincode, :state, :faculty, :reviewer, :completion_date, :creation_date, :approval_date, :proposal_status, :scilab_version, :operating_system, -:teacher_email, :message, :samplefilepath)"; +:teacher_email, :message, :samplefilepath,:proposed_completion_date)"; $args = array( ":uid" => $user->uid, ":approver_uid" => 0, @@ -1040,7 +1040,8 @@ function book_proposal_form_submit($form, &$form_state) ":operating_system" => _tbc_sentence_case($form_state['values']['operating_system']), ":teacher_email" => $form_state['values']['faculty_email'], ":message" => 'None', - ":samplefilepath" => "" + ":samplefilepath" => "", + ":proposed_completion_date" => $completion_date_timestamp ); $result = db_query($query, $args, array( 'return' => Database::RETURN_INSERT_ID @@ -1149,7 +1150,7 @@ function book_proposal_form_submit($form, &$form_state) ); */ $query = "INSERT INTO {textbook_companion_preference} - (proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES (:proposal_id, :pref_number, :book, :author, :isbn, :publisher, :edition, :year, :category, :approval_status) + (proposal_id, pref_number, book, author, isbn, publisher, edition, year, category, approval_status) VALUES (:proposal_id, :pref_number, :book, :author, :isbn, :publisher, :edition, :year, :category, :approval_status) "; $args = array( ":proposal_id" => $proposal_id, @@ -1840,9 +1841,9 @@ function book_proposal_nonaicte_form_submit($form, &$form_state) $scilab_version = 'scilab ' . $form_state['values']['version']; $query = " INSERT INTO {textbook_companion_proposal} - (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, country, city, pincode, state, faculty, reviewer, reference, completion_date, creation_date, approval_date, proposal_status, message, scilab_version, operating_system, teacher_email, proposal_type, reason, samplefilepath) VALUES (:uid, :approver_uid, :full_name, :mobile, :gender, :how_project, :course, :branch, :university, :country, :city, :pincode, :state, + (uid, approver_uid, full_name, mobile, gender, how_project, course, branch, university, country, city, pincode, state, faculty, reviewer, reference, completion_date, creation_date, approval_date, proposal_status, message, scilab_version, operating_system, teacher_email, proposal_type, reason, samplefilepath,proposed_completion_date) VALUES (:uid, :approver_uid, :full_name, :mobile, :gender, :how_project, :course, :branch, :university, :country, :city, :pincode, :state, :faculty, :reviewer, :reference, :completion_date, :creation_date, :approval_date, :proposal_status, :message, :scilab_version, - :operating_system, :teacher_email, :proposal_type, :reason, :samplefilepath) + :operating_system, :teacher_email, :proposal_type, :reason, :samplefilepath,:proposed_completion_date) "; // $result = db_query($query); $args = array( @@ -1872,7 +1873,8 @@ INSERT INTO {textbook_companion_proposal} ":teacher_email" => $form_state['values']['faculty_email'], ":proposal_type" => $form_state['values']['proposal_type'], ":reason" => $my_reason, - ":samplefilepath" => "" + ":samplefilepath" => "", + ":proposed_completion_date" => $completion_date_timestamp ); $result = db_query($query, $args, array( 'return' => Database::RETURN_INSERT_ID |