extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 14:41:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Calendar - Planner view, events on Friday would sometimes go missing if weekends were hidden

Browse Source
This commit is contained in:
nathangray 2018-03-26 11:16:54 -06:00
parent efdc25bb37
commit fbf3634d1e
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
calendar/js/et2_widget_planner_row.js
View File

@ -461,7 +461,7 @@ var et2_calendar_planner_row = (function(){ "use strict"; return et2_valueWidget
event_ids.splice(i--,1); event_ids.splice(i--,1);
} }
} }
if(!this._parent.disabled) if(!this._parent.disabled && event_ids.length > 0)
{ {
this.resize(); this.resize();
this._update_events(events); this._update_events(events);
@ -496,7 +496,7 @@ var et2_calendar_planner_row = (function(){ "use strict"; return et2_valueWidget
} }
// Seperate loop so column sorting finds all children in the right place // Seperate loop so column sorting finds all children in the right place
for(var c = 0; c < events.length && c < this._children.length; c++) for(var c = 0; c < events.length; c++)
{ {
var event = this.getWidgetById('event_'+events[c].row_id); var event = this.getWidgetById('event_'+events[c].row_id);
if(!event) continue; if(!event) continue;
@ -715,6 +715,7 @@ var et2_calendar_planner_row = (function(){ "use strict"; return et2_valueWidget
// Remove space for weekends, if hidden // Remove space for weekends, if hidden
var weekend_count = 0; var weekend_count = 0;
var weekend_before = 0; var weekend_before = 0;
var partial_weekend = 0;
if(this._parent.options.group_by !== 'month' && this._parent && !this._parent.options.show_weekend) if(this._parent.options.group_by !== 'month' && this._parent && !this._parent.options.show_weekend)
{ {
@ -723,8 +724,16 @@ var et2_calendar_planner_row = (function(){ "use strict"; return et2_valueWidget
{ {
if([0,6].indexOf(counter_date.getUTCDay()) !== -1) if([0,6].indexOf(counter_date.getUTCDay()) !== -1)
{ {
if(counter_date.getUTCDate() === t.getUTCDate() && counter_date.getUTCMonth() === t.getUTCMonth())
{
// Event is partially on a weekend
partial_weekend += (t.getUTCHours() *60 + t.getUTCMinutes())*60*1000;
}
else if(counter_date < t)
{
weekend_before++;
}
weekend_count++; weekend_count++;
if(counter_date < t) weekend_before++;
} }
counter_date.setUTCDate(counter_date.getUTCDate() + 1); counter_date.setUTCDate(counter_date.getUTCDate() + 1);
} while(counter_date < end) } while(counter_date < end)
@ -734,7 +743,7 @@ var et2_calendar_planner_row = (function(){ "use strict"; return et2_valueWidget
} }
// Basic scaling, doesn't consider working times // Basic scaling, doesn't consider working times
pos = (t - start - weekend_before) / (end - start - weekend_count); pos = (t - start - weekend_before-partial_weekend) / (end - start - weekend_count);
// Month view // Month view
if(this._parent.options.group_by !== 'month') if(this._parent.options.group_by !== 'month')