Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

175 abilitare i responsabili di sede a vedere il riepilogo delle assenze dal cartellino #176

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 3 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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à
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.16.0
2.15.1
2 changes: 1 addition & 1 deletion app/controllers/AbsenceGroups.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand Down
16 changes: 15 additions & 1 deletion conf/permissions.drl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
4 changes: 2 additions & 2 deletions publiccode.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down