X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=timesheet_view.php;h=d0198c780ca6e51622d8db2d3e55986b43252987;hb=d5923832a32b1f43cbc6c5d74bbd064888761c80;hp=70ab3357dabca597ef40128e8fb7f2f2437fc874;hpb=e5486346ac0574517a4fd118f03616ec455df9a9;p=timetracker.git

diff --git a/timesheet_view.php b/timesheet_view.php
index 70ab3357..d0198c78 100644
--- a/timesheet_view.php
+++ b/timesheet_view.php
@@ -28,9 +28,10 @@
 
 require_once('initialize.php');
 import('ttTimesheetHelper');
+import('ttReportHelper');
 
 // Access checks.
-if (!(ttAccessAllowed('view_own_timesheets') || ttAccessAllowed('view_timesheets') || ttAccessAllowed('view_all_timesheets') || ttAccessAllowed('view_client_timesheets'))) {
+if (!(ttAccessAllowed('track_own_time') || ttAccessAllowed('track_time'))) {
   header('Location: access_denied.php');
   exit();
 }
@@ -38,14 +39,14 @@ if (!$user->isPluginEnabled('ts')) {
   header('Location: feature_disabled.php');
   exit();
 }
-$timesheet_id = (int)$request->getParameter('id');
-$timesheet = ttTimesheetHelper::getTimesheet($timesheet_id);
+$cl_timesheet_id = (int)$request->getParameter('id');
+$timesheet = ttTimesheetHelper::getTimesheet($cl_timesheet_id);
 if (!$timesheet) {
   header('Location: access_denied.php');
   exit();
 }
 // TODO: add other checks here for timesheet being appropriate for user role.
-// TODO: if this is a timeheet submit, validate approver id, too.
+// TODO: if this is a timesheet submit, validate approver id, too.
 // End of access checks.
 
 if ($request->isPost()) {
@@ -55,20 +56,22 @@ if ($request->isPost()) {
 $options = ttTimesheetHelper::getReportOptions($timesheet);
 $subtotals = ttReportHelper::getSubtotals($options);
 $totals = ttReportHelper::getTotals($options);
-$notClient = !$user->isClient();
 
 // Determine which controls to show and obtain date for them.
-$showSubmit = $notClient && !$timesheet['submit_status'];
-if ($showSubmit) $approvers = ttTimesheetHelper::getApprovers($timesheet['user_id']);
-$canApprove = $user->can('approve_timesheets') || $user_>can('approve_all_timesheets');
-$showApprove = $notClient && $timesheet['submit_status'] && $timesheet['approval_status'] == null;
+$showSubmit = !$timesheet['submit_status'];
+if ($showSubmit) {
+  $approvers = ttTimesheetHelper::getApprovers();
+  $showApprovers = count($approvers) >= 1;
+}
+$canApprove = $user->can('approve_timesheets') || $user->can('approve_own_timesheets');
+$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) {
-  if (count($approvers) >= 1) {
+  if ($showApprovers) {
     $form->addInput(array('type'=>'combobox',
       'name'=>'approver',
       'style'=>'width: 200px;',
@@ -125,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('show_approvers', $showApprovers);
 $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');