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

(js) Improve handling of vacation dates

Browse Source 
Fixes #4844
This commit is contained in:
Francis Lachapelle
2019-10-10 15:37:50 -04:00
parent 7bc73b6f68
commit 66645384bc
2 changed files with 19 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/WebServerResources/js/Preferences/PreferencesController.js
+10 -2
View File
@@ -472,7 +472,10 @@
if (v.startDateEnabled) {
// Enabling the start date
if (v.endDateEnabled && v.startDate.getTime() > v.endDate.getTime()) {
if (!v.startDate) {
v.startDate = new Date();
}
if (v.endDateEnabled && v.endDate && v.startDate.getTime() > v.endDate.getTime()) {
v.startDate = new Date(v.endDate.getTime());
v.startDate.addDays(-1);
}
@@ -486,7 +489,10 @@
if (v.endDateEnabled) {
// Enabling the end date
if (v.startDateEnabled && v.endDate.getTime() < v.startDate.getTime()) {
if (!v.endDate) {
v.endDate = new Date();
}
if (v.startDateEnabled && v.startDate && v.endDate.getTime() < v.startDate.getTime()) {
v.endDate = new Date(v.startDate.getTime());
v.endDate.addDays(1);
}
@@ -500,6 +506,7 @@
d.Vacation.enabled) {
if (d.Vacation.startDateEnabled) {
r = (!d.Vacation.endDateEnabled ||
!d.Vacation.endDate ||
date.getTime() <= d.Vacation.endDate.getTime()) &&
date.getTime() >= today.getTime();
}
@@ -515,6 +522,7 @@
d.Vacation.enabled) {
if (d.Vacation.endDateEnabled) {
r = (!d.Vacation.startDateEnabled ||
!d.Vacation.startDate ||
date.getTime() >= d.Vacation.startDate.getTime()) &&
date.getTime() >= today.getTime();
}