Merge branch '1303-aggiungere-codici-402-e-412-relativi-a-campagna-an…

…tartica' into 'master' Resolve "Aggiungere codici 402 e 412 relativi a campagna antartica" Closes #1303 See merge request epas/epas!1496
archetipo · Mar 22, 2022 · 9dfe735 · 9dfe735
2 parents 828f846 + 823a93d
commit 9dfe735
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 6 deletions.
diff --git a/app/models/absences/definitions/DefaultAbsenceType.java b/app/models/absences/definitions/DefaultAbsenceType.java
@@ -1729,10 +1729,19 @@ null, new LocalDate(2020, 1, 1), true, true, true),
       null, new LocalDate(2019, 12, 31), false, true, true),
   A_400("400", "Ferie missione Antartide anno corrente", false,
       ImmutableSet.of(JustifiedTypeName.all_day), 0, false, false, 0, null, Sets.newHashSet(), null,
-      null, false, true, true), 
+      new LocalDate(2021, 12, 31), false, true, true), 
   A_410("410", "Riposo compensativo missione Antartide", false,
       ImmutableSet.of(JustifiedTypeName.all_day), 0, false, false, 0, null, Sets.newHashSet(),
-      null, null, false, true, true),
+      null, new LocalDate(2021, 12, 31), false, true, true),
+  A_401("401", "Ferie missione Antartide anno precedente", false,
+      ImmutableSet.of(JustifiedTypeName.all_day), 0, false, false, 0, null, Sets.newHashSet(), null,
+      new LocalDate(2022, 12, 31), false, true, true), 
+  A_402("402", "Ferie missione Antartide anno corrente", false,
+      ImmutableSet.of(JustifiedTypeName.all_day), 0, false, false, 0, null, Sets.newHashSet(), 
+      new LocalDate(2022, 1, 1), new LocalDate(2023, 12, 31), false, true, true), 
+  A_412("412", "Riposo compensativo missione Antartide", false,
+      ImmutableSet.of(JustifiedTypeName.all_day), 0, false, false, 0, null, Sets.newHashSet(), 
+      new LocalDate(2022, 1, 1), new LocalDate(2022, 12, 31), false, true, true), 
 
 
   A_NC("NC", "Giorno non conteggiato ai fini del tempo a lavoro", true,

diff --git a/app/models/absences/definitions/DefaultTakable.java b/app/models/absences/definitions/DefaultTakable.java
@@ -475,8 +475,8 @@ public enum DefaultTakable {
           DefaultAbsenceType.A_NC, DefaultAbsenceType.A_62, DefaultAbsenceType.A_35R,
           DefaultAbsenceType.A_96, DefaultAbsenceType.A_96A, DefaultAbsenceType.A_96B,
           DefaultAbsenceType.A_98, DefaultAbsenceType.A_52, DefaultAbsenceType.A_100,
-          DefaultAbsenceType.A_400, DefaultAbsenceType.A_410,
-          DefaultAbsenceType.A_409, DefaultAbsenceType.A_62,
+          DefaultAbsenceType.A_401, DefaultAbsenceType.A_412,
+          DefaultAbsenceType.A_402, DefaultAbsenceType.A_62,
           DefaultAbsenceType.A_62A, DefaultAbsenceType.A_62D, DefaultAbsenceType.A_98CV, 
           DefaultAbsenceType.A_39LA, DefaultAbsenceType.A_40LA, DefaultAbsenceType.A_46,
           DefaultAbsenceType.A_46RA, DefaultAbsenceType.A_VAC19),
@@ -520,8 +520,8 @@ public enum DefaultTakable {
           DefaultAbsenceType.A_NC, DefaultAbsenceType.A_62, DefaultAbsenceType.A_35R,
           DefaultAbsenceType.A_96, DefaultAbsenceType.A_96A, DefaultAbsenceType.A_96B,
           DefaultAbsenceType.A_98, DefaultAbsenceType.A_52, DefaultAbsenceType.A_100,
-          DefaultAbsenceType.A_400, DefaultAbsenceType.A_410,
-          DefaultAbsenceType.A_409, DefaultAbsenceType.A_62,
+          DefaultAbsenceType.A_401, DefaultAbsenceType.A_412,
+          DefaultAbsenceType.A_402,DefaultAbsenceType.A_62,
           DefaultAbsenceType.A_62A, DefaultAbsenceType.A_62D, DefaultAbsenceType.A_98CV,
           DefaultAbsenceType.A_39LA, DefaultAbsenceType.A_40LA, DefaultAbsenceType.A_46,
           DefaultAbsenceType.A_46RA, DefaultAbsenceType.A_VAC19),