summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSashi202019-03-07 12:44:41 +0530
committerGitHub2019-03-07 12:44:41 +0530
commit5b80d8042b2280297bc24645fe069d036efed8e4 (patch)
tree427cd5fb122d3001aa6c3e6d368ee3470d136257
parentba0ef8b255f019b807d677b8cd929d882d8e8e39 (diff)
parentf4b04d8722297b78f1ce2f7ce975e5e9eaa4e816 (diff)
downloadcfd_case_study-5b80d8042b2280297bc24645fe069d036efed8e4.tar.gz
cfd_case_study-5b80d8042b2280297bc24645fe069d036efed8e4.tar.bz2
cfd_case_study-5b80d8042b2280297bc24645fe069d036efed8e4.zip
Merge pull request #4 from Sashi20/master
Added date of approval column in manage proposal interface
-rwxr-xr-xmanage_proposal.inc12
1 files changed, 11 insertions, 1 deletions
diff --git a/manage_proposal.inc b/manage_proposal.inc
index ac16336..90e732f 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -74,10 +74,19 @@ function cfd_case_study_proposal_all()
{
$actual_completion_date = date('d-m-Y', $proposal_data->actual_completion_date);
}
+ if ($proposal_data->approval_date == 0)
+ {
+ $approval_date = "Not Approved";
+ } //$proposal_data->actual_completion_date == 0
+ else
+ {
+ $approval_date = date('d-m-Y', $proposal_data->approval_date);
+ }
$proposal_rows[] = array(
date('d-m-Y', $proposal_data->creation_date),
l($proposal_data->contributor_name, 'user/' . $proposal_data->uid),
$proposal_data->project_title,
+ $approval_date,
$actual_completion_date,
$approval_status,
l('Status', 'case-study-project/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'case-study-project/manage-proposal/edit/' . $proposal_data->id)
@@ -93,7 +102,8 @@ function cfd_case_study_proposal_all()
'Date of Submission',
'Student Name',
'Title of the case-study project',
- 'Date of Completion',
+ 'Date of Approval',
+ 'Date of Project Completion',
'Status',
'Action'
);