feat(worker_calendar): repaint, fix front test and add fixtures
gitea/salix/pipeline/head This commit looks good
Details
gitea/salix/pipeline/head This commit looks good
Details
This commit is contained in:
parent
0963b66560
commit
254fee5036
|
@ -2503,3 +2503,15 @@ INSERT INTO `vn`.`docuware` (`code`, `fileCabinetName`, `dialogName` , `find`)
|
||||||
INSERT INTO `vn`.`docuwareConfig` (`url`)
|
INSERT INTO `vn`.`docuwareConfig` (`url`)
|
||||||
VALUES
|
VALUES
|
||||||
('https://verdnatura.docuware.cloud/docuware/platform');
|
('https://verdnatura.docuware.cloud/docuware/platform');
|
||||||
|
|
||||||
|
INSERT INTO `vn`.`calendarHolidaysName` (`id`, `name`)
|
||||||
|
VALUES
|
||||||
|
(1, 'dayOfIT');
|
||||||
|
|
||||||
|
INSERT INTO `vn`.`calendarHolidaysType` (`id`, `name`, `hexColour`)
|
||||||
|
VALUES
|
||||||
|
(1, 'test', 'E9AA01');
|
||||||
|
|
||||||
|
INSERT INTO `vn`.`calendarHolidays` (`id`, `calendarHolidaysTypeFk`, `dated`, `calendarHolidaysNameFk`, `workCenterFk`)
|
||||||
|
VALUES
|
||||||
|
(1, 1, CONCAT(YEAR(CURDATE()), '-12-09'), 1, 1);
|
|
@ -228,9 +228,9 @@ class Controller extends Section {
|
||||||
this.repaintCanceller(() =>
|
this.repaintCanceller(() =>
|
||||||
this.refresh()
|
this.refresh()
|
||||||
.then(calendar.repaint())
|
.then(calendar.repaint())
|
||||||
.then(() => this.repaint())
|
|
||||||
.then(() => this.getContractHolidays())
|
.then(() => this.getContractHolidays())
|
||||||
.then(() => this.getYearHolidays())
|
.then(() => this.getYearHolidays())
|
||||||
|
.then(() => this.repaint())
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
@ -265,9 +265,9 @@ class Controller extends Section {
|
||||||
this.repaintCanceller(() =>
|
this.repaintCanceller(() =>
|
||||||
this.refresh()
|
this.refresh()
|
||||||
.then(calendar.repaint())
|
.then(calendar.repaint())
|
||||||
.then(() => this.repaint())
|
|
||||||
.then(() => this.getContractHolidays())
|
.then(() => this.getContractHolidays())
|
||||||
.then(() => this.getYearHolidays())
|
.then(() => this.getYearHolidays())
|
||||||
|
.then(() => this.repaint())
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -191,7 +191,8 @@ describe('Worker', () => {
|
||||||
const selectedDay = new Date();
|
const selectedDay = new Date();
|
||||||
const expectedEvent = {
|
const expectedEvent = {
|
||||||
dated: selectedDay,
|
dated: selectedDay,
|
||||||
type: 'holiday'
|
type: 'holiday',
|
||||||
|
absenceId: 1
|
||||||
};
|
};
|
||||||
const $event = {
|
const $event = {
|
||||||
target: {
|
target: {
|
||||||
|
@ -214,7 +215,8 @@ describe('Worker', () => {
|
||||||
const selectedDay = new Date();
|
const selectedDay = new Date();
|
||||||
const expectedEvent = {
|
const expectedEvent = {
|
||||||
dated: selectedDay,
|
dated: selectedDay,
|
||||||
type: 'leaveOfAbsence'
|
type: 'leaveOfAbsence',
|
||||||
|
absenceId: 1
|
||||||
};
|
};
|
||||||
const $event = {
|
const $event = {
|
||||||
target: {
|
target: {
|
||||||
|
|
Loading…
Reference in New Issue