X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=report.php;h=93720cb27e69abb756c0b36afe081c93339854ac;hb=1e2a1839bd4b4530a43dfcdc3f0582623edd5486;hp=a34238fbcc144e5b09b664fceb926414726e9114;hpb=a7ba11adfecf6cb906749efe5abce688363aef07;p=timetracker.git

diff --git a/report.php b/report.php
index a34238fb..93720cb2 100644
--- a/report.php
+++ b/report.php
@@ -30,93 +30,210 @@ require_once('initialize.php');
 import('form.Form');
 import('form.ActionForm');
 import('ttReportHelper');
-import('ttTeamHelper');
+import('ttGroupHelper');
 
 // Access check.
-if (!ttAccessCheck(right_view_reports)) {
+if (!(ttAccessAllowed('view_own_reports') || ttAccessAllowed('view_reports') || ttAccessAllowed('view_all_reports')  || ttAccessAllowed('view_client_reports'))) {
   header('Location: access_denied.php');
   exit();
 }
 
+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;
+  $cl_mark_paid_action_option = $request->getParameter('mark_paid_action_options', ($request->isPost() ? null : @$_SESSION['mark_paid_action_option']));
+  $_SESSION['mark_paid_action_option'] = $cl_mark_paid_action_option;
+}
+if ($user->isPluginEnabled('iv')) {
+  $cl_assign_invoice_select_option = $request->getParameter('assign_invoice_select_options', ($request->isPost() ? null : @$_SESSION['assign_invoice_select_option']));
+  $_SESSION['assign_invoice_select_option'] = $cl_assign_invoice_select_option;
+  $cl_recent_invoice_option = $request->getParameter('recent_invoice', ($request->isPost() ? null : @$_SESSION['recent_invoice_option']));
+  $_SESSION['recent_invoice_option'] = $cl_recent_invoice_option;
+}
+
 // Use custom fields plugin if it is enabled.
