Some more work on timesheets.

[timetracker.git] / timesheet_view.php

diff --git a/timesheet_view.php b/timesheet_view.php
index 9b5b4cdfed935aa893dd62cb6e16a9847181f76c..d0198c780ca6e51622d8db2d3e55986b43252987 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'))) {


@@ -58,16 +59,19 @@ $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;',
     $form->addInput(array('type'=>'combobox',
       'name'=>'approver',
       'style'=>'width: 200px;',


@@ -124,9 +128,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');