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

Bugfixes and wording improvements for the free-busy features

Browse source
This commit is contained in:
Thomas Bruederli 2011-07-27 11:47:15 +02:00
parent a6e22b5dc6
commit 8c5d569041
3 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/calendar/calendar.php
View file

@ -1227,7 +1227,7 @@ class calendar extends rcube_plugin
if (!$start) $start = time(); if (!$start) $start = time();
if (!$end) $end = $start + 3600; if (!$end) $end = $start + 3600;
$fbtypemap = array(calendar::FREEBUSY_FREE => 'FREE', calendar::FREEBUSY_BUSY => 'BUSY', calendar::FREEBUSY_TENTATIVE => 'TENTATIVE', calendar::FREEBUSY_OOF => 'OUT-OF-OFFICE'); $fbtypemap = array(calendar::FREEBUSY_UNKNOWN => 'UNKNOWN', calendar::FREEBUSY_FREE => 'FREE', calendar::FREEBUSY_BUSY => 'BUSY', calendar::FREEBUSY_TENTATIVE => 'TENTATIVE', calendar::FREEBUSY_OOF => 'OUT-OF-OFFICE');
$status = 'UNKNOWN'; $status = 'UNKNOWN';
// if the backend has free-busy information // if the backend has free-busy information
@ -1238,7 +1238,7 @@ class calendar extends rcube_plugin
foreach ($fblist as $slot) { foreach ($fblist as $slot) {
list($from, $to, $type) = $slot; list($from, $to, $type) = $slot;
if ($from <= $end && $to > $start) { if ($from <= $end && $to > $start) {
$status = $type && $fbtypemap[$type] ? $fbtypemap[$type] : 'BUSY'; $status = isset($type) && $fbtypemap[$type] ? $fbtypemap[$type] : 'BUSY';
break; break;
} }
} }

26
plugins/calendar/calendar_ui.js
View file

