holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix empty custom start- or end-date is displayed as 1970-01-01 in app-header and just selecting a start to get week starting from that day got wrong enddate

Browse Source
This commit is contained in:
Ralf Becker 2014-08-25 18:22:50 +00:00
parent 300263e534
commit 4e044c5bde
2 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
timesheet/inc/class.timesheet_bo.inc.php
View File

@ -384,7 +384,7 @@ class timesheet_bo extends so_sql_cf
} }
else else
{ {
$end = $start + 8*24*60*60; $end = $start + 7*24*60*60;
} }
} }
else else
@ -433,8 +433,9 @@ class timesheet_bo extends so_sql_cf
$start = $weekstart + $sweek*7*24*60*60; $start = $weekstart + $sweek*7*24*60*60;
$end = $weekstart + $eweek*7*24*60*60; $end = $weekstart + $eweek*7*24*60*60;
} }
$end_param = $end - 24*60*60;
} }
$end_param = $end - 24*60*60;
//echo "<p align='right'>date_filter($name,$start,$end) today=".date('l, Y-m-d H:i',$this->today)." ==> ".date('l, Y-m-d H:i:s',$start)." <= date < ".date('l, Y-m-d H:i:s',$end)."</p>\n"; //echo "<p align='right'>date_filter($name,$start,$end) today=".date('l, Y-m-d H:i',$this->today)." ==> ".date('l, Y-m-d H:i:s',$start)." <= date < ".date('l, Y-m-d H:i:s',$end)."</p>\n";
// convert start + end from user to servertime for the filter // convert start + end from user to servertime for the filter
return '('.($start-$this->tz_offset_s).' <= ts_start AND ts_start < '.($end-$this->tz_offset_s).')'; return '('.($start-$this->tz_offset_s).' <= ts_start AND ts_start < '.($end-$this->tz_offset_s).')';

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

@ -481,39 +481,42 @@ class timesheet_ui extends timesheet_bo
{ {
$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']);
$start = explode('-',date('Y-m-d',$query_in['startdate']+12*60*60)); if ($query_in['startdate'])
$end = explode('-',date('Y-m-d',$query_in['enddate'] ? $query_in['enddate'] : $query_in['startdate']+7.5*24*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));
// show year-sums, if we are year-aligned (show full years)? // 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) if ((int)$start[2] == 1 && (int)$start[1] == 1 && (int)$end[2] == 31 && (int)$end[1] == 12)
{ {
$this->show_sums[] = 'year'; $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'; $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'];
if (!$week_start_day) $week_start_day = 'Sunday'; if (!$week_start_day) $week_start_day = 'Sunday';
switch($week_start_day) switch($week_start_day)
{ {
case 'Sunday': $week_end_day = 'Saturday'; break; case 'Sunday': $week_end_day = 'Saturday'; break;
case 'Monday': $week_end_day = 'Sunday'; break; case 'Monday': $week_end_day = 'Sunday'; break;
case 'Saturday': $week_end_day = 'Friday'; break; case 'Saturday': $week_end_day = 'Friday'; break;
} }
$filter_start_day = date('l',$query_in['startdate']+12*60*60); $filter_start_day = date('l',$query_in['startdate']+12*60*60);
$filter_end_day = $query_in['enddate'] ? date('l',$query_in['enddate']+12*60*60) : false; $filter_end_day = $query_in['enddate'] ? date('l',$query_in['enddate']+12*60*60) : false;
//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'; $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'; $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";
@ -651,7 +654,7 @@ class timesheet_ui extends timesheet_bo
$GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . date('W',$query['enddate']-36*60*60) . '/' . $end[0]; $GLOBALS['egw_info']['flags']['app_header'] .= ' - ' . date('W',$query['enddate']-36*60*60) . '/' . $end[0];
} }
} }
else elseif ($query['startdate'])
{ {
$df = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat']; $df = $GLOBALS['egw_info']['user']['preferences']['common']['dateformat'];
$GLOBALS['egw_info']['flags']['app_header'] .= ': ' . common::show_date($query['startdate']+12*60*60,$df,false); $GLOBALS['egw_info']['flags']['app_header'] .= ': ' . common::show_date($query['startdate']+12*60*60,$df,false);
@ -705,10 +708,10 @@ class timesheet_ui extends timesheet_bo
// Remove fake modified date, it breaks nextmatch checks // Remove fake modified date, it breaks nextmatch checks
unset($row['ts_modified']); unset($row['ts_modified']);
// Set flag to avoid actions on these rows // Set flag to avoid actions on these rows
$row['no_actions'] = true; $row['no_actions'] = true;
switch($row['ts_id']) switch($row['ts_id'])
{ {
case 0: // day-sum case 0: // day-sum