X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/timetracker.git/blobdiff_plain/00b04fd2b07cfd576ffb038c750bf955ca7f87a6..6dbcf228dba9d1175ffd0c177f0739c58ce0f199:/WEB-INF/lib/ttFavReportHelper.class.php

diff --git a/WEB-INF/lib/ttFavReportHelper.class.php b/WEB-INF/lib/ttFavReportHelper.class.php
index a1ea8bc2..006d5567 100644
--- a/WEB-INF/lib/ttFavReportHelper.class.php
+++ b/WEB-INF/lib/ttFavReportHelper.class.php
@@ -80,21 +80,22 @@ class ttFavReportHelper {
     $mdb2 = getConnection();
 
     $sql = "insert into tt_fav_reports (name, user_id, client_id, cf_1_option_id, project_id, task_id,
-      billable, invoice, users, period, period_start, period_end,
-      show_client, show_invoice,
+      billable, invoice, paid_status, users, period, period_start, period_end,
+      show_client, show_invoice, show_paid, show_ip,
       show_project, show_start, show_duration, show_cost,
-      show_task, show_end, show_note, show_custom_field_1,
+      show_task, show_end, show_note, show_custom_field_1, show_work_units,
       group_by, show_totals_only)
       values(".
       $mdb2->quote($fields['name']).", ".$fields['user_id'].", ".
       $mdb2->quote($fields['client']).", ".$mdb2->quote($fields['option']).", ".
       $mdb2->quote($fields['project']).", ".$mdb2->quote($fields['task']).", ".
       $mdb2->quote($fields['billable']).", ".$mdb2->quote($fields['invoice']).", ".
+      $mdb2->quote($fields['paid_status']).", ".
       $mdb2->quote($fields['users']).", ".$mdb2->quote($fields['period']).", ".
       $mdb2->quote($fields['from']).", ".$mdb2->quote($fields['to']).", ".
-      $fields['chclient'].", ".$fields['chinvoice'].", ".
+      $fields['chclient'].", ".$fields['chinvoice'].", ".$fields['chpaid'].", ".$fields['chip'].", ".
       $fields['chproject'].", ".$fields['chstart'].", ".$fields['chduration'].", ".$fields['chcost'].", ".
-      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".
+      $fields['chtask'].", ".$fields['chfinish'].", ".$fields['chnote'].", ".$fields['chcf_1'].", ".$fields['chunits'].", ".
       $mdb2->quote($fields['group_by']).", ".$fields['chtotalsonly'].")";
     $affected = $mdb2->exec($sql);
     if (is_a($affected, 'PEAR_Error'))
@@ -120,12 +121,15 @@ class ttFavReportHelper {
       "task_id = ".$mdb2->quote($fields['task']).", ".
       "billable = ".$mdb2->quote($fields['billable']).", ".
       "invoice = ".$mdb2->quote($fields['invoice']).", ".
+      "paid_status = ".$mdb2->quote($fields['paid_status']).", ".
       "users = ".$mdb2->quote($fields['users']).", ".
       "period = ".$mdb2->quote($fields['period']).", ".
       "period_start = ".$mdb2->quote($fields['from']).", ".
       "period_end = ".$mdb2->quote($fields['to']).", ".
       "show_client = ".$fields['chclient'].", ".
       "show_invoice = ".$fields['chinvoice'].", ".
+      "show_paid = ".$fields['chpaid'].", ".
+      "show_ip = ".$fields['chip'].", ".
       "show_project = ".$fields['chproject'].", ".
       "show_start = ".$fields['chstart'].", ".
       "show_duration = ".$fields['chduration'].", ".
@@ -134,6 +138,7 @@ class ttFavReportHelper {
       "show_end = ".$fields['chfinish'].", ".
       "show_note = ".$fields['chnote'].", ".
       "show_custom_field_1 = ".$fields['chcf_1'].", ".
+      "show_work_units = ".$fields['chunits'].", ".
       "group_by = ".$mdb2->quote($fields['group_by']).", ".
       "show_totals_only = ".$fields['chtotalsonly'].
       " where id = ".$fields['id'];
@@ -152,6 +157,8 @@ class ttFavReportHelper {
     //  Later in this function we use it to construct $fields array to update database.
     if (!$bean->getAttribute('chclient')) $bean->setAttribute('chclient', 0);
     if (!$bean->getAttribute('chinvoice')) $bean->setAttribute('chinvoice', 0);
+    if (!$bean->getAttribute('chpaid')) $bean->setAttribute('chpaid', 0);
+    if (!$bean->getAttribute('chip')) $bean->setAttribute('chip', 0);
     if (!$bean->getAttribute('chproject')) $bean->setAttribute('chproject', 0);
     if (!$bean->getAttribute('chstart')) $bean->setAttribute('chstart', 0);
     if (!$bean->getAttribute('chduration')) $bean->setAttribute('chduration', 0);
@@ -160,6 +167,7 @@ class ttFavReportHelper {
     if (!$bean->getAttribute('chfinish')) $bean->setAttribute('chfinish', 0);
     if (!$bean->getAttribute('chnote')) $bean->setAttribute('chnote', 0);
     if (!$bean->getAttribute('chcf_1')) $bean->setAttribute('chcf_1', 0);
+    if (!$bean->getAttribute('chunits')) $bean->setAttribute('chunits', 0);
     if (!$bean->getAttribute('chtotalsonly')) $bean->setAttribute('chtotalsonly', 0);
 
     if ($bean->getAttribute('users') && is_array($bean->getAttribute('users'))) {
@@ -167,7 +175,7 @@ class ttFavReportHelper {
 
       // If all users are selected - use a null value (which means "all users").
       $all_users_selected = true;
-      if ($user->canManageTeam()) {
+      if ($user->can('view_reports')) {
         $all = ttTeamHelper::getActiveUsers();
         foreach ($all as $one) {
           if (!in_array($one['id'], $users_in_bean)) {
@@ -198,12 +206,15 @@ class ttFavReportHelper {
       'task'=>$bean->getAttribute('task'),
       'billable'=>$bean->getAttribute('include_records'),
       'invoice'=>$bean->getAttribute('invoice'),
+      'paid_status'=>$bean->getAttribute('paid_status'),
       'users'=>$users,
       'period'=>$bean->getAttribute('period'),
       'from'=>$from,
       'to'=>$to,
       'chclient'=>$bean->getAttribute('chclient'),
       'chinvoice'=>$bean->getAttribute('chinvoice'),
+      'chpaid'=>$bean->getAttribute('chpaid'),
+      'chip'=>$bean->getAttribute('chip'),
       'chproject'=>$bean->getAttribute('chproject'),
       'chstart'=>$bean->getAttribute('chstart'),
       'chduration'=>$bean->getAttribute('chduration'),
@@ -212,6 +223,7 @@ class ttFavReportHelper {
       'chfinish'=>$bean->getAttribute('chfinish'),
       'chnote'=>$bean->getAttribute('chnote'),
       'chcf_1'=>$bean->getAttribute('chcf_1'),
+      'chunits'=>$bean->getAttribute('chunits'),
       'group_by'=>$bean->getAttribute('group_by'),
       'chtotalsonly'=>$bean->getAttribute('chtotalsonly'));
 
@@ -249,11 +261,12 @@ class ttFavReportHelper {
       $bean->setAttribute('task', $val['task_id']);
       $bean->setAttribute('include_records', $val['billable']);
       $bean->setAttribute('invoice', $val['invoice']);
+      $bean->setAttribute('paid_status', $val['paid_status']);
       if ($val['users'])
         $bean->setAttribute('users', explode(',', $val['users']));
       else {
         // Null users value means "all users". Add them to the bean.
-        if ($user->canManageTeam()) {
+        if ($user->can('view_reports')) {
           $all = ttTeamHelper::getActiveUsers();
           foreach ($all as $one) {
             $all_user_ids[] = $one['id'];
@@ -272,6 +285,8 @@ class ttFavReportHelper {
       }
       $bean->setAttribute('chclient', $val['show_client']);
       $bean->setAttribute('chinvoice', $val['show_invoice']);
+      $bean->setAttribute('chpaid', $val['show_paid']);
+      $bean->setAttribute('chip', $val['show_ip']);
       $bean->setAttribute('chproject', $val['show_project']);
       $bean->setAttribute('chstart', $val['show_start']);
       $bean->setAttribute('chduration', $val['show_duration']);
@@ -280,6 +295,7 @@ class ttFavReportHelper {
       $bean->setAttribute('chfinish', $val['show_end']);
       $bean->setAttribute('chnote', $val['show_note']);
       $bean->setAttribute('chcf_1', $val['show_custom_field_1']);
+      $bean->setAttribute('chunits', $val['show_work_units']);
       $bean->setAttribute('group_by', $val['group_by']);
       $bean->setAttribute('chtotalsonly', $val['show_totals_only']);
       $bean->setAttribute('new_fav_report', $val['name']);
@@ -304,6 +320,7 @@ class ttFavReportHelper {
         'chfinish'=>'1',
         'chnote'=>'1',
         'chcf_1'=>'',
+        'chunits'=>'',
         'group_by'=>'',
         'chtotalsonly'=>'',
         'new_fav_report'=>''));