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

* Calendar: Fix bug where yearly planner would not show events that went outside the displayed time period

Browse Source
This commit is contained in:
nathangray 2021-01-06 10:30:15 -07:00
parent 13c1c575a9
commit c0cfb375c3
2 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
calendar/js/et2_widget_planner.js
View File

@ -272,10 +272,12 @@ var et2_calendar_planner = /** @class */ (function (_super) {
break; break;
} }
} }
if (typeof rows[label_index] === 'undefined') { if (label_index) {
rows[label_index] = []; if (typeof rows[label_index] === 'undefined') {
rows[label_index] = [];
}
rows[label_index].push(event);
} }
rows[label_index].push(event);
// 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);
@ -284,10 +286,10 @@ var et2_calendar_planner = /** @class */ (function (_super) {
var month = start.getMonth(); var month = start.getMonth();
key = sprintf('%04d-%02d', year, month); key = sprintf('%04d-%02d', year, month);
do { do {
var end_label_index = label_index; var end_label_index = typeof label_index == "boolean" ? 0 : label_index;
for (var i = end_label_index; i < labels.length; i++) { for (var i_1 = end_label_index; i_1 < labels.length; i_1++) {
if (labels[i].id == key) { if (labels[i_1].id == key) {
end_label_index = i; end_label_index = i_1;
if (typeof rows[end_label_index] === 'undefined') { if (typeof rows[end_label_index] === 'undefined') {
rows[end_label_index] = []; rows[end_label_index] = [];
} }
@ -295,7 +297,7 @@ var et2_calendar_planner = /** @class */ (function (_super) {
} }
} }
if (end_label_index != label_index) { if (end_label_index != label_index) {
rows[label_index].push(event); rows[end_label_index].push(event);
} }
if (++month > 11) { if (++month > 11) {
++year; ++year;

17
calendar/js/et2_widget_planner.ts
View File

@ -607,7 +607,7 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
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 = sprintf('%04d-%02d', start.getFullYear(), start.getMonth()); var key = sprintf('%04d-%02d', start.getFullYear(), start.getMonth());
var label_index = false; var label_index : number|boolean = false;
for(var i = 0; i < labels.length; i++) for(var i = 0; i < labels.length; i++)
{ {
if(labels[i].id == key) if(labels[i].id == key)
@ -616,11 +616,14 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
break; break;
} }
} }
if(typeof rows[label_index] === 'undefined') if(label_index)
{ {
rows[label_index] = []; if(typeof rows[label_index] === 'undefined')
{
rows[label_index] = [];
}
rows[label_index].push(event);
} }
rows[label_index].push(event);
// end in a different month? // end in a different month?
var end = new Date(event.end); var end = new Date(event.end);
@ -632,9 +635,9 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
do do
{ {
var end_label_index = label_index; var end_label_index = typeof label_index == "boolean" ? 0 : label_index;
for(var i = end_label_index; i < labels.length; i++) for(let i = end_label_index; i < labels.length; i++)
{ {
if(labels[i].id == key) if(labels[i].id == key)
{ {
@ -648,7 +651,7 @@ export class et2_calendar_planner extends et2_calendar_view implements et2_IDeta
} }
if(end_label_index != label_index) if(end_label_index != label_index)
{ {
rows[label_index].push(event); rows[end_label_index].push(event);
} }
if (++month > 11) if (++month > 11)
{ {