extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-24 00:43:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

* Calendar - yearly planner view events would sometimes load in the next month as well

Browse Source
This commit is contained in:
nathangray 2018-04-17 10:38:49 -06:00
parent bd9d959cfa
commit 66ffa92306
1 changed files with 22 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
calendar/js/et2_widget_planner.js
View File

@ -585,28 +585,35 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
var end_key = end.getFullYear() +'-'+end.getMonth(); var end_key = end.getFullYear() +'-'+end.getMonth();
var year = start.getFullYear(); var year = start.getFullYear();
var month = start.getMonth(); var month = start.getMonth();
while(key <= end_key) key = sprintf('%04d-%d',year,month);
do
{ {
var end_label_index = label_index;
for(var i = end_label_index; i < labels.length; i++)
{
if(labels[i].id == key)
{
end_label_index = i;
if(typeof rows[end_label_index] === 'undefined')
{
rows[end_label_index] = [];
}
break;
}
}
if(end_label_index != label_index)
{
rows[label_index].push(event);
}
if (++month > 11) if (++month > 11)
{ {
++year; ++year;
month = 0; month = 0;
} }
key = sprintf('%04d-%d',year,month); key = sprintf('%04d-%d',year,month);
for(var i = 0; i < labels.length; i++) } while(key <= end_key)
{
if(labels[i].id == key)
{
label_index = i;
if(typeof rows[label_index] === 'undefined')
{
rows[label_index] = [];
}
break;
}
}
rows[label_index].push(event);
}
}, },
// Draw a single row, but split up the dates // Draw a single row, but split up the dates
draw_row: function(sort_key, label, events) draw_row: function(sort_key, label, events)