Merge pull request #254 from consiglionazionaledellericerche/251-crea…

…zione-codice-183 251 creazione codice 183
consiglionazionaledellericerche · Oct 30, 2024 · 5297786 · 5297786
2 parents 23ba450 + 78c7437
commit 5297786
Show file tree

Hide file tree

Showing 11 changed files with 122 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,8 +4,9 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [2.19.1] - UNRELEASED
+## [2.19.1] - 2024-10-30
 ### Added
+  - Aggiunto codice 183 giornaliero e ore e minuti per terzo parente disabile
   - Aggiunto job che invia agli amministrativi i problemi sui giorni dei dipendenti della sede che
     gestiscono
 

diff --git a/app/manager/configurations/EpasParam.java b/app/manager/configurations/EpasParam.java
@@ -151,6 +151,15 @@ public enum EpasParam {
       EpasParamValueType.formatValue(false),
       Lists.<RecomputationType>newArrayList(),
       Person.class),
+
+  THIRD_DISABLED_RELATIVE_PERMISSION("third_disabled_relative_permission",
+
+      EpasParamCategory.GENERAL,
+      EpasParamTimeType.GENERAL,
+      EpasParamValueType.BOOLEAN,
+      EpasParamValueType.formatValue(false),
+      Lists.<RecomputationType>newArrayList(),
+      Person.class),
 
   OFF_SITE_ABSENCE_WITH_CONVENTION("off_site_absence_with_convention",
 

diff --git a/app/manager/services/absences/AbsenceService.java b/app/manager/services/absences/AbsenceService.java
@@ -564,6 +564,8 @@ public List<GroupAbsenceType> groupsPermitted(Person person, boolean readOnly) {
         .groupAbsenceTypeByName(DefaultGroup.G_18_PARENTI_DIPENDENTI.name()).get();
     final GroupAbsenceType secondDisabledRelativeAbsence = absenceComponentDao
         .groupAbsenceTypeByName(DefaultGroup.G_182_PARENTI_DIPENDENTI.name()).get();
+    final GroupAbsenceType thirdDisabledRelativeAbsence = absenceComponentDao
+        .groupAbsenceTypeByName(DefaultGroup.G_183_PARENTI_DIPENDENTI.name()).get();
     final GroupAbsenceType medicalExams = absenceComponentDao
         .groupAbsenceTypeByName(DefaultGroup.G_631_DIPENDENTI.name()).get();
     final GroupAbsenceType cod39LA = absenceComponentDao
@@ -607,6 +609,7 @@ public List<GroupAbsenceType> groupsPermitted(Person person, boolean readOnly) {
       groupsPermitted.remove(disabledRelativeAbsence);
       groupsPermitted.remove(additionalHours);
       groupsPermitted.remove(secondDisabledRelativeAbsence);
+      groupsPermitted.remove(thirdDisabledRelativeAbsence);
       //groupsPermitted.remove(parentalLeaveForFathers);
       //groupsPermitted.remove(parentalLeaveTwinsForFathers);
       //groupsPermitted.remove(lagile);
@@ -682,6 +685,9 @@ public List<GroupAbsenceType> groupsPermitted(Person person, boolean readOnly) {
         if ((Boolean) confManager.configValue(person, 
             EpasParam.SECOND_DISABLED_RELATIVE_PERMISSION)) {
           groupsPermitted.add(secondDisabledRelativeAbsence);
+          if ((Boolean) confManager.configValue(person, EpasParam.THIRD_DISABLED_RELATIVE_PERMISSION)) {
+            groupsPermitted.add(thirdDisabledRelativeAbsence);
+          }
         }
       }
 

diff --git a/app/models/absences/definitions/DefaultAbsenceType.java b/app/models/absences/definitions/DefaultAbsenceType.java
@@ -226,6 +226,54 @@ public enum DefaultAbsenceType {
       0, false, MealTicketBehaviour.notAllowMealTicket, 0, JustifiedTypeName.all_day, 
       Sets.newHashSet(), null, null, false, true, true, null),
 
+  A_183("183", "Permesso assistenza terzo parenti/affini disabili L. 104/92 intera giornata",
+      false, ImmutableSet.of(JustifiedTypeName.all_day), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket, 0, null,
+      Sets.newHashSet(), null, null, false, true, true, null), 
+  A_183M("183M", "Permesso assistenza terzo parenti/affini disabili L. 104/92 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, null), 
+  A_183H1("183H1", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 1 ora", 
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket, 60,
+      JustifiedTypeName.absence_type_minutes, Sets.newHashSet(), null, null, false, true, true, null), 
+  A_183H2("183H2", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 2 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket, 120,
+      JustifiedTypeName.absence_type_minutes, Sets.newHashSet(), null, null, false, true, true, null), 
+  A_183H3("183H3", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 3 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket, 180,
+      JustifiedTypeName.absence_type_minutes, Sets.newHashSet(), null, null, false, true, true, null), 
+  A_183H4("183H4", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 4 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket, 240,
+      JustifiedTypeName.absence_type_minutes, Sets.newHashSet(), null, null, false, true, true, null), 
+  A_183H5("183H5", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 5 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket,
+      300, JustifiedTypeName.absence_type_minutes, Sets.newHashSet(), null, null, 
+      false, true, true, null), 
+  A_183H6("183H6", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 6 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false,
+      MealTicketBehaviour.notAllowMealTicket, 360, JustifiedTypeName.absence_type_minutes, 
+      Sets.newHashSet(), null, null, false, true, true, null), 
+  A_183H7("183H7", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 7 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false,
+      MealTicketBehaviour.notAllowMealTicket, 420, JustifiedTypeName.absence_type_minutes, 
+      Sets.newHashSet(), null, null, false, true, true, null), 
+  A_183H8("183H8", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 8 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket, 
+      480, JustifiedTypeName.absence_type_minutes, Sets.newHashSet(), null, null, 
+      false, true, true, null), 
+  A_183H9("183H9", "Permesso assistenza terzo parenti/affini disabili L.104/92 compl. 9 ore",
+      false, ImmutableSet.of(JustifiedTypeName.nothing), 0, false, 
+      MealTicketBehaviour.notAllowMealTicket, 540,
+      JustifiedTypeName.absence_type_minutes, Sets.newHashSet(), null, null, false, true, true, null), 
+
   A_19M("19M", "Permesso per dipendente disabile L. 104/92 in ore e minuti", true,
       ImmutableSet.of(JustifiedTypeName.specified_minutes), 0, false, 
       MealTicketBehaviour.notAllowMealTicket, 0, null,

diff --git a/app/models/absences/definitions/DefaultComplation.java b/app/models/absences/definitions/DefaultComplation.java
@@ -60,6 +60,18 @@ public enum DefaultComplation {
           DefaultAbsenceType.A_182H7, 
           DefaultAbsenceType.A_182H8, 
           DefaultAbsenceType.A_182H9)),
+
+  C_183(AmountType.minutes, 
+      ImmutableSet.of(DefaultAbsenceType.A_183M), 
+      ImmutableSet.of(DefaultAbsenceType.A_183H1, 
+          DefaultAbsenceType.A_183H2, 
+          DefaultAbsenceType.A_183H3, 
+          DefaultAbsenceType.A_183H4, 
+          DefaultAbsenceType.A_183H5, 
+          DefaultAbsenceType.A_183H6, 
+          DefaultAbsenceType.A_183H7, 
+          DefaultAbsenceType.A_183H8, 
+          DefaultAbsenceType.A_183H9)),
 
   C_182P(AmountType.units, 
       ImmutableSet.of(DefaultAbsenceType.A_182PM), 

diff --git a/app/models/absences/definitions/DefaultGroup.java b/app/models/absences/definitions/DefaultGroup.java
@@ -55,6 +55,15 @@ public enum DefaultGroup {
       + "secondo parente tre giorni mese", "", DefaultCategoryType.L_104_PARENTI_DIPENDENTI, 2, 
       GroupAbsenceTypePattern.programmed, PeriodType.month, DefaultTakable.T_182, 
       DefaultComplation.C_182, null, false, false),
+
+  G_183("183 - Permesso assistenza terzo parenti/affini disabili L. 104/92 tre gg. mese", "",
+      DefaultCategoryType.L_104, 1, GroupAbsenceTypePattern.programmed, PeriodType.month,
+      DefaultTakable.T_183, DefaultComplation.C_183, null, false, false), 
+  G_183_PARENTI_DIPENDENTI("183 - Permesso assistenza parenti/affini disabili L. 104/92 "
+      + "terzo parente tre giorni mese", "", DefaultCategoryType.L_104_PARENTI_DIPENDENTI, 2, 
+      GroupAbsenceTypePattern.programmed, PeriodType.month, DefaultTakable.T_183, 
+      DefaultComplation.C_183, null, false, false),
+
   G_182P("182P - Permesso provv. assist. secondo parenti/affini dis. L. 104/92 tre gg. mese", "",
       DefaultCategoryType.PERMESSI_PROVVISORI_104, 0, GroupAbsenceTypePattern.programmed,
       PeriodType.month, DefaultTakable.T_182P, DefaultComplation.C_182P, null, false, false),
@@ -568,6 +577,10 @@ public static List<String> employeeSecondDisabledRelativeCodes() {
     return getCodes(DefaultGroup.G_182_PARENTI_DIPENDENTI);
   }
 
+  public static List<String> employeeThirdDisabledRelativeCodes() {
+    return getCodes(DefaultGroup.G_183_PARENTI_DIPENDENTI);
+  }
+
   public static List<String> employeeAgileWorkOrDisabledPeopleAssistanceCodes() {
     return getCodes(DefaultGroup.G_39LA);
   }

diff --git a/app/models/absences/definitions/DefaultTakable.java b/app/models/absences/definitions/DefaultTakable.java
@@ -63,6 +63,12 @@ public enum DefaultTakable {
           DefaultAbsenceType.A_182PM), 
       ImmutableSet.of(DefaultAbsenceType.A_182P, DefaultAbsenceType.A_182PM), 
       3, null),
+
+  T_183(AmountType.units, 
+      ImmutableSet.of(DefaultAbsenceType.A_183, 
+          DefaultAbsenceType.A_183M), 
+      ImmutableSet.of(DefaultAbsenceType.A_183, DefaultAbsenceType.A_183M), 
+      3, TakeAmountAdjustment.workingTimePercent),
 
   T_19(AmountType.units, 
       ImmutableSet.of(DefaultAbsenceType.A_19, 

diff --git a/app/views/Configurations/_tutorial.html b/app/views/Configurations/_tutorial.html
@@ -261,6 +261,12 @@
       autonomamente il codice di assenza per legge 104 per un secondo parente disabile del dipendente (182).
 	  </p> 
     #{/if}
+
+	#{if configuration.epasParam.equals(manager.configurations.EpasParam.THIRD_DISABLED_RELATIVE_PERMISSION) }
+	  <p>Abilitando questa funzionalità sarà possibile per il dipendente <strong>${configuration.person.fullname}</strong> inserire 
+	  autonomamente il codice di assenza per legge 104 per un terzo parente disabile del dipendente (183).
+	  </p> 
+	#{/if}
 
     #{if configuration.epasParam.equals(manager.configurations.EpasParam.AGILE_WORK_OR_DISABLED_PEOPLE_ASSISTANCE) }
       <p>Abilitando questa funzionalità sarà possibile per il dipendente <strong>${configuration.person.fullname}</strong> inserire 

diff --git a/conf/messages.it b/conf/messages.it
@@ -1365,6 +1365,7 @@ COVID_19=Auto inserimento codice per emergenza COVID-19
 ADDITIONAL_HOURS=Auto inserimento ore aggiuntive
 PARENTAL_LEAVE_AND_CHILD_ILLNESS=Auto inserimento congedi parentali e malattie figlio
 SECOND_DISABLED_RELATIVE_PERMISSION=Auto inserimento assenze 104 secondo parente disabile
+THIRD_DISABLED_RELATIVE_PERMISSION=Auto inserimento assenze 104 terzo parente disabile
 PEOPLE_ALLOWED_INSERT_MEDICAL_EXAM=Abilita personale all'auto inserimento di permessi per visita medica
 AGILE_WORK_OR_DISABLED_PEOPLE_ASSISTANCE=Auto inserimento lavoro agile per dipendenti fragili o assistenza disabile/immunodepresso
 SMARTWORKING =Auto inserimento codice di assenza per smartworking

diff --git a/conf/permissions.drl b/conf/permissions.drl
@@ -3180,6 +3180,7 @@ when
  				|| (epasParam == EpasParam.ADDITIONAL_HOURS && fieldValue == true)
  				|| (epasParam == EpasParam.PARENTAL_LEAVE_AND_CHILD_ILLNESS && fieldValue == true)
  				|| (epasParam == EpasParam.SECOND_DISABLED_RELATIVE_PERMISSION && fieldValue == true)
+ 				|| (epasParam == EpasParam.THIRD_DISABLED_RELATIVE_PERMISSION && fieldValue == true)
  				|| (epasParam == EpasParam.AGILE_WORK_OR_DISABLED_PEOPLE_ASSISTANCE && fieldValue == true)
  				|| (epasParam == EpasParam.SMARTWORKING && fieldValue == true)
  				|| (epasParam == EpasParam.AGILE_WORK && fieldValue == true)
@@ -3369,6 +3370,22 @@ then
  $c.grant();
 end
 
+/*********************************************************************************************
+ * L'impiegato può modificare/salvare una determinata assenza per terzo parente disabile se:
+ *********************************************************************************************/
+rule EmployeeCanEditThirdDisabledRelativeAbsence
+when
+ $uro: UsersRolesOffices(role.name == Role.EMPLOYEE)
+ $p: Person() from currentOperator.person
+ PersonConfiguration(epasParam == EpasParam.THIRD_DISABLED_RELATIVE_PERMISSION, fieldValue == true) from $p.personConfigurations
+ $target: Absence(DefaultGroup.employeeSecondDisabledRelativeCodes().contains(this.getCode()), this.getOwner() == $p)
+ $c: PermissionCheck(action in ("AbsenceGroups.insert", "AbsenceGroups.edit", "AbsenceGroups.save", "AbsenceGroups.delete"), target == $target, granted == false )
+ eval (!$target.isPersistent() || HistoricalDao.lastRevisionOperator($target) == currentOperator)
+ eval($target.getYearMonth().isAfter(YearMonth.now().minusMonths(2)) && $p.checkLastCertificationDate($target.getYearMonth()))
+then
+ $c.grant();
+end
+
 /******************************************************************************************************************************************
  * L'impiegato può modificare/salvare una determinata assenza per lavoro agile per dipendenti fragili o assistenza disabile/immunodepresso:
  ******************************************************************************************************************************************/

diff --git a/publiccode.yml b/publiccode.yml
@@ -4,10 +4,10 @@
 
 publiccodeYmlVersion: '0.2'
 name: epas
-releaseDate: '2024-10-15'
+releaseDate: '2024-10-30'
 url: 'https://github.com/consiglionazionaledellericerche/epas'
 applicationSuite: epas
-softwareVersion: 2.19.0
+softwareVersion: 2.19.1
 developmentStatus: stable
 softwareType: standalone/web
 platforms: