summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSashi202020-06-17 10:46:57 +0530
committerSashi202020-06-17 10:46:57 +0530
commitf3509f1da7734eded424022544460f666f80ce8e (patch)
tree58b44db09f1ec0b7bd3dd2d9ba11720f5393c151
parentcdc1a1fe166ea2a917f1044a4d02e8ce93981ae2 (diff)
downloadarduino_projects_blog-f3509f1da7734eded424022544460f666f80ce8e.tar.gz
arduino_projects_blog-f3509f1da7734eded424022544460f666f80ce8e.tar.bz2
arduino_projects_blog-f3509f1da7734eded424022544460f666f80ce8e.zip
Update my proposals page to view disapproved proposal details
-rw-r--r--my_proposals.inc14
-rwxr-xr-xproposal.inc2
2 files changed, 15 insertions, 1 deletions
diff --git a/my_proposals.inc b/my_proposals.inc
index 10ba23d..4c56bce 100644
--- a/my_proposals.inc
+++ b/my_proposals.inc
@@ -571,6 +571,7 @@ function arduino_projects_blog_my_proposal_view_form($form, &$form_state)
'#title' => t('Expected Completion date'),
'#markup' => date('d-m-Y', $proposal_data->expected_date_of_completion)
);
+ if($proposal_data->approval_status == 2){
if($proposal_data->resubmit_comment){
$form['resubmit_comment'] = array(
'#type' => 'item',
@@ -578,6 +579,19 @@ function arduino_projects_blog_my_proposal_view_form($form, &$form_state)
'#markup' => $proposal_data->resubmit_comment
);
}
+}
+ else if($proposal_data->approval_status == 4){
+ $form['status'] = array(
+ '#type' => 'item',
+ '#title' => t('Status'),
+ '#markup' => t('Dis-approved')
+ );
+ $form['disapproval_reason'] = array(
+ '#type' => 'item',
+ '#title' => t('Disapproval Reason'),
+ '#markup' => $proposal_data->dissapproval_reason
+ );
+ }
$form['cancel'] = array(
'#type' => 'item',
'#markup' => l(t('Cancel'), 'arduino-projects/my-proposals')
diff --git a/proposal.inc b/proposal.inc
index 9ddd45a..4901fb0 100755
--- a/proposal.inc
+++ b/proposal.inc
@@ -636,7 +636,7 @@ function arduino_projects_blog_my_proposal()
if($my_proposals_data->approval_status == 2){
$action = l('Edit', 'arduino-projects/my-proposals/edit/' . $my_proposals_data->id);
}
- else if($my_proposals_data->approval_status == 1 or $my_proposals_data->approval_status == 3){
+ else if($my_proposals_data->approval_status == 1 or $my_proposals_data->approval_status == 3 or $my_proposals_data->approval_status == 4){
$action = l('View', 'arduino-projects/my-proposals/view/' . $my_proposals_data->id);
}
else if($my_proposals_data->approval_status == 0){