amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-10 15:58:52 +00:00
Code Issues Projects Releases Wiki Activity

(js) Adapt Component ctrl to latest md changes

Browse Source 
Fixes #3823
This commit is contained in:
Francis Lachapelle
2016-09-28 14:39:18 -04:00
parent 9623604aac
commit c1733221ba
3 changed files with 4 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
UI/Templates/SchedulerUI/UIxAppointmentEditorTemplate.wox
View File

@@ -153,7 +153,7 @@
</div>
<div layout="row" layout-align="start center" layout-wrap="layout-wrap">
<md-datepicker ng-model="editor.component.start"
ng-change="editor.updateStartTime()"
ng-change="editor.adjustStartTime()"
label:md-placeholder="From"><!-- date picker --></md-datepicker>
<sg-timepicker ng-model="editor.component.start"
ng-change="editor.adjustStartTime()"
@@ -166,7 +166,7 @@
</div>
<div layout="row" layout-align="start center" layout-wrap="layout-wrap">
<md-datepicker ng-model="editor.component.end"
ng-change="editor.updateEndTime()"
ng-change="editor.adjustEndTime()"
label:md-placeholder="To"><!-- date picker --></md-datepicker>
<sg-timepicker ng-model="editor.component.end"
ng-change="editor.adjustEndTime()"

4
UI/Templates/SchedulerUI/UIxTaskEditorTemplate.wox
View File

@@ -121,7 +121,7 @@
<md-icon>remove_circle</md-icon>
</md-button>
<md-datepicker ng-model="editor.component.start"
ng-change="editor.updateStartTime()"
ng-change="editor.adjustStartTime()"
label:md-placeholder="From"> <!-- date picker--></md-datepicker>
<sg-timepicker ng-model="editor.component.start"
ng-change="editor.adjustStartTime()"><!-- time picker --></sg-timepicker>
@@ -143,7 +143,7 @@
<md-icon>remove_circle</md-icon>
</md-button>
<md-datepicker ng-model="editor.component.due"
ng-change="editor.updateDueTime()"
ng-change="editor.adjustDueTime()"
label:md-placeholder="Due"><!-- date picker--></md-datepicker>
<sg-timepicker ng-model="editor.component.due"
ng-change="editor.adjustDueTime()"><!-- time picker --></sg-timepicker>

21
UI/WebServerResources/js/Scheduler/ComponentController.js
View File

@@ -237,11 +237,8 @@
vm.addDueDate = addDueDate;
// Synchronize start and end dates
vm.updateStartTime = updateStartTime;
vm.adjustStartTime = adjustStartTime;
vm.updateEndTime = updateEndTime;
vm.adjustEndTime = adjustEndTime;
vm.updateDueTime = updateDueTime;
vm.adjustDueTime = adjustDueTime;
if (vm.component.start)
@@ -356,12 +353,6 @@
oldDueDate = new Date(vm.component.due.getTime());
}
function updateStartTime() {
// When using the datepicker, the time is reset to 00:00; restore it
vm.component.start.addMinutes(oldStartDate.getHours() * 60 + oldStartDate.getMinutes());
adjustStartTime();
}
function adjustStartTime() {
if (vm.component.start) {
// Preserve the delta between the start and end dates
@@ -379,12 +370,6 @@
}
}
function updateEndTime() {
// When using the datepicker, the time is reset to 00:00; restore it
vm.component.end.addMinutes(oldEndDate.getHours() * 60 + oldEndDate.getMinutes());
adjustEndTime();
}
function adjustEndTime() {
if (vm.component.end) {
// The end date must be after the start date
@@ -402,12 +387,6 @@
}
}
function updateDueTime() {
// When using the datepicker, the time is reset to 00:00; restore it
vm.component.due.addMinutes(oldDueDate.getHours() * 60 + oldDueDate.getMinutes());
adjustDueTime();
}
function adjustDueTime() {
oldDueDate = new Date(vm.component.due.getTime());
}