verdnatura/salix
verdnatura
/
salix
3
5
Fork 2
Code Issues Pull Requests 70 Releases Wiki Activity

1781-zoneHoliday #994

Merged
joan merged 49 commits from 1781-zoneHoliday into dev 2022-08-03 06:41:31 +00:00
Conversation 1 Commits 49 Files Changed 20 +11 -2
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 6359c9e5bf - Show all commits

9
db/dump/fixtures.sql
View File

@ -2577,3 +2577,12 @@ INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed`
(1106, 2, CURDATE(), NULL), (1106, 2, CURDATE(), NULL),
(1106, 2, DATE_ADD(CURDATE(), INTERVAL + 1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY)); (1106, 2, DATE_ADD(CURDATE(), INTERVAL + 1 DAY), DATE_ADD(CURDATE(), INTERVAL +1 DAY));
INSERT INTO `vn`.`zoneExclusion` (`id`, `zoneFk`, `dated`, `created`, `userFk`)
VALUES
(1, 1, DATE_ADD(CURDATE(), INTERVAL + 10 DAY), CURDATE(), 100),
(2, 1, DATE_ADD(CURDATE(), INTERVAL + 12 DAY), CURDATE(), 100);
INSERT INTO `vn`.`zoneExclusionGeo` (`zoneExclusionFk`, `geoFk`)
VALUES
(2, 1);

2
modules/zone/front/calendar/style.scss
View File

@ -34,7 +34,7 @@ vn-zone-calendar {
background-color: $color-alert; background-color: $color-alert;
} }
&.geoExcluded .day-number { &.geoExcluded .day-number {
background-color: #33CAFF; background-color: $color-main;
} }
} }
} }

2
modules/zone/front/events/index.js
View File

@ -6,7 +6,7 @@ class Controller extends Section {
constructor($element, $, vnWeekDays) { constructor($element, $, vnWeekDays) {
super($element, $); super($element, $);
this.vnWeekDays = vnWeekDays; this.vnWeekDays = vnWeekDays;
this.editMode = 'exclude'; this.editMode = 'include';
this.exclusions; this.exclusions;
this.days; this.days;
} }