wassname/fullcalendar
1
0
Fork 0
mirror of https://github.com/wassname/fullcalendar.git synced 2026-06-27 16:10:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Getting event into corrcet resource column

Browse Source
This commit is contained in:
sean kenny
2014-08-09 14:48:29 +01:00
parent 98568e51e5
commit d01301bf7f
2 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/resource/ResourceEventRenderer.js
+12 -12
View File
@@ -97,10 +97,10 @@ function ResourceEventRenderer() {
//new
for (i=0; i<colCnt; i++) {
cellDate = cellToDate(0, 0); // updated
cellDate = cellToDate(0, 0); // updated - should show same day for all
var resourceEvents = eventsForResource(resources()[i], events);
colSegs = sliceSegs(
events,
resourceEvents,
cellDate.clone().time(minTime),
cellDate.clone().time(maxTime)
);
@@ -169,15 +169,15 @@ function ResourceEventRenderer() {
return segs.sort(compareSlotSegs);
}
// 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 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) {
tests/resourceDayView.html
+10 -3
View File
@@ -10,7 +10,7 @@
</style>
</head>
<body style='font-size:12px'>
<p>
<!-- <p>
<button onclick="cal.fullCalendar('prev')">prev</button>
<button onclick="cal.fullCalendar('next')">next</button>
<button onclick="cal.fullCalendar('today')">today</button>
@@ -48,7 +48,7 @@
<button onclick="cal.width(1100)">change width (passive)</button>
<button onclick="cal.fullCalendar('render')">render</button>
<button onclick="cal.fullCalendar('option', 'height', 1000)">change height</button>
</p>
</p> -->
<!-- <div id='loading' style='position:absolute;display:none'>loading...</div>-->
<div id='calendar' style='width:70%;margin:20px auto 0;font-family:arial'></div>
@@ -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']
}
]
});