extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

- fixed not working reports on MySQL 4.0, Postgres and (untested) MsSQL

Browse Source 
- added a yearly sum
This commit is contained in:
Ralf Becker 2006-04-05 16:23:44 +00:00
parent c695fc3ab9
commit 0d73bce482
2 changed files with 52 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
timesheet/inc/class.botimesheet.inc.php
View File

@ -256,8 +256,17 @@ class botimesheet extends so_sql
*/ */
function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false,$only_summary=false) function &search($criteria,$only_keys=True,$order_by='',$extra_cols='',$wildcard='',$empty=False,$op='AND',$start=false,$filter=null,$join='',$need_full_no_count=false,$only_summary=false)
{ {
if (!$extra_cols) $extra_cols = 'round(ts_quantity*ts_unitprice,2) AS ts_total'; // postgres can't round from double precission, only from numeric ;-)
$total_sql = $this->db->Type != 'pgsql' ? "round(ts_quantity*ts_unitprice,2)" : "round(cast(ts_quantity*ts_unitprice AS numeric),2)";
if ($extra_cols && !is_array($extra_cols))
{
$extra_cols = explode(',',$extra_cols);
}
else
{
$extra_cols = array($total_sql.' AS ts_total');
}
if (!isset($filter['ts_owner']) || !count($filter['ts_owner'])) if (!isset($filter['ts_owner']) || !count($filter['ts_owner']))
{ {
$filter['ts_owner'] = array_keys($this->grants); $filter['ts_owner'] = array_keys($this->grants);
@ -280,42 +289,45 @@ class botimesheet extends so_sql
$this->summary = array(); $this->summary = array();
return array(); return array();
} }
$this->summary = parent::search($criteria,'SUM(ts_duration) AS duration,SUM(round(ts_quantity*ts_unitprice,2)) AS price', $this->summary = parent::search($criteria,"SUM(ts_duration) AS duration,SUM($total_sql) AS price",
'','',$wildcard,$empty,$op,false,$filter,$join); '','',$wildcard,$empty,$op,false,$filter,$join);
$this->summary = $this->summary[0]; $this->summary = $this->summary[0];
if ($only_summary) return $this->summary; if ($only_summary) return $this->summary;
// ToDo: get the day- & weeksums working with DB's other then MySQL (problem is a missing equivalent to FROM_UNIXTIME) if ($this->show_sums && strstr($order_by,'ts_start') && // sums only make sense if ordered by ts_start
if ($this->show_sums && $this->db->Type == 'mysql' && strstr($order_by,'ts_start')) // day- / weekwise sums only for mysql and if ordered by ts_start $this->db->capabilities['union'] && ($from_unixtime_ts_start = $this->db->from_unixtime('ts_start')))
{ {
$sum_sql = array(
'year' => $this->db->date_format($from_unixtime_ts_start,'%Y'),
'month' => $this->db->date_format($from_unixtime_ts_start,'%Y%m'),
'week' => $this->db->date_format($from_unixtime_ts_start,$GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? '%X%V' : '%x%v'),
'day' => $this->db->date_format($from_unixtime_ts_start,'%Y-%m-%d'),
);
foreach($this->show_sums as $type)
{
$extra_cols[] = $sum_sql[$type].' AS ts_'.$type;
$extra_cols[] = '0 AS is_sum_'.$type;
$sum_extra_cols[] = str_replace('ts_start','MIN(ts_start)',$sum_sql[$type]); // as we dont group by ts_start
$sum_extra_cols[$type] = '0 AS is_sum_'.$type;
}
// regular entries // regular entries
parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count); parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
if ($this->show_sums['month']) // month-sums
{
parent::search($criteria,"-2,'',DATE_FORMAT(FROM_UNIXTIME(ts_start),'%Y%m') AS ts_month,'',ts_start,".
"SUM(ts_duration) AS ts_duration,0,0,0,0,0,0,0,SUM(round(ts_unitprice * ts_quantity,2)) AS ts_total",
'GROUP BY ts_month ORDER BY '.$order_by,'',$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
}
$weekstart = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'] == 'Sunday' ? 0 : 1;
if ($this->show_sums['week']) // week-sums
{
parent::search($criteria,"-1,'',YEARWEEK(FROM_UNIXTIME(ts_start),$weekstart) AS ts_week,'',ts_start,".
"SUM(ts_duration) AS ts_duration,0,0,0,0,0,0,0,SUM(round(ts_unitprice * ts_quantity,2)) AS ts_total",
'GROUP BY ts_week ORDER BY '.$order_by,'',$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
}
// order of the union: monthsums behind the month, weeksums behind the week and daysums behind the day
$sort = substr($order_by,8); $sort = substr($order_by,8);
$union_order = "DATE_FORMAT(FROM_UNIXTIME(ts_start),'%Y%m') $sort,CASE WHEN ts_id=-2 THEN 1 ELSE 0 END,". $union_order = array();
"YEARWEEK(FROM_UNIXTIME(ts_start),$weekstart) $sort,CASE WHEN ts_id=-1 THEN 1 ELSE 0 END,". $sum_ts_id = array('year' => -3,'month' => -2,'week' => -1,'day' => 0);
"DATE(FROM_UNIXTIME(ts_start)) $sort,CASE WHEN ts_id=0 THEN 1 ELSE 0 END,$order_by"; foreach($this->show_sums as $type)
{
// day-sums $union_order[] = 'ts_'.$type . ' ' . $sort;
return parent::search($criteria,"0,'',DATE(FROM_UNIXTIME(ts_start)) AS ts_date,'',ts_start,". $union_order[] = 'is_sum_'.$type;
"SUM(ts_duration) AS ts_duration,0,0,0,0,0,0,0,SUM(round(ts_unitprice * ts_quantity,2)) AS ts_total", $sum_extra_cols[$type]{0} = '1';
array('GROUP BY ts_date ORDER BY '.$order_by,$union_order), // the $type sum
'',$wildcard,$empty,$op,$start,$this->show_sums['day'] ? $filter : array('ts_id'=>0),$join,$need_full_no_count); parent::search($criteria,$sum_ts_id[$type].",'','','',MIN(ts_start),SUM(ts_duration) AS ts_duration,0,0,0,0,0,0,0,SUM($total_sql) AS ts_total",
'GROUP BY '.$sum_sql[$type],$sum_extra_cols,$wildcard,$empty,$op,'UNION',$filter,$join,$need_full_no_count);
$sum_extra_cols[$type]{0} = '0';
}
return parent::search('','',implode(',',$union_order),'','',false,'',$start);
} }
return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count); return parent::search($criteria,$only_keys,$order_by,$extra_cols,$wildcard,$empty,$op,$start,$filter,$join,$need_full_no_count);
} }

