A bit of refactoring in report.php for timesheet assignment.

diff --git a/WEB-INF/lib/ttTimesheetHelper.class.php b/WEB-INF/lib/ttTimesheetHelper.class.php
index f214963b2fa0e74f850d9ec58fd298bdf4b1d1ff..22f1292758faefc604b1ff955c4d030824d56400 100644 (file)
--- a/WEB-INF/lib/ttTimesheetHelper.class.php
+++ b/WEB-INF/lib/ttTimesheetHelper.class.php
@@ -414,4 +414,14 @@ class ttTimesheetHelper {
     }
     return false;
   }
     }
     return false;
   }

-}
+
+  // The canAssign function determines if we can show controls on a report page
+  // for timesheet assignment.
+  //
+  // Conditions:
+  // - Report date range, client_id, and project_id match an existing timesheet
+  //   with approved_status null.
+  static function canAssign($options) {
+    return false;
+  }
+}
\ No newline at end of file

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 6732e72eb1fe79b88e3052feff5026631aefc79b..f7a5219611c028e73eb535cfbc51e9bc4f63bc26 100644 (file)
--- a/WEB-INF/templates/footer.tpl
+++ b/WEB-INF/templates/footer.tpl
@@ -12,7 +12,7 @@
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>
       <br>
       <table cellspacing="0" cellpadding="4" width="100%" border="0">
         <tr>

-          <td align="center">&nbsp;Anuko Time Tracker 1.18.52.4816 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |
+          <td align="center">&nbsp;Anuko Time Tracker 1.18.52.4817 | Copyright &copy; <a href="https://www.anuko.com/lp/tt_3.htm" target="_blank">Anuko</a> |

             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>
             <a href="https://www.anuko.com/lp/tt_4.htm" target="_blank">{$i18n.footer.credits}</a> |
             <a href="https://www.anuko.com/lp/tt_5.htm" target="_blank">{$i18n.footer.license}</a> |
             <a href="https://www.anuko.com/lp/tt_7.htm" target="_blank">{$i18n.footer.improve}</a>

diff --git a/report.php b/report.php
index 84b18b66c45e521af65c0a7bad0b2e2d2079acd0..b31394e27085bd20eb02e3b6418f3b0bb8ce86fc 100644 (file)
--- a/report.php
+++ b/report.php
@@ -73,21 +73,29 @@ if ($request->isPost()) $bean->loadBean();
 
 $client_id = $bean->getAttribute('client');
 
 
 $client_id = $bean->getAttribute('client');
 

-// Do we need to show checkboxes? We show them if we allow setting approved or paid status,
-// and also when we can assign / deassign records to invoces.
+// Do we need to show checkboxes? We show them in the following 4 situations:
+// - We can approve items.
+// - We can mark items as paid.
+// - We can sssign items to invoices.
+// - We can assign items to a timesheet.
+// Determine these conditions separately.

 if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_eports')))
 if ($bean->getAttribute('chapproved') && ($user->can('approve_reports') || $user->can('approve_all_eports')))

-  $showForApproved = true;
-if ($bean->getAttribute('chpaid') ||
-   ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
-  if ($user->can('manage_invoices'))
-    $showForInvoicesOrPaid = true;
-}
-$use_checkboxes = $showForApproved || $showForInvoicesOrPaid;
+  $useMarkApproved = true;
+if ($bean->getAttribute('chpaid') && $user->can('manage_invoices'))
+  $useMarkPaid = true;
+if ($bean->getAttribute('chinvoice') && $client_id && 'no_grouping' == $bean->getAttribute('group_by1') && !$user->isClient() && $user->can('manage_invoices'))
+  $useAssignToInvoice = true;
+//if ($bean->getAttribute('chtimesheet') && ($user->can('track_own_time') || $user->can('track_time')))
+//  $useAssignToTimesheet = true; // TODO: add a check for timesheet capability.
+//if (ttTimesheetHelper::canAssign($options))
+//  $useAssignToTimesheet = true;
+
+$use_checkboxes = $useMarkApproved || $useMarkPaid || $useAssignToInvoice || $useAssignToTimesheet;

 if ($use_checkboxes)
   $smarty->assign('use_checkboxes', true);
 
 // Controls for "Mark approved" block.
 if ($use_checkboxes)
   $smarty->assign('use_checkboxes', true);
 
 // Controls for "Mark approved" block.

-if ($showForApproved) {
+if ($useMarkApproved) {

   $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_select_options',
   $mark_approved_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_approved_select_options',


@@ -103,7 +111,7 @@ if ($showForApproved) {
 }
 
 // Controls for "Mark paid" block.
 }
 
 // Controls for "Mark paid" block.

-if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) {
+if ($useMarkPaid) {

   $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_select_options',
   $mark_paid_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
   $form->addInput(array('type'=>'combobox',
     'name'=>'mark_paid_select_options',


@@ -119,8 +127,7 @@ if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) {
 }
 
 // Controls for "Assign to invoice" block.
 }
 
 // Controls for "Assign to invoice" block.

-if ($user->can('manage_invoices') &&
-  ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
+if ($useAssignToInvoice) {

   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
   if ($recent_invoices) {
   // Client is selected and we are displaying the invoice column.
   $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
   if ($recent_invoices) {