Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix free-busy display/selection for all-day events (#291)

Browse source
This commit is contained in:
Thomas Bruederli 2011-08-05 19:56:39 +02:00
parent af6bd860a9
commit a11b617429
3 changed files with 27 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plugins/calendar/calendar.php
View file

@ -1448,7 +1448,8 @@ class calendar extends rcube_plugin
list($from, $to, $type) = $slot; list($from, $to, $type) = $slot;
if ($from < $t_end && $to > $t) { if ($from < $t_end && $to > $t) {
$status = isset($type) ? $type : self::FREEBUSY_BUSY; $status = isset($type) ? $type : self::FREEBUSY_BUSY;
break; if ($status == self::FREEBUSY_BUSY) // can't get any worse :-)
break;
} }
} }
} }

31
plugins/calendar/calendar_ui.js
View file

@ -707,8 +707,8 @@ function rcube_calendar_ui(settings)
freebusy_data = { required:{}, all:{} }; freebusy_data = { required:{}, all:{} };
freebusy_ui.loading = 1; // prevent render_freebusy_grid() to load data yet freebusy_ui.loading = 1; // prevent render_freebusy_grid() to load data yet
freebusy_ui.numdays = allday.checked ? 7 : Math.ceil(duration * 2 / 86400); freebusy_ui.numdays = Math.max(allday.checked ? 14 : 1, Math.ceil(duration * 2 / 86400));
freebusy_ui.interval = allday.checked ? 360 : 60; freebusy_ui.interval = allday.checked ? 1440 : 60;
freebusy_ui.start = fb_start; freebusy_ui.start = fb_start;
freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays); freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays);
render_freebusy_grid(0); render_freebusy_grid(0);
@ -790,10 +790,17 @@ function rcube_calendar_ui(settings)
} }
var dayslots = Math.floor(1440 / freebusy_ui.interval); var dayslots = Math.floor(1440 / freebusy_ui.interval);
var lastdate, datestr, css, curdate = new Date(), dates_row = '<tr class="dates">', times_row = '<tr class="times">', slots_row = ''; var date_format = 'ddd '+ (dayslots <= 2 ? settings.date_short : settings.date_format);
var lastdate, datestr, css,
curdate = new Date(),
allday = (freebusy_ui.interval == 1440),
times_css = (allday ? 'allday ' : ''),
dates_row = '<tr class="dates">',
times_row = '<tr class="times">',
slots_row = '';
for (var s = 0, t = freebusy_ui.start.getTime(); t < freebusy_ui.end.getTime(); s++) { for (var s = 0, t = freebusy_ui.start.getTime(); t < freebusy_ui.end.getTime(); s++) {
curdate.setTime(t); curdate.setTime(t);
datestr = fc.fullCalendar('formatDate', curdate, 'ddd '+settings['date_format']); datestr = fc.fullCalendar('formatDate', curdate, date_format);
if (datestr != lastdate) { if (datestr != lastdate) {
dates_row += '<th colspan="' + dayslots + '" class="boxtitle date' + $.fullCalendar.formatDate(curdate, 'ddMMyyyy') + '">' + Q(datestr) + '</th>'; dates_row += '<th colspan="' + dayslots + '" class="boxtitle date' + $.fullCalendar.formatDate(curdate, 'ddMMyyyy') + '">' + Q(datestr) + '</th>';
lastdate = datestr; lastdate = datestr;
@ -801,7 +808,7 @@ function rcube_calendar_ui(settings)
// set css class according to working hours // set css class according to working hours
css = is_weekend(curdate) || (freebusy_ui.interval <= 60 && !is_workinghour(curdate)) ? 'offhours' : 'workinghours'; css = is_weekend(curdate) || (freebusy_ui.interval <= 60 && !is_workinghour(curdate)) ? 'offhours' : 'workinghours';
times_row += '<td class="' + css + '" id="t-' + Math.floor(t/1000) + '">' + Q($.fullCalendar.formatDate(curdate, settings['time_format'])) + '</td>'; times_row += '<td class="' + times_css + css + '" id="t-' + Math.floor(t/1000) + '">' + Q(allday ? rcmail.gettext('all-day','calendar') : $.fullCalendar.formatDate(curdate, settings['time_format'])) + '</td>';
slots_row += '<td class="' + css + ' unknown">&nbsp;</td>'; slots_row += '<td class="' + css + ' unknown">&nbsp;</td>';
t += freebusy_ui.interval * 60000; t += freebusy_ui.interval * 60000;
@ -873,7 +880,7 @@ function rcube_calendar_ui(settings)
width = 0, width = 0,
pos = { top:table.children('thead').height(), left:0 }, pos = { top:table.children('thead').height(), left:0 },
eventstart = date2unixtime(me.selected_event.start), eventstart = date2unixtime(me.selected_event.start),
eventend = date2unixtime(me.selected_event.end), eventend = date2unixtime(me.selected_event.end) - 60,
slotstart = date2unixtime(freebusy_ui.start), slotstart = date2unixtime(freebusy_ui.start),
slotsize = freebusy_ui.interval * 60, slotsize = freebusy_ui.interval * 60,
slotend, fraction, $cell; slotend, fraction, $cell;
@ -887,7 +894,7 @@ function rcube_calendar_ui(settings)
pos.left = Math.round(cell.offsetLeft + cell.offsetWidth * fraction); pos.left = Math.round(cell.offsetLeft + cell.offsetWidth * fraction);
} }
// event ends in this slot: compute width // event ends in this slot: compute width
else if (eventend >= slotstart && eventend <= slotend) { if (eventend >= slotstart && eventend <= slotend) {
fraction = 1 - (slotend - eventend) / slotsize; fraction = 1 - (slotend - eventend) / slotsize;
width = Math.round(cell.offsetLeft + cell.offsetWidth * fraction) - pos.left; width = Math.round(cell.offsetLeft + cell.offsetWidth * fraction) - pos.left;
} }
@ -914,8 +921,10 @@ function rcube_calendar_ui(settings)
var range_t = freebusy_ui.end.getTime() - freebusy_ui.start.getTime(); var range_t = freebusy_ui.end.getTime() - freebusy_ui.start.getTime();
var newstart = new Date(freebusy_ui.start.getTime() + px * (range_t / range_p)); var newstart = new Date(freebusy_ui.start.getTime() + px * (range_t / range_p));
newstart.setSeconds(0); newstart.setMilliseconds(0); newstart.setSeconds(0); newstart.setMilliseconds(0);
// set time to 00:00 // snap to day boundaries
if (me.selected_event.allDay) { if (me.selected_event.allDay) {
if (newstart.getHours() >= 12) // snap to next day
newstart.setTime(newstart.getTime() + DAY_MS);
newstart.setMinutes(0); newstart.setMinutes(0);
newstart.setHours(0); newstart.setHours(0);
} }
@ -944,7 +953,7 @@ function rcube_calendar_ui(settings)
var load_freebusy_data = function(from, interval) var load_freebusy_data = function(from, interval)
{ {
var start = new Date(from.getTime() - DAY_MS * 2); // start 1 days before event var start = new Date(from.getTime() - DAY_MS * 2); // start 1 days before event
var end = new Date(start.getTime() + DAY_MS * 14); // load 14 days var end = new Date(start.getTime() + DAY_MS * Math.max(14, freebusy_ui.numdays + 7)); // load min. 14 days
freebusy_ui.numrequired = 0; freebusy_ui.numrequired = 0;
// load free-busy information for every attendee // load free-busy information for every attendee
@ -1021,7 +1030,7 @@ function rcube_calendar_ui(settings)
var ts = date2unixtime(freebusy_ui.start); var ts = date2unixtime(freebusy_ui.start);
var fbdata = freebusy_data[email]; var fbdata = freebusy_data[email];
if (fbdata && fbdata[ts] && row.length) { if (fbdata && fbdata[ts] !== undefined && row.length) {
row.children().each(function(i, cell){ row.children().each(function(i, cell){
cell.className = cell.className.replace('unknown', fbdata[ts] ? status_classes[fbdata[ts]] : 'unknown'); cell.className = cell.className.replace('unknown', fbdata[ts] ? status_classes[fbdata[ts]] : 'unknown');
@ -1064,7 +1073,7 @@ function rcube_calendar_ui(settings)
eventend = date2unixtime(event.end), eventend = date2unixtime(event.end),
duration = eventend - eventstart, duration = eventend - eventstart,
sinterval = freebusy_data.interval * 60, sinterval = freebusy_data.interval * 60,
intvlslots = event.allDay ? 4 : 1, intvlslots = 1,
numslots = Math.ceil(duration / sinterval), numslots = Math.ceil(duration / sinterval),
checkdate, slotend, email, curdate; checkdate, slotend, email, curdate;

5
plugins/calendar/skins/default/calendar.css
View file

@ -770,6 +770,7 @@ td.topalign {
border-color: #aaa; border-color: #aaa;
border-style: solid; border-style: solid;
border-width: 0 1px 0 1px; border-width: 0 1px 0 1px;
white-space: nowrap;
} }
#attendees-freebusy-table div.timesheader, #attendees-freebusy-table div.timesheader,
@ -780,6 +781,10 @@ td.topalign {
text-align: center; text-align: center;
} }
#schedule-freebusy-times tr.times td.allday {
min-width: 60px;
}
#schedule-freebusy-times tr.times td { #schedule-freebusy-times tr.times td {
cursor: pointer; cursor: pointer;
} }