verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

refs #6882 fix pr
gitea/salix/pipeline/pr-dev This commit looks good Details

This commit is contained in:
Carlos Satorres 2024-05-08 08:48:19 +02:00
parent 371df19194
commit 8637488fc1
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
db/versions/11030-salmonCyca/00-firstScript.sql
View File

@ -1,7 +1,7 @@
-- Place your SQL code here -- Place your SQL code here
ALTER TABLE vn.absenceType ADD isFestiveEligible BOOL DEFAULT 1 NOT NULL COMMENT 'Para marcar un tipo de absence'; ALTER TABLE vn.absenceType ADD isFestiveEligible BOOL DEFAULT 1 NOT NULL COMMENT 'Para marcar un tipo de absence';
UPDATE absenceType UPDATE vn.absenceType
SET isFestiveEligible = 0 SET isFestiveEligible = 0
WHERE code = 'holiday'; WHERE code = 'holiday';

2
modules/worker/back/methods/worker/createAbsence.js
View File

@ -95,7 +95,7 @@ module.exports = Self => {
const hasHalfHoliday = result.halfHolidayCounter > 0; const hasHalfHoliday = result.halfHolidayCounter > 0;
const isHalfHoliday = absenceType.code === 'halfHoliday'; const isHalfHoliday = absenceType.code === 'halfHoliday';
const isFestive = absenceType.isFestive; const isFestive = absenceType.isFestiveEligible;
const workCenter = await models.Business.findOne({ const workCenter = await models.Business.findOne({
where: {id: args.businessFk} where: {id: args.businessFk}

2
modules/worker/back/models/absence-type.json
View File

@ -23,7 +23,7 @@
"holidayEntitlementRate": { "holidayEntitlementRate": {
"type": "number" "type": "number"
}, },
"isFestive": { "isFestiveEligible": {
"type": "boolean" "type": "boolean"
} }
}, },