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.

Sign up for GitHub

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

191 in caso di dipendente con presenza automatica aggiungere il tempo da timbrature nel popover del tempo a lavoro #192

Closed
wants to merge 2 commits into from
Closed

191 in caso di dipendente con presenza automatica aggiungere il tempo da timbrature nel popover del tempo a lavoro #192

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
92c9a82
Prime modifiche per consentire la visualizzazione corretta del tempo a
Jun 5, 2024
445c818
Modificato il changelog.
Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,21 @@ 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.1] - Unreleased
### Added

### Changed
- Modificato il comportamento del popover nella colonna tempo a lavoro per i dipendenti con "Presenza automatica":
anche per questi viene mostrato il tempo che si avrebbe da timbrature con l'eventuale sottrazione della pausa pranzo
(per rendicontazione).

## [2.16.0] - 2024-05-24
### Added

### Changed
- Modificato il nome dell'orario Maternità CNR in Allattamento per renderlo più generico e usabile in
tutte le installazioni di ePAS


## [2.15.2] - 2024-05-23
### Added
Expand Down
10 changes: 6 additions & 4 deletions app/manager/PersonDayManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -416,10 +416,6 @@ public PersonDay updateTimeAtWork(PersonDay personDay, WorkingTimeTypeDay wttd,
personDay.setJustifiedTimeNoMeal(0);
personDay.setTimeAtWork(0);

// Patch persone fixed
if (fixedTimeAtWork) {
return updateTimeAtWorkFixed(personDay, wttd);
}

// Gli invarianti del calcolo.
//
Expand All @@ -439,6 +435,7 @@ public PersonDay updateTimeAtWork(PersonDay personDay, WorkingTimeTypeDay wttd,
} else {
personDay.setOutOpening(personDay.getStampingsTime() - stampingTimeInOpening);
}


//Caso assenza che assegna l'intera giornata ex 103, 103BP, 105BP
Optional<Absence> assignAllDay = getAssignAllDay(personDay);
Expand Down Expand Up @@ -513,6 +510,11 @@ public PersonDay updateTimeAtWork(PersonDay personDay, WorkingTimeTypeDay wttd,

mealTicketHandlerAndDecurtedMeal(personDay, wttd, stampingTimeInOpening,
startLunch, endLunch, exitingNow);

// Patch persone fixed
if (fixedTimeAtWork) {
return updateTimeAtWorkFixed(personDay, wttd);
}

//Gestione decurtazione.
// Si applica solo se non ci sono assenze orarie che maturano il buono
Expand Down
2 changes: 1 addition & 1 deletion app/views/Stampings/personStampingComponents/_workTimeDifferenceProgressive.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
Tempo a lavoro totale calcolato: <strong>${dayRecap.personDay.timeAtWork.printHourMinute()}</strong>

#{if dayRecap.fixedWorkingTimeCode}
<br><em>${dayRecap.fixedWorkingTimeCode.description}</em>
<br><em>${dayRecap.fixedWorkingTimeCode.description}</em>
#{/if}

#{if dayRecap.personDay?.stampingsTime > 0}
Expand Down
Loading