From: Nik Okuntseff <support@anuko.com>
Date: Mon, 25 Feb 2019 15:55:05 +0000 (+0000)
Subject: More work in progress on report approval.
X-Git-Tag: timetracker_1.19-1~271
X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=a93a92b4959bf35c5c6b41adaea5a666b876bf2d;p=timetracker.git

More work in progress on report approval.
---

diff --git a/WEB-INF/templates/footer.tpl b/WEB-INF/templates/footer.tpl
index 87bda8d1..0fb5ca50 100644
--- 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>
-          <td align="center">&nbsp;Anuko Time Tracker 1.18.43.4775 | 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.43.4776 | 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>
diff --git a/WEB-INF/templates/report.tpl b/WEB-INF/templates/report.tpl
index 0de892ee..294582dc 100644
--- a/WEB-INF/templates/report.tpl
+++ b/WEB-INF/templates/report.tpl
@@ -166,8 +166,17 @@
   </td>
 </tr>
 </table>
-{if $report_items && ($use_mark_paid || $use_assign_to_invoice)}
+{if $report_items && ($use_mark_approved || $use_mark_paid || $use_assign_to_invoice)}
 <table width="720" cellspacing="0" cellpadding="0" border="0">
+  {if $use_mark_approved}
+  <tr>
+    <td align="right">
+      <table>
+        <tr><td>{$i18n.label.mark_approved}: {$forms.reportViewForm.mark_approved_select_options.control} {$forms.reportViewForm.mark_approved_action_options.control} {$forms.reportViewForm.btn_mark_approved.control}</td></tr>
+      </table>
+    </td>
+  </tr>
+  {/if}
   {if $use_mark_paid}
   <tr>
     <td align="right">
diff --git a/report.php b/report.php
index 93720cb2..135c8f27 100644
--- a/report.php
+++ b/report.php
@@ -38,6 +38,12 @@ if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') ||
   exit();
 }
 
+if ($user->isPluginEnabled('ap')) {
+  $cl_mark_approved_select_option = $request->getParameter('mark_approved_select_options', ($request->isPost() ? null : @$_SESSION['mark_approved_select_option']));
+  $_SESSION['mark_approved_select_option'] = $cl_mark_approved_select_option;
+  $cl_mark_approved_action_option = $request->getParameter('mark_approved_action_options', ($request->isPost() ? null : @$_SESSION['mark_approved_action_option']));
+  $_SESSION['mark_aproved_action_option'] = $cl_mark_approved_action_option;
+}
 if ($user->isPluginEnabled('ps')) {
   $cl_mark_paid_select_option = $request->getParameter('mark_paid_select_options', ($request->isPost() ? null : @$_SESSION['mark_paid_select_option']));
   $_SESSION['mark_paid_select_option'] = $cl_mark_paid_select_option;
@@ -67,11 +73,32 @@ if ($request->isPost()) $bean->loadBean();
 
 $client_id = $bean->getAttribute('client');
 
-// Do we need to show checkboxes?
+// 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.
+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'))
-    $smarty->assign('use_checkboxes', true);
+    $showForInvoicesOrPaid = true;
+}
+if ($showForApproved || $showForInvoicesOrPaid)
+  $smarty->assign('use_checkboxes', true);
+
+// Controls for "Mark approved" block.
+if ($showForApproved) {
+  $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',
+    'data'=>$mark_approved_select_options,
+    'value'=>$cl_mark_approved_select_option));
+  $mark_approved_action_options = array('1'=>$i18n->get('form.reports.include_approved'),'2'=>$i18n->get('form.reports.include_not_approved'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_approved_action_options',
+    'data'=>$mark_approved_action_options,
+    'value'=>$cl_mark_approved_action_option));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_approved','value'=>$i18n->get('button.submit')));
+  $smarty->assign('use_mark_approved', true);
 }
 
 // Controls for "Mark paid" block.