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

* Calendar - fix event positioning bug in yearly planner view

Browse Source 
Events would sometimes be mis-sorted into a different month and show at the start of the month
This commit is contained in:
nathangray 2018-06-19 10:22:13 -06:00
parent 281564b4a6
commit e11f22f0e9
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
calendar/js/et2_widget_planner.js
View File

@ -552,7 +552,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
for(var i = 0; i < 12; i++) for(var i = 0; i < 12; i++)
{ {
// Not using UTC because we corrected for timezone offset // Not using UTC because we corrected for timezone offset
labels.push({id: d.getFullYear() +'-'+d.getMonth(), label:this.egw().lang(date('F',d))+' '+d.getFullYear()}); labels.push({id:sprintf('%04d-%02d', d.getFullYear(), d.getMonth()), label:this.egw().lang(date('F',d))+' '+d.getFullYear()});
d.setMonth(d.getMonth()+1); d.setMonth(d.getMonth()+1);
} }
return labels; return labels;
@ -563,7 +563,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
var start = new Date(event.start); var start = new Date(event.start);
start = new Date(start.valueOf() + start.getTimezoneOffset() * 60 * 1000); start = new Date(start.valueOf() + start.getTimezoneOffset() * 60 * 1000);
var key = start.getFullYear() +'-'+start.getMonth(); var key = sprintf('%04d-%02d', start.getFullYear(), start.getMonth());
var label_index = false; var label_index = false;
for(var i = 0; i < labels.length; i++) for(var i = 0; i < labels.length; i++)
{ {
@ -582,11 +582,11 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
// end in a different month? // end in a different month?
var end = new Date(event.end); var end = new Date(event.end);
end = new Date(end.valueOf() + end.getTimezoneOffset() * 60 * 1000); end = new Date(end.valueOf() + end.getTimezoneOffset() * 60 * 1000);
var end_key = end.getFullYear() +'-'+end.getMonth(); var end_key = sprintf('%04d-%02d',end.getFullYear(),end.getMonth());
var year = start.getFullYear(); var year = start.getFullYear();
var month = start.getMonth(); var month = start.getMonth();
key = sprintf('%04d-%d',year,month); key = sprintf('%04d-%02d',year,month);
do do
{ {
var end_label_index = label_index; var end_label_index = label_index;
@ -612,7 +612,7 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
++year; ++year;
month = 0; month = 0;
} }
key = sprintf('%04d-%d',year,month); key = sprintf('%04d-%02d',year,month);
} while(key <= end_key) } while(key <= end_key)
}, },
// Draw a single row, but split up the dates // Draw a single row, but split up the dates