').attr(attr));
+
+ // also update total row if all data was loaded
+ if (!freebusy_ui.loading && freebusy_data.all[ts] && all_cell) {
+ var all_status = freebusy_data.all[ts][2] ? 'busy' : 'unknown',
+ req_status = freebusy_data.required[ts][2] ? 'busy' : 'free';
+
+ for (j=1; j < status_classes.length; j++) {
+ if (freebusy_ui.numrequired && freebusy_data.required[ts][j] >= freebusy_ui.numrequired)
+ req_status = status_classes[j];
+ if (freebusy_data.all[ts][j] == event_attendees.length)
+ all_status = status_classes[j];
+ }
+
+ attr['class'] = req_status + ' all-' + all_status;
+
+ // these elements use some specific styling, so we want to minimize their number
+ if (last && last.attr('class') == attr['class'])
+ last.css('width', (percent + parseFloat(last.css('width').replace('%', ''))).toFixed(2) + '%');
+ else {
+ last = $('
').attr(attr);
+ all_slots.push(last);
+ }
}
-
- cell.className = (workinghours ? 'workinghours ' : 'offhours ') + req_status + ' all-' + all_status;
+
+ t += freebusy_ui.interval * 60000;
}
-
- t += freebusy_ui.interval * 60000;
+
+ $(cell).html('').append(slots);
+ if (all_slots.length)
+ $(all_cell).html('').append(all_slots);
});
}
};
@@ -1712,17 +1745,20 @@
sinterval = freebusy_data.interval * 60000,
intvlslots = 1,
numslots = Math.ceil(duration / sinterval),
- checkdate, slotend, email, ts, slot, slotdate = new Date();
+ fb_start = freebusy_data.start.getTime(),
+ fb_end = freebusy_data.end.getTime(),
+ checkdate, slotend, email, ts, slot, slotdate = new Date(),
+ candidatecount = 0, candidatestart = false, success = false;
// shift event times to next possible slot
eventstart += sinterval * intvlslots * dir;
eventend += sinterval * intvlslots * dir;
// iterate through free-busy slots and find candidates
- var candidatecount = 0, candidatestart = candidateend = success = false;
- for (slot = dir > 0 ? freebusy_data.start.getTime() : freebusy_data.end.getTime() - sinterval;
- (dir > 0 && slot < freebusy_data.end.getTime()) || (dir < 0 && slot >= freebusy_data.start.getTime());
- slot += sinterval * dir) {
+ for (slot = dir > 0 ? fb_start : fb_end - sinterval;
+ (dir > 0 && slot < fb_end) || (dir < 0 && slot >= fb_start);
+ slot += sinterval * dir
+ ) {
slotdate.setTime(slot);
// fix slot if just crossed a DST change
if (event.allDay) {
@@ -1734,10 +1770,10 @@
if ((dir > 0 && slotend <= eventstart) || (dir < 0 && slot >= eventend)) // skip
continue;
- // respect workingours setting
+ // respect workinghours setting
if (freebusy_ui.workinhoursonly) {
if (is_weekend(slotdate) || (freebusy_data.interval <= 60 && !is_workinghour(slotdate))) { // skip off-hours
- candidatestart = candidateend = false;
+ candidatestart = false;
candidatecount = 0;
continue;
}
@@ -1746,11 +1782,12 @@
if (!candidatestart)
candidatestart = slot;
- // check freebusy data for all attendees
ts = date2timestring(slotdate, freebusy_data.interval > 60);
+
+ // check freebusy data for all attendees
for (var i=0; i < event_attendees.length; i++) {
if (freebusy_ui.attendees[i].role != 'OPT-PARTICIPANT' && (email = freebusy_ui.attendees[i].email) && freebusy_data[email] && freebusy_data[email][ts] > 1) {
- candidatestart = candidateend = false;
+ candidatestart = false;
break;
}
}
@@ -1761,22 +1798,15 @@
candidatecount = 0;
continue;
}
+ else if (dir < 0)
+ candidatestart = slot;
- // set candidate end to slot end time
candidatecount++;
- if (dir < 0 && !candidateend)
- candidateend = slotend;
// if candidate is big enough, this is it!
if (candidatecount == numslots) {
- if (dir > 0) {
- event.start.setTime(candidatestart);
- event.end.setTime(candidatestart + duration);
- }
- else {
- event.end.setTime(candidateend);
- event.start.setTime(candidateend - duration);
- }
+ event.start.setTime(candidatestart);
+ event.end.setTime(candidatestart + duration);
success = true;
break;
}
@@ -1806,7 +1836,6 @@
}
};
-
// update event properties and attendees availability if event times have changed
var event_times_changed = function()
{
@@ -1821,7 +1850,6 @@
}
};
-
// add the given list of participants
var add_attendees = function(names, params)
{
diff --git a/plugins/calendar/skins/larry/calendar.css b/plugins/calendar/skins/larry/calendar.css
--- a/plugins/calendar/skins/larry/calendar.css
+++ b/plugins/calendar/skins/larry/calendar.css
@@ -115,6 +115,7 @@
width: 6px;
top: 40px !important;
bottom: 0;
+ height: auto;
background: url(images/toggle.gif) -1px 48% no-repeat transparent;
}
@@ -1245,44 +1246,44 @@
background: url(images/loading_blue.gif) center no-repeat;
}
-#schedule-freebusy-times td.unknown,
+#schedule-freebusy-times td div.unknown,
.availability img.availabilityicon.unknown {
background: #ddd;
}
-#schedule-freebusy-times td.free,
+#schedule-freebusy-times td div.free,
.availability img.availabilityicon.free {
background: #abd640;
}
-#schedule-freebusy-times td.busy,
+#schedule-freebusy-times td div.busy,
.availability img.availabilityicon.busy {
background: #e26569;
}
-#schedule-freebusy-times td.tentative,
+#schedule-freebusy-times td div.tentative,
.availability img.availabilityicon.tentative {
background: #8383fc;
}
-#schedule-freebusy-times td.out-of-office,
+#schedule-freebusy-times td div.out-of-office,
.availability img.availabilityicon.out-of-office {
background: #fbaa68;
}
-#schedule-freebusy-times td.all-busy,
-#schedule-freebusy-times td.all-tentative,
-#schedule-freebusy-times td.all-out-of-office {
+#schedule-freebusy-times td div.all-busy,
+#schedule-freebusy-times td div.all-tentative,
+#schedule-freebusy-times td div.all-out-of-office {
background-image: url(images/freebusy-colors.png);
background-position: top right;
background-repeat: no-repeat;
}
-#schedule-freebusy-times td.all-tentative {
+#schedule-freebusy-times td div.all-tentative {
background-position: right -40px;
}
-#schedule-freebusy-times td.all-out-of-office {
+#schedule-freebusy-times td div.all-out-of-office {
background-position: right -80px;
}
@@ -1409,7 +1410,8 @@
.attendees-list .spacer,
#schedule-freebusy-times tr.spacer td {
background: 0;
- font-size: 50%;
+ padding: 0;
+ height: 10px;
}
#schedule-freebusy-times {
@@ -1422,6 +1424,15 @@
border: 1px solid #ccc;
}
+#schedule-freebusy-times tbody td {
+ padding: 0;
+ height: 20px;
+}
+
+#schedule-freebusy-times tbody td div {
+ height: 100%;
+}
+
#attendees-freebusy-table div.timesheader,
#schedule-freebusy-times tr.times td {
min-width: 30px;
@@ -1439,6 +1450,10 @@
cursor: pointer;
}
+#schedule-freebusy-times #fbrowall td {
+ border-bottom: none;
+}
+
#schedule-event-time {
position: absolute;
border: 2px solid #333;