amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-07-10 02:45:08 +00:00
Code Issues Projects Releases Wiki Activity

fix(calendar(js)): swap start-end dates when delta is negative

Browse Source 
When creating an event by drag'n'dropping from bottom to top, the
original coordinate become the start date.
This commit is contained in:
Francis Lachapelle
2019-10-30 13:46:07 -04:00
parent 060dea3818
commit 8b45f2c731
2 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Scheduler/CalendarListController.js
+4 -1
View File
@@ -222,16 +222,19 @@
// Adjust component or create new component through drag'n'drop
function updateComponentFromGhost($event) {
var component, pointerHandler, coordinates, delta, params, calendarNumber, activeCalendars;
var component, pointerHandler, originalCoordinates, coordinates, delta, params, calendarNumber, activeCalendars;
component = Component.$ghost.component;
pointerHandler = Component.$ghost.pointerHandler;
if (component.isNew) {
originalCoordinates = pointerHandler.originalEventCoordinates;
coordinates = pointerHandler.currentEventCoordinates;
component.summary = '';
if (component.isAllDay)
coordinates.duration -= 96;
if (coordinates.start < originalCoordinates.start)
coordinates.duration *= -1;
component.setDelta(coordinates.duration * 15);
newComponent(null, 'appointment', component)
.catch()
UI/WebServerResources/js/Scheduler/Component.service.js
+7
View File
@@ -759,6 +759,13 @@
* @param {number} delta - the number of minutes
*/
Component.prototype.setDelta = function(delta) {
if (delta < 0) {
var start = new Date(this.start.getTime());
start.setMinutes(Math.round(start.getMinutes()/15)*15);
start.addMinutes(delta);
this.start = start;
delta *= -1;
}
this.delta = delta;
this.end = new Date(this.start.getTime());
this.end.setMinutes(Math.round(this.end.getMinutes()/15)*15);