diff --git a/CHANGELOG.md b/CHANGELOG.md index f5c9f41be..acf196c00 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,10 +4,12 @@ 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.16.0] - UNRELEASED +## [2.15.1] - 2024-04-23 ### Added - Aggiunto campo externalId all'enumerato che modella gli absenceTypes e reso disponibile anche nella form di modifica degli absence_types + - Aggiunta possibilità per il responsabile di sede di verificare lo stato di avanzamento delle assenze + soggette a limitazione temporale/quantitativa sui cartellini dei dipendenti delle sedi che gestisce ### Changed - Modificato il valore del campo isRealAbsence per le assenze che sono in realtà specifiche modalità diff --git a/VERSION b/VERSION index 79a00e9a0..d91346fd9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.16.0 \ No newline at end of file +2.15.1 \ No newline at end of file diff --git a/app/controllers/AbsenceGroups.java b/app/controllers/AbsenceGroups.java index ea0bbf1d8..3092183e2 100644 --- a/app/controllers/AbsenceGroups.java +++ b/app/controllers/AbsenceGroups.java @@ -749,7 +749,7 @@ public static void groupStatus(Long personId, Long groupAbsenceTypeId, LocalDate final User currentUser = Security.getUser().get(); if (currentUser.isSystemUser() || userDao.getUsersWithRoles(person.getOffice(), - Role.PERSONNEL_ADMIN, Role.PERSONNEL_ADMIN_MINI) + Role.PERSONNEL_ADMIN, Role.PERSONNEL_ADMIN_MINI, Role.SEAT_SUPERVISOR) .contains(currentUser)) { isAdmin = true; } diff --git a/conf/permissions.drl b/conf/permissions.drl index 72f2b1a99..bdc4096cc 100755 --- a/conf/permissions.drl +++ b/conf/permissions.drl @@ -1194,7 +1194,7 @@ end */ rule PersonnelAdmin_onPerson when - $uro: UsersRolesOffices(role.name == Role.PERSONNEL_ADMIN) + $uro: UsersRolesOffices(role.name in (Role.PERSONNEL_ADMIN, Role.SEAT_SUPERVISOR)) $o: Office() from $uro.office $c: PermissionCheck($o.persons contains target, granted == false, action not in ("Persons.updateEppn")) then @@ -1582,6 +1582,14 @@ when "Stampings.personStamping", "Vacations.list", "Vacations.vacationSummary", + + "AbsenceGroups.insert", + "AbsenceGroups.insertAssisted", + "AbsenceGroups.findCode", + "AbsenceGroups.groupStatus", + "AbsenceGroups.save", + "AbsenceGroups.edit", + "AbsenceGroups.delete", "AbsenceRequests.blank", "AbsenceRequests.edit", @@ -1677,6 +1685,12 @@ when "Vacations.list", "Vacations.vacationSummary", "Stampings.dailyPresence", + + "AbsenceGroups.groupStatus", + "AbsenceGroups.showAbsenceTypes", + "AbsenceGroups.editGroup", /* per la show... */ + "AbsenceGroups.editAbsenceType", + "AbsenceRequests.blank", "AbsenceRequests.vacations", diff --git a/publiccode.yml b/publiccode.yml index fdd4ba441..ead21865e 100644 --- a/publiccode.yml +++ b/publiccode.yml @@ -4,10 +4,10 @@ publiccodeYmlVersion: '0.2' name: epas -releaseDate: '2024-04-04' +releaseDate: '2024-04-23' url: 'https://github.com/consiglionazionaledellericerche/epas' applicationSuite: epas -softwareVersion: 2.15.0 +softwareVersion: 2.15.1 developmentStatus: stable softwareType: standalone/web platforms: