extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-25 12:21:26 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix wrong date headers after crossing DST east of Greenwich

Browse Source
This commit is contained in:
Nathan Gray 2015-10-29 19:47:01 +00:00
parent 51873f80c2
commit f3d166a6c5
3 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
calendar/js/app.js
View File

@ -1709,18 +1709,19 @@ app.classes.calendar = AppJS.extend(
{ {
var val = { var val = {
id: ""+date.getUTCFullYear() + sprintf("%02d",date.getUTCMonth()) + sprintf("%02d",date.getUTCDate()), id: ""+date.getUTCFullYear() + sprintf("%02d",date.getUTCMonth()) + sprintf("%02d",date.getUTCDate()),
start_date: new Date(date), start_date: date.toJSON(),
end_date: new Date(date), end_date: new Date(date.toJSON()),
owner: state.state.owner owner: state.state.owner
}; };
val.end_date.setUTCHours(24*7-1); val.end_date.setUTCHours(24*7-1);
val.end_date = val.end_date.toJSON();
value.push(val); value.push(val);
date.setUTCHours(24*7); date.setUTCHours(24*7);
} }
state.state.last=val.end_date; state.state.last=val.end_date;
break; break;
default: default:
var end = state.state.last = view.end_date(state.state); var end = state.state.last = view.end_date(state.state).toJSON();
for(var owner = 0; owner < grid_count && owner < state.state.owner.length; owner++) for(var owner = 0; owner < grid_count && owner < state.state.owner.length; owner++)
{ {
value.push({ value.push({
@ -1732,7 +1733,6 @@ app.classes.calendar = AppJS.extend(
} }
break; break;
} }
state.state.last = state.state.last.toJSON()
// If we have cached data for the timespan, pass it along // If we have cached data for the timespan, pass it along
this._need_data(value,state.state); this._need_data(value,state.state);
if(grid) if(grid)
@ -2584,7 +2584,8 @@ app.classes.calendar = AppJS.extend(
date.setUTCDate(1); date.setUTCDate(1);
date.setFullYear(year); date.setFullYear(year);
date.setUTCMonth(month-1); date.setUTCMonth(month-1);
var state = {date: date}; // Use toJSON() to get UTC, not browser timezone
var state = {date: date.toJSON()};
if(app.calendar.sidebox_changes_views.indexOf(app.calendar.state.view) >= 0) if(app.calendar.sidebox_changes_views.indexOf(app.calendar.state.view) >= 0)
{ {
state.view = 'month'; state.view = 'month';

4
calendar/js/et2_widget_daycol.js
View File

@ -215,8 +215,8 @@ var et2_calendar_daycol = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResizea
else if(typeof _date === "string") else if(typeof _date === "string")
{ {
// Need a new date to avoid invalid month/date combinations when setting // Need a new date to avoid invalid month/date combinations when setting
// month then day // month then day. Use a string to avoid browser timezone.
this._parent.date_helper.set_value(new Date(_date.substring(0,4),_date.substring(4,6)-1,_date.substring(6,8),-new Date().getTimezoneOffset()/60,0,0)); this._parent.date_helper.set_value(_date.substring(0,4)+'-'+(_date.substring(4,6))+'-'+_date.substring(6,8)+'T00:00:00Z');
} }
this.date = new Date(this._parent.date_helper.getValue()); this.date = new Date(this._parent.date_helper.getValue());

2
calendar/js/et2_widget_timegrid.js
View File

@ -506,7 +506,7 @@ var et2_calendar_timegrid = et2_valueWidget.extend([et2_IDetachedDOM, et2_IResiz
var rowHeight = (100/rowsToDisplay).toFixed(1); var rowHeight = (100/rowsToDisplay).toFixed(1);
// Pixels // Pixels
this.rowHeight = this.div.height() / rowsToDisplay; this.rowHeight = this.div.height() / rowsToDisplay;
debugger;
this.gridHeader this.gridHeader
.empty() .empty()
.attr('data-date', this.options.start_date) .attr('data-date', this.options.start_date)