db/versions/11030-salmonCyca/00-firstScript.sql

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

modules/worker/back/methods/worker/createAbsence.js

@@ -95,6 +95,8 @@ module.exports = Self => {
             const hasHalfHoliday = result.halfHolidayCounter > 0;
             const isHalfHoliday = absenceType.code === 'halfHoliday';
 
+            const isFestive = absenceType.isFestive;
+
             const workCenter = await models.Business.findOne({
                 where: {id: args.businessFk}
             },);
@@ -105,10 +107,10 @@ module.exports = Self => {
                     workCenterFk: workCenter.workCenterFk
                 }
             },);
-            if (holiday)
+            if (holiday && isFestive)
                 throw new UserError(`Cannot add holidays on this day`);
 
-            if (isHalfHoliday && hasHalfHoliday)
+            if ((isHalfHoliday && hasHalfHoliday) && isFestive)
                 throw new UserError(`Cannot add more than one '1/2 day vacation'`);
 
             const absence = await models.Calendar.create({

modules/worker/back/models/absence-type.json

@@ -22,7 +22,10 @@
 		},
 		"holidayEntitlementRate": {
 			"type": "number"
-		}
+		},
+        "isFestive": {
+            "type": "boolean"
+        }
 	},
 	"acls": [
         {
@@ -32,4 +35,4 @@
         "permission": "ALLOW"
         }
     ]
-}
+}