@ -38,6 +38,7 @@ function rcube_calendar_ui(settings)
/*** private vars ***/ /*** private vars ***/
var DAY_MS = 86400000;
var me = this; var me = this;
var gmt_offset = (new Date().getTimezoneOffset() / -60) - (settings.timezone || 0); var gmt_offset = (new Date().getTimezoneOffset() / -60) - (settings.timezone || 0);
var day_clicked = day_clicked_ts = 0; var day_clicked = day_clicked_ts = 0;
@ -655,14 +656,14 @@ function rcube_calendar_ui(settings)
var now = new Date(), fb_start = new Date(), fb_end = new Date(); var now = new Date(), fb_start = new Date(), fb_end = new Date();
fb_start.setTime(event.start); fb_start.setTime(event.start);
fb_start.setHours(0); fb_start.setMinutes(0); fb_start.setSeconds(0); fb_start.setMilliseconds(0); fb_start.setHours(0); fb_start.setMinutes(0); fb_start.setSeconds(0); fb_start.setMilliseconds(0);
fb_end.setTime(fb_start.getTime() + 86400000); fb_end.setTime(fb_start.getTime() + DAY_MS);
freebusy_data = {}; freebusy_data = {};
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 = allday.checked ? 7 : Math.ceil(duration * 2 / 86400);
freebusy_ui.interval = allday.checked ? 360 : 60; freebusy_ui.interval = allday.checked ? 360 : 60;
freebusy_ui.start = fb_start; freebusy_ui.start = fb_start;
freebusy_ui.end = new Date(freebusy_ui.start.getTime() + 86400000 * 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);
// render list of attendees // render list of attendees
@ -682,7 +683,7 @@ function rcube_calendar_ui(settings)
// dialog buttons // dialog buttons
var buttons = {}; var buttons = {};
buttons[rcmail.gettext('adobt', 'calendar')] = function() { buttons[rcmail.gettext('select', 'calendar')] = function() {
$('#edit-startdate').val(freebusy_ui.startdate.val()); $('#edit-startdate').val(freebusy_ui.startdate.val());
$('#edit-starttime').val(freebusy_ui.starttime.val()); $('#edit-starttime').val(freebusy_ui.starttime.val());
$('#edit-enddate').val(freebusy_ui.enddate.val()); $('#edit-enddate').val(freebusy_ui.enddate.val());
@ -733,8 +734,8 @@ function rcube_calendar_ui(settings)
var render_freebusy_grid = function(delta) var render_freebusy_grid = function(delta)
{ {
if (delta) { if (delta) {
freebusy_ui.start.setTime(freebusy_ui.start.getTime() + 86400000 * delta); freebusy_ui.start.setTime(freebusy_ui.start.getTime() + DAY_MS * delta);
freebusy_ui.end = new Date(freebusy_ui.start.getTime() + 86400000 * freebusy_ui.numdays); freebusy_ui.end = new Date(freebusy_ui.start.getTime() + DAY_MS * freebusy_ui.numdays);
} }
var dayslots = Math.floor(1440 / freebusy_ui.interval); var dayslots = Math.floor(1440 / freebusy_ui.interval);
@ -869,8 +870,8 @@ function rcube_calendar_ui(settings)
// fetch free-busy information for each attendee from server // fetch free-busy information for each attendee from server
var load_freebusy_data = function(from, interval) var load_freebusy_data = function(from, interval)
{ {
var start = new Date(from.getTime() - 86400000 * 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() + 86400000 * 14); // load 14 days var end = new Date(start.getTime() + DAY_MS * 14); // load 14 days
// load free-busy information for every attendee // load free-busy information for every attendee
var domid, email var domid, email
@ -1016,10 +1017,11 @@ function rcube_calendar_ui(settings)
update_freebusy_dates(event.start, event.end); update_freebusy_dates(event.start, event.end);
// move freebusy grid if necessary // move freebusy grid if necessary
var offset = Math.ceil((event.start.getTime() - freebusy_ui.end.getTime()) / DAY_MS);
if (event.start.getTime() >= freebusy_ui.end.getTime()) if (event.start.getTime() >= freebusy_ui.end.getTime())
render_freebusy_grid(1); render_freebusy_grid(Math.max(1, offset));
else if (event.end.getTime() <= freebusy_ui.start.getTime()) else if (event.end.getTime() <= freebusy_ui.start.getTime())
render_freebusy_grid(-1); render_freebusy_grid(Math.min(-1, offset));
else else
render_freebusy_overlay(); render_freebusy_overlay();
@ -1637,7 +1639,7 @@ function rcube_calendar_ui(settings)
dayClick: function(date, allDay, e, view) { dayClick: function(date, allDay, e, view) {
var now = new Date().getTime(); var now = new Date().getTime();
if (now - day_clicked_ts < 400 && day_clicked == date.getTime()) { // emulate double-click on day if (now - day_clicked_ts < 400 && day_clicked == date.getTime()) { // emulate double-click on day
var enddate = new Date(); enddate.setTime(date.getTime() + 86400000 - 60000); var enddate = new Date(); enddate.setTime(date.getTime() + DAY_MS - 60000);
return event_edit_dialog('new', { start:date, end:enddate, allDay:allDay, calendar:me.selected_calendar }); return event_edit_dialog('new', { start:date, end:enddate, allDay:allDay, calendar:me.selected_calendar });
} }
@ -1705,9 +1707,9 @@ function rcube_calendar_ui(settings)
if (day_off < 0) day_off = 6; if (day_off < 0) day_off = 6;
var base_kw = $.datepicker.iso8601Week(base_date); var base_kw = $.datepicker.iso8601Week(base_date);
var kw = parseInt($(this).html()); var kw = parseInt($(this).html());
var diff = (kw - base_kw) * 7 * 86400000; var diff = (kw - base_kw) * 7 * DAY_MS;
// select monday of the chosen calendar week // select monday of the chosen calendar week
var date = new Date(base_date.getTime() - day_off * 86400000 + diff); var date = new Date(base_date.getTime() - day_off * DAY_MS + diff);
fc.fullCalendar('gotoDate', date).fullCalendar('setDate', date).fullCalendar('changeView', 'agendaWeek'); fc.fullCalendar('gotoDate', date).fullCalendar('setDate', date).fullCalendar('changeView', 'agendaWeek');
minical.datepicker('setDate', date); minical.datepicker('setDate', date);
window.setTimeout(init_week_events, 10); window.setTimeout(init_week_events, 10);

6
plugins/calendar/localization/en_US.inc
View file

@ -34,7 +34,7 @@ $labels['edit'] = 'Edit';
$labels['save'] = 'Save'; $labels['save'] = 'Save';
$labels['remove'] = 'Remove'; $labels['remove'] = 'Remove';
$labels['cancel'] = 'Cancel'; $labels['cancel'] = 'Cancel';
$labels['adobt'] = 'Adopt changes'; $labels['select'] = 'Select';
$labels['print'] = 'Print calendars'; $labels['print'] = 'Print calendars';
$labels['title'] = 'Summary'; $labels['title'] = 'Summary';
$labels['description'] = 'Description'; $labels['description'] = 'Description';
@ -102,9 +102,9 @@ $labels['availbusy'] = 'Busy';
$labels['availunknown'] = 'Unknown'; $labels['availunknown'] = 'Unknown';
$labels['availtentative'] = 'Tentative'; $labels['availtentative'] = 'Tentative';
$labels['availoutofoffice'] = 'Out of Office'; $labels['availoutofoffice'] = 'Out of Office';
$labels['scheduletime'] = 'Available times'; $labels['scheduletime'] = 'Find availability';
$labels['sendnotifications'] = 'Send notifications'; $labels['sendnotifications'] = 'Send notifications';
$labels['onlyworkinghours'] = 'Only working hours'; $labels['onlyworkinghours'] = 'Find availability within my working hours';
$labels['prevslot'] = 'Previous Slot'; $labels['prevslot'] = 'Previous Slot';
$labels['nextslot'] = 'Next Slot'; $labels['nextslot'] = 'Next Slot';
$labels['noslotfound'] = 'Unable to find a free time slot'; $labels['noslotfound'] = 'Unable to find a free time slot';