diff --git a/db/dump/fixtures.sql b/db/dump/fixtures.sql index c69012f414..d9e0b5e087 100644 --- a/db/dump/fixtures.sql +++ b/db/dump/fixtures.sql @@ -2577,3 +2577,12 @@ INSERT INTO `vn`.`machineWorker` (`workerFk`, `machineFk`, `inTimed`, `outTimed` (1106, 2, CURDATE(), NULL), (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); + diff --git a/modules/zone/front/calendar/style.scss b/modules/zone/front/calendar/style.scss index d6853e33cc..38491af58e 100644 --- a/modules/zone/front/calendar/style.scss +++ b/modules/zone/front/calendar/style.scss @@ -34,7 +34,7 @@ vn-zone-calendar { background-color: $color-alert; } &.geoExcluded .day-number { - background-color: #33CAFF; + background-color: $color-main; } } } diff --git a/modules/zone/front/events/index.js b/modules/zone/front/events/index.js index 55b7a82d71..3007ea510b 100644 --- a/modules/zone/front/events/index.js +++ b/modules/zone/front/events/index.js @@ -6,7 +6,7 @@ class Controller extends Section { constructor($element, $, vnWeekDays) { super($element, $); this.vnWeekDays = vnWeekDays; - this.editMode = 'exclude'; + this.editMode = 'include'; this.exclusions; this.days; }