1 files changed, 40 insertions, 8 deletions
diff --git a/manage_proposal.inc b/manage_proposal.inc
index 67aa601..230d9e9 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -123,13 +123,17 @@ function _proposal_all()
         else{
         $proposed_completion_date = "-----";
         }
+        if($proposal_data->completion_date != 0){
+            $completion_date = date('d-m-Y', $proposal_data->completion_date);
+        }
+        else{
+            $completion_date = date('d-m-Y', $proposal_data->approval_date);
+        }
         $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),
-            $proposed_completion_date,
+            //$completion_date,
             $proposal_status,
             t($code_submission_status),
             l('Status', 'textbook-companion/manage-proposal/status/' . $proposal_data->id) . ' | ' . l('Edit', 'textbook-companion/manage-proposal/edit/' . $proposal_data->id) . _tbc_ext($proposal_status, $preference_data->id)
@@ -144,8 +148,7 @@ function _proposal_all()
         'Date of Submission',
         'Title of the Book',
         'Contributor Name',
-        'Actual Date of Completion',
-        'Proposed Date of Completion',
+        //'Date of Approval/Completion',
         'Status',
         'Is all code submitted',
         'Action'
@@ -576,10 +579,39 @@ function proposal_status_form($from, $form_state)
         '#markup' => $proposal_data->reviewer,
         '#title' => t('Reviewer')
     );
+    if($proposal_data->approval_date != 0){
+        $approval_date = date('d-m-Y', $proposal_data->approval_date);
+    }
+    else{
+        $approval_date = "-----";
+    }
+    $form['approval_date'] = array(
+        '#type' => 'item',
+        '#markup' => $approval_date,
+        '#title' => t('Date of Approval')
+    );
+    if($proposal_data->completion_date != 0){
+        $completion_date = date('d-m-Y', $proposal_data->completion_date);
+    }
+    else{
+        $completion_date = "-----";
+    }
     $form['completion_date'] = array(
         '#type' => 'item',
-        '#markup' => date('d-m-Y', $proposal_data->completion_date),
-        '#title' => t('Expected Date of Completion')
+        '#markup' => $completion_date,
+        '#title' => t('Date of Completion')
+    );
+    if($proposal_data->proposed_completion_date != 0){
+    $proposed_completion_date = date('d-m-Y', $proposal_data->proposed_completion_date);
+    }
+    else{
+        $proposed_completion_date = "-----";
+    }
+        
+     $form['proposed_completion_date'] = array(
+        '#type' => 'item',
+        '#markup' => $proposed_completion_date,
+        '#title' => t('Proposed Date of Completion')
     );
     $form['operating_system'] = array(
         '#type' => 'item',