All day events now assigned to correct resource

This commit is contained in:
Sean Kenny
2014-09-13 14:53:08 +01:00
parent e9cd69918d
commit a0f13dcb1c
3 changed files with 45 additions and 2 deletions
+23
View File
@@ -3,5 +3,28 @@
----------------------------------------------------------------------------------------------------------------------*/
$.extend(ResourceDayGrid.prototype, {
eventToSegs: function(event, intervalStart, intervalEnd) {
var eventStart = event.start.clone().stripZone(); // normalize
var eventEnd = this.view.calendar.getEventEnd(event).stripZone(); // compute (if necessary) and normalize
var segs;
var i, seg;
if (intervalStart && intervalEnd) {
seg = intersectionToSeg(eventStart, eventEnd, intervalStart, intervalEnd);
segs = seg ? [ seg ] : [];
}
else {
segs = this.rangeToSegs(eventStart, eventEnd, event.resources); // defined by the subclass
}
// assign extra event-related properties to the segment objects
for (i = 0; i < segs.length; i++) {
seg = segs[i];
seg.event = event;
seg.eventStartMS = +eventStart;
seg.eventDurationMS = eventEnd - eventStart;
}
return segs;
}
});
+21 -1
View File
@@ -9,5 +9,25 @@ function ResourceDayGrid(view) {
ResourceDayGrid.prototype = createObject(DayGrid.prototype); // declare the super-class
$.extend(ResourceDayGrid.prototype, {
rangeToSegs: function(rangeStart, rangeEnd, resourceIds) {
var segments = [];
var view = this.view;
});
var resources = view.calendar.fetchResources();
for (col = 0; col < view.colCnt; col++) {
var resource = resources[col];
if (resourceIds.indexOf(resource.id) > -1){
segments.push({
row: 0,
leftCol: col,
rightCol: col,
isStart: true,
isEnd: true
});
}
}
return segments;
}
});
+1 -1
View File
@@ -48,7 +48,7 @@ function ResourceView(calendar) {
this.timeGrid = new ResourceTimeGrid(this);
if (this.opt('allDaySlot')) { // should we display the "all-day" area?
this.dayGrid = new DayGrid(this); // the all-day subcomponent of this view
this.dayGrid = new ResourceDayGrid(this); // the all-day subcomponent of this view
// the coordinate grid will be a combination of both subcomponents' grids
this.coordMap = new ComboCoordMap([