extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-13 17:38:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calculate totals all the time

Browse Source
This commit is contained in:
Nathan Gray 2016-05-03 22:18:49 +00:00
parent dafe7d484d
commit d9f99b9fe4
1 changed files with 39 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
timesheet/inc/class.timesheet_ui.inc.php
View File

@ -471,8 +471,7 @@ class timesheet_ui extends timesheet_bo
function get_rows(&$query_in,&$rows,&$readonlys,$id_only=false) function get_rows(&$query_in,&$rows,&$readonlys,$id_only=false)
{ {
$this->show_sums = false; $this->show_sums = false;
if ($query_in['filter'])
{
$query_in['enddate'] = $query_in['enddate'] ? $query_in['enddate'] : time(); $query_in['enddate'] = $query_in['enddate'] ? $query_in['enddate'] : time();
$date_filter = $this->date_filter($query_in['filter'],$query_in['startdate'],$query_in['enddate']); $date_filter = $this->date_filter($query_in['filter'],$query_in['startdate'],$query_in['enddate']);
@ -513,7 +512,6 @@ class timesheet_ui extends timesheet_bo
$this->show_sums[] = 'day'; $this->show_sums[] = 'day';
} }
} }
}
//echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n"; //echo "<p align=right>show_sums=".print_r($this->show_sums,true)."</p>\n";
if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in); if (!$id_only && !$query_in['csv_export']) $GLOBALS['egw']->session->appsession('index',TIMESHEET_APP,$query_in);
@ -785,15 +783,9 @@ class timesheet_ui extends timesheet_bo
if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint'; if ($query['col_filter']['ts_owner']) $rows['ownerClass'] = 'noPrint';
$rows['no_owner_col'] = $query['no_owner_col']; $rows['no_owner_col'] = $query['no_owner_col'];
if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1; if (!$rows['no_owner_col'] && $query['selectcols'] && !strpos($query['selectcols'],'ts_owner')) $rows['no_owner_col'] = 1;
if ($query['filter'])
{
$rows += $this->summary; $rows += $this->summary;
}
else
{
// Clear summary
$rows += array('duration'=>'','price'=>'','quantity'=>'');
}
$rows['pm_integration'] = $this->pm_integration; $rows['pm_integration'] = $this->pm_integration;
$rows['ts_viewtype'] = $rows['no_ts_quantity'] = $rows['no_ts_unitprice'] = $rows['no_ts_total'] = $this->ts_viewtype == 'short'; $rows['ts_viewtype'] = $rows['no_ts_quantity'] = $rows['no_ts_unitprice'] = $rows['no_ts_total'] = $this->ts_viewtype == 'short';
if (!$rows['ts_viewtype']) if (!$rows['ts_viewtype'])