From f5b7908f3db88969a4f76b401edff07d502428dc Mon Sep 17 00:00:00 2001 From: dario Date: Wed, 21 Sep 2022 17:03:37 +0200 Subject: [PATCH] Cambiata versione a 2.6.0rc2. Rimossi i pezzi di codice commentati nelle classi --- VERSION | 2 +- .../definitions/DefaultAbsenceType.java | 30 ------------------- .../absences/definitions/DefaultGroup.java | 14 --------- .../absences/definitions/DefaultTakable.java | 15 ---------- 4 files changed, 1 insertion(+), 60 deletions(-) diff --git a/VERSION b/VERSION index 18ad5bd85..c14b79ed0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.6.0-rc1 \ No newline at end of file +2.6.0-rc2 \ No newline at end of file diff --git a/app/models/absences/definitions/DefaultAbsenceType.java b/app/models/absences/definitions/DefaultAbsenceType.java index c4e8a6c2c..859c6dc62 100644 --- a/app/models/absences/definitions/DefaultAbsenceType.java +++ b/app/models/absences/definitions/DefaultAbsenceType.java @@ -641,36 +641,6 @@ null, new LocalDate(2020, 1, 1), true, true, true), MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, new LocalDate(2021, 9, 30), false, true, true), -// A_COV50("COV50", "congedo parentale straordinario al 50%.", -// false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, -// MealTicketBehaviour.notAllowMealTicket, 0, null, -// Sets.newHashSet(), new LocalDate(2021, 10, 1), null, false, true, true), -// -// A_COV50M("COV50M", "Congedo parentale straordinario al 50% in ore e minuti.", -// true, ImmutableSet.of(JustifiedTypeName.specified_minutes), 0, false, -// MealTicketBehaviour.notAllowMealTicket, 0, null, -// Sets.newHashSet(new Behaviour(JustifiedBehaviourName.no_overtime)), null, null, -// false, true, true), -// A_COV50H("COV50H", "Congedo parentale straordinario al 50% completamento giornata", -// false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, -// MealTicketBehaviour.notAllowMealTicket, 0, -// JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), - -// A_COV00("COV00", "congedo parentale straordinario al 0%.", -// false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, -// MealTicketBehaviour.notAllowMealTicket, 0, null, -// Sets.newHashSet(), new LocalDate(2021, 10, 1), null, false, true, true), - -// A_COV00M("COV00M", "Congedo parentale straordinario al 0% in ore e minuti.", -// true, ImmutableSet.of(JustifiedTypeName.specified_minutes), 0, false, -// MealTicketBehaviour.notAllowMealTicket, 0, null, -// Sets.newHashSet(new Behaviour(JustifiedBehaviourName.no_overtime)), null, null, -// false, true, true), -// A_COV00H("COV00H", "Congedo parentale straordinario al 0% completamento giornata", -// false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, -// MealTicketBehaviour.notAllowMealTicket, 0, -// JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), - A_25O("25", "Astensione facoltativa post partum 30% primo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, diff --git a/app/models/absences/definitions/DefaultGroup.java b/app/models/absences/definitions/DefaultGroup.java index bd4f30727..01945d663 100644 --- a/app/models/absences/definitions/DefaultGroup.java +++ b/app/models/absences/definitions/DefaultGroup.java @@ -248,20 +248,6 @@ public enum DefaultGroup { "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_12, DefaultTakable.T_25, DefaultComplation.C_25, DefaultGroup.G_25A, false, true), - // G_COVID50("COVID50 - Congedo parentale straordinario al 50%.", - // "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, - // PeriodType.always, DefaultTakable.T_COVID50, null, null, - // false, true), - -// G_COV50("COV50 - Congedo parentale straordinario al 50%.", -// "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, -// PeriodType.always, DefaultTakable.T_COV50, DefaultComplation.C_COV50, null, -// false, true), - -// G_COV00("COV00 - Congedo parentale straordinario al 0%.", -// "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, -// PeriodType.always, DefaultTakable.T_COV00, DefaultComplation.C_COV00, null, -// false, true), G_23O("23 - Astensione facoltativa post partum 100% primo figlio 0-12 anni 30 giorni", "23/25/24 - Astensione facoltativa post partum primo figlio", diff --git a/app/models/absences/definitions/DefaultTakable.java b/app/models/absences/definitions/DefaultTakable.java index aba56d4ed..7b5324a23 100644 --- a/app/models/absences/definitions/DefaultTakable.java +++ b/app/models/absences/definitions/DefaultTakable.java @@ -259,21 +259,6 @@ public enum DefaultTakable { DefaultAbsenceType.A_23M, DefaultAbsenceType.A_23U), 30, null), - // T_COVID50(AmountType.units, - // ImmutableSet.of(DefaultAbsenceType.A_COVID50), - // ImmutableSet.of(DefaultAbsenceType.A_COVID50), -1, null), - -// T_COV50(AmountType.units, -// ImmutableSet.of(DefaultAbsenceType.A_COV50, -// DefaultAbsenceType.A_COV50M), -// ImmutableSet.of(DefaultAbsenceType.A_COV50, -// DefaultAbsenceType.A_COV50M), -1, null), -// -// T_COV00(AmountType.units, -// ImmutableSet.of(DefaultAbsenceType.A_COV00, -// DefaultAbsenceType.A_COV00M), -// ImmutableSet.of(DefaultAbsenceType.A_COV00, -// DefaultAbsenceType.A_COV00M), -1, null), T_25O(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_25O,