From e8d30db3b20423ed1132209f8441cc32bcf86a66 Mon Sep 17 00:00:00 2001
From: Cristian Lucchesi <cristian.lucchesi@iit.cnr.it>
Date: Fri, 15 Mar 2024 14:48:50 +0100
Subject: [PATCH] Fix lista persone attive con errore introdotto nelle
 precedente release.

---
 CHANGELOG.md           |  5 +++++
 VERSION                |  2 +-
 app/dao/PersonDao.java | 16 ++++++++--------
 publiccode.yml         |  4 ++--
 4 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b7447e740..dfc5e29f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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.14.1] - 2024-03-15
+### Added
+  - Corretto metodo che preleva la lista delle persone attive che aveva un problema
+    introdotto nella versione 2.14.0
+
 ## [2.14.0] - 2024-03-12
 ### Added
   - Aggiunto piano ferie 15+2
diff --git a/VERSION b/VERSION
index 575a07b9f..2ad1684ea 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.14.0
\ No newline at end of file
+2.14.1
\ No newline at end of file
diff --git a/app/dao/PersonDao.java b/app/dao/PersonDao.java
index 9fc238c54..d12fc494b 100755
--- a/app/dao/PersonDao.java
+++ b/app/dao/PersonDao.java
@@ -755,14 +755,14 @@ private JPQLQuery<Person> personQuery(Optional<String> name, Set<Office> offices
 
     final BooleanBuilder condition = new BooleanBuilder();
 
-    if (start.isPresent()) {
-      condition.and(affiliation.beginDate.before(JodaConverters.jodaToJavaLocalDate(start.get())));
-    }
-    if (end.isPresent()) {
-      condition.andAnyOf(
-          affiliation.endDate.goe(JodaConverters.jodaToJavaLocalDate(end.get())), 
-          affiliation.endDate.isNull());
-    }
+//    if (start.isPresent()) {
+//      condition.and(affiliation.isNull().or(affiliation.beginDate.before(JodaConverters.jodaToJavaLocalDate(start.get()))));
+//    }
+//    if (end.isPresent()) {
+//      condition.and(affiliation.isNull().or(
+//          affiliation.endDate.isNull().or(
+//          affiliation.endDate.goe(JodaConverters.jodaToJavaLocalDate(end.get())))));
+//    }
     filterOffices(condition, offices);
     filterOnlyTechnician(condition, onlyTechnician);
     condition.and(new QFilters().filterNameFromPerson(QPerson.person, name));
diff --git a/publiccode.yml b/publiccode.yml
index 00e01c085..dcabd5d05 100644
--- a/publiccode.yml
+++ b/publiccode.yml
@@ -4,10 +4,10 @@
 
 publiccodeYmlVersion: '0.2'
 name: epas
-releaseDate: '2024-03-12'
+releaseDate: '2024-03-15'
 url: 'https://github.com/consiglionazionaledellericerche/epas'
 applicationSuite: epas
-softwareVersion: 2.14.0
+softwareVersion: 2.14.1
 developmentStatus: stable
 softwareType: standalone/web
 platforms: