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

* Calendar: Fix events later in the day would not show if one was filtered out

Browse Source
This commit is contained in:
nathangray 2020-04-20 12:00:42 -06:00
parent 9817d25a47
commit 04bf5580c8
4 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
calendar/js/et2_widget_daycol.js
View File

@ -470,7 +470,8 @@ var et2_calendar_daycol = /** @class */ (function (_super) {
}, this); }, this);
} }
// 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 (c = 0; c < events.length && c < this._children.length; c++) { var child_length = this._children.length;
for (c = 0; c < events.length && c < child_length; c++) {
var event_2 = this.getWidgetById('event_' + events[c].id); var event_2 = this.getWidgetById('event_' + events[c].id);
if (!event_2) if (!event_2)
continue; continue;

3
calendar/js/et2_widget_daycol.ts
View File

@ -605,7 +605,8 @@ export class et2_calendar_daycol extends et2_valueWidget implements et2_IDetache
} }
// 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(c = 0; c < events.length && c < this._children.length; c++) let child_length = this._children.length;
for(c = 0; c < events.length && c < child_length; c++)
{ {
let event = this.getWidgetById('event_'+events[c].id); let event = this.getWidgetById('event_'+events[c].id);
if(!event) continue; if(!event) continue;

4
calendar/js/et2_widget_event.js
View File

@ -171,6 +171,9 @@ var et2_calendar_event = /** @class */ (function (_super) {
var value = event === null ? null : jQuery.extend({}, event); var value = event === null ? null : jQuery.extend({}, event);
var parent = this.getParent(); var parent = this.getParent();
var parent_owner = parent.getDOMNode(parent).dataset['owner'] || parent.getParent().options.owner; var parent_owner = parent.getDOMNode(parent).dataset['owner'] || parent.getParent().options.owner;
if (parent_owner.indexOf(',')) {
parent_owner = parent_owner.split(',');
}
// Make sure id is a string, check values // Make sure id is a string, check values
if (value) { if (value) {
this._values_check(value); this._values_check(value);
@ -912,6 +915,7 @@ var et2_calendar_event = /** @class */ (function (_super) {
var resource = options.find(function (element) { return element.id == parent_owner[i]; }) || {}; var resource = options.find(function (element) { return element.id == parent_owner[i]; }) || {};
if (resource && resource.resources) { if (resource && resource.resources) {
parent_owner.splice(i, 1); parent_owner.splice(i, 1);
i--;
parent_owner = parent_owner.concat(resource.resources); parent_owner = parent_owner.concat(resource.resources);
} }
} }

5
calendar/js/et2_widget_event.ts
View File

@ -211,6 +211,10 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
const value = event === null ? null : jQuery.extend({}, event); const value = event === null ? null : jQuery.extend({}, event);
let parent = <et2_DOMWidget>this.getParent(); let parent = <et2_DOMWidget>this.getParent();
let parent_owner = parent.getDOMNode(parent).dataset['owner'] || parent.getParent().options.owner; let parent_owner = parent.getDOMNode(parent).dataset['owner'] || parent.getParent().options.owner;
if(parent_owner.indexOf(','))
{
parent_owner = parent_owner.split(',');
}
// Make sure id is a string, check values // Make sure id is a string, check values
if(value) if(value)
@ -1170,6 +1174,7 @@ export class et2_calendar_event extends et2_valueWidget implements et2_IDetached
if(resource && resource.resources) if(resource && resource.resources)
{ {
parent_owner.splice(i,1); parent_owner.splice(i,1);
i--;
parent_owner = parent_owner.concat(resource.resources); parent_owner = parent_owner.concat(resource.resources);
} }