diff --git a/CHANGELOG.md b/CHANGELOG.md index 176405ff4..e23ebc477 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ### Added - Aggiunto calendario ICS con le assenze di un dipendente - Aggiunti codici di ferie e riposo compensativo per missione antartide + - Aggiunti codici 62S25V e 62S75V ### Changed - Rimosso campo personId da calendari ICS per reperibilità e turni - Rivisto metodo approvazione ferie con rimozione doppio invio email al dipendente diff --git a/app/models/absences/definitions/DefaultAbsenceType.java b/app/models/absences/definitions/DefaultAbsenceType.java index 753db68e3..6aec3821c 100644 --- a/app/models/absences/definitions/DefaultAbsenceType.java +++ b/app/models/absences/definitions/DefaultAbsenceType.java @@ -1632,6 +1632,14 @@ null, new LocalDate(2019, 12, 31), false, true, true), ImmutableSet.of(JustifiedTypeName.all_day), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + A_62S25V("62S25V", "dist. sind.a temp. det. p. t. 25% vert.", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), + null, null, false, true, true), + A_62S75V("62S75V", "dist. sind.a temp. det. p. t. 75% vert.", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), + null, null, false, true, true), A_ES_L133("ES-L133", "esonero servizio art.72 L.133/08", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, diff --git a/app/models/absences/definitions/DefaultTakable.java b/app/models/absences/definitions/DefaultTakable.java index fc5af8659..903e52971 100644 --- a/app/models/absences/definitions/DefaultTakable.java +++ b/app/models/absences/definitions/DefaultTakable.java @@ -583,7 +583,8 @@ public enum DefaultTakable { DefaultAbsenceType.A_83, DefaultAbsenceType.A_84, DefaultAbsenceType.A_85, DefaultAbsenceType.A_86, DefaultAbsenceType.A_87, DefaultAbsenceType.A_662, - DefaultAbsenceType.A_62S50V, DefaultAbsenceType.A_ES_L133, + DefaultAbsenceType.A_62S50V, DefaultAbsenceType.A_62S25V, + DefaultAbsenceType.A_62S75V, DefaultAbsenceType.A_ES_L133, DefaultAbsenceType.A_99, DefaultAbsenceType.A_65, DefaultAbsenceType.A_61, DefaultAbsenceType.A_16, DefaultAbsenceType.A_42, DefaultAbsenceType.A_93, DefaultAbsenceType.A_408, DefaultAbsenceType.A_50, @@ -629,7 +630,8 @@ public enum DefaultTakable { DefaultAbsenceType.A_83, DefaultAbsenceType.A_84, DefaultAbsenceType.A_85, DefaultAbsenceType.A_86, DefaultAbsenceType.A_87, DefaultAbsenceType.A_662, - DefaultAbsenceType.A_62S50V, DefaultAbsenceType.A_ES_L133, + DefaultAbsenceType.A_62S50V, DefaultAbsenceType.A_62S25V, + DefaultAbsenceType.A_62S75V, DefaultAbsenceType.A_ES_L133, DefaultAbsenceType.A_99, DefaultAbsenceType.A_65, DefaultAbsenceType.A_61, DefaultAbsenceType.A_16, DefaultAbsenceType.A_42, DefaultAbsenceType.A_93, DefaultAbsenceType.A_408, DefaultAbsenceType.A_50, @@ -770,7 +772,8 @@ public enum DefaultTakable { DefaultAbsenceType.A_98CV, DefaultAbsenceType.A_C17, DefaultAbsenceType.A_C18, DefaultAbsenceType.A_C16, DefaultAbsenceType.A_35R, - DefaultAbsenceType.A_54B), + DefaultAbsenceType.A_54B, DefaultAbsenceType.A_62S50V, + DefaultAbsenceType.A_62S25V,DefaultAbsenceType.A_62S75V), ImmutableSet.of( DefaultAbsenceType.A_24, DefaultAbsenceType.A_24H7, DefaultAbsenceType.A_25O, DefaultAbsenceType.A_25OH7, @@ -793,7 +796,8 @@ public enum DefaultTakable { DefaultAbsenceType.A_98CV, DefaultAbsenceType.A_C17, DefaultAbsenceType.A_C18, DefaultAbsenceType.A_C16, DefaultAbsenceType.A_35R, - DefaultAbsenceType.A_54B), + DefaultAbsenceType.A_54B, DefaultAbsenceType.A_62S50V, + DefaultAbsenceType.A_62S25V,DefaultAbsenceType.A_62S75V), -1, null), T_RIPOSI_CNR_ATTESTATI(AmountType.units,