Merge pull request #124 from consiglionazionaledellericerche/123-ripr…

…istinare-a-8-giorni-di-lavoro-agile-il-mese-di-febbraio 123 ripristinare a 8 giorni di lavoro agile il mese di febbraio
consiglionazionaledellericerche · Feb 1, 2024 · 8c2bc43 · 8c2bc43
2 parents 298ac9e + cd0a896
commit 8c2bc43
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,10 @@ 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.12.2] - 2024-02-01
+### Changed
+  - Ripristinato vincolo degli 8 giorni al Lavoro Agile per il mese di febbraio.
+
 ## [2.12.1] - 2024-01-30
 ### Changed
   - Rimosso vincolo degli 8 giorni al Lavoro Agile per il mese di febbraio.

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.12.1
+2.12.2
diff --git a/app/manager/services/absences/model/AbsencePeriod.java b/app/manager/services/absences/model/AbsencePeriod.java
@@ -219,9 +219,9 @@ public int computePeriodTakableAmount(TakeCountBehaviour countBehaviour, LocalDa
          * gruppo del codice LAGILE (this.fixexPeriodTakableAmount).
          */
         int quantity = 0;
-//        if (from.monthOfYear().get() == DateTimeConstants.FEBRUARY) {
-//          return this.fixedPeriodTakableAmount - 2 * 100;
-//        }
+        if (from.monthOfYear().get() == DateTimeConstants.FEBRUARY) {
+          return this.fixedPeriodTakableAmount - 2 * 100;
+        }
         List<PersonDay> workingDays = personDayManager.workingDaysInMonth(person, from, to);
         int count = (workingDays.size() * 100 / 2);
         if (count % 100 != 0) {