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

Jump to bottom

add federal state (public holidays) configuration for a person #500

Merged
merged 9 commits into from
Jan 3, 2024
Merged

add federal state (public holidays) configuration for a person #500

merged 9 commits into from
Jan 3, 2024

Conversation

bseber
Copy link
Contributor

@bseber bseber commented Dec 24, 2023 •
edited
Loading

add option to configure federal state (public holidays) for a person and whether he/she works on public holidays or not.

closes #259

Here are some things you should have thought about:

Multi-Tenancy

  • Extended new entities with AbstractTenantAwareEntity?
  • New entity added to TenantAwareDatabaseConfiguration?
  • Tested with dev-multitenant profile?

@bseber bseber added this to the 2.0.0 milestone Dec 24, 2023
@github-actions github-actions bot added the status: planned This issue is planned in a milestone and won't be touched by stale bot. label Dec 24, 2023
@bseber bseber force-pushed the 259-maintain-public-holidays branch 3 times, most recently from df75e9f to 791dbd4 Compare December 26, 2023 11:11
@bseber bseber marked this pull request as ready for review December 26, 2023 11:12
@bseber bseber changed the title add public holidays add federal state (public holidays) configuration for a person Dec 26, 2023
@bseber bseber force-pushed the 259-maintain-public-holidays branch 2 times, most recently from 1117d31 to 08ef880 Compare December 27, 2023 20:14
@derTobsch
Copy link
Contributor

In der Übersicht

grafik

könnte man noch die Feiertagsregelung anzeigen

derTobsch
derTobsch reviewed Dec 28, 2023
View reviewed changes
src/main/java/de/focusshift/zeiterfassung/publicholiday/PublicHoliday.java
/**
* Describes a public holiday for the given date.
*/
public record PublicHoliday(LocalDate date, Function<Locale, String> description) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Es gibt die Möglichkeit, dass zwei Feiertage an einem Tag sind. Wurde das hier bedacht? In der UV haben wir ein Ticket dafür. Das passiert zum Beispiel in Kroatien, wenn ein Feiertag wie Ostern/Pfingsten auf einen fixen Feiertag fällt.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

das ist im PublicHolidayCalendar. Da gibt es für ein Datum eine Menge an Feiertagen.

ist die frage wie das mit der aktuellen PublicHoliday#equals Funktion passt. Vielleicht muss da noch ein aufgelöstes description mit dazu 🤔

@derTobsch derTobsch force-pushed the 259-maintain-public-holidays branch 4 times, most recently from 35c350f to a2af489 Compare December 28, 2023 13:02
@bseber bseber force-pushed the 259-maintain-public-holidays branch from c843fb4 to 50aedc3 Compare December 28, 2023 14:18
@sonarcloud SonarCloud
Copy link

sonarcloud bot commented Dec 30, 2023

Quality Gate Passed Quality Gate passed

The SonarCloud Quality Gate passed, but some issues were introduced.

5 New issues
0 Security Hotspots
89.4% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud

@derTobsch derTobsch merged commit bf17290 into main Jan 3, 2024
2 checks passed
@derTobsch derTobsch deleted the 259-maintain-public-holidays branch January 3, 2024 19:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@derTobsch derTobsch derTobsch left review comments

Assignees
No one assigned
Labels
status: planned This issue is planned in a milestone and won't be touched by stale bot.
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.

Feiertage in der Zeiterfassung beachten
2 participants
@bseber @derTobsch