From d01301bf7f827597af5af22ab2634bc33cdb697e Mon Sep 17 00:00:00 2001 From: sean kenny Date: Sat, 9 Aug 2014 14:48:29 +0100 Subject: [PATCH] Getting event into corrcet resource column --- src/resource/ResourceEventRenderer.js | 24 ++++++++++++------------ tests/resourceDayView.html | 13 ++++++++++--- 2 files changed, 22 insertions(+), 15 deletions(-) diff --git a/src/resource/ResourceEventRenderer.js b/src/resource/ResourceEventRenderer.js index 55bbad0..a7523cf 100644 --- a/src/resource/ResourceEventRenderer.js +++ b/src/resource/ResourceEventRenderer.js @@ -97,10 +97,10 @@ function ResourceEventRenderer() { //new for (i=0; i= 0) { - // resourceEvents.push(events[i]); - // } - // } - // return resourceEvents; - // } + function eventsForResource(resource, events) { + var resourceEvents = []; + for (var i = 0; i < events.length; i++) { + if (events[i].resources && $.inArray(resource.id, events[i].resources) >= 0) { + resourceEvents.push(events[i]); + } + } + return resourceEvents; + } // function slotEventEnd(event) { // if (event.end) { diff --git a/tests/resourceDayView.html b/tests/resourceDayView.html index e157660..469783a 100644 --- a/tests/resourceDayView.html +++ b/tests/resourceDayView.html @@ -10,7 +10,7 @@ -

+

@@ -105,6 +105,7 @@ showModal(event.apId, event.patId, event.provisoryId); }, editable: true, + allDaySlot: false, // weekends: false, header: { left: 'prev,next today', @@ -135,12 +136,18 @@ resources: ['resource1', 'resource2'] }, { - id: 777, title: 'R1: 14:30-16', start: new Date(y, m, d, 14, 30), end: new Date(y, m, d, 16, 0), allDay: false, resources: ['resource1'] + }, + { + title: 'R2: 10:00-10:30', + start: new Date(y, m, d, 10, 0), + end: new Date(y, m, d, 10, 30), + allDay: false, + resources: ['resource2'] } ] });