holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix some more cases with recurring events & drag and drop (duration changes)

Browse Source
This commit is contained in:
Nathan Gray 2015-12-03 22:56:52 +00:00
parent 585c856307
commit 7b527d699e
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
calendar/inc/class.calendar_uiforms.inc.php
View File

@ -738,7 +738,8 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
// we edit a existing series event
if ($event['start'] != $old_event['start'] ||
$event['whole_day'] != $old_event['whole_day'])
$event['whole_day'] != $old_event['whole_day'] ||
$event['end'] != $old_event['end'])
{
// calculate offset against old series start or clicked recurrance,
// depending on which is smaller
@ -1103,6 +1104,7 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
$orig_event = $event;
$offset = $event['start'] - $old_event['start'];
$duration = $event['duration'] ? $event['duration'] : $event['end'] - $event['start'];
// base start-date of new series on actual / clicked date
$event['start'] = $as_of_date ;
@ -1144,15 +1146,15 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
//error_log(__METHOD__ ." Series should end at " . egw_time::to($last));
//error_log(__METHOD__ ." New series starts at " . egw_time::to($event['start']));
if ($content['duration'])
if ($duration)
{
$event['end'] = $event['start'] + $content['duration'];
$event['end'] = $event['start'] + $duration;
}
elseif($event['end'] < $event['start'])
{
$event['end'] = $old_event['end'] - $old_event['start'] + $event['start'];
}
//error_log(__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration={$content['duration']}, event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset\n");
//error_log(__LINE__.": event[start]=$event[start]=".egw_time::to($event['start']).", duration={$duration}, event[end]=$event[end]=".egw_time::to($event['end']).", offset=$offset\n");
$last->setTime(0, 0, 0);
$event['participants'] = $old_event['participants'];
@ -1180,6 +1182,7 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
$event = $orig_event;
}
}
$event['start'] = egw_time::to($event['start'],'ts');
return $msg;
}
@ -2764,7 +2767,23 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
unset($preserv['edit_single']);
}
}
$event['start'] = $this->bo->date2ts($targetDateTime);
$event['end'] = $event['start']+$duration;
if ($event['recur_type'] != MCAL_RECUR_NONE && !$date && $seriesInstance)
{
// calculate offset against clicked recurrance,
// depending on which is smaller
$offset = egw_time::to($targetDateTime,'ts') - egw_time::to($seriesInstance,'ts');
$event['start'] = $old_event['start'] + $offset;
$event['duration'] = $duration;
// We have a recurring event starting in the past -
// stop it & create a new one.
$this->_break_recurring($event, $old_event, $this->bo->date2ts($targetDateTime));
}
// Drag a whole day to a time
if($durationT && $durationT != 'whole_day')
{
@ -2784,21 +2803,6 @@ foreach($recur_event as $_k => $_v) error_log($_k . ': ' . array2string($_v));
$event['non_blocking'] = true;
}
$event['start'] = $this->bo->date2ts($targetDateTime);
if ($event['recur_type'] != MCAL_RECUR_NONE && !$date && $seriesInstance)
{
// calculate offset against clicked recurrance,
// depending on which is smaller
$offset = egw_time::to($targetDateTime,'ts') - egw_time::to($seriesInstance,'ts');
$event['start'] = $old_event['start'] + $offset;
// We have a recurring event starting in the past -
// stop it & create a new one.
$this->_break_recurring($event, $old_event, $this->bo->date2ts($targetDateTime));
}
$event['end'] = $event['start']+$duration;
$status_reset_to_unknown = false;
$sameday = (date('Ymd', $old_event['start']) == date('Ymd', $event['start']));
foreach((array)$event['participants'] as $uid => $status)

9
calendar/js/app.js
View File

@ -815,7 +815,14 @@ app.classes.calendar = AppJS.extend(
{
egw().json(
'calendar.calendar_uiforms.ajax_moveEvent',
[widget.options.value.id, widget.options.value.owner, widget.options.value.start, widget.options.value.owner, widget.options.value.duration],
[
dialog_button == 'exception' ? widget.options.value.app_id : widget.options.value.id,
widget.options.value.owner,
widget.options.value.start,
widget.options.value.owner,
widget.options.value.duration,
dialog_button == 'series' ? widget.options.value.start : null
],
// Remove loading spinner
function() {if(widget && widget.div) widget.div.removeClass('loading');}
).sendRequest(true);