From cc800e56d5f0509de8efb411605d212b1c85c7c9 Mon Sep 17 00:00:00 2001 From: Cristian Lucchesi Date: Mon, 12 Sep 2022 16:52:57 +0200 Subject: [PATCH 01/13] Aggiunta configurazione per la comunicazione delle assenze livelli I-III --- app/controllers/Configurations.java | 19 +++++++++++++-- app/helpers/TemplateUtility.java | 8 +++++++ app/manager/configurations/EpasParam.java | 24 +++++++++++++++++++ app/models/GeneralSetting.java | 7 ++++++ app/views/Administration/_generalSetting.html | 12 ++++++++++ conf/messages.it | 4 ++++ db/evolutions/192.sql | 9 +++++++ 7 files changed, 81 insertions(+), 2 deletions(-) create mode 100644 db/evolutions/192.sql diff --git a/app/controllers/Configurations.java b/app/controllers/Configurations.java index 9e4d8b762..76c010c0f 100755 --- a/app/controllers/Configurations.java +++ b/app/controllers/Configurations.java @@ -21,6 +21,7 @@ import com.google.common.base.Preconditions; import com.google.common.base.Verify; import common.security.SecurityRules; +import dao.GeneralSettingDao; import dao.OfficeDao; import dao.PersonDao; import java.io.File; @@ -75,7 +76,8 @@ public class Configurations extends Controller { static PeriodManager periodManager; @Inject static SecurityRules rules; - + @Inject + static GeneralSettingDao generalSettingDao; private static IPropertyInPeriod compute(IPropertyInPeriod configuration, EpasParam epasParam, ConfigurationDto configurationDto) { @@ -256,10 +258,23 @@ public static void show(Long officeId, EpasParamCategory paramCategory) { .filter(conf -> conf.epasParam.category == EpasParam.EpasParamCategory.AUTOCERTIFICATION) .collect(Collectors.toList()); - final List flows = configurations.stream() + List flows = configurations.stream() .filter(conf -> conf.epasParam.category == EpasParam.EpasParamCategory.FLOWS) .collect(Collectors.toList()); + if (!generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization) { + flows = flows.stream().filter(conf -> + !conf.epasParam.equals(EpasParam.COMPENSATORY_REST_REQUEST_I_III_MANAGER_APPROVAL_REQUIRED) && + !conf.epasParam.equals(EpasParam.COMPENSATORY_REST_REQUEST_I_III_OFFICE_HEAD_APPROVAL_REQUIRED) && + !conf.epasParam.equals(EpasParam.VACATION_REQUEST_I_III_MANAGER_APPROVAL_REQUIRED) && + !conf.epasParam.equals(EpasParam.VACATION_REQUEST_I_III_OFFICE_HEAD_APPROVAL_REQUIRED)) + .collect(Collectors.toList()); + } else { + flows = flows.stream().filter(conf -> + !conf.epasParam.equals(EpasParam.ABSENCE_TOP_LEVEL_MANAGER_NOTIFICATION) && + !conf.epasParam.equals(EpasParam.ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION)) + .collect(Collectors.toList()); + } final List competenceFlows = configurations.stream() .filter(conf -> conf.epasParam.category == EpasParam.EpasParamCategory.COMPETENCE_FLOWS) .collect(Collectors.toList()); diff --git a/app/helpers/TemplateUtility.java b/app/helpers/TemplateUtility.java index 37d7d42ce..99fbf6c32 100644 --- a/app/helpers/TemplateUtility.java +++ b/app/helpers/TemplateUtility.java @@ -909,4 +909,12 @@ public String getCompanyUrl() { return CompanyConfig.url(); } + + /** + * Indica se è permessa la configurabilità delle richieste di assenza + * per i livelli I-III. + */ + public boolean absenceRequestAuthorizationTopLevelEnabled () { + return generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization; + } } diff --git a/app/manager/configurations/EpasParam.java b/app/manager/configurations/EpasParam.java index ac9fd1e99..280ee6b19 100644 --- a/app/manager/configurations/EpasParam.java +++ b/app/manager/configurations/EpasParam.java @@ -681,6 +681,30 @@ public enum EpasParam { Lists.newArrayList(), Office.class), + /** + * Il responsabile di sede deve ricevere le notifiche delle comunicazioni di ferie deli livelli I-III. + */ + ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION( + "absence_top_level_office_head_notification", + EpasParamCategory.FLOWS, + EpasParamTimeType.PERIODIC, + EpasParamValueType.BOOLEAN, + EpasParamValueType.formatValue(true), + Lists.newArrayList(), + Office.class), + + /** + * Il responsabile di gruppo deve ricevere le notifiche delle comunicazioni di ferie deli livelli I-III. + */ + ABSENCE_TOP_LEVEL_MANAGER_NOTIFICATION( + "absence_top_level_manager_notification", + EpasParamCategory.FLOWS, + EpasParamTimeType.PERIODIC, + EpasParamValueType.BOOLEAN, + EpasParamValueType.formatValue(false), + Lists.newArrayList(), + Office.class), + //##################################################################### //FLOWS PARAMS COMPETENCES diff --git a/app/models/GeneralSetting.java b/app/models/GeneralSetting.java index a269a12ca..cc9ac82a8 100644 --- a/app/models/GeneralSetting.java +++ b/app/models/GeneralSetting.java @@ -98,5 +98,12 @@ public class GeneralSetting extends BaseModel { * inserire timbrature via REST. */ public int maxDaysInPastForRestStampings = 90; + + /* + * Indica se è possibile o meno configurare per i livelli I-III + * la richiesta di approvazione ferie da parte di un responsabile di + * gruppo o del responsabile di sede. + */ + public boolean enableAbsenceTopLevelAuthorization = true; } \ No newline at end of file diff --git a/app/views/Administration/_generalSetting.html b/app/views/Administration/_generalSetting.html index f90ed3d70..053fb8854 100644 --- a/app/views/Administration/_generalSetting.html +++ b/app/views/Administration/_generalSetting.html @@ -64,6 +64,18 @@

&{actionSelected+'.table'}

#{/b.buttons} #{/form} #{/accordionItem} + #{accordionItem 'enableAbsenceTopLevelRequestAuthorization', parent:'generalSetting', + title:'Abilitazione dei flussi di approvazione per i livelli I-III', open:false} + #{form action:@saveGeneralSetting(), method:'POST', class:'form form-horizontal'} + #{f.hidden 'generalSetting.id' /} + #{alert color:'info'}Permette di configurazione l'approvazione delle richieste di assenza per i livelli I-III. Se impostato a "no" per i livelli I-III sarà possibile solo configurare le notifiche per le comunicazioni di assenza. #{/alert} + #{f.booleanRadio 'generalSetting.enableAbsenceTopLevelAuthorization' /} + #{b.buttons} + #{b.save /} + #{/b.buttons} + #{/form} + #{/accordionItem} + #{accordionItem 'handleGroupsByInstitute', parent:'generalSetting', title:'Gestione gruppi per istituto', open:false} #{form action:@saveGeneralSetting(), method:'POST', class:'form form-horizontal'} #{f.hidden 'generalSetting.id' /} diff --git a/conf/messages.it b/conf/messages.it index cde42bc90..e623012d1 100755 --- a/conf/messages.it +++ b/conf/messages.it @@ -449,6 +449,7 @@ generalSetting.enableAutoconfigCovid19=Abilita visione auto inserimento covid19 generalSetting.enableAutoconfigSmartworking=Abilita visione auto inserimento smartworking in configurazione generalSetting.enableDailyPresenceForManager=Abilita visualizzazione presenza giornaliera dipendenti appartenenti a gruppo generalSetting.holidayShiftInNightToo=Considera come festivi i turni notturni effettuati nei festivi +generalSetting.enableAbsenceTopLevelAuthorization=Possibilità di configurare le autorizzazioni per le assenze dei livelli I-III group.label =Nome gruppo group.limitType =Periodo di utililzzo limite @@ -1267,6 +1268,9 @@ PERSONAL_PERMISSION_REQUEST_I_III_MANAGER_APPROVAL_REQUIRED =Richiesta approvazi PERSONAL_PERMISSION_REQUEST_IV_VIII_MANAGER_APPROVAL_REQUIRED =Richiesta approvazione permessi personali per i livelli IV-VIII da parte del Responsabile gruppo di lavoro PERSONAL_PERMISSION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED =Richiesta approvazione permessi personali per i Responsabili di gruppo da parte del Responsabile di Sede +ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION=Invio notifica a responsabile di sede per comunicazione assenza livelli I-III +ABSENCE_TOP_LEVEL_MANAGER_NOTIFICATION=Invio notifica a responsabile di gruppo per comunicazione assenza livelli I-III + ENABLE_COMPETENCE_FLOWS =Abilitazione flusso di richiesta competenze CHANGE_REPERIBILITY_REQUEST_REPERIBILITY_MANAGER_APPROVAL_REQUIRED =Richiesta approvazione del responsabile del servizio per cambio giorno di reperibilità CHANGE_REPERIBILITY_REQUEST_EMPLOYEE_APPROVAL_REQUIRED =Richiesta approvazione del reperibile per cambio giorno di reperibilità diff --git a/db/evolutions/192.sql b/db/evolutions/192.sql new file mode 100644 index 000000000..c936e7ddb --- /dev/null +++ b/db/evolutions/192.sql @@ -0,0 +1,9 @@ +# ---!Ups + +ALTER TABLE general_setting ADD COLUMN enable_absence_top_level_authorization BOOLEAN DEFAULT TRUE; +ALTER TABLE general_setting_history ADD COLUMN enable_absence_top_level_authorization BOOLEAN; + +# ---!Downs + +ALTER TABLE general_setting DROP COLUMN enable_absence_top_level_authorization; +ALTER TABLE general_setting_history DROP enable_absence_top_level_authorization; \ No newline at end of file From 56dc75c3887089733236a5c16c70138ee9cd26ab Mon Sep 17 00:00:00 2001 From: darietto1983 Date: Tue, 13 Sep 2022 17:04:40 +0200 Subject: [PATCH 02/13] Iniziata rifattorizzazione dei congedi parentali. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Aggiunti i nuovi codici 25A e 25S (anche per secondo e terzo figlio) e modificati i vecchi 25 (anche per figli successivi) aggiungendo la "O" in fondo al codice. Inserita fine validità per tutti i codici 24 --- .../definitions/DefaultAbsenceType.java | 216 ++++++++++++++++-- .../definitions/DefaultComplation.java | 12 + .../absences/definitions/DefaultGroup.java | 23 ++ .../absences/definitions/DefaultTakable.java | 45 +++- 4 files changed, 265 insertions(+), 31 deletions(-) diff --git a/app/models/absences/definitions/DefaultAbsenceType.java b/app/models/absences/definitions/DefaultAbsenceType.java index ebaec0de9..220d6e171 100644 --- a/app/models/absences/definitions/DefaultAbsenceType.java +++ b/app/models/absences/definitions/DefaultAbsenceType.java @@ -670,20 +670,69 @@ null, new LocalDate(2020, 1, 1), true, true, true), 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, + null, false, true, true), A_25("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, null, false, true, true), + /*Da definire 25A e 25S*/ + A_25A("25A", "Da definire...", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), + A_25AM("25AM", "Da definire... 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_25AH7("25AH7", "Astensione facoltativa post partum 30% primo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_25S("25S", "Da definire...", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), + A_25SM("25SM", "Da definire... 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_25SH7("25SH7", "Astensione facoltativa post partum 30% primo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + /*Fine spazio 25A e 25S*/ + A_25OM("25M", "Astensione facoltativa post partum 30% primo figlio 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_25M("25M", "Astensione facoltativa post partum 30% primo figlio 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_25OH7("25H7", "Astensione facoltativa post partum 30% primo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), A_25H7("25H7", "Astensione facoltativa post partum 30% primo figlio completamento giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_25OU("25U", "Astensione facoltativa post partum 30% primo figlio intera giornata altro genitore", + true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, + Sets.newHashSet(), null, null, false, true, true), A_25U("25U", "Astensione facoltativa post partum 30% primo figlio intera giornata altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, null, @@ -692,20 +741,20 @@ null, new LocalDate(2020, 1, 1), true, true, true), A_24("24", "Astensione facoltativa post partum non retrib. primo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, - null, false, true, true), + new LocalDate(2022,8,12), false, true, true), A_24M("24M", "Astensione facoltativa post partum non retrib. primo figlio 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), + Sets.newHashSet(new Behaviour(JustifiedBehaviourName.no_overtime)), null, + new LocalDate(2022,8,12), false, true, true), A_24H7("24H7", "Astensione facoltativa post partum non retrib. primo figlio completamento " + "giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, - MealTicketBehaviour.notAllowMealTicket, 0, - JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), + null, new LocalDate(2022,8,12), false, true, true), A_24U("24U", "Astensione facoltativa post partum non retrib. primo figlio intera giornata altro " + "genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, false, MealTicketBehaviour.notAllowMealTicket, - 0, null, Sets.newHashSet(), null, null, false, true, true), + 0, null, Sets.newHashSet(), null, new LocalDate(2022,8,12), false, true, true), A_232("232", "Astensione facoltativa post partum 100% secondo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, @@ -725,19 +774,68 @@ null, new LocalDate(2020, 1, 1), true, true, true), true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + A_252OM("252M", "Astensione facoltativa post partum 30% secondo figlio 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_252M("252M", "Astensione facoltativa post partum 30% secondo figlio 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_252("252", "Astensione facoltativa post partum 30% secondo figlio intera giornata", + + A_252O("252", "Astensione facoltativa post partum 30% secondo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + A_252("252", "Astensione facoltativa post partum 30% secondo figlio intera giornata", + false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, + Sets.newHashSet(), null, null, false, true, true), + + A_252A("252A", "Da definire...", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), + A_252AM("252AM", "Da definire... 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_252AH7("25H7", "Astensione facoltativa post partum 30% primo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_252S("252S", "Da definire...", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), + A_252SM("252SM", "Da definire... 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_252SH7("25H7", "Astensione facoltativa post partum 30% primo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + + A_252OH7("252H7", "Astensione facoltativa post partum 30% secondo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), A_252H7("252H7", "Astensione facoltativa post partum 30% secondo figlio completamento giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_252OU("252U", "Astensione facoltativa post partum 30% secondo figlio intera giornata " + + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, + MealTicketBehaviour.notAllowMealTicket, + 0, null, Sets.newHashSet(), null, null, false, true, true), A_252U("252U", "Astensione facoltativa post partum 30% secondo figlio intera giornata " + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, MealTicketBehaviour.notAllowMealTicket, @@ -746,21 +844,21 @@ null, new LocalDate(2020, 1, 1), true, true, true), A_242("242", "Astensione facoltativa post partum non retrib. secondo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), - null, null, false, true, true), + null, new LocalDate(2022,8,12), false, true, true), A_242M("242M", "Astensione facoltativa post partum non retrib. secondo figlio 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), + Sets.newHashSet(new Behaviour(JustifiedBehaviourName.no_overtime)), null, + new LocalDate(2022,8,12), false, true, true), A_242H7("242H7", "Astensione facoltativa post partum non retrib. secondo figlio completamento " + "giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, - MealTicketBehaviour.notAllowMealTicket, 0, - JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), + null, new LocalDate(2022,8,12), false, true, true), A_242U("242U", "Astensione facoltativa post partum non retrib. secondo figlio intera giornata " + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, false, MealTicketBehaviour.notAllowMealTicket, - 0, null, Sets.newHashSet(), null, null, false, true, true), + 0, null, Sets.newHashSet(), null, new LocalDate(2022,8,12), false, true, true), A_233("233", "Astensione facoltativa post partum 100% terzo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, @@ -780,19 +878,67 @@ null, new LocalDate(2020, 1, 1), true, true, true), true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + A_253O("253", "Astensione facoltativa post partum 30% terzo figlio intera giornata", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), A_253("253", "Astensione facoltativa post partum 30% terzo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + + A_253A("253A", "Da definire...", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), + A_253AM("253AM", "Da definire... 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_253AH7("253AH7", "Astensione facoltativa post partum 30% terzo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_253S("253S", "Da definire...", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), + A_253SM("253SM", "Da definire... 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_253SH7("253SH7", "Astensione facoltativa post partum 30% terzo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_253OM("253M", "Astensione facoltativa post partum 30% terzo figlio 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_253M("253M", "Astensione facoltativa post partum 30% terzo figlio 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_253OH7("253H7", "Astensione facoltativa post partum 30% terzo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), A_253H7("253H7", "Astensione facoltativa post partum 30% terzo figlio completamento giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_253OU("253U", "Astensione facoltativa post partum 30% terzo figlio intera giornata " + + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, + MealTicketBehaviour.notAllowMealTicket, + 0, null, Sets.newHashSet(), null, null, false, true, true), A_253U("253U", "Astensione facoltativa post partum 30% terzo figlio intera giornata " + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, MealTicketBehaviour.notAllowMealTicket, @@ -801,21 +947,21 @@ null, new LocalDate(2020, 1, 1), true, true, true), A_243("243", "Astensione facoltativa post partum non retrib. terzo figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, - null, false, true, true), + new LocalDate(2022,8,12), false, true, true), A_243M("243M", "Astensione facoltativa post partum non retrib. terzo figlio 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), + Sets.newHashSet(new Behaviour(JustifiedBehaviourName.no_overtime)), null, + new LocalDate(2022,8,12), false, true, true), A_243H7("243H7", "Astensione facoltativa post partum non retrib. terzo figlio completamento " + "giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, - MealTicketBehaviour.notAllowMealTicket, 0, - JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), + null, new LocalDate(2022,8,12), false, true, true), A_243U("243U", "Astensione facoltativa post partum non retrib. terzo figlio intera giornata " + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, false, MealTicketBehaviour.notAllowMealTicket, - 0, null, Sets.newHashSet(), null, null, false, true, true), + 0, null, Sets.newHashSet(), null, new LocalDate(2022,8,12), false, true, true), A_234("234", "Astensione facoltativa post partum 100% quarto figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, @@ -835,19 +981,39 @@ null, new LocalDate(2020, 1, 1), true, true, true), MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + A_254O("254", "Astensione facoltativa post partum 30% quarto figlio intera giornata", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, + 0, null, Sets.newHashSet(), null, null, false, true, true), A_254("254", "Astensione facoltativa post partum 30% quarto figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + + A_254OM("254M", + "Astensione facoltativa post partum 30% quarto figlio 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_254M("254M", "Astensione facoltativa post partum 30% quarto figlio 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_254OH7("254H7", "Astensione facoltativa post partum 30% quarto figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), A_254H7("254H7", "Astensione facoltativa post partum 30% quarto figlio completamento giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_254OU("254U", "Astensione facoltativa post partum 30% quarto figlio intera giornata " + + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, + MealTicketBehaviour.notAllowMealTicket, + 0, null, Sets.newHashSet(), null, null, false, true, true), A_254U("254U", "Astensione facoltativa post partum 30% quarto figlio intera giornata " + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, MealTicketBehaviour.notAllowMealTicket, @@ -856,21 +1022,21 @@ null, new LocalDate(2020, 1, 1), true, true, true), A_244("244", "Astensione facoltativa post partum non retrib. quarto figlio intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, null, - Sets.newHashSet(), null, null, false, true, true), + Sets.newHashSet(), null, new LocalDate(2022,8,12), false, true, true), A_244M("244M", "Astensione facoltativa post partum non retrib. quarto figlio 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), + Sets.newHashSet(new Behaviour(JustifiedBehaviourName.no_overtime)), null, + new LocalDate(2022,8,12), false, true, true), A_244H7("244H7", "Astensione facoltativa post partum non retrib. quarto figlio completamento " + "giornata", false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, - MealTicketBehaviour.notAllowMealTicket, 0, - JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), + null, new LocalDate(2022,8,12), false, true, true), A_244U("244U", "Astensione facoltativa post partum non retrib. quarto figlio intera giornata " + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, false, MealTicketBehaviour.notAllowMealTicket, 0, - null, Sets.newHashSet(), null, null, false, true, true), + null, Sets.newHashSet(), null, new LocalDate(2022,8,12), false, true, true), A_25P("25P", "Prolungamento astensione facoltativa post partum 30% intera giornata", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, diff --git a/app/models/absences/definitions/DefaultComplation.java b/app/models/absences/definitions/DefaultComplation.java index 460577151..a6db00b74 100644 --- a/app/models/absences/definitions/DefaultComplation.java +++ b/app/models/absences/definitions/DefaultComplation.java @@ -173,6 +173,9 @@ public enum DefaultComplation { C_23(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_23M), ImmutableSet.of(DefaultAbsenceType.A_23H7)), + C_25O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_25OM), + ImmutableSet.of(DefaultAbsenceType.A_25OH7)), C_25(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_25M), ImmutableSet.of(DefaultAbsenceType.A_25H7)), @@ -188,6 +191,9 @@ public enum DefaultComplation { C_232(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_232M), ImmutableSet.of(DefaultAbsenceType.A_232H7)), + C_252O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_252OM), + ImmutableSet.of(DefaultAbsenceType.A_252OH7)), C_252(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_252M), ImmutableSet.of(DefaultAbsenceType.A_252H7)), @@ -198,6 +204,9 @@ public enum DefaultComplation { C_233(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_233M), ImmutableSet.of(DefaultAbsenceType.A_233H7)), + C_253O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_253OM), + ImmutableSet.of(DefaultAbsenceType.A_253OH7)), C_253(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_253M), ImmutableSet.of(DefaultAbsenceType.A_253H7)), @@ -208,6 +217,9 @@ public enum DefaultComplation { C_234(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_234M), ImmutableSet.of(DefaultAbsenceType.A_234H7)), + C_254O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_254OM), + ImmutableSet.of(DefaultAbsenceType.A_254OH7)), C_254(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_254M), ImmutableSet.of(DefaultAbsenceType.A_254H7)), diff --git a/app/models/absences/definitions/DefaultGroup.java b/app/models/absences/definitions/DefaultGroup.java index 0605df96d..bed844f1c 100644 --- a/app/models/absences/definitions/DefaultGroup.java +++ b/app/models/absences/definitions/DefaultGroup.java @@ -223,6 +223,11 @@ public enum DefaultGroup { DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_12, DefaultTakable.T_24, DefaultComplation.C_24, null, false, true), + + G_25O("25 - Astensione facoltativa post partum 30% primo figlio 0-6 anni 150 giorni", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child1_0_6, DefaultTakable.T_25O, DefaultComplation.C_25O, DefaultGroup.G_24, + false, true), G_25("25 - Astensione facoltativa post partum 30% primo figlio 0-6 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_6, DefaultTakable.T_25, DefaultComplation.C_25, DefaultGroup.G_24, @@ -242,6 +247,12 @@ public enum DefaultGroup { 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", + DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child1_0_12, DefaultTakable.T_23, DefaultComplation.C_23, + DefaultGroup.G_25, false, true), + G_23("23 - Astensione facoltativa post partum 100% primo figlio 0-12 anni 30 giorni", "23/25/24 - Astensione facoltativa post partum primo figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, @@ -253,6 +264,10 @@ public enum DefaultGroup { "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child2_0_12, DefaultTakable.T_242, DefaultComplation.C_242, null, false, true), + G_252O("252 - Astensione facoltativa post partum 30% secondo figlio 0-6 anni 150 giorni", "", + DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child2_0_6, DefaultTakable.T_252O, DefaultComplation.C_252O, DefaultGroup.G_242, + false, true), G_252("252 - Astensione facoltativa post partum 30% secondo figlio 0-6 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child2_0_6, DefaultTakable.T_252, DefaultComplation.C_252, DefaultGroup.G_242, @@ -266,6 +281,10 @@ public enum DefaultGroup { G_243("243 - Astensione facoltativa post partum non retrib. terzo figlio 0-12 anni 600 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child3_0_12, DefaultTakable.T_243, DefaultComplation.C_243, null, false, true), + G_253O("253 - Astensione facoltativa post partum 30% terzo figlio 0-6 anni 150 giorni", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child3_0_6, DefaultTakable.T_253O, DefaultComplation.C_253O, DefaultGroup.G_243, + false, true), G_253("253 - Astensione facoltativa post partum 30% terzo figlio 0-6 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child3_0_6, DefaultTakable.T_253, DefaultComplation.C_253, DefaultGroup.G_243, @@ -279,6 +298,10 @@ public enum DefaultGroup { G_244("244 - Astensione facoltativa post partum non retrib. quarto figlio 0-12 anni 600 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child4_0_12, DefaultTakable.T_244, DefaultComplation.C_244, null, false, true), + G_254O("254 - Astensione facoltativa post partum 30% quarto figlio 0-6 anni 150 giorni", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child4_0_6, DefaultTakable.T_254O, DefaultComplation.C_254O, DefaultGroup.G_244, + false, true), G_254("254 - Astensione facoltativa post partum 30% quarto figlio 0-6 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child4_0_6, DefaultTakable.T_254, DefaultComplation.C_254, DefaultGroup.G_244, diff --git a/app/models/absences/definitions/DefaultTakable.java b/app/models/absences/definitions/DefaultTakable.java index a20d74294..60c772fb7 100644 --- a/app/models/absences/definitions/DefaultTakable.java +++ b/app/models/absences/definitions/DefaultTakable.java @@ -265,6 +265,15 @@ public enum DefaultTakable { DefaultAbsenceType.A_COV00M), ImmutableSet.of(DefaultAbsenceType.A_COV00, DefaultAbsenceType.A_COV00M), -1, null), + + T_25O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_25O, + DefaultAbsenceType.A_25OM, + DefaultAbsenceType.A_25OU), + ImmutableSet.of(DefaultAbsenceType.A_25O, + DefaultAbsenceType.A_25OM, + DefaultAbsenceType.A_25OU), + 150, null), T_25(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_25, @@ -293,6 +302,14 @@ public enum DefaultTakable { DefaultAbsenceType.A_232U), 30, null), + T_252O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_252O, + DefaultAbsenceType.A_252OM, + DefaultAbsenceType.A_252OU), + ImmutableSet.of(DefaultAbsenceType.A_252O, + DefaultAbsenceType.A_252OM, + DefaultAbsenceType.A_252OU), + 150, null), T_252(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_252, DefaultAbsenceType.A_252M, @@ -320,6 +337,14 @@ public enum DefaultTakable { DefaultAbsenceType.A_233U), 30, null), + T_253O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_253O, + DefaultAbsenceType.A_253OM, + DefaultAbsenceType.A_253OU), + ImmutableSet.of(DefaultAbsenceType.A_253O, + DefaultAbsenceType.A_253OM, + DefaultAbsenceType.A_253OU), + 150, null), T_253(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_253, DefaultAbsenceType.A_253M, @@ -346,6 +371,14 @@ public enum DefaultTakable { DefaultAbsenceType.A_234M, DefaultAbsenceType.A_234U), 30, null), + T_254O(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_254O, + DefaultAbsenceType.A_254OM, + DefaultAbsenceType.A_254OU), + ImmutableSet.of(DefaultAbsenceType.A_254O, + DefaultAbsenceType.A_254OM, + DefaultAbsenceType.A_254OU), + 150, null), T_254(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_254, DefaultAbsenceType.A_254M, @@ -649,11 +682,11 @@ public enum DefaultTakable { T_RIDUCE_FERIE_CNR(AmountType.units, ImmutableSet.of( DefaultAbsenceType.A_24, DefaultAbsenceType.A_24H7, - DefaultAbsenceType.A_25, DefaultAbsenceType.A_25H7, + DefaultAbsenceType.A_25O, DefaultAbsenceType.A_25OH7, DefaultAbsenceType.A_242, DefaultAbsenceType.A_242H7, - DefaultAbsenceType.A_252, DefaultAbsenceType.A_252H7, + DefaultAbsenceType.A_252O, DefaultAbsenceType.A_252OH7, DefaultAbsenceType.A_243, DefaultAbsenceType.A_243H7, - DefaultAbsenceType.A_253, DefaultAbsenceType.A_253H7, + DefaultAbsenceType.A_253O, DefaultAbsenceType.A_253OH7, DefaultAbsenceType.A_54L230, DefaultAbsenceType.A_50, DefaultAbsenceType.A_54, DefaultAbsenceType.A_54D, DefaultAbsenceType.A_54E, DefaultAbsenceType.A_54F, @@ -670,11 +703,11 @@ public enum DefaultTakable { DefaultAbsenceType.A_C16, DefaultAbsenceType.A_35R), ImmutableSet.of( DefaultAbsenceType.A_24, DefaultAbsenceType.A_24H7, - DefaultAbsenceType.A_25, DefaultAbsenceType.A_25H7, + DefaultAbsenceType.A_25O, DefaultAbsenceType.A_25OH7, DefaultAbsenceType.A_242, DefaultAbsenceType.A_242H7, - DefaultAbsenceType.A_252, DefaultAbsenceType.A_252H7, + DefaultAbsenceType.A_252O, DefaultAbsenceType.A_252OH7, DefaultAbsenceType.A_243, DefaultAbsenceType.A_243H7, - DefaultAbsenceType.A_253, DefaultAbsenceType.A_253H7, + DefaultAbsenceType.A_253O, DefaultAbsenceType.A_253OH7, DefaultAbsenceType.A_54L230, DefaultAbsenceType.A_50, DefaultAbsenceType.A_54, DefaultAbsenceType.A_54D, DefaultAbsenceType.A_54E, DefaultAbsenceType.A_54F, From 70bc6df2e2f16145bf1849ae74af8ebc04ee023c Mon Sep 17 00:00:00 2001 From: Cristian Lucchesi Date: Wed, 14 Sep 2022 18:19:35 +0200 Subject: [PATCH 03/13] Versione non ancora funzionante comunicazione assenze liv. I-III --- app/controllers/Configurations.java | 5 +- app/manager/NotificationManager.java | 120 +++++++++++++++++- app/manager/configurations/EpasParam.java | 16 ++- app/manager/flows/AbsenceRequestManager.java | 23 +++- .../absences/AbsenceEngineUtility.java | 1 - .../absences/model/AbsencePeriod.java | 1 - app/models/PersonalWorkingTime.java | 7 - app/views/AbsenceRequests/edit.html | 10 +- app/views/AbsenceRequests/list.html | 14 +- app/views/_workflowsMenu.html | 29 +++-- app/views/tags/secure/li.html | 5 +- conf/messages.it | 15 ++- 12 files changed, 199 insertions(+), 47 deletions(-) diff --git a/app/controllers/Configurations.java b/app/controllers/Configurations.java index 76c010c0f..ce7163dfe 100755 --- a/app/controllers/Configurations.java +++ b/app/controllers/Configurations.java @@ -271,8 +271,9 @@ public static void show(Long officeId, EpasParamCategory paramCategory) { .collect(Collectors.toList()); } else { flows = flows.stream().filter(conf -> - !conf.epasParam.equals(EpasParam.ABSENCE_TOP_LEVEL_MANAGER_NOTIFICATION) && - !conf.epasParam.equals(EpasParam.ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION)) + !conf.epasParam.equals(EpasParam.ABSENCE_TOP_LEVEL_GROUP_MANAGER_NOTIFICATION) && + !conf.epasParam.equals(EpasParam.ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION) && + !conf.epasParam.equals(EpasParam.ABSENCE_TOP_LEVEL_OF_GROUP_MANAGER_OFFICE_HEAD_NOTIFICATION)) .collect(Collectors.toList()); } final List competenceFlows = configurations.stream() diff --git a/app/manager/NotificationManager.java b/app/manager/NotificationManager.java index 1e3103ed1..254ea7bb9 100644 --- a/app/manager/NotificationManager.java +++ b/app/manager/NotificationManager.java @@ -20,9 +20,11 @@ import com.google.common.base.Optional; import com.google.common.base.Strings; import com.google.common.base.Verify; +import com.google.common.collect.Sets; import com.google.inject.Inject; import controllers.Security; import dao.AbsenceDao; +import dao.GeneralSettingDao; import dao.GroupDao; import dao.InformationRequestDao; import dao.RoleDao; @@ -89,7 +91,8 @@ public class NotificationManager { private GroupDao groupDao; private ConfigurationManager configurationManager; private InformationRequestDao requestDao; - + private GeneralSettingDao generalSettingDao; + final String dateFormatter = "dd/MM/YYYY"; /** @@ -98,7 +101,8 @@ public class NotificationManager { @Inject public NotificationManager(SecureManager secureManager, RoleDao roleDao, AbsenceDao absenceDao, AbsenceComponentDao componentDao, GroupDao groupDao, - ConfigurationManager configurationManager, InformationRequestDao requestDao) { + ConfigurationManager configurationManager, InformationRequestDao requestDao, + GeneralSettingDao generalSettingDao) { this.secureManager = secureManager; this.roleDao = roleDao; this.absenceDao = absenceDao; @@ -106,7 +110,7 @@ public NotificationManager(SecureManager secureManager, RoleDao roleDao, Absence this.groupDao = groupDao; this.configurationManager = configurationManager; this.requestDao = requestDao; - + this.generalSettingDao = generalSettingDao; } private static final String WORKDAY_REPERIBILITY = "207"; @@ -749,6 +753,15 @@ private void sendEmailAbsenceRequest(AbsenceRequest absenceRequest) { Verify.verifyNotNull(absenceRequest); final Person person = absenceRequest.person; + //Nel caso si tratti di una "comunicazione" di assenza da parte di + //un livelli I-III e non sia necessaria nessuna autorizzazione, allora + //si invia solo una notifica al responsabile sede e/o responsabile gruppo + //(dipendente dalla configurazione) + if (generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization == false && + absenceRequest.person.isTopQualification()) { + sendEmailAbsenceNotification(absenceRequest); + } + final Role roleDestination = getProperRole(absenceRequest); if (roleDestination == null) { log.warn( @@ -794,6 +807,67 @@ private void sendEmailAbsenceRequest(AbsenceRequest absenceRequest) { }); } + private void sendEmailAbsenceNotification(AbsenceRequest absenceRequest) { + Set recipients = Sets.newHashSet(); + //si invia solo una notifica al responsabile sede e/o responsabile gruppo + //(dipendente dalla configurazione) + + //Email al responsabile di sede per i livelli I-III che NON SONO + //responsabili di gruppo + if (configurationManager.configValue(absenceRequest.person.office, + EpasParam.ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION, LocalDate.now()).equals(Boolean.TRUE) + && !absenceRequest.person.isGroupManager()) { + recipients = + absenceRequest.person.office.usersRolesOffices.stream() + .filter(uro -> uro.role.name.equals(Role.SEAT_SUPERVISOR)).map(uro -> uro.user.person) + .collect(Collectors.toSet()); + } + //Email al responsabile di sede per i livelli I-III che SONO + //responsabili di gruppo + if (configurationManager.configValue(absenceRequest.person.office, + EpasParam.ABSENCE_TOP_LEVEL_OF_GROUP_MANAGER_OFFICE_HEAD_NOTIFICATION, LocalDate.now()).equals(Boolean.TRUE) + && absenceRequest.person.isGroupManager()) { + recipients = + absenceRequest.person.office.usersRolesOffices.stream() + .filter(uro -> uro.role.name.equals(Role.SEAT_SUPERVISOR)).map(uro -> uro.user.person) + .collect(Collectors.toSet()); + } + //Email al responsabile di gruppo per i livelli I-III del suo gruppo (se sono attive + //notifiche al responsabile di gruppo nella configurazione del gruppo). + if (configurationManager.configValue(absenceRequest.person.office, + EpasParam.ABSENCE_TOP_LEVEL_GROUP_MANAGER_NOTIFICATION, LocalDate.now()).equals(Boolean.TRUE)) { + recipients.addAll(groupDao.myGroups(absenceRequest.person).stream() + .filter(group -> group.sendFlowsEmail) + .map(group -> group.manager) + .collect(Collectors.toSet())); + } + + if (!recipients.isEmpty()) { + SimpleEmail simpleEmail = new SimpleEmail(); + recipients.forEach(r -> { + try { + simpleEmail.addTo(r.email); + simpleEmail.setSubject( + String.format("ePas Comunicazione assenza (%s)", absenceRequest.id)); + val mailBody = createAbsenceNotificationEmail(absenceRequest, r.user); + try { + simpleEmail.setMsg(mailBody); + } catch (EmailException e) { + e.printStackTrace(); + } + Mail.send(simpleEmail); + log.info( + "Inviata email per richiesta di flusso richiesta: {}. " + + "Mail: \n\tTo: {}\n\tSubject: {}\n\tbody: {}", + absenceRequest, r.user.person.email, simpleEmail.getSubject(), mailBody); + } catch (EmailException e) { + log.error("Impossibile inviare l'email a {} che è destinatario del email " + + "per la comunicazione dell'assenza di {}", + r.getFullname(), absenceRequest.person.getFullname(), e); + } + }); + } + } /** * Metodo privato che invia la mail al richiedente la ferie/riposo compensativo. * @@ -825,10 +899,10 @@ private void sendEmailAbsenceRequestConfirmation(AbsenceRequest absenceRequest, approver = " da " + Security.getUser().get().person.getFullname(); } if (approval) { - message.append(String.format("\r\nè stata APPROVATA%s la sua richiesta di : %s", + message.append(String.format("\r\nè stata APPROVATA%s la sua %s", approver, requestType)); } else { - message.append(String.format("\r\nè stata RESPINTA%s la sua richiesta di : %s", + message.append(String.format("\r\nè stata RESPINTA%s la sua %s", approver, requestType)); } @@ -842,7 +916,7 @@ private void sendEmailAbsenceRequestConfirmation(AbsenceRequest absenceRequest, } Mail.send(simpleEmail); log.info( - "Inviata email per approvazione di flusso richiesta: {}. " + "Inviata email per approvazione di flusso {}. " + "Mail: \n\tTo: {}\n\tSubject: {}\n\tbody: {}", absenceRequest, person.email, simpleEmail.getSubject(), mailBody); @@ -891,6 +965,40 @@ private String createAbsenceRequestEmail(AbsenceRequest absenceRequest, User use return message.toString(); } + /** + * Metodo che compone il corpo della mail da inviare. + * + * @param absenceRequest la richiesta d'assenza + * @param user l'utente a cui inviare la mail + * @return il corpo della mail da inviare all'utente responsabile dell'approvazione. + */ + private String createAbsenceNotificationEmail(AbsenceRequest absenceRequest, User user) { + + String requestType = ""; + if (absenceRequest.type == AbsenceRequestType.COMPENSATORY_REST) { + requestType = Messages.get("AbsenceRequestType.COMPENSATORY_REST"); + } else if (absenceRequest.type == AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST) { + requestType = Messages.get("AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST_TOP_LEVEL"); + } else { + requestType = Messages.get("AbsenceRequestType.VACATION_REQUEST"); + } + final StringBuilder message = + new StringBuilder().append(String.format("Gentile %s,\r\n", user.person.fullName())); + message.append(String.format("\r\nLe è stata notificata da %s", + absenceRequest.person.fullName())); + message.append(String.format("\r\n una assenza di tipo: %s", requestType)); + if (absenceRequest.startAt.isEqual(absenceRequest.endTo)) { + message.append(String.format("\r\n per il giorno: %s", + absenceRequest.startAt.toLocalDate().toString(dateFormatter))); + } else { + message.append(String.format("\r\n dal: %s", + absenceRequest.startAt.toLocalDate().toString(dateFormatter))); + message.append( + String.format(" al: %s", absenceRequest.endTo.toLocalDate().toString(dateFormatter))); + } + return message.toString(); + } + ////////////////////////////////////////////////////////////////////////////////////////// // Notifiche per competence request ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/app/manager/configurations/EpasParam.java b/app/manager/configurations/EpasParam.java index 280ee6b19..530283b3e 100644 --- a/app/manager/configurations/EpasParam.java +++ b/app/manager/configurations/EpasParam.java @@ -693,11 +693,23 @@ public enum EpasParam { Lists.newArrayList(), Office.class), + /** + * Il responsabile di sede deve ricevere le notifiche delle comunicazioni di ferie deli livelli I-III. + */ + ABSENCE_TOP_LEVEL_OF_GROUP_MANAGER_OFFICE_HEAD_NOTIFICATION( + "absence_top_level_of_group_manager_office_head_notification", + EpasParamCategory.FLOWS, + EpasParamTimeType.PERIODIC, + EpasParamValueType.BOOLEAN, + EpasParamValueType.formatValue(true), + Lists.newArrayList(), + Office.class), + /** * Il responsabile di gruppo deve ricevere le notifiche delle comunicazioni di ferie deli livelli I-III. */ - ABSENCE_TOP_LEVEL_MANAGER_NOTIFICATION( - "absence_top_level_manager_notification", + ABSENCE_TOP_LEVEL_GROUP_MANAGER_NOTIFICATION( + "absence_top_level_group_manager_notification", EpasParamCategory.FLOWS, EpasParamTimeType.PERIODIC, EpasParamValueType.BOOLEAN, diff --git a/app/manager/flows/AbsenceRequestManager.java b/app/manager/flows/AbsenceRequestManager.java index 9f0115b93..470cc4c7c 100644 --- a/app/manager/flows/AbsenceRequestManager.java +++ b/app/manager/flows/AbsenceRequestManager.java @@ -22,6 +22,7 @@ import com.google.common.collect.Maps; import controllers.Security; import dao.AbsenceRequestDao; +import dao.GeneralSettingDao; import dao.GroupDao; import dao.PersonReperibilityDayDao; import dao.PersonShiftDayDao; @@ -97,7 +98,8 @@ public class AbsenceRequestManager { private GroupDao groupDao; private PersonReperibilityDayDao personReperibilityDayDao; private PersonShiftDayDao personShiftDayDao; - + private GeneralSettingDao generalSettingDao; + /** * DTO per la configurazione delle AbsenceRequest. */ @@ -127,7 +129,8 @@ public AbsenceRequestManager(ConfigurationManager configurationManager, AbsenceService absenceService, AbsenceManager absenceManager, AbsenceComponentDao absenceDao, PersonDayManager personDayManager, ConsistencyManager consistencyManager, AbsenceRequestDao absenceRequestDao, GroupDao groupDao, - PersonReperibilityDayDao personReperibilityDayDao, PersonShiftDayDao personShiftDayDao) { + PersonReperibilityDayDao personReperibilityDayDao, PersonShiftDayDao personShiftDayDao, + GeneralSettingDao generalSettingDao) { this.configurationManager = configurationManager; this.uroDao = uroDao; this.roleDao = roleDao; @@ -141,6 +144,7 @@ public AbsenceRequestManager(ConfigurationManager configurationManager, this.groupDao = groupDao; this.personReperibilityDayDao = personReperibilityDayDao; this.personShiftDayDao = personShiftDayDao; + this.generalSettingDao = generalSettingDao; } private static final String FERIE_CNR = "FERIE_CNR"; @@ -205,8 +209,14 @@ public List checkconfiguration(AbsenceRequestType requestType, Person pe public AbsenceRequestConfiguration getConfiguration(AbsenceRequestType requestType, Person person) { val absenceRequestConfiguration = new AbsenceRequestConfiguration(person, requestType); + + //Per i livelli I-III in configurazione generale può esserci scritto di + //non abilitare la possibilità di chiedere autorizzazioni, in questo caso i flussi + //dei livelli I-III non hanno mai approvazioni richieste. + val skipTopLevelAuthorization = + person.isTopQualification() && !generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization; - if (requestType.alwaysSkipAdministrativeApproval) { + if (requestType.alwaysSkipAdministrativeApproval || skipTopLevelAuthorization) { absenceRequestConfiguration.administrativeApprovalRequired = false; } else { if (person.isTopQualification() @@ -223,7 +233,8 @@ public AbsenceRequestConfiguration getConfiguration(AbsenceRequestType requestTy } } - if (requestType.alwaysSkipManagerApproval || person.isGroupManager()) { + if (requestType.alwaysSkipManagerApproval || person.isGroupManager() || + skipTopLevelAuthorization) { absenceRequestConfiguration.managerApprovalRequired = false; } else { if (person.isTopQualification() && requestType.managerApprovalRequiredTopLevel.isPresent()) { @@ -238,7 +249,7 @@ public AbsenceRequestConfiguration getConfiguration(AbsenceRequestType requestTy requestType.managerApprovalRequiredTechnicianLevel.get(), LocalDate.now()); } } - if (requestType.alwaysSkipOfficeHeadApproval) { + if (requestType.alwaysSkipOfficeHeadApproval || skipTopLevelAuthorization) { absenceRequestConfiguration.officeHeadApprovalRequired = false; } else { if (person.isTopQualification() @@ -255,7 +266,7 @@ public AbsenceRequestConfiguration getConfiguration(AbsenceRequestType requestTy } } - if (requestType.alwaysSkipOfficeHeadApprovalForManager) { + if (requestType.alwaysSkipOfficeHeadApprovalForManager || skipTopLevelAuthorization) { absenceRequestConfiguration.officeHeadApprovalForManagerRequired = false; } else { if (person.isGroupManager()) { diff --git a/app/manager/services/absences/AbsenceEngineUtility.java b/app/manager/services/absences/AbsenceEngineUtility.java index 2eaee1629..6edad6bb2 100644 --- a/app/manager/services/absences/AbsenceEngineUtility.java +++ b/app/manager/services/absences/AbsenceEngineUtility.java @@ -34,7 +34,6 @@ import models.Contract; import models.ContractWorkingTimeType; import models.Person; -import models.PersonDay; import models.absences.Absence; import models.absences.AbsenceType; import models.absences.AbsenceTypeJustifiedBehaviour; diff --git a/app/manager/services/absences/model/AbsencePeriod.java b/app/manager/services/absences/model/AbsencePeriod.java index d91674a52..89fdefb07 100644 --- a/app/manager/services/absences/model/AbsencePeriod.java +++ b/app/manager/services/absences/model/AbsencePeriod.java @@ -28,7 +28,6 @@ import java.util.Map; import java.util.Set; import java.util.SortedMap; -import javax.inject.Inject; import manager.PersonDayManager; import manager.services.absences.AbsenceEngineUtility; import manager.services.absences.errors.ErrorsBox; diff --git a/app/models/PersonalWorkingTime.java b/app/models/PersonalWorkingTime.java index 67b0d989a..d4f9f8996 100644 --- a/app/models/PersonalWorkingTime.java +++ b/app/models/PersonalWorkingTime.java @@ -17,22 +17,15 @@ package models; -import com.google.common.base.Optional; import javax.persistence.Entity; import javax.persistence.JoinColumn; import javax.persistence.ManyToOne; import javax.persistence.Table; -import javax.persistence.Transient; import lombok.Getter; import lombok.ToString; -import manager.configurations.EpasParam.EpasParamValueType.LocalTimeInterval; import models.base.IPropertiesInPeriodOwner; import models.base.IPropertyInPeriod; import models.base.PropertyInPeriod; -import org.joda.time.LocalTime; -import org.joda.time.format.DateTimeFormat; -import org.joda.time.format.DateTimeFormatter; -import org.testng.util.Strings; import play.data.validation.Required; /** diff --git a/app/views/AbsenceRequests/edit.html b/app/views/AbsenceRequests/edit.html index 796bf9dcb..dabb08204 100644 --- a/app/views/AbsenceRequests/edit.html +++ b/app/views/AbsenceRequests/edit.html @@ -1,13 +1,19 @@ #{extends 'main.html' /} #{set header:'navbar' /} -#{set absenceRequestTypeLabel: messages.get('AbsenceRequestType.' + absenceRequest.type.toString() + 'S') /} +#{if currentUser.person != null && currentUser.person.isTopQualification()} + #{set absenceRequestTypeLabel: messages.get('AbsenceRequestType.' + absenceRequest.type.toString() + 'S_TOP_LEVEL') /} + #{set typeLabel: messages.get('AbsenceRequestType.' + absenceRequest.type.toString() + '_TOP_LEVEL') /} +#{/if}#{else} + #{set absenceRequestTypeLabel: messages.get('AbsenceRequestType.' + absenceRequest.type.toString() + 'S') /} + #{set typeLabel: messages.get('AbsenceRequestType.' + absenceRequest.type.toString()) /} +#{/else} #{set title:('ePAS - ' + absenceRequest.isPersistent() ? 'Modifica ' : 'Inserimento ' + absenceRequest.type.label()) /} #{set breadcrumbs:[(absenceRequestTypeLabel):@AbsenceRequests.list(absenceRequest.type), ('Modifica'):null] /}
#{breadcrumbs breadcrumbs /} - #{title title:(absenceRequest.isPersistent() ? 'Modifica ' : 'Inserimento ' + absenceRequest.type.label()) /} + #{title title:(absenceRequest.isPersistent() ? 'Modifica ' : 'Inserimento ' + messages.get(typeLabel)) /}
diff --git a/app/views/AbsenceRequests/list.html b/app/views/AbsenceRequests/list.html index a1e3e9b3a..48c10206a 100644 --- a/app/views/AbsenceRequests/list.html +++ b/app/views/AbsenceRequests/list.html @@ -1,6 +1,12 @@ #{extends 'main.html' /} #{set header:'navbar' /} -#{set absenceRequestTypeLabel: messages.get('AbsenceRequestType.' + type.toString() + 'S') /} +#{if currentUser.person != null && currentUser.person.isTopQualification()} + #{set absenceRequestTypeLabel: messages.get('AbsenceRequestType.' + type.toString() + 'S_TOP_LEVEL') /} + #{set topLevelNoAuth:true /} +#{/if}#{else} + #{set absenceRequestTypeLabel: messages.get('AbsenceRequestType.' + type.toString() + 'S') /} + #{set topLevelNoAuth:false /} +#{/else} #{set title:('ePAS - ' + absenceRequestTypeLabel) /} #{set breadcrumbs:[(absenceRequestTypeLabel):null] /} @@ -34,12 +40,14 @@ #{tabContentItem id:'attivo', active:true} #{b.buttons center:true} - &{'AbsenceRequestType.' + type + '.blank'} + + #{if topLevelNoAuth}&{'AbsenceRequestType.' + type + '_TOP_LEVEL.blank'}#{/if} + #{else}&{'AbsenceRequestType.' + type + '.blank'}#{/else} #{/b.buttons} #{if myResults.isEmpty()} #{alert color:'info'} -

Al momento non ci sono flussi di richiesta assenza in esecuzione.

+

Al momento non ci sono flussi di richiesta/comunicazione assenza in esecuzione.

#{/alert} #{/if} #{else} diff --git a/app/views/_workflowsMenu.html b/app/views/_workflowsMenu.html index 1ad7f168c..2dbaddcdb 100644 --- a/app/views/_workflowsMenu.html +++ b/app/views/_workflowsMenu.html @@ -29,16 +29,16 @@ + templateUtility.illnessRequests() + templateUtility.changeReperibilityRequests()} - #{/if} + #{/if}
Flussi di lavoro -
+
*{ items }*
    - + #{secure.check 'CompetenceRequests.enabled'} #{secure.li @CompetenceRequests.changeReperibility()} @@ -46,28 +46,33 @@ #{/secure.li}
  • #{/secure.check} - - #{secure.li @AbsenceRequests.vacations()} + + %{ + absenceRequestLabel = + (currentUser.person != null && currentUser.person.isTopQualification() && !templateUtility.absenceRequestAuthorizationTopLevelEnabled()) ? 'AbsenceRequests.vacationsTopLevel' : 'AbsenceRequests.vacations' + }% + #{secure.li @AbsenceRequests.vacations(), label:absenceRequestLabel} #{/secure.li} #{secure.li @AbsenceRequests.compensatoryRests()} #{/secure.li} - + #{secure.li @AbsenceRequests.personalPermissions()} - #{/secure.li} - + #{secure.check 'AbsenceRequests.pastYearEnabled'} - #{secure.li @AbsenceRequests.vacationsPastYearAfterDeadline()} + %{ + absenceRequestPastYearLabel = + currentUser.person != null && currentUser.person.isTopQualification() && !templateUtility.absenceRequestAuthorizationTopLevelEnabled() ? 'AbsenceRequests.vacationsPastYearAfterDeadlineTopLevel' : 'AbsenceRequests.vacationsPastYearAfterDeadline' + }% + #{secure.li @AbsenceRequests.vacationsPastYearAfterDeadline(), label:absenceRequestPastYearLabel} #{/secure.li} #{/secure.check} - - - + #{secure.check 'InformationRequests.enabled'} #{secure.li @InformationRequests.teleworks()} diff --git a/app/views/tags/secure/li.html b/app/views/tags/secure/li.html index 2ac528a8a..986c39b22 100644 --- a/app/views/tags/secure/li.html +++ b/app/views/tags/secure/li.html @@ -2,11 +2,12 @@ target: optional target for security check class: optional classes for a element hide: optional set true if the link must be hidden +showDisabled: set true if for link without permission should be shown its label }* #{if request.action == _arg.action}#{set active='active' /}#{/if} #{if controllers.Resecure.check(_arg.action, _target)} -
  • #{doBody /} &{_arg.action}
    • +
  • #{doBody /} #{if _label}&{_label}#{/if}#{else}&{_arg.action}#{/else}
    • #{/if} #{elseif _showDisabled} -
  • #{doBody /} &{_arg.action}
    • +
  • #{doBody /} #{if _label}&{_label}#{/if}#{else}&{_arg.action}#{/else}
    • #{/elseif} diff --git a/conf/messages.it b/conf/messages.it index e623012d1..3ddcf24fc 100755 --- a/conf/messages.it +++ b/conf/messages.it @@ -994,10 +994,12 @@ Contracts.updateSourceContract= Inizializzazione Contracts.initializationsStatus=Dati Iniziali AbsenceRequests.vacations =Mie richieste di ferie +AbsenceRequests.vacationsTopLevel=Mie comunicazioni ferie AbsenceRequests.compensatoryRests =Miei riposi compensativi AbsenceRequests.shortTermPermit =Miei permessi brevi AbsenceRequests.personalPermissions =Miei permessi personali AbsenceRequests.vacationsPastYearAfterDeadline =Mie richieste ferie anno passato dopo deadline +AbsenceRequests.vacationsPastYearAfterDeadlineTopLevel =Mie comunicazioni ferie anno passato dopo deadline AbsenceRequests.vacationsToApprove =Flussi di richieste di ferie AbsenceRequests.compensatoryRestsToApprove =Flussi di riposi compensativi AbsenceRequests.shortTermPermitToApprove =Flussi di permessi brevi @@ -1014,11 +1016,14 @@ InformationRequests.serviceExitToApprove =Flussi di richieste uscite di servizio AbsenceRequestType.VACATION_REQUEST =richiesta di ferie AbsenceRequestType.VACATION_REQUESTS = Mie richieste ferie AbsenceRequestType.VACATION_REQUEST.blank =nuova richiesta ferie - +AbsenceRequestType.VACATION_REQUEST_TOP_LEVEL =comunicazione di ferie +AbsenceRequestType.VACATION_REQUESTS_TOP_LEVEL = Mie comunicazioni ferie +AbsenceRequestType.VACATION_REQUEST_TOP_LEVEL.blank =nuova comunicazione ferie AbsenceRequestType.COMPENSATORY_REST =riposo compensativo AbsenceRequestType.COMPENSATORY_RESTS =Miei riposi compensativi AbsenceRequestType.COMPENSATORY_REST.blank =nuova richiesta riposo compensativo +AbsenceRequestType.COMPENSATORY_REST_TOP_LEVEL.blank =nuova comunicazione riposo compensativo AbsenceRequestType.PERSONAL_PERMISSION =permesso personale AbsenceRequestType.PERSONAL_PERMISSIONS =Miei permessi personali @@ -1034,6 +1039,9 @@ Groups.seatOrganizationChart =Ruoli in ePAS all'interno della sede AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST =richiesta ferie anno passato dopo deadline AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUESTS = Mie richieste ferie anno passato dopo deadline AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST.blank =nuova richiesta ferie anno passato dopo deadline +AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST_TOP_LEVEL =comunicazione ferie anno passato dopo deadline +AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUESTS_TOP_LEVEL = Mie comunicazioni ferie anno passato dopo deadline +AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST_TOP_LEVEL.blank =nuova comunicazione ferie anno passato dopo deadline Institutes.list= Sedi e Amministratori @@ -1268,8 +1276,9 @@ PERSONAL_PERMISSION_REQUEST_I_III_MANAGER_APPROVAL_REQUIRED =Richiesta approvazi PERSONAL_PERMISSION_REQUEST_IV_VIII_MANAGER_APPROVAL_REQUIRED =Richiesta approvazione permessi personali per i livelli IV-VIII da parte del Responsabile gruppo di lavoro PERSONAL_PERMISSION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED =Richiesta approvazione permessi personali per i Responsabili di gruppo da parte del Responsabile di Sede -ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION=Invio notifica a responsabile di sede per comunicazione assenza livelli I-III -ABSENCE_TOP_LEVEL_MANAGER_NOTIFICATION=Invio notifica a responsabile di gruppo per comunicazione assenza livelli I-III +ABSENCE_TOP_LEVEL_OFFICE_HEAD_NOTIFICATION=Invio notifica a responsabile di sede per comunicazione assenza livelli I-III (non responsabili di gruppo) +ABSENCE_TOP_LEVEL_OF_GROUP_MANAGER_OFFICE_HEAD_NOTIFICATION=Invio notifica a responsabile di sede per comunicazione assenza livelli I-III (responsabili di gruppo) +ABSENCE_TOP_LEVEL_GROUP_MANAGER_NOTIFICATION=Invio notifica a responsabile di gruppo per comunicazione assenza livelli I-III ENABLE_COMPETENCE_FLOWS =Abilitazione flusso di richiesta competenze CHANGE_REPERIBILITY_REQUEST_REPERIBILITY_MANAGER_APPROVAL_REQUIRED =Richiesta approvazione del responsabile del servizio per cambio giorno di reperibilità From 38daee3babd8c445e01cb44f9da5df666de5b57a Mon Sep 17 00:00:00 2001 From: Cristian Lucchesi Date: Wed, 14 Sep 2022 18:58:45 +0200 Subject: [PATCH 04/13] Versione forse funzionante comunicazione ferie livelli I-III --- app/controllers/AbsenceRequests.java | 14 +++++++++++++- app/manager/NotificationManager.java | 19 +++---------------- app/manager/flows/AbsenceRequestManager.java | 11 +++++++++++ 3 files changed, 27 insertions(+), 17 deletions(-) diff --git a/app/controllers/AbsenceRequests.java b/app/controllers/AbsenceRequests.java index 2c54e36ea..86a65f022 100644 --- a/app/controllers/AbsenceRequests.java +++ b/app/controllers/AbsenceRequests.java @@ -24,6 +24,7 @@ import com.google.common.collect.Lists; import common.security.SecurityRules; import dao.AbsenceRequestDao; +import dao.GeneralSettingDao; import dao.GroupDao; import dao.PersonDao; import dao.PersonReperibilityDayDao; @@ -131,6 +132,8 @@ public class AbsenceRequests extends Controller { @Inject static PersonReperibilityDayDao personReperibilityDayDao; + @Inject + static GeneralSettingDao generalSettingDao; /** * Lista delle richiesta di assenza di tipo ferie. @@ -550,7 +553,16 @@ public static void save(@Required @Valid AbsenceRequest absenceRequest, if (isNewRequest || !absenceRequest.flowStarted) { absenceRequestManager.executeEvent(absenceRequest, absenceRequest.person, AbsenceRequestEventType.STARTING_APPROVAL_FLOW, Optional.absent()); - if (absenceRequest.person.isSeatSupervisor() || (absenceRequest.person.isGroupManager() + + //Nel caso si tratti di una "comunicazione" di assenza da parte di + //un livelli I-III e non sia necessaria nessuna autorizzazione, allora + //si invia solo una notifica al responsabile sede e/o responsabile gruppo + //(dipendente dalla configurazione) + if (generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization == false && + absenceRequest.person.isTopQualification()) { + absenceRequestManager.topLevelSelfApproval(absenceRequest, Security.getUser().get().person); + notificationManager.sendEmailAbsenceNotification(absenceRequest); + } else if (absenceRequest.person.isSeatSupervisor() || (absenceRequest.person.isGroupManager() && !absenceRequest.officeHeadApprovalForManagerRequired)) { approval(absenceRequest.id); } else { diff --git a/app/manager/NotificationManager.java b/app/manager/NotificationManager.java index 254ea7bb9..c31d8d0c0 100644 --- a/app/manager/NotificationManager.java +++ b/app/manager/NotificationManager.java @@ -24,7 +24,6 @@ import com.google.inject.Inject; import controllers.Security; import dao.AbsenceDao; -import dao.GeneralSettingDao; import dao.GroupDao; import dao.InformationRequestDao; import dao.RoleDao; @@ -91,8 +90,7 @@ public class NotificationManager { private GroupDao groupDao; private ConfigurationManager configurationManager; private InformationRequestDao requestDao; - private GeneralSettingDao generalSettingDao; - + final String dateFormatter = "dd/MM/YYYY"; /** @@ -101,8 +99,7 @@ public class NotificationManager { @Inject public NotificationManager(SecureManager secureManager, RoleDao roleDao, AbsenceDao absenceDao, AbsenceComponentDao componentDao, GroupDao groupDao, - ConfigurationManager configurationManager, InformationRequestDao requestDao, - GeneralSettingDao generalSettingDao) { + ConfigurationManager configurationManager, InformationRequestDao requestDao) { this.secureManager = secureManager; this.roleDao = roleDao; this.absenceDao = absenceDao; @@ -110,7 +107,6 @@ public NotificationManager(SecureManager secureManager, RoleDao roleDao, Absence this.groupDao = groupDao; this.configurationManager = configurationManager; this.requestDao = requestDao; - this.generalSettingDao = generalSettingDao; } private static final String WORKDAY_REPERIBILITY = "207"; @@ -753,15 +749,6 @@ private void sendEmailAbsenceRequest(AbsenceRequest absenceRequest) { Verify.verifyNotNull(absenceRequest); final Person person = absenceRequest.person; - //Nel caso si tratti di una "comunicazione" di assenza da parte di - //un livelli I-III e non sia necessaria nessuna autorizzazione, allora - //si invia solo una notifica al responsabile sede e/o responsabile gruppo - //(dipendente dalla configurazione) - if (generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization == false && - absenceRequest.person.isTopQualification()) { - sendEmailAbsenceNotification(absenceRequest); - } - final Role roleDestination = getProperRole(absenceRequest); if (roleDestination == null) { log.warn( @@ -807,7 +794,7 @@ private void sendEmailAbsenceRequest(AbsenceRequest absenceRequest) { }); } - private void sendEmailAbsenceNotification(AbsenceRequest absenceRequest) { + public void sendEmailAbsenceNotification(AbsenceRequest absenceRequest) { Set recipients = Sets.newHashSet(); //si invia solo una notifica al responsabile sede e/o responsabile gruppo //(dipendente dalla configurazione) diff --git a/app/manager/flows/AbsenceRequestManager.java b/app/manager/flows/AbsenceRequestManager.java index 470cc4c7c..319c3448e 100644 --- a/app/manager/flows/AbsenceRequestManager.java +++ b/app/manager/flows/AbsenceRequestManager.java @@ -723,6 +723,17 @@ public void managerSelfApproval(long id, User user) { log.info("{} auto approvata dal responsabile del gruppo {}.", absenceRequest, currentPerson.getFullname()); } + + /** + * Da configurazione è possibile fare in modo che le richieste di assenza + * dei livelli I-III siano automaticamente approvate. + */ + public void topLevelSelfApproval(AbsenceRequest absenceRequest, Person person) { + executeEvent(absenceRequest, person, AbsenceRequestEventType.COMPLETE, + Optional.absent()); + log.info("{} auto approvata dal dipendente (livello I-III) ", absenceRequest, + person.getFullname()); + } /** * Metodo che ritorna il gruppo di assenze per inoltrare la richiesta. From 671f29549ba7dfdc5ee9d4b93237fd0f718296f0 Mon Sep 17 00:00:00 2001 From: Cristian Lucchesi Date: Thu, 15 Sep 2022 16:54:44 +0200 Subject: [PATCH 05/13] Terminata configurazione comunicazioni/richieste assenza livelli I-III --- CHANGELOG.md | 4 + VERSION | 2 +- app/controllers/AbsenceRequests.java | 5 +- app/manager/NotificationManager.java | 195 +++++++++++------- app/manager/flows/AbsenceRequestManager.java | 4 +- .../flows/enumerate/AbsenceRequestType.java | 17 +- app/views/AbsenceRequests/list.html | 2 +- conf/messages.it | 8 + publiccode.yml | 2 +- 9 files changed, 159 insertions(+), 80 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 089896b59..96fe482bc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [2.5.4] - UNRELEASED ### Added + - Aggiunta la possibilità di disabilitare la configurabilità delle approvazioni delle ferie + e riposi compensati dei livelli I-III. Con l'apposita configurazione generale abilitata + i livelli I-III hanno dei flussi solo per comunicare le asssenze, senza autorizzazioni e + con le etichette dei flussi modificati da "richiesta" a "comunicazione" - Aggiunta la possibilità di disattivare e cancellare gli orari di lavoro predefiniti non utilizzati. - Aggiunta la possibilità di rinominare gli orari di lavoro predefiniti. diff --git a/VERSION b/VERSION index 83f947f7e..a610e2137 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.5.4-rc5 \ No newline at end of file +2.5.4-rc6 \ No newline at end of file diff --git a/app/controllers/AbsenceRequests.java b/app/controllers/AbsenceRequests.java index 86a65f022..0e8ad754b 100644 --- a/app/controllers/AbsenceRequests.java +++ b/app/controllers/AbsenceRequests.java @@ -558,8 +558,9 @@ public static void save(@Required @Valid AbsenceRequest absenceRequest, //un livelli I-III e non sia necessaria nessuna autorizzazione, allora //si invia solo una notifica al responsabile sede e/o responsabile gruppo //(dipendente dalla configurazione) - if (generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization == false && - absenceRequest.person.isTopQualification()) { + if (!generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization && + absenceRequest.person.isTopQualification() && + absenceRequest.type.canBeInsertedByTopLevelWithoutApproval) { absenceRequestManager.topLevelSelfApproval(absenceRequest, Security.getUser().get().person); notificationManager.sendEmailAbsenceNotification(absenceRequest); } else if (absenceRequest.person.isSeatSupervisor() || (absenceRequest.person.isGroupManager() diff --git a/app/manager/NotificationManager.java b/app/manager/NotificationManager.java index c31d8d0c0..7a283d68b 100644 --- a/app/manager/NotificationManager.java +++ b/app/manager/NotificationManager.java @@ -794,6 +794,14 @@ private void sendEmailAbsenceRequest(AbsenceRequest absenceRequest) { }); } + /** + * Invia le email con le notifiche di assenza dei livelli I-III in caso + * sia configurazione che non abbiano necesittà di approvazioni. + * Le email vengono inviate al responsabile di sede e/o di gruppo i + * funzione della configurazione della sede. + * Viene inviata un'email anche il dipendente che inserire la comunicazione + * di assenza. + */ public void sendEmailAbsenceNotification(AbsenceRequest absenceRequest) { Set recipients = Sets.newHashSet(); //si invia solo una notifica al responsabile sede e/o responsabile gruppo @@ -830,18 +838,14 @@ public void sendEmailAbsenceNotification(AbsenceRequest absenceRequest) { } if (!recipients.isEmpty()) { - SimpleEmail simpleEmail = new SimpleEmail(); recipients.forEach(r -> { try { + SimpleEmail simpleEmail = new SimpleEmail(); simpleEmail.addTo(r.email); simpleEmail.setSubject( - String.format("ePas Comunicazione assenza (%s)", absenceRequest.id)); + String.format("ePas Comunicazione assenza (id=%s)", absenceRequest.id)); val mailBody = createAbsenceNotificationEmail(absenceRequest, r.user); - try { - simpleEmail.setMsg(mailBody); - } catch (EmailException e) { - e.printStackTrace(); - } + simpleEmail.setMsg(mailBody); Mail.send(simpleEmail); log.info( "Inviata email per richiesta di flusso richiesta: {}. " @@ -852,9 +856,27 @@ public void sendEmailAbsenceNotification(AbsenceRequest absenceRequest) { + "per la comunicazione dell'assenza di {}", r.getFullname(), absenceRequest.person.getFullname(), e); } - }); + }); + } + + SimpleEmail email = new SimpleEmail(); + try { + email.setSubject( + String.format("ePas Comunicazione assenza (id=%s)", absenceRequest.id)); + email.addTo(absenceRequest.person.email); + val mailBody = createEmployeeAbsenceNotificationEmail(absenceRequest); + email.setMsg(mailBody); + Mail.send(email); + log.info( + "Inviata email per completamento flusso di notifica: {}. " + + "Mail: \n\tTo: {}\n\tSubject: {}\n\tbody: {}", + absenceRequest, absenceRequest.person.email, email.getSubject(), mailBody); + } catch (EmailException e) { + log.error("Impossibile inviare l'email a {} relativa alla sua comunicazione di assenza.", + absenceRequest.person.getFullname(), e); } } + /** * Metodo privato che invia la mail al richiedente la ferie/riposo compensativo. * @@ -867,46 +889,35 @@ private void sendEmailAbsenceRequestConfirmation(AbsenceRequest absenceRequest, SimpleEmail simpleEmail = new SimpleEmail(); try { simpleEmail.addTo(person.email); - } catch (EmailException e) { - e.printStackTrace(); - } - String requestType = ""; - if (absenceRequest.type == AbsenceRequestType.COMPENSATORY_REST) { - requestType = Messages.get("AbsenceRequestType.COMPENSATORY_REST"); - } else if (absenceRequest.type == AbsenceRequestType.PERSONAL_PERMISSION) { - requestType = Messages.get("AbsenceRequestType.PERSONAL_PERMISSION"); - } else { - requestType = Messages.get("AbsenceRequestType.VACATION_REQUEST"); - } - simpleEmail.setSubject("ePas Approvazione flusso"); - final StringBuilder message = - new StringBuilder().append(String.format("Gentile %s,\r\n", person.fullName())); - String approver = " "; - if (Security.getUser().isPresent() && Security.getUser().get().person != null) { - approver = " da " + Security.getUser().get().person.getFullname(); - } - if (approval) { - message.append(String.format("\r\nè stata APPROVATA%s la sua %s", - approver, requestType)); - } else { - message.append(String.format("\r\nè stata RESPINTA%s la sua %s", - approver, requestType)); - } - - message.append(String.format("\r\n per i giorni %s - %s", absenceRequest.startAt.toLocalDate(), - absenceRequest.endTo.toLocalDate())); - val mailBody = message.toString(); - try { + String requestType = getRequestTypeLabel(absenceRequest); + + simpleEmail.setSubject("ePas Approvazione flusso"); + final StringBuilder message = + new StringBuilder().append(String.format("Gentile %s,\r\n", person.fullName())); + String approver = " "; + if (Security.getUser().isPresent() && Security.getUser().get().person != null) { + approver = " da " + Security.getUser().get().person.getFullname(); + } + if (approval) { + message.append(String.format("\r\nè stata APPROVATA%s la sua richiesta di %s", + approver, requestType)); + } else { + message.append(String.format("\r\nè stata RESPINTA%s la sua richiesta di %s", + approver, requestType)); + } + message.append(String.format("\r\n per i giorni %s - %s", absenceRequest.startAt.toLocalDate(), + absenceRequest.endTo.toLocalDate())); + val mailBody = message.toString(); simpleEmail.setMsg(mailBody); + Mail.send(simpleEmail); + log.info( + "Inviata email per approvazione di flusso {}. " + + "Mail: \n\tTo: {}\n\tSubject: {}\n\tbody: {}", + absenceRequest, person.email, simpleEmail.getSubject(), mailBody); } catch (EmailException e) { - e.printStackTrace(); + log.error("Impossibile inviare l'email con conferma della richiesta di assenza {}.", + absenceRequest, e); } - Mail.send(simpleEmail); - log.info( - "Inviata email per approvazione di flusso {}. " - + "Mail: \n\tTo: {}\n\tSubject: {}\n\tbody: {}", - absenceRequest, person.email, simpleEmail.getSubject(), mailBody); - } /** @@ -918,14 +929,8 @@ private void sendEmailAbsenceRequestConfirmation(AbsenceRequest absenceRequest, */ private String createAbsenceRequestEmail(AbsenceRequest absenceRequest, User user) { - String requestType = ""; - if (absenceRequest.type == AbsenceRequestType.COMPENSATORY_REST) { - requestType = Messages.get("AbsenceRequestType.COMPENSATORY_REST"); - } else if (absenceRequest.type == AbsenceRequestType.PERSONAL_PERMISSION) { - requestType = Messages.get("AbsenceRequestType.PERSONAL_PERMISSION"); - } else { - requestType = Messages.get("AbsenceRequestType.VACATION_REQUEST"); - } + String requestType = getRequestTypeLabel(absenceRequest); + final StringBuilder message = new StringBuilder().append(String.format("Gentile %s,\r\n", user.person.fullName())); message.append(String.format("\r\nLe è stata notificata la richiesta di : %s", @@ -952,40 +957,92 @@ private String createAbsenceRequestEmail(AbsenceRequest absenceRequest, User use return message.toString(); } + private String getRequestTypeLabel(AbsenceRequest absenceRequest) { + String requestType = ""; + switch (absenceRequest.type) { + case COMPENSATORY_REST: + requestType = Messages.get("AbsenceRequestType.COMPENSATORY_REST"); + case VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST: + requestType = Messages.get("AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST"); + case VACATION_REQUEST: + requestType = Messages.get("AbsenceRequestType.VACATION_REQUEST"); + case PERSONAL_PERMISSION: + requestType = Messages.get("AbsenceRequestType.PERSONAL_PERMISSION"); + case SHORT_TERM_PERMIT: + requestType = Messages.get("AbsenceRequestType.SHORT_TERM_PERMIT"); + } + return requestType; + } + + private String getRequestTypeLabelTopLevel(AbsenceRequest absenceRequest) { + String requestType = ""; + switch (absenceRequest.type) { + case COMPENSATORY_REST: + requestType = Messages.get("AbsenceRequestType.COMPENSATORY_REST_TOP_LEVEL"); + case VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST: + requestType = Messages.get("AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST_TOP_LEVEL"); + case VACATION_REQUEST: + requestType = Messages.get("AbsenceRequestType.VACATION_REQUEST_TOP_LEVEL"); + case PERSONAL_PERMISSION: + requestType = Messages.get("AbsenceRequestType.PERSONAL_PERMISSION_TOP_LEVEL"); + case SHORT_TERM_PERMIT: + requestType = Messages.get("AbsenceRequestType.SHORT_TERM_PERMIT_TOP_LEVEL"); + } + return requestType; + } + /** * Metodo che compone il corpo della mail da inviare. * - * @param absenceRequest la richiesta d'assenza + * @param absenceRequest la comunicazione d'assenza * @param user l'utente a cui inviare la mail - * @return il corpo della mail da inviare all'utente responsabile dell'approvazione. + * @return il corpo della mail da inviare all'utente che deve ricevere la notifica. */ private String createAbsenceNotificationEmail(AbsenceRequest absenceRequest, User user) { - String requestType = ""; - if (absenceRequest.type == AbsenceRequestType.COMPENSATORY_REST) { - requestType = Messages.get("AbsenceRequestType.COMPENSATORY_REST"); - } else if (absenceRequest.type == AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST) { - requestType = Messages.get("AbsenceRequestType.VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST_TOP_LEVEL"); - } else { - requestType = Messages.get("AbsenceRequestType.VACATION_REQUEST"); - } + String requestType = getRequestTypeLabelTopLevel(absenceRequest); + final StringBuilder message = new StringBuilder().append(String.format("Gentile %s,\r\n", user.person.fullName())); - message.append(String.format("\r\nLe è stata notificata da %s", + message.append(String.format("\r\nti è stata notificata da %s ", absenceRequest.person.fullName())); - message.append(String.format("\r\n una assenza di tipo: %s", requestType)); + message.append(String.format("una assenza di tipo \"%s\" ", requestType)); if (absenceRequest.startAt.isEqual(absenceRequest.endTo)) { - message.append(String.format("\r\n per il giorno: %s", + message.append(String.format("per il giorno %s.", absenceRequest.startAt.toLocalDate().toString(dateFormatter))); } else { - message.append(String.format("\r\n dal: %s", + message.append(String.format("dal %s", absenceRequest.startAt.toLocalDate().toString(dateFormatter))); message.append( - String.format(" al: %s", absenceRequest.endTo.toLocalDate().toString(dateFormatter))); + String.format(" al %s.", absenceRequest.endTo.toLocalDate().toString(dateFormatter))); } return message.toString(); } - + + /*/ + * Contenuto dell'email di avvenuto inserimento assenza senza nessun tipo di approvazione. + */ + private String createEmployeeAbsenceNotificationEmail(AbsenceRequest absenceRequest) { + + String requestType = getRequestTypeLabelTopLevel(absenceRequest); + + final StringBuilder message = + new StringBuilder().append(String.format("Gentile %s,\r\n", absenceRequest.person.fullName())); + message.append(String.format("\r\nil tuo flusso di assenza di tipo \"%s\" è terminato correttamente, ", + requestType)); + if (absenceRequest.startAt.isEqual(absenceRequest.endTo)) { + message.append(String.format("assenza per il giorno %s.", + absenceRequest.startAt.toLocalDate().toString(dateFormatter))); + } else { + message.append(String.format("assenza dal %s", + absenceRequest.startAt.toLocalDate().toString(dateFormatter))); + message.append( + String.format(" al %s.", absenceRequest.endTo.toLocalDate().toString(dateFormatter))); + } + return message.toString(); + + } + ////////////////////////////////////////////////////////////////////////////////////////// // Notifiche per competence request ////////////////////////////////////////////////////////////////////////////////////////// diff --git a/app/manager/flows/AbsenceRequestManager.java b/app/manager/flows/AbsenceRequestManager.java index 319c3448e..ad4f73a52 100644 --- a/app/manager/flows/AbsenceRequestManager.java +++ b/app/manager/flows/AbsenceRequestManager.java @@ -214,7 +214,9 @@ public AbsenceRequestConfiguration getConfiguration(AbsenceRequestType requestTy //non abilitare la possibilità di chiedere autorizzazioni, in questo caso i flussi //dei livelli I-III non hanno mai approvazioni richieste. val skipTopLevelAuthorization = - person.isTopQualification() && !generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization; + person.isTopQualification() && requestType.canBeInsertedByTopLevelWithoutApproval + && !generalSettingDao.generalSetting().enableAbsenceTopLevelAuthorization + ; if (requestType.alwaysSkipAdministrativeApproval || skipTopLevelAuthorization) { absenceRequestConfiguration.administrativeApprovalRequired = false; diff --git a/app/models/flows/enumerate/AbsenceRequestType.java b/app/models/flows/enumerate/AbsenceRequestType.java index 13abf6595..b836daaba 100644 --- a/app/models/flows/enumerate/AbsenceRequestType.java +++ b/app/models/flows/enumerate/AbsenceRequestType.java @@ -41,7 +41,8 @@ public enum AbsenceRequestType { Optional.of(EpasParam.VACATION_REQUEST_IV_VIII_MANAGER_APPROVAL_REQUIRED), Optional.absent(), Optional.absent(), - Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED)), + Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED), + true), //Riposo compensatvio COMPENSATORY_REST(true, false, false, true, false, false, @@ -51,7 +52,8 @@ public enum AbsenceRequestType { Optional.of(EpasParam.COMPENSATORY_REST_REQUEST_IV_VIII_MANAGER_APPROVAL_REQUIRED), Optional.absent(), Optional.absent(), - Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED)), + Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED), + true), //Riposo compensatvio PERSONAL_PERMISSION(true, false, false, true, false, false, @@ -61,7 +63,8 @@ public enum AbsenceRequestType { Optional.of(EpasParam.PERSONAL_PERMISSION_REQUEST_IV_VIII_MANAGER_APPROVAL_REQUIRED), Optional.absent(), Optional.absent(), - Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED)), + Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED), + false), //Richiesta ferie anno passato dopo scadenza VACATION_PAST_YEAR_AFTER_DEADLINE_REQUEST(true, false, false, true, false, false, @@ -71,7 +74,8 @@ public enum AbsenceRequestType { Optional.of(EpasParam.VACATION_REQUEST_IV_VIII_MANAGER_APPROVAL_REQUIRED), Optional.absent(), Optional.absent(), - Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED)), + Optional.of(EpasParam.VACATION_REQUEST_MANAGER_OFFICE_HEAD_APPROVAL_REQUIRED), + true), //Permessso breve SHORT_TERM_PERMIT(false, false, false, false, false, false, @@ -81,7 +85,8 @@ public enum AbsenceRequestType { Optional.absent(), Optional.absent(), Optional.absent(), - Optional.absent()); + Optional.absent(), + false); public final boolean allDay; public final boolean alwaysSkipOfficeHeadApproval; @@ -98,4 +103,6 @@ public enum AbsenceRequestType { public final Optional administrativeApprovalRequiredTechnicianLevel; public final Optional officeHeadApprovalRequiredForManager; + public final boolean canBeInsertedByTopLevelWithoutApproval; + } diff --git a/app/views/AbsenceRequests/list.html b/app/views/AbsenceRequests/list.html index 48c10206a..00dc447b6 100644 --- a/app/views/AbsenceRequests/list.html +++ b/app/views/AbsenceRequests/list.html @@ -1,6 +1,6 @@ #{extends 'main.html' /} #{set header:'navbar' /} -#{if currentUser.person != null && currentUser.person.isTopQualification()} +#{if currentUser.person != null && currentUser.person.isTopQualification() && !templateUtility.absenceRequestAuthorizationTopLevelEnabled()} #{set absenceRequestTypeLabel: messages.get('AbsenceRequestType.' + type.toString() + 'S_TOP_LEVEL') /} #{set topLevelNoAuth:true /} #{/if}#{else} diff --git a/conf/messages.it b/conf/messages.it index 3ddcf24fc..18a89f480 100755 --- a/conf/messages.it +++ b/conf/messages.it @@ -1021,17 +1021,25 @@ AbsenceRequestType.VACATION_REQUESTS_TOP_LEVEL = Mie comunicazioni ferie AbsenceRequestType.VACATION_REQUEST_TOP_LEVEL.blank =nuova comunicazione ferie AbsenceRequestType.COMPENSATORY_REST =riposo compensativo +AbsenceRequestType.COMPENSATORY_REST_TOP_LEVEL =riposo compensativo AbsenceRequestType.COMPENSATORY_RESTS =Miei riposi compensativi +AbsenceRequestType.COMPENSATORY_RESTS_TOP_LEVEL =Miei riposi compensativi AbsenceRequestType.COMPENSATORY_REST.blank =nuova richiesta riposo compensativo AbsenceRequestType.COMPENSATORY_REST_TOP_LEVEL.blank =nuova comunicazione riposo compensativo AbsenceRequestType.PERSONAL_PERMISSION =permesso personale +AbsenceRequestType.PERSONAL_PERMISSION_TOP_LEVEL =permesso personale AbsenceRequestType.PERSONAL_PERMISSIONS =Miei permessi personali AbsenceRequestType.PERSONAL_PERMISSION.blank =nuova richiesta permesso personale +AbsenceRequestType.PERSONAL_PERMISSIONS_TOP_LEVEL =Miei permessi personali +AbsenceRequestType.PERSONAL_PERMISSION_TOP_LEVEL.blank =nuova richiesta permesso personale AbsenceRequestType.SHORT_TERM_PERMIT =permesso breve +AbsenceRequestType.SHORT_TERM_PERMIT_TOP_LEVEL =permesso breve AbsenceRequestType.SHORT_TERM_PERMITS =permessi breve +AbsenceRequestType.SHORT_TERM_PERMITS_TOP_LEVEL =permessi breve AbsenceRequestType.SHORT_TERM_PERMIT.blank =nuova richiesta permesso breve +AbsenceRequestType.SHORT_TERM_PERMIT_TOP_LEVEL.blank =nuova richiesta permesso breve Groups.seatOrganizationChart =Ruoli in ePAS all'interno della sede diff --git a/publiccode.yml b/publiccode.yml index fd79af890..11b828814 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -7,7 +7,7 @@ name: epas releaseDate: '2022-08-16' url: 'https://github.com/consiglionazionaledellericerche/epas' applicationSuite: epas -softwareVersion: 2.5.3 +softwareVersion: 2.5.4 developmentStatus: stable softwareType: standalone/web platforms: From 412ab4a85c851fbfbf1f922a3f07ebf13a2bd211 Mon Sep 17 00:00:00 2001 From: darietto1983 Date: Thu, 15 Sep 2022 17:52:51 +0200 Subject: [PATCH 06/13] Prosegue modifica dei codici di assenza. Aggiunta evoluzione che trasforma tutti i codici 25 in 25O (compresi ore e minuti e orari). Iniziato job per il ricambio dei codici 25O e successivi in 25 dal 13 agosto in poi. --- app/jobs/ParentalCodesFix.java | 74 +++++++++++++++++++ .../definitions/DefaultAbsenceType.java | 37 ++++++++++ .../definitions/DefaultComplation.java | 12 +++ .../absences/definitions/DefaultGroup.java | 52 ++++++++++--- .../absences/definitions/DefaultTakable.java | 67 +++++++++++++++++ db/evolutions/192.sql | 20 +++++ 6 files changed, 253 insertions(+), 9 deletions(-) create mode 100644 app/jobs/ParentalCodesFix.java create mode 100644 db/evolutions/192.sql diff --git a/app/jobs/ParentalCodesFix.java b/app/jobs/ParentalCodesFix.java new file mode 100644 index 000000000..17124f513 --- /dev/null +++ b/app/jobs/ParentalCodesFix.java @@ -0,0 +1,74 @@ +package jobs; + +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Lists; +import dao.absences.AbsenceComponentDao; +import java.util.List; +import java.util.stream.Collectors; +import javax.inject.Inject; +import lombok.extern.slf4j.Slf4j; +import models.Person; +import models.absences.Absence; +import org.joda.time.LocalDate; +import play.Play; +import play.jobs.Job; +import play.jobs.OnApplicationStart; + +@Slf4j +@OnApplicationStart +public class ParentalCodesFix extends Job { + + @Inject + static AbsenceComponentDao absenceComponentDao; + + @Override + public void doJob() { + + //in modo da inibire l'esecuzione dei job in base alla configurazione + if (!"true".equals(Play.configuration.getProperty(Bootstrap.JOBS_CONF))) { + log.info("{} interrotto. Disattivato dalla configurazione.", getClass().getName()); + return; + } + log.info("Start Job parental codes fix"); + List codes = ImmutableList.of("25O", "252O", "253O", "254O", "25MO", "252MO", "253MO", + "254MO", "25OH7", "252OH7", "253OH7", "254OH7"); + List allChildrenCodes = absenceComponentDao.absences(codes); + List childrenCodesFiltered = allChildrenCodes.stream() + .filter(ab -> !ab.personDay.date.isBefore(new LocalDate(2022, 8, 13))) + .collect(Collectors.toList()); + for (Absence abs : childrenCodesFiltered) { + switch (abs.absenceType.code) { + case "25O": + break; + case "252O": + break; + case "253O": + break; + case "254O": + break; + case "25MO": + break; + case "252MO": + break; + case "253MO": + break; + case "254MO": + break; + case "25OH7": + break; + case "252OH7": + break; + case "253OH7": + break; + case "254OH7": + break; + default: + break; + } + } + + log.debug("End Job parental codes fix"); + + } +} diff --git a/app/models/absences/definitions/DefaultAbsenceType.java b/app/models/absences/definitions/DefaultAbsenceType.java index 220d6e171..ff70f499d 100644 --- a/app/models/absences/definitions/DefaultAbsenceType.java +++ b/app/models/absences/definitions/DefaultAbsenceType.java @@ -1010,6 +1010,35 @@ null, new LocalDate(2022,8,12), false, true, true), MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + A_254A("254A", "Astensione facoltativa post partum 30% quarto figlio intera giornata", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, + 0, null, Sets.newHashSet(), null, null, false, true, true), + + A_254AM("254AM", + "Astensione facoltativa post partum 30% quarto figlio 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_254AH7("254AH7", "Astensione facoltativa post partum 30% quarto figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + + A_254S("254S", "Da definire...", false, + ImmutableSet.of(JustifiedTypeName.all_day), 0, true, + MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, + null, false, true, true), + A_254SM("254SM", "Da definire... 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_254SH7("254SH7", "Da definire 30% terzo figlio completamento giornata", + false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, + MealTicketBehaviour.notAllowMealTicket, 0, + JustifiedTypeName.all_day, Sets.newHashSet(), null, null, false, true, true), + A_254OU("254U", "Astensione facoltativa post partum 30% quarto figlio intera giornata " + "altro genitore", true, ImmutableSet.of(JustifiedTypeName.all_day_limit), 0, true, MealTicketBehaviour.notAllowMealTicket, @@ -1099,6 +1128,14 @@ null, new LocalDate(2019, 12, 31), false, true, true), A_21("21", "Congedo/permesso per maternità", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), null, null, false, true, true), + + A_21P("21P", "Da definire...", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, + true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), + null, null, false, true, true), + + A_21P2("21P2", "Da definire...", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, + true, MealTicketBehaviour.notAllowMealTicket, 0, null, Sets.newHashSet(), + null, null, false, true, true), A_111("111", "Malattia", false, ImmutableSet.of(JustifiedTypeName.all_day), 0, true, MealTicketBehaviour.notAllowMealTicket, 0, diff --git a/app/models/absences/definitions/DefaultComplation.java b/app/models/absences/definitions/DefaultComplation.java index a6db00b74..52be58017 100644 --- a/app/models/absences/definitions/DefaultComplation.java +++ b/app/models/absences/definitions/DefaultComplation.java @@ -179,6 +179,9 @@ public enum DefaultComplation { C_25(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_25M), ImmutableSet.of(DefaultAbsenceType.A_25H7)), + C_25A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_25AM), + ImmutableSet.of(DefaultAbsenceType.A_25AH7)), C_24(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_24M), ImmutableSet.of(DefaultAbsenceType.A_24H7)), @@ -197,6 +200,9 @@ public enum DefaultComplation { C_252(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_252M), ImmutableSet.of(DefaultAbsenceType.A_252H7)), + C_252A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_252AM), + ImmutableSet.of(DefaultAbsenceType.A_252AH7)), C_242(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_242M), ImmutableSet.of(DefaultAbsenceType.A_242H7)), @@ -210,6 +216,9 @@ public enum DefaultComplation { C_253(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_253M), ImmutableSet.of(DefaultAbsenceType.A_253H7)), + C_253A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_253AM), + ImmutableSet.of(DefaultAbsenceType.A_253AH7)), C_243(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_243M), ImmutableSet.of(DefaultAbsenceType.A_243H7)), @@ -223,6 +232,9 @@ public enum DefaultComplation { C_254(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_254M), ImmutableSet.of(DefaultAbsenceType.A_254H7)), + C_254A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_254AM), + ImmutableSet.of(DefaultAbsenceType.A_254AH7)), C_244(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_244M), ImmutableSet.of(DefaultAbsenceType.A_244H7)); diff --git a/app/models/absences/definitions/DefaultGroup.java b/app/models/absences/definitions/DefaultGroup.java index bed844f1c..bf42dcb94 100644 --- a/app/models/absences/definitions/DefaultGroup.java +++ b/app/models/absences/definitions/DefaultGroup.java @@ -218,6 +218,22 @@ public enum DefaultGroup { MALATTIA_FIGLIO_4("124/134/144 - Malattia quarto figlio", "", DefaultCategoryType.MALATTIA_FIGLIO_4, 2, GroupAbsenceTypePattern.simpleGrouping, PeriodType.always, DefaultTakable.T_MALATTIA_FIGLIO_4, null, null, false, false), + G_25A("25A - Astensione facoltativa post partum 30% primo figlio 0-12 anni 90 giorni", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child1_0_12, DefaultTakable.T_25A, DefaultComplation.C_25A, null, + false, true), + G_252A("252A - Astensione facoltativa post partum 30% secondo figlio 0-12 anni 90 giorni", "", + DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child2_0_12, DefaultTakable.T_252A, DefaultComplation.C_252A, null, + false, true), + G_253A("253A - Astensione facoltativa post partum 30% terzo figlio 0-12 anni 90 giorni", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child3_0_12, DefaultTakable.T_253A, DefaultComplation.C_253A, null, + false, true), + G_254A("254A - Astensione facoltativa post partum 30% quarto figlio 0-12 anni 90 giorni", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child4_0_12, DefaultTakable.T_254A, DefaultComplation.C_254A, null, + false, true), G_24("24 - Astensione facoltativa post partum non retrib. primo figlio 0-12 anni 600 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, @@ -228,9 +244,9 @@ public enum DefaultGroup { "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_6, DefaultTakable.T_25O, DefaultComplation.C_25O, DefaultGroup.G_24, false, true), - G_25("25 - Astensione facoltativa post partum 30% primo figlio 0-6 anni 150 giorni", + G_25("25 - Astensione facoltativa post partum 30% primo figlio 0-12 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, - PeriodType.child1_0_6, DefaultTakable.T_25, DefaultComplation.C_25, DefaultGroup.G_24, + 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, @@ -251,7 +267,7 @@ public enum DefaultGroup { "23/25/24 - Astensione facoltativa post partum primo figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_12, DefaultTakable.T_23, DefaultComplation.C_23, - DefaultGroup.G_25, false, true), + DefaultGroup.G_25O, false, true), G_23("23 - Astensione facoltativa post partum 100% primo figlio 0-12 anni 30 giorni", "23/25/24 - Astensione facoltativa post partum primo figlio", @@ -268,10 +284,16 @@ public enum DefaultGroup { DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child2_0_6, DefaultTakable.T_252O, DefaultComplation.C_252O, DefaultGroup.G_242, false, true), - G_252("252 - Astensione facoltativa post partum 30% secondo figlio 0-6 anni 150 giorni", "", + G_252("252 - Astensione facoltativa post partum 30% secondo figlio 0-12 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, - PeriodType.child2_0_6, DefaultTakable.T_252, DefaultComplation.C_252, DefaultGroup.G_242, + PeriodType.child2_0_12, DefaultTakable.T_252, DefaultComplation.C_252, DefaultGroup.G_252A, false, true), + + G_232O("232O - Astensione facoltativa post partum 100% secondo figlio 0-12 anni 30 giorni", + "232/252/242 - Astensione facoltativa post partum secondo figlio", + DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child2_0_12, DefaultTakable.T_232, DefaultComplation.C_232, + DefaultGroup.G_252O, false, true), G_232("232 - Astensione facoltativa post partum 100% secondo figlio 0-12 anni 30 giorni", "232/252/242 - Astensione facoltativa post partum secondo figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, @@ -285,10 +307,16 @@ public enum DefaultGroup { "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child3_0_6, DefaultTakable.T_253O, DefaultComplation.C_253O, DefaultGroup.G_243, false, true), - G_253("253 - Astensione facoltativa post partum 30% terzo figlio 0-6 anni 150 giorni", + G_253("253 - Astensione facoltativa post partum 30% terzo figlio 0-12 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, - PeriodType.child3_0_6, DefaultTakable.T_253, DefaultComplation.C_253, DefaultGroup.G_243, + PeriodType.child3_0_12, DefaultTakable.T_253, DefaultComplation.C_253, DefaultGroup.G_253A, false, true), + G_233O("233 - Astensione facoltativa post partum 100% terzo figlio 0-12 anni 30 giorni", + "233/253/243 - Astensione facoltativa post partum terzo figlio", + DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + PeriodType.child3_0_12, DefaultTakable.T_233, DefaultComplation.C_233, + DefaultGroup.G_253O, false, true), + G_233("233 - Astensione facoltativa post partum 100% terzo figlio 0-12 anni 30 giorni", "233/253/243 - Astensione facoltativa post partum terzo figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, @@ -302,10 +330,16 @@ public enum DefaultGroup { "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child4_0_6, DefaultTakable.T_254O, DefaultComplation.C_254O, DefaultGroup.G_244, false, true), - G_254("254 - Astensione facoltativa post partum 30% quarto figlio 0-6 anni 150 giorni", + G_254("254 - Astensione facoltativa post partum 30% quarto figlio 0-12 anni 150 giorni", "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, - PeriodType.child4_0_6, DefaultTakable.T_254, DefaultComplation.C_254, DefaultGroup.G_244, + PeriodType.child4_0_12, DefaultTakable.T_254, DefaultComplation.C_254, DefaultGroup.G_254A, false, true), + + G_234O("234 - Astensione facoltativa post partum 100% quarto figlio 0-12 anni 30 giorni", + "234/254/244 - Astensione facoltativa post partum quarto figlio", + DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, + PeriodType.child4_0_12, DefaultTakable.T_234, DefaultComplation.C_234, + DefaultGroup.G_254O, false, true), G_234("234 - Astensione facoltativa post partum 100% quarto figlio 0-12 anni 30 giorni", "234/254/244 - Astensione facoltativa post partum quarto figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, diff --git a/app/models/absences/definitions/DefaultTakable.java b/app/models/absences/definitions/DefaultTakable.java index 60c772fb7..5719fc81a 100644 --- a/app/models/absences/definitions/DefaultTakable.java +++ b/app/models/absences/definitions/DefaultTakable.java @@ -84,6 +84,15 @@ public enum DefaultTakable { ImmutableSet.of(DefaultAbsenceType.A_20M), -1, null), + T_21P(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_21P), + ImmutableSet.of(DefaultAbsenceType.A_21P), + 10, null), + T_21P2(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_21P2), + ImmutableSet.of(DefaultAbsenceType.A_21P2), + 20, null), + T_26(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_26, DefaultAbsenceType.A_26BP), ImmutableSet.of(DefaultAbsenceType.A_26, DefaultAbsenceType.A_26BP), @@ -404,6 +413,62 @@ public enum DefaultTakable { DefaultAbsenceType.A_25PM), -1, null), //150 + + T_25A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_25A, + DefaultAbsenceType.A_25AM), + ImmutableSet.of(DefaultAbsenceType.A_25A, + DefaultAbsenceType.A_25AM), + 90, null), + + T_25S(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_25S, + DefaultAbsenceType.A_25SM), + ImmutableSet.of(DefaultAbsenceType.A_25S, + DefaultAbsenceType.A_25SM), + 90, null), + T_252A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_252A, + DefaultAbsenceType.A_25AM), + ImmutableSet.of(DefaultAbsenceType.A_252A, + DefaultAbsenceType.A_252AM), + 90, null), + + T_252S(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_252S, + DefaultAbsenceType.A_252SM), + ImmutableSet.of(DefaultAbsenceType.A_252S, + DefaultAbsenceType.A_252SM), + 90, null), + + T_253A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_253A, + DefaultAbsenceType.A_253AM), + ImmutableSet.of(DefaultAbsenceType.A_253A, + DefaultAbsenceType.A_253AM), + 90, null), + + T_253S(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_253S, + DefaultAbsenceType.A_253SM), + ImmutableSet.of(DefaultAbsenceType.A_253S, + DefaultAbsenceType.A_253SM), + 90, null), + + T_254A(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_254A, + DefaultAbsenceType.A_254AM), + ImmutableSet.of(DefaultAbsenceType.A_254, + DefaultAbsenceType.A_254M), + 90, null), + + T_254S(AmountType.units, + ImmutableSet.of(DefaultAbsenceType.A_254S, + DefaultAbsenceType.A_254SM), + ImmutableSet.of(DefaultAbsenceType.A_254S, + DefaultAbsenceType.A_254SM), + 90, null), + T_MALATTIA(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_111, DefaultAbsenceType.A_111FR, @@ -687,6 +752,7 @@ public enum DefaultTakable { DefaultAbsenceType.A_252O, DefaultAbsenceType.A_252OH7, DefaultAbsenceType.A_243, DefaultAbsenceType.A_243H7, DefaultAbsenceType.A_253O, DefaultAbsenceType.A_253OH7, + DefaultAbsenceType.A_254O, DefaultAbsenceType.A_254OH7, DefaultAbsenceType.A_54L230, DefaultAbsenceType.A_50, DefaultAbsenceType.A_54, DefaultAbsenceType.A_54D, DefaultAbsenceType.A_54E, DefaultAbsenceType.A_54F, @@ -708,6 +774,7 @@ public enum DefaultTakable { DefaultAbsenceType.A_252O, DefaultAbsenceType.A_252OH7, DefaultAbsenceType.A_243, DefaultAbsenceType.A_243H7, DefaultAbsenceType.A_253O, DefaultAbsenceType.A_253OH7, + DefaultAbsenceType.A_254O, DefaultAbsenceType.A_254OH7, DefaultAbsenceType.A_54L230, DefaultAbsenceType.A_50, DefaultAbsenceType.A_54, DefaultAbsenceType.A_54D, DefaultAbsenceType.A_54E, DefaultAbsenceType.A_54F, diff --git a/db/evolutions/192.sql b/db/evolutions/192.sql new file mode 100644 index 000000000..ad4ce62a1 --- /dev/null +++ b/db/evolutions/192.sql @@ -0,0 +1,20 @@ +# ---!Ups + +UPDATE absence_types SET code = '25O' where code = '25'; +UPDATE absence_types SET code = '252O' where code = '252'; +UPDATE absence_types SET code = '253O' where code = '253'; +UPDATE absence_types SET code = '254O' where code = '254'; + +UPDATE absence_types SET code = '25MO' where code = '25M'; +UPDATE absence_types SET code = '252MO' where code = '252M'; +UPDATE absence_types SET code = '253MO' where code = '253M'; +UPDATE absence_types SET code = '254MO' where code = '254M'; + +UPDATE absence_types SET code = '25OH7' where code = '25H7'; +UPDATE absence_types SET code = '252OH7' where code = '252H7'; +UPDATE absence_types SET code = '253OH7' where code = '253H7'; +UPDATE absence_types SET code = '254OH7' where code = '254H7'; + +# ---!Downs + +-- non è necessaria una down \ No newline at end of file From 6a4ff1afcdafeb170123a644aa64f8885cb1ea88 Mon Sep 17 00:00:00 2001 From: darietto1983 Date: Fri, 16 Sep 2022 14:17:19 +0200 Subject: [PATCH 07/13] Completata la procedura di fix dei codici di assenza. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit I congedi parentali sono stati modificati correttamente. Mancano però ancora le descrizioni dei codici nuovi: 21P, 21P2, 25A, 25S ecc... --- app/jobs/AbsencesRedefinitionsJob.java | 2 +- app/jobs/ParentalCodesFix.java | 22 +++++++-- .../services/absences/AbsenceService.java | 12 +++-- .../absences/definitions/DefaultGroup.java | 48 +++++++++++-------- 4 files changed, 54 insertions(+), 30 deletions(-) diff --git a/app/jobs/AbsencesRedefinitionsJob.java b/app/jobs/AbsencesRedefinitionsJob.java index 0e3fba584..92a94b51f 100644 --- a/app/jobs/AbsencesRedefinitionsJob.java +++ b/app/jobs/AbsencesRedefinitionsJob.java @@ -33,7 +33,7 @@ * */ @Slf4j -@OnApplicationStart(async = true) +@OnApplicationStart public class AbsencesRedefinitionsJob extends Job { @Inject diff --git a/app/jobs/ParentalCodesFix.java b/app/jobs/ParentalCodesFix.java index 17124f513..f975c6ce8 100644 --- a/app/jobs/ParentalCodesFix.java +++ b/app/jobs/ParentalCodesFix.java @@ -16,7 +16,7 @@ import play.jobs.OnApplicationStart; @Slf4j -@OnApplicationStart +@OnApplicationStart(async = true) public class ParentalCodesFix extends Job { @Inject @@ -37,38 +37,52 @@ public void doJob() { List childrenCodesFiltered = allChildrenCodes.stream() .filter(ab -> !ab.personDay.date.isBefore(new LocalDate(2022, 8, 13))) .collect(Collectors.toList()); + log.debug("Ci sono {} assenze da modificare", childrenCodesFiltered.size() ); for (Absence abs : childrenCodesFiltered) { switch (abs.absenceType.code) { case "25O": + abs.absenceType = absenceComponentDao.absenceTypeByCode("25").get(); break; case "252O": + abs.absenceType = absenceComponentDao.absenceTypeByCode("252").get(); break; case "253O": + abs.absenceType = absenceComponentDao.absenceTypeByCode("253").get(); break; case "254O": + abs.absenceType = absenceComponentDao.absenceTypeByCode("254").get(); break; case "25MO": + abs.absenceType = absenceComponentDao.absenceTypeByCode("25M").get(); break; case "252MO": + abs.absenceType = absenceComponentDao.absenceTypeByCode("252M").get(); break; case "253MO": + abs.absenceType = absenceComponentDao.absenceTypeByCode("253M").get(); break; case "254MO": + abs.absenceType = absenceComponentDao.absenceTypeByCode("254M").get(); break; case "25OH7": + abs.absenceType = absenceComponentDao.absenceTypeByCode("25H7").get(); break; case "252OH7": + abs.absenceType = absenceComponentDao.absenceTypeByCode("252H7").get(); break; case "253OH7": + abs.absenceType = absenceComponentDao.absenceTypeByCode("253H7").get(); break; case "254OH7": - break; + abs.absenceType = absenceComponentDao.absenceTypeByCode("254H7").get(); + break; default: - break; + break; } + abs.save(); } - log.debug("End Job parental codes fix"); + log.info("End Job parental codes fix"); } } diff --git a/app/manager/services/absences/AbsenceService.java b/app/manager/services/absences/AbsenceService.java index e8e1f1635..85c64d094 100644 --- a/app/manager/services/absences/AbsenceService.java +++ b/app/manager/services/absences/AbsenceService.java @@ -702,17 +702,21 @@ public List groupsPermitted(Person person, boolean readOnly) { private List namesOfChildGroups() { List names = Lists.newArrayList(); names.add(DefaultGroup.G_23.name()); - names.add(DefaultGroup.G_24.name()); +// names.add(DefaultGroup.G_24.name()); names.add(DefaultGroup.G_25.name()); + names.add(DefaultGroup.G_25A.name()); names.add(DefaultGroup.G_232.name()); names.add(DefaultGroup.G_233.name()); - names.add(DefaultGroup.G_242.name()); - names.add(DefaultGroup.G_243.name()); - names.add(DefaultGroup.G_244.name()); +// names.add(DefaultGroup.G_242.name()); +// names.add(DefaultGroup.G_243.name()); +// names.add(DefaultGroup.G_244.name()); names.add(DefaultGroup.G_234.name()); names.add(DefaultGroup.G_252.name()); names.add(DefaultGroup.G_253.name()); names.add(DefaultGroup.G_254.name()); + names.add(DefaultGroup.G_252A.name()); + names.add(DefaultGroup.G_253A.name()); + names.add(DefaultGroup.G_254A.name()); names.add(DefaultGroup.MALATTIA_FIGLIO_1.name()); names.add(DefaultGroup.MALATTIA_FIGLIO_2.name()); names.add(DefaultGroup.MALATTIA_FIGLIO_3.name()); diff --git a/app/models/absences/definitions/DefaultGroup.java b/app/models/absences/definitions/DefaultGroup.java index bf42dcb94..5b9af0bce 100644 --- a/app/models/absences/definitions/DefaultGroup.java +++ b/app/models/absences/definitions/DefaultGroup.java @@ -236,12 +236,12 @@ public enum DefaultGroup { false, true), G_24("24 - Astensione facoltativa post partum non retrib. primo figlio 0-12 anni 600 giorni", "", - DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_12, DefaultTakable.T_24, DefaultComplation.C_24, null, false, true), G_25O("25 - Astensione facoltativa post partum 30% primo figlio 0-6 anni 150 giorni", - "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_6, DefaultTakable.T_25O, DefaultComplation.C_25O, DefaultGroup.G_24, false, true), G_25("25 - Astensione facoltativa post partum 30% primo figlio 0-12 anni 150 giorni", @@ -265,23 +265,23 @@ public enum DefaultGroup { G_23O("23 - Astensione facoltativa post partum 100% primo figlio 0-12 anni 30 giorni", "23/25/24 - Astensione facoltativa post partum primo figlio", - DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_12, DefaultTakable.T_23, DefaultComplation.C_23, DefaultGroup.G_25O, false, true), G_23("23 - Astensione facoltativa post partum 100% primo figlio 0-12 anni 30 giorni", - "23/25/24 - Astensione facoltativa post partum primo figlio", + "23/25/25A - Astensione facoltativa post partum primo figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child1_0_12, DefaultTakable.T_23, DefaultComplation.C_23, DefaultGroup.G_25, false, true), G_242("242 - Astensione facoltativa post partum non retrib. " + "secondo figlio 0-12 anni 600 giorni", - "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child2_0_12, DefaultTakable.T_242, DefaultComplation.C_242, null, false, true), G_252O("252 - Astensione facoltativa post partum 30% secondo figlio 0-6 anni 150 giorni", "", - DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child2_0_6, DefaultTakable.T_252O, DefaultComplation.C_252O, DefaultGroup.G_242, false, true), G_252("252 - Astensione facoltativa post partum 30% secondo figlio 0-12 anni 150 giorni", "", @@ -291,20 +291,20 @@ public enum DefaultGroup { G_232O("232O - Astensione facoltativa post partum 100% secondo figlio 0-12 anni 30 giorni", "232/252/242 - Astensione facoltativa post partum secondo figlio", - DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child2_0_12, DefaultTakable.T_232, DefaultComplation.C_232, DefaultGroup.G_252O, false, true), G_232("232 - Astensione facoltativa post partum 100% secondo figlio 0-12 anni 30 giorni", - "232/252/242 - Astensione facoltativa post partum secondo figlio", + "232/252/252A - Astensione facoltativa post partum secondo figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child2_0_12, DefaultTakable.T_232, DefaultComplation.C_232, DefaultGroup.G_252, false, true), G_243("243 - Astensione facoltativa post partum non retrib. terzo figlio 0-12 anni 600 giorni", - "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child3_0_12, DefaultTakable.T_243, DefaultComplation.C_243, null, false, true), G_253O("253 - Astensione facoltativa post partum 30% terzo figlio 0-6 anni 150 giorni", - "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child3_0_6, DefaultTakable.T_253O, DefaultComplation.C_253O, DefaultGroup.G_243, false, true), G_253("253 - Astensione facoltativa post partum 30% terzo figlio 0-12 anni 150 giorni", @@ -313,21 +313,21 @@ public enum DefaultGroup { false, true), G_233O("233 - Astensione facoltativa post partum 100% terzo figlio 0-12 anni 30 giorni", "233/253/243 - Astensione facoltativa post partum terzo figlio", - DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child3_0_12, DefaultTakable.T_233, DefaultComplation.C_233, DefaultGroup.G_253O, false, true), G_233("233 - Astensione facoltativa post partum 100% terzo figlio 0-12 anni 30 giorni", - "233/253/243 - Astensione facoltativa post partum terzo figlio", + "233/253/253A - Astensione facoltativa post partum terzo figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, PeriodType.child3_0_12, DefaultTakable.T_233, DefaultComplation.C_233, DefaultGroup.G_253, false, true), G_244("244 - Astensione facoltativa post partum non retrib. quarto figlio 0-12 anni 600 giorni", - "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child4_0_12, DefaultTakable.T_244, DefaultComplation.C_244, null, false, true), G_254O("254 - Astensione facoltativa post partum 30% quarto figlio 0-6 anni 150 giorni", - "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 0, GroupAbsenceTypePattern.programmed, + "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.child4_0_6, DefaultTakable.T_254O, DefaultComplation.C_254O, DefaultGroup.G_244, false, true), G_254("254 - Astensione facoltativa post partum 30% quarto figlio 0-12 anni 150 giorni", @@ -337,11 +337,11 @@ public enum DefaultGroup { G_234O("234 - Astensione facoltativa post partum 100% quarto figlio 0-12 anni 30 giorni", "234/254/244 - Astensione facoltativa post partum quarto figlio", - DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, + DefaultCategoryType.ALTRI_CODICI, 1, GroupAbsenceTypePattern.programmed, PeriodType.child4_0_12, DefaultTakable.T_234, DefaultComplation.C_234, DefaultGroup.G_254O, false, true), G_234("234 - Astensione facoltativa post partum 100% quarto figlio 0-12 anni 30 giorni", - "234/254/244 - Astensione facoltativa post partum quarto figlio", + "234/254/254A - Astensione facoltativa post partum quarto figlio", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, PeriodType.child4_0_12, DefaultTakable.T_234, DefaultComplation.C_234, DefaultGroup.G_254, false, true), @@ -569,21 +569,27 @@ public static List parentalLeaveAndChildIllnessCodes() { List g232 = getCodes(DefaultGroup.G_232); List g233 = getCodes(DefaultGroup.G_233); List g234 = getCodes(DefaultGroup.G_234); - List g24 = getCodes(DefaultGroup.G_24); - List g242 = getCodes(DefaultGroup.G_242); - List g243 = getCodes(DefaultGroup.G_243); - List g244 = getCodes(DefaultGroup.G_244); +// List g24 = getCodes(DefaultGroup.G_24); +// List g242 = getCodes(DefaultGroup.G_242); +// List g243 = getCodes(DefaultGroup.G_243); +// List g244 = getCodes(DefaultGroup.G_244); List g25 = getCodes(DefaultGroup.G_25); List g252 = getCodes(DefaultGroup.G_252); List g253 = getCodes(DefaultGroup.G_253); List g254 = getCodes(DefaultGroup.G_254); + List g25a = getCodes(DefaultGroup.G_25A); + List g252a = getCodes(DefaultGroup.G_252A); + List g253a = getCodes(DefaultGroup.G_253A); + List g254a = getCodes(DefaultGroup.G_254A); + List g25P = getCodes(DefaultGroup.G_25P); List gmal1 = getCodes(DefaultGroup.MALATTIA_FIGLIO_1); List gmal2 = getCodes(DefaultGroup.MALATTIA_FIGLIO_2); List gmal3 = getCodes(DefaultGroup.MALATTIA_FIGLIO_3); List gmal4 = getCodes(DefaultGroup.MALATTIA_FIGLIO_4); - return Stream.of(g23, g232, g233, g234, g24, g242, g243, g244, g25, g252, g253, g254, + return Stream.of(g23, g232, g233, g234, /*g24, g242, g243, g244,*/ g25, g252, g253, g254, + g25a, g252a, g253a, g254a, g25P, gmal1, gmal2, gmal3, gmal4).flatMap(x -> x.stream()).collect(Collectors.toList()); } From 7fc4f0e75791a8affe87cda7aa0cebb009a4bd79 Mon Sep 17 00:00:00 2001 From: darietto1983 Date: Fri, 16 Sep 2022 15:23:27 +0200 Subject: [PATCH 08/13] Aggiunti i gruppi dei congedi per il padre. --- app/models/absences/definitions/DefaultComplation.java | 1 + app/models/absences/definitions/DefaultGroup.java | 10 ++++++++++ 2 files changed, 11 insertions(+) diff --git a/app/models/absences/definitions/DefaultComplation.java b/app/models/absences/definitions/DefaultComplation.java index 52be58017..98e32396c 100644 --- a/app/models/absences/definitions/DefaultComplation.java +++ b/app/models/absences/definitions/DefaultComplation.java @@ -123,6 +123,7 @@ public enum DefaultComplation { DefaultAbsenceType.A_20H6, DefaultAbsenceType.A_20H7)), + C_92E(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_92E), ImmutableSet.of(DefaultAbsenceType.A_92E)), diff --git a/app/models/absences/definitions/DefaultGroup.java b/app/models/absences/definitions/DefaultGroup.java index 5b9af0bce..94e3b34f0 100644 --- a/app/models/absences/definitions/DefaultGroup.java +++ b/app/models/absences/definitions/DefaultGroup.java @@ -370,6 +370,16 @@ public enum DefaultGroup { G_20("20 - Congedo/permesso DPR 1026 Art. 20", "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.programmed, PeriodType.year, DefaultTakable.T_20, DefaultComplation.C_20, null, false, false), + + G_21P("21P - Congedo parentale per il padre da definire....", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, + PeriodType.always, DefaultTakable.T_21P, null, null, + false, true), + + G_21P2("21P2 - Congedo parentale per il padre da definire....", + "", DefaultCategoryType.ASTENSIONE_POSTPARTUM, 1, GroupAbsenceTypePattern.programmed, + PeriodType.always, DefaultTakable.T_21P2, null, null, + false, true), G_ALTRI_CODICI("Altri Codici", "", DefaultCategoryType.ALTRI_CODICI, 0, GroupAbsenceTypePattern.simpleGrouping, PeriodType.always, DefaultTakable.T_ALTRI, null, null, From 8f832ddb8b6f0f36fda9ea945deaceaaeb7979d0 Mon Sep 17 00:00:00 2001 From: darietto1983 Date: Fri, 16 Sep 2022 15:52:02 +0200 Subject: [PATCH 09/13] Aggiunto inserimento delle righe nell'absence_types_history --- db/evolutions/192.sql | 112 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 112 insertions(+) diff --git a/db/evolutions/192.sql b/db/evolutions/192.sql index ad4ce62a1..c727c38e7 100644 --- a/db/evolutions/192.sql +++ b/db/evolutions/192.sql @@ -15,6 +15,118 @@ UPDATE absence_types SET code = '252OH7' where code = '252H7'; UPDATE absence_types SET code = '253OH7' where code = '253H7'; UPDATE absence_types SET code = '254OH7' where code = '254H7'; +INSERT INTO revinfo (revtstmp) VALUES (EXTRACT(EPOCH FROM NOW())::BIGINT*1000); + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '25'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '252'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '253'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '254'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '25M'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '252M'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '253M'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '254M'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '25H7'; + + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '252H7'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '253H7'; + +INSERT INTO absence_types_history ( + id, _revision, _revision_type, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour) + SELECT id, (SELECT MAX(rev) AS rev FROM revinfo), 1, certification_code, code, considered_week_end, description, internal_use, + justified_time_at_work, valid_from, valid_to, justified_time, replacing_time, replacing_type_id, + documentation, reperibility_compatible, is_real_absence, to_update, meal_ticket_behaviour + FROM absence_types WHERE code = '254H7'; + + # ---!Downs -- non è necessaria una down \ No newline at end of file From 9ae84e93fca6aa9597dfc88e77342c8c1290e7db Mon Sep 17 00:00:00 2001 From: dario Date: Wed, 21 Sep 2022 11:42:31 +0200 Subject: [PATCH 10/13] =?UTF-8?q?Rimossi=20i=20codici=20COV00=20e=20COV50?= =?UTF-8?q?=20che=20non=20sono=20pi=C3=B9=20usati?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../services/absences/AbsenceService.java | 2 +- .../definitions/DefaultAbsenceType.java | 58 +++++++++---------- .../definitions/DefaultComplation.java | 14 ++--- .../absences/definitions/DefaultGroup.java | 16 ++--- .../absences/definitions/DefaultTakable.java | 22 +++---- 5 files changed, 56 insertions(+), 56 deletions(-) diff --git a/app/manager/services/absences/AbsenceService.java b/app/manager/services/absences/AbsenceService.java index 85c64d094..2bdfde7eb 100644 --- a/app/manager/services/absences/AbsenceService.java +++ b/app/manager/services/absences/AbsenceService.java @@ -722,7 +722,7 @@ private List namesOfChildGroups() { names.add(DefaultGroup.MALATTIA_FIGLIO_3.name()); names.add(DefaultGroup.MALATTIA_FIGLIO_4.name()); names.add(DefaultGroup.G_25P.name()); - names.add(DefaultGroup.G_COV50.name()); +// names.add(DefaultGroup.G_COV50.name()); return names; } diff --git a/app/models/absences/definitions/DefaultAbsenceType.java b/app/models/absences/definitions/DefaultAbsenceType.java index 4593f73e4..c4e8a6c2c 100644 --- a/app/models/absences/definitions/DefaultAbsenceType.java +++ b/app/models/absences/definitions/DefaultAbsenceType.java @@ -641,35 +641,35 @@ 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_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, diff --git a/app/models/absences/definitions/DefaultComplation.java b/app/models/absences/definitions/DefaultComplation.java index 98e32396c..0eef57bf5 100644 --- a/app/models/absences/definitions/DefaultComplation.java +++ b/app/models/absences/definitions/DefaultComplation.java @@ -163,13 +163,13 @@ public enum DefaultComplation { ImmutableSet.of(DefaultAbsenceType.A_43), ImmutableSet.of(DefaultAbsenceType.A_43)), - C_COV50(AmountType.units, - ImmutableSet.of(DefaultAbsenceType.A_COV50M), - ImmutableSet.of(DefaultAbsenceType.A_COV50H)), - - C_COV00(AmountType.units, - ImmutableSet.of(DefaultAbsenceType.A_COV00M), - ImmutableSet.of(DefaultAbsenceType.A_COV00H)), +// C_COV50(AmountType.units, +// ImmutableSet.of(DefaultAbsenceType.A_COV50M), +// ImmutableSet.of(DefaultAbsenceType.A_COV50H)), +// +// C_COV00(AmountType.units, +// ImmutableSet.of(DefaultAbsenceType.A_COV00M), +// ImmutableSet.of(DefaultAbsenceType.A_COV00H)), C_23(AmountType.units, ImmutableSet.of(DefaultAbsenceType.A_23M), diff --git a/app/models/absences/definitions/DefaultGroup.java b/app/models/absences/definitions/DefaultGroup.java index 94e3b34f0..bd4f30727 100644 --- a/app/models/absences/definitions/DefaultGroup.java +++ b/app/models/absences/definitions/DefaultGroup.java @@ -253,15 +253,15 @@ public enum DefaultGroup { // 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_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_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 5719fc81a..aba56d4ed 100644 --- a/app/models/absences/definitions/DefaultTakable.java +++ b/app/models/absences/definitions/DefaultTakable.java @@ -263,17 +263,17 @@ public enum DefaultTakable { // 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_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, From bf47efebd5c2c96e615a0692b6c602edb2a7fa32 Mon Sep 17 00:00:00 2001 From: dario Date: Wed, 21 Sep 2022 16:48:21 +0200 Subject: [PATCH 11/13] Rimossa riga in fondo all'evoluzione 192 --- db/evolutions/192.sql | 1 - 1 file changed, 1 deletion(-) diff --git a/db/evolutions/192.sql b/db/evolutions/192.sql index b64cb41b2..dea9421de 100644 --- a/db/evolutions/192.sql +++ b/db/evolutions/192.sql @@ -7,4 +7,3 @@ ALTER TABLE general_setting_history ADD COLUMN enable_absence_top_level_authoriz ALTER TABLE general_setting DROP COLUMN enable_absence_top_level_authorization; ALTER TABLE general_setting_history DROP enable_absence_top_level_authorization; - From 1856d87273805f59a61a0fa68a989b9a5081a6fb Mon Sep 17 00:00:00 2001 From: dario Date: Wed, 21 Sep 2022 16:52:29 +0200 Subject: [PATCH 12/13] Replace della evoluzione 192 con quella del branch master. --- db/evolutions/192.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/db/evolutions/192.sql b/db/evolutions/192.sql index dea9421de..c936e7ddb 100644 --- a/db/evolutions/192.sql +++ b/db/evolutions/192.sql @@ -6,4 +6,4 @@ ALTER TABLE general_setting_history ADD COLUMN enable_absence_top_level_authoriz # ---!Downs ALTER TABLE general_setting DROP COLUMN enable_absence_top_level_authorization; -ALTER TABLE general_setting_history DROP enable_absence_top_level_authorization; +ALTER TABLE general_setting_history DROP enable_absence_top_level_authorization; \ No newline at end of file From f5b7908f3db88969a4f76b401edff07d502428dc Mon Sep 17 00:00:00 2001 From: dario Date: Wed, 21 Sep 2022 17:03:37 +0200 Subject: [PATCH 13/13] 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,