18
timesheet/inc/class.uitimesheet.inc.php
View File

@ -266,10 +266,15 @@ class uitimesheet extends botimesheet
$start = explode('-',date('Y-m-d',$query_in['startdate']+12*60*60)); $start = explode('-',date('Y-m-d',$query_in['startdate']+12*60*60));
$end = explode('-',date('Y-m-d',$query_in['enddate'] ? $query_in['enddate'] : $query_in['startdate']+7.5*24*60*60)); $end = explode('-',date('Y-m-d',$query_in['enddate'] ? $query_in['enddate'] : $query_in['startdate']+7.5*24*60*60));
// show year-sums, if we are year-aligned (show full years)?
if ((int)$start[2] == 1 && (int)$start[1] == 1 && (int)$end[2] == 31 && (int)$end[1] == 12)
{
$this->show_sums[] = 'year';
}
// show month-sums, if we are month-aligned (show full monthes)? // show month-sums, if we are month-aligned (show full monthes)?
if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d',mktime(12,0,0,$end[1]+1,0,$end[0]))) if ((int)$start[2] == 1 && (int)$end[2] == (int)date('d',mktime(12,0,0,$end[1]+1,0,$end[0])))
{ {
$this->show_sums['month'] = true; $this->show_sums[] = 'month';
} }
// show week-sums, if we are week-aligned (show full weeks)? // show week-sums, if we are week-aligned (show full weeks)?
$week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts']; $week_start_day = $GLOBALS['egw_info']['user']['preferences']['calendar']['weekdaystarts'];
@ -285,12 +290,12 @@ class uitimesheet extends botimesheet
//echo "<p align=right>prefs: $week_start_day - $week_end_day, filter: $filter_start_day - $filter_end_day</p>\n"; //echo "<p align=right>prefs: $week_start_day - $week_end_day, filter: $filter_start_day - $filter_end_day</p>\n";
if ($filter_start_day == $week_start_day && (!$filter_end_day || $filter_end_day == $week_end_day)) if ($filter_start_day == $week_start_day && (!$filter_end_day || $filter_end_day == $week_end_day))
{ {
$this->show_sums['week'] = true; $this->show_sums[] = 'week';
} }
// show day-sums, if range <= 5 weeks // show day-sums, if range <= 5 weeks
if (!$query_in['enddate'] || $query_in['enddate'] - $query_in['startdate'] < 36*24*60*60) if (!$query_in['enddate'] || $query_in['enddate'] - $query_in['startdate'] < 36*24*60*60)
{ {
$this->show_sums['day'] = true; $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";
@ -388,10 +393,13 @@ class uitimesheet extends botimesheet
$GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false)); $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'],false));
break; break;
case -1: // week-sum case -1: // week-sum
$row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_title'],4).'/'.substr($row['ts_title'],0,4)); $row['ts_title'] = lang('Sum %1:',lang('week').' '.substr($row['ts_week'],4).'/'.substr($row['ts_week'],0,4));
break; break;
case -2: // month-sum case -2: // month-sum
$row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_title'],0,4)); $row['ts_title'] = lang('Sum %1:',lang(date('F',$row['ts_start'])).' '.substr($row['ts_month'],0,4));
break;
case -3: // year-sum
$row['ts_title'] = lang('Sum %1:',$row['ts_year']);
break; break;
} }
$row['ts_start'] = $row['ts_quantity'] = $row['ts_unitprice'] = ''; $row['ts_start'] = $row['ts_quantity'] = $row['ts_unitprice'] = '';