Renamed MULTITEAM_MODE to MULTIORG_MODE to better reflect the meaning of the constant.

[timetracker.git] / timesheet_view.php

diff --git a/timesheet_view.php b/timesheet_view.php
index 9b5b4cdfed935aa893dd62cb6e16a9847181f76c..c8d7048a43d04826973e3e0320ba4d50f71c793a 100644 (file)
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -28,6 +28,7 @@
 
 require_once('initialize.php');
 import('ttTimesheetHelper');
 
 require_once('initialize.php');
 import('ttTimesheetHelper');

+import('ttReportHelper');

 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
 
 // Access checks.
 if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {


@@ -50,6 +51,7 @@ if (!$timesheet) {
 
 if ($request->isPost()) {
   $cl_comment = trim($request->getParameter('comment'));
 
 if ($request->isPost()) {
   $cl_comment = trim($request->getParameter('comment'));

+  $approver_id = $request->getParameter('approver');

 }
 
 $options = ttTimesheetHelper::getReportOptions($timesheet);
 }
 
 $options = ttTimesheetHelper::getReportOptions($timesheet);


@@ -58,21 +60,24 @@ $totals = ttReportHelper::getTotals($options);
 
 // Determine which controls to show and obtain date for them.
 $showSubmit = !$timesheet['submit_status'];
 
 // Determine which controls to show and obtain date for them.
 $showSubmit = !$timesheet['submit_status'];

-if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
+if ($showSubmit) {
+  $approvers = ttTimesheetHelper::getApprovers();
+  $showApprovers = count($approvers) >= 1;
+}

 $canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
 $canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');

-$showApprove = $timesheet['submit_status'] && $timesheet['approval_status'] == null;
+$showApprove = $timesheet['submit_status'] && $timesheet['approve_status'] == null;

 
 // Add a form with controls.
 $form = new Form('timesheetForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$timesheet['id']));
 
 if ($showSubmit) {
 
 // Add a form with controls.
 $form = new Form('timesheetForm');
 $form->addInput(array('type'=>'hidden','name'=>'id','value'=>$timesheet['id']));
 
 if ($showSubmit) {

-  if (count($approvers) >= 1) {
+  if ($showApprovers) {

     $form->addInput(array('type'=>'combobox',
       'name'=>'approver',
       'style'=>'width: 200px;',
       'data'=>$approvers,
     $form->addInput(array('type'=>'combobox',
       'name'=>'approver',
       'style'=>'width: 200px;',
       'data'=>$approvers,

-      'datakeys'=>array('id','name')));
+      'datakeys'=>array('id','name','email')));

   }
   $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 }
   }
   $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->get('button.submit')));
 }


@@ -87,35 +92,51 @@ if ($showApprove) {
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     $fields = array('timesheet_id' => $timesheet['id'],
 if ($request->isPost()) {
   if ($request->getParameter('btn_submit')) {
     $fields = array('timesheet_id' => $timesheet['id'],

-      'approver_id' => $approver_id); // TODO: obtain (and check) approver id above during access checks.
-    if (ttTimesheetHelper::submitTimesheet($fields)) {
+      'approver_id' => $approver_id);
+    if (!ttTimesheetHelper::markSubmitted($fields))
+      $err->add($i18n->get('error.db'));
+    if ($err->no() && !ttTimesheetHelper::sendSubmitEmail($fields)) {
+      $err->add($i18n->get('error.mail_send'));
+    }
+    if ($err->no()) {

       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();
       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();

-    } else
-      $err->add($i18n->get('error.db'));
+    }

   }
 
   if ($request->getParameter('btn_approve')) {
     $fields = array('timesheet_id' => $timesheet['id'],
   }
 
   if ($request->getParameter('btn_approve')) {
     $fields = array('timesheet_id' => $timesheet['id'],

+      'name' => $timesheet['name'],
+      'user_id' => $timesheet['user_id'],

       'comment' => $cl_comment);
       'comment' => $cl_comment);

-    if (ttTimesheetHelper::approveTimesheet($fields)) {
+    if (!ttTimesheetHelper::markApproved($fields))
+      $err->add($i18n->get('error.db'));
+    if ($err->no() && !ttTimesheetHelper::sendApprovedEmail($fields)) {
+      $err->add($i18n->get('error.mail_send'));
+    }
+    if ($err->no()) {

       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();
       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();

-    } else
-      $err->add($i18n->get('error.db'));
+    }

   }
 
   if ($request->getParameter('btn_disapprove')) {
     $fields = array('timesheet_id' => $timesheet['id'],
   }
 
   if ($request->getParameter('btn_disapprove')) {
     $fields = array('timesheet_id' => $timesheet['id'],

+      'name' => $timesheet['name'],
+      'user_id' => $timesheet['user_id'],

       'comment' => $cl_comment);
       'comment' => $cl_comment);

-    if (ttTimesheetHelper::disapproveTimesheet($fields)) {
+    if (!ttTimesheetHelper::markDisapproved($fields))
+      $err->add($i18n->get('error.db'));
+    if ($err->no() && !ttTimesheetHelper::sendDisapprovedEmail($fields)) {
+      $err->add($i18n->get('error.mail_send'));
+    }
+    if ($err->no()) {

       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();
       // Redirect to self.
       header('Location: timesheet_view.php?id='.$timesheet['id']);
       exit();

-    } else
-      $err->add($i18n->get('error.db'));
+    }

   }
 }
 
   }
 }
 


@@ -124,9 +145,10 @@ $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
 $smarty->assign('timesheet', $timesheet);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);

+$smarty->assign('show_approvers', $showApprovers);

 $smarty->assign('show_submit', $showSubmit);
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
 $smarty->assign('show_submit', $showSubmit);
 $smarty->assign('show_approve', $showApprove);
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));

-$smarty->assign('title', $i18n->get('title.timesheet'));
+$smarty->assign('title', $i18n->get('title.timesheet').": ".$timesheet['start_date']." - ".$timesheet['end_date']);

 $smarty->assign('content_page_name', 'timesheet_view.tpl');
 $smarty->display('index.tpl');
 $smarty->assign('content_page_name', 'timesheet_view.tpl');
 $smarty->display('index.tpl');