extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-15 12:34:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Make days count in calendar report independent of the amounts

Browse Source
This commit is contained in:
Hadi Nategh 2017-01-10 18:03:22 +01:00
parent 20cddc8445
commit 7e270dea76
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
calendar/inc/class.calendar_category_report.inc.php
View File

@ -293,7 +293,7 @@ class calendar_category_report extends calendar_ui{
$content['grid'][$row_id]['min_days'], $content['grid'][$row_id]['min_days'],
$content['grid'][$row_id]['unit'], $content['grid'][$row_id]['unit'],
$content['start'], $content['start'],
$content['end']+86399 // range till midnight of the sele3cted end date $content['end']+86399 // range till midnight of the selected end date
); );
} }
} }
@ -314,6 +314,7 @@ class calendar_category_report extends calendar_ui{
$days_output[$user_id][$cat_id]['amount'] = $days_output[$user_id][$cat_id]['amount'] =
$days_output[$user_id][$cat_id]['amount'] + (int)$e['amount']; $days_output[$user_id][$cat_id]['amount'] + (int)$e['amount'];
$days_output[$user_id][$cat_id]['unit'] = $e['unit']; $days_output[$user_id][$cat_id]['unit'] = $e['unit'];
$days_output[$user_id][$cat_id]['days'] += 1;
} }
} }
} }
@ -378,6 +379,7 @@ class calendar_category_report extends calendar_ui{
$cats_row [$cat_id] = ceil($cats_data[$cat_id]['amount']? $cats_row [$cat_id] = ceil($cats_data[$cat_id]['amount']?
($cats_data[$cat_id]['amount'] - $events_log['reductions'][$user_id][$cat_id]) / ($cats_data[$cat_id]['amount'] - $events_log['reductions'][$user_id][$cat_id]) /
$cats_data[$cat_id]['unit']: 0); $cats_data[$cat_id]['unit']: 0);
if ($cats_data[$cat_id]['unit'] == 86400) $cats_row [$cat_id] = $cats_data[$cat_id]['days'];
} }
// first name // first name
$n_given = array('n_given' => Api\Accounts::id2name($user_id, 'account_firstname')) ? $n_given = array('n_given' => Api\Accounts::id2name($user_id, 'account_firstname')) ?
@ -404,7 +406,7 @@ class calendar_category_report extends calendar_ui{
} }
//check if all values of the row is zero then escape the row //check if all values of the row is zero then escape the row
if (!$check_row) continue; if (!$check_row) continue;
// printout each row into file // printout each row into file
fputcsv($fp, array_values($row)); fputcsv($fp, array_values($row));
} }