From 675ba16b2fd7ef92729d245123f3ced2ba45e9da Mon Sep 17 00:00:00 2001 From: Saketh1499 Date: Wed, 22 Dec 2021 15:58:54 +0530 Subject: Adding completion date in status page --- manage_proposal.inc | 35 ++++++++++++++++++++++++++++++++++- 1 file changed, 34 insertions(+), 1 deletion(-) (limited to 'manage_proposal.inc') diff --git a/manage_proposal.inc b/manage_proposal.inc index 6e037ae..fe4b66b 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -127,7 +127,7 @@ function lab_migration_proposal_all() return ''; } $proposal_header = array( - 'Date of Submission', + 'Date of Proposal Submission', 'Name', 'Title of the Lab', 'Department', @@ -599,6 +599,22 @@ function lab_migration_proposal_status_form($form, $form_state) '#markup' => $proposal_status, '#title' => t('Proposal Status') ); + if($proposal_data->approval_status == 0) + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => "Expected completion date soon", + '#title' => t('Date Of Completion') + ); + } + if($proposal_data->approval_status == 1) + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => "Expected completion date soon", + '#title' => t('Date Of Completion') + ); + } if ($proposal_data->approval_status == 0) { $form['approve'] = array( @@ -623,6 +639,23 @@ function lab_migration_proposal_status_form($form, $form_state) '#title' => t('Reason for disapproval') ); } + if($proposal_data->approval_status == 3) + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => date('d-m-Y', $proposal_data->expected_completion_date), + '#title' => t('Date Of Completion') + ); + } + + if($proposal_data->approval_status == 2) + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => "Proposal is disapproved", + '#title' => t('Date Of Completion') + ); + } $form['submit'] = array( '#type' => 'submit', '#value' => t('Submit') -- cgit From dcb82214d5185768d05b3707ed042e93898974d1 Mon Sep 17 00:00:00 2001 From: Saketh1499 Date: Thu, 23 Dec 2021 12:28:59 +0530 Subject: Updating the display of date of completion --- manage_proposal.inc | 44 +++++++++++++++++++++++++++++++++----------- 1 file changed, 33 insertions(+), 11 deletions(-) (limited to 'manage_proposal.inc') diff --git a/manage_proposal.inc b/manage_proposal.inc index fe4b66b..84560d6 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -601,19 +601,41 @@ function lab_migration_proposal_status_form($form, $form_state) ); if($proposal_data->approval_status == 0) { - $form['completion_date'] = array( - '#type' => 'item', - '#markup' => "Expected completion date soon", - '#title' => t('Date Of Completion') - ); + if($proposal_data->expected_completion_date == 0) + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => 'Expecting date of completion soon', + '#title' => t('Expected date of completion') + ); + } + else + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => date('d-m-Y', $proposal_data->expected_completion_date), + '#title' => t('Expected date of completion') + ); + } } if($proposal_data->approval_status == 1) { - $form['completion_date'] = array( - '#type' => 'item', - '#markup' => "Expected completion date soon", - '#title' => t('Date Of Completion') - ); + if($proposal_data->expected_completion_date == 0) + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => 'Expecting date of completion soon', + '#title' => t('Expected date of completion') + ); + } + else + { + $form['completion_date'] = array( + '#type' => 'item', + '#markup' => date('d-m-Y', $proposal_data->expected_completion_date), + '#title' => t('Expected date of completion') + ); + } } if ($proposal_data->approval_status == 0) { @@ -639,6 +661,7 @@ function lab_migration_proposal_status_form($form, $form_state) '#title' => t('Reason for disapproval') ); } + //DATE OF COMPLETION if($proposal_data->approval_status == 3) { $form['completion_date'] = array( @@ -647,7 +670,6 @@ function lab_migration_proposal_status_form($form, $form_state) '#title' => t('Date Of Completion') ); } - if($proposal_data->approval_status == 2) { $form['completion_date'] = array( -- cgit From 0ecb33c55d6146af1f26756d8b5a46dc8138df22 Mon Sep 17 00:00:00 2001 From: Saketh1499 Date: Tue, 4 Jan 2022 16:27:29 +0530 Subject: Updating completion date section in status proposal page --- manage_proposal.inc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'manage_proposal.inc') diff --git a/manage_proposal.inc b/manage_proposal.inc index 84560d6..ebc3ebe 100755 --- a/manage_proposal.inc +++ b/manage_proposal.inc @@ -606,7 +606,7 @@ function lab_migration_proposal_status_form($form, $form_state) $form['completion_date'] = array( '#type' => 'item', '#markup' => 'Expecting date of completion soon', - '#title' => t('Expected date of completion') + '#title' => t('Date of Completion') ); } else @@ -625,7 +625,7 @@ function lab_migration_proposal_status_form($form, $form_state) $form['completion_date'] = array( '#type' => 'item', '#markup' => 'Expecting date of completion soon', - '#title' => t('Expected date of completion') + '#title' => t('Date of Completion') ); } else @@ -633,7 +633,7 @@ function lab_migration_proposal_status_form($form, $form_state) $form['completion_date'] = array( '#type' => 'item', '#markup' => date('d-m-Y', $proposal_data->expected_completion_date), - '#title' => t('Expected date of completion') + '#title' => t('Date of Completion') ); } } @@ -667,7 +667,7 @@ function lab_migration_proposal_status_form($form, $form_state) $form['completion_date'] = array( '#type' => 'item', '#markup' => date('d-m-Y', $proposal_data->expected_completion_date), - '#title' => t('Date Of Completion') + '#title' => t('Date of Completion') ); } if($proposal_data->approval_status == 2) @@ -675,7 +675,7 @@ function lab_migration_proposal_status_form($form, $form_state) $form['completion_date'] = array( '#type' => 'item', '#markup' => "Proposal is disapproved", - '#title' => t('Date Of Completion') + '#title' => t('Date of Completion') ); } $form['submit'] = array( -- cgit