-if (in_array('cf', explode(',', $user->plugins))) {
+if ($user->isPluginEnabled('cf')) {
   require_once('plugins/CustomFields.class.php');
-  $custom_fields = new CustomFields($user->team_id);
+  $custom_fields = new CustomFields();
   $smarty->assign('custom_fields', $custom_fields);
 }
 
-$form = new Form('reportForm');
+$form = new Form('reportViewForm');
 
 // Report settings are stored in session bean before we get here from reports.php.
-$bean = new ActionForm('reportBean', $form, $request);
+$bean = new ActionForm('reportBean', new Form('reportForm'), $request);
+// If we are in post, load the bean from session, as the constructor does it only in get.
+if ($request->isPost()) $bean->loadBean();
+
 $client_id = $bean->getAttribute('client');
-if ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by')) && !$user->isClient()) {
+
+// Do we need to show checkboxes?
+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);
+}
+
+// Controls for "Mark paid" block.
+if ($user->can('manage_invoices') && $bean->getAttribute('chpaid')) {
+  $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',
+    'data'=>$mark_paid_select_options,
+    'value'=>$cl_mark_paid_select_option));
+  $mark_paid_action_options = array('1'=>$i18n->get('dropdown.paid'),'2'=>$i18n->get('dropdown.not_paid'));
+  $form->addInput(array('type'=>'combobox',
+    'name'=>'mark_paid_action_options',
+    'data'=>$mark_paid_action_options,
+    'value'=>$cl_mark_paid_action_option));
+  $form->addInput(array('type'=>'submit','name'=>'btn_mark_paid','value'=>$i18n->get('button.submit')));
+  $smarty->assign('use_mark_paid', true);
+}
+
+// Controls for "Assign to invoice" block.
+if ($user->can('manage_invoices') &&
+  ($client_id && $bean->getAttribute('chinvoice') && ('no_grouping' == $bean->getAttribute('group_by1')) && !$user->isClient())) {
   // Client is selected and we are displaying the invoice column.
-  $recent_invoices = ttTeamHelper::getRecentInvoices($user->team_id, $client_id);
+  $recent_invoices = ttGroupHelper::getRecentInvoices($client_id);
   if ($recent_invoices) {
+    $assign_invoice_select_options = array('1'=>$i18n->get('dropdown.all'),'2'=>$i18n->get('dropdown.select'));
+    $form->addInput(array('type'=>'combobox',
+      'name'=>'assign_invoice_select_options',
+      'data'=>$assign_invoice_select_options,
+      'value'=>$cl_assign_invoice_select_option));
     $form->addInput(array('type'=>'combobox',
       'name'=>'recent_invoice',
       'data'=>$recent_invoices,
       'datakeys'=>array('id','name'),
-      'empty'=>array(''=>$i18n->getKey('dropdown.select_invoice'))));
-    $form->addInput(array('type'=>'submit','name'=>'btn_submit','value'=>$i18n->getKey('button.submit')));
-    $smarty->assign('use_checkboxes', true);
+      'value'=>$cl_recent_invoice_option,
+      'empty'=>array(''=>$i18n->get('dropdown.select_invoice'))));
+    $form->addInput(array('type'=>'submit','name'=>'btn_assign','value'=>$i18n->get('button.submit')));
+    $smarty->assign('use_assign_to_invoice', true);
   }
 }
 
 if ($request->isPost()) {
-  foreach($_POST as $key => $val) {
-    if ('log_id_' == substr($key, 0, 7))
-      $time_log_ids[] = substr($key, 7);
-    if ('item_id_' == substr($key, 0, 8))
-      $expense_item_ids[] = substr($key, 8);
-    if ('recent_invoice' == $key)
-       $invoice_id = $val;
+
+  // Validate parameters and at the same time build arrays of record ids.
+  if (($request->getParameter('btn_mark_paid') && 2 == $request->getParameter('mark_paid_select_options'))
+       || ($request->getParameter('btn_assign') && 2 == $request->getParameter('assign_invoice_select_options'))) {
+    // We act on selected records. Are there any?
+    foreach($_POST as $key => $val) {
+      if ('log_id_' == substr($key, 0, 7))
+        $time_log_ids[] = substr($key, 7);
+      if ('item_id_' == substr($key, 0, 8))
+        $expense_item_ids[] = substr($key, 8);
+    }
+    if (!$time_log_ids && !$expense_item_ids) $err->Add($i18n->get('error.record')); // There are no selected records.
+    // Validation of parameteres ended here.
+  } else {
+    // We are assigning all report items. Get the arrays from session.
+    // Note: getting from session assures we act only on previously displayed records.
+    // Rebuilding from $bean may get us a different set.
+    $item_ids = ttReportHelper::getFromSession();
+    $time_log_ids = $item_ids['report_item_ids'];
+    $expense_item_ids = $item_ids['report_item_expense_ids'];
+    // The above code is here beacues the arrays are used in both "Mark paid" and "Assign to invoice" handlers below.
   }
-  if ($time_log_ids || $expense_item_ids) {
-    // Some records are checked for invoice editing. Adjust their invoice accordingly.
-    ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
+
+  if ($err->no()) {
+    if ($request->getParameter('btn_mark_paid')) {
+      // User clicked the "Mark paid" button to mark some or all items either paid or not paid.
+
+      // Determine user action.
+      $mark_paid = $request->getParameter('mark_paid_action_options') == 1 ? true : false;
+
+      // Mark as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::markPaid($time_log_ids, $expense_item_ids, $mark_paid);
+      }
+
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
+
+    if ($request->getParameter('btn_assign')) {
+      // User clicked the Submit button to assign all or some items to a recent invoice.
+
+      // Determine invoice id.
+      $invoice_id = $request->getParameter('recent_invoice');
+
+      // Assign as requested.
+      if ($time_log_ids || $expense_item_ids) {
+        ttReportHelper::assignToInvoice($invoice_id, $time_log_ids, $expense_item_ids);
+      }
+      // Re-display this form.
+      header('Location: report.php');
+      exit();
+    }
   }
-  // Re-display this form.
-  header('Location: report.php');
-  exit();
-} // POST
+} // isPost
+
+$options = ttReportHelper::getReportOptions($bean);
+
+$report_items = ttReportHelper::getItems($options);
+// Store record ids in session in case user wants to act on records such as marking them all paid.
+if ($request->isGet() && $user->isPluginEnabled('ps'))
+  ttReportHelper::putInSession($report_items);
+
+if (ttReportHelper::grouping($options)) {
+  $subtotals = ttReportHelper::getSubtotals($options);
+  $smarty->assign('group_by_header', ttReportHelper::makeGroupByHeader($options));
+}
+$totals = ttReportHelper::getTotals($options);
 
-$group_by = $bean->getAttribute('group_by');
+// TODO: Determine if we can create a timesheet out of this report.
+// There must be only one user, and nothing assigned to existing timesheets.
+$canCreateTimesheet = false;
+if ($user->isPluginEnabled('ts') && count($report_items) > 0 &&
+  ($user->can('manage_own_timesheets') || $user->can('manage_timesheets'))) {
 
-$report_items = ttReportHelper::getItems($bean);
-if ('no_grouping' != $group_by)
-  $subtotals = ttReportHelper::getSubtotals($bean);
-$totals = ttReportHelper::getTotals($bean);
+  $canCreateTimesheet = true; // Start with true and reset if we can't.
+  $first_user_id = null;
+  foreach ($report_items as $report_item) {
+    // Check user id.
+    if (!$first_user_id)
+      $first_user_id = $report_item['user_id'];
+    else {
+      if ($report_item['user_id'] != $first_user_id) {
+        // We have items for multiple users.
+        $canCreateTimesheet = false;
+        break;
+      }
+    }
+    // Check timesheet id.
+    if ($report_item['timesheet_id']) {
+      // We have an item already assigned to a timesheet.
+      $canCreateTimesheet = false;
+      break;
+    }
+  }
+  // Save user_id in session.
+  $bean->saveDetachedAttribute('timesheet_user_id', $first_user_id);
+
+  // TODO: Improve this for "view_all_reports" situation.
+  // We may need to add "manage_all_timesheets" right.
+}
 
 // Assign variables that are used to print subtotals.
-if ($report_items && 'no_grouping' != $group_by) {
+if ($report_items) {
   $smarty->assign('print_subtotals', true);
   $smarty->assign('first_pass', true);
-  $smarty->assign('group_by', $group_by);
   $smarty->assign('prev_grouped_by', '');
   $smarty->assign('cur_grouped_by', '');
 }
-// Determine group by header.
-if ('no_grouping' != $group_by) {
-  if ('cf_1' == $group_by)
-    $smarty->assign('group_by_header', $custom_fields->fields[0]['label']);
-  else {
-    $key = 'label.'.$group_by;
-    $smarty->assign('group_by_header', $i18n->getKey($key));
-  }
-}
+
 // Assign variables that are used to alternate color of rows for different dates.
 $smarty->assign('prev_date', '');
 $smarty->assign('cur_date', '');
 $smarty->assign('report_row_class', 'rowReportItem');
-
 $smarty->assign('forms', array($form->getName()=>$form->toArray()));
-
 $smarty->assign('report_items', $report_items);
 $smarty->assign('subtotals', $subtotals);
 $smarty->assign('totals', $totals);
+$smarty->assign('can_create_timesheet', $canCreateTimesheet);
 $smarty->assign('bean', $bean);
-$smarty->assign('title', $i18n->getKey('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
+$smarty->assign('title', $i18n->get('title.report').": ".$totals['start_date']." - ".$totals['end_date']);
 $smarty->assign('content_page_name', 'report.tpl');
 $smarty->display('index.tpl');