Skip to content

Commit

Permalink
Merge pull request #182 from consiglionazionaledellericerche/181-crea…
Browse files Browse the repository at this point in the history
…re-un-orario-maternità-generico

181 creare un orario maternità generico
  • Loading branch information
criluc committed May 23, 2024
2 parents c951b3e + 1e22dba commit 67059bc
Show file tree
Hide file tree
Showing 4 changed files with 45 additions and 3 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,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.15.2] - 2024-05-23
### Added
- Aggiunto nuovo orario Maternità CNR da utilizzare come orario di lavoro maternità generico per tutti i dipendenti CNR.

### Changed
- Disabilitati gli orari Maternità e Maternità gemellare che erano incompleti o sbagliati

## [2.15.1] - 2024-04-23
### Added
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2.15.1
2.15.2
36 changes: 36 additions & 0 deletions db/evolutions/215.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
# --- !Ups
UPDATE working_time_types SET disabled = true where id in (2, 6);

INSERT INTO working_time_types (description, shift, meal_ticket_enabled, office_id, disabled, horizontal, version, enable_adjustment_for_quantity, external_id, updated_at)
VALUES ('Maternità CNR', false, true, null, false, true, 0, false, null, now());

INSERT INTO working_time_type_days (break_ticket_time, day_of_week, holiday, meal_ticket_time, time_meal_from, time_meal_to, time_slot_entrance_from,time_slot_entrance_to,
time_slot_exit_from, time_slot_exit_to, working_time, working_time_type_id, ticket_afternoon_threshold, ticket_afternoon_working_time, version, updated_at)
VALUES (30, 1, false, 240, 0, 0, 0, 0, 0, 0, 312, (select id from working_time_types where description = 'Maternità CNR'), 0, 0, 0, now());

INSERT INTO working_time_type_days (break_ticket_time, day_of_week, holiday, meal_ticket_time, time_meal_from, time_meal_to, time_slot_entrance_from,time_slot_entrance_to,
time_slot_exit_from, time_slot_exit_to, working_time, working_time_type_id, ticket_afternoon_threshold, ticket_afternoon_working_time, version, updated_at)
VALUES (30, 2, false, 240, 0, 0, 0, 0, 0, 0, 312, (select id from working_time_types where description = 'Maternità CNR'), 0, 0, 0, now());

INSERT INTO working_time_type_days (break_ticket_time, day_of_week, holiday, meal_ticket_time, time_meal_from, time_meal_to, time_slot_entrance_from,time_slot_entrance_to,
time_slot_exit_from, time_slot_exit_to, working_time, working_time_type_id, ticket_afternoon_threshold, ticket_afternoon_working_time, version, updated_at)
VALUES (30, 3, false, 240, 0, 0, 0, 0, 0, 0, 312, (select id from working_time_types where description = 'Maternità CNR'), 0, 0, 0, now());

INSERT INTO working_time_type_days (break_ticket_time, day_of_week, holiday, meal_ticket_time, time_meal_from, time_meal_to, time_slot_entrance_from,time_slot_entrance_to,
time_slot_exit_from, time_slot_exit_to, working_time, working_time_type_id, ticket_afternoon_threshold, ticket_afternoon_working_time, version, updated_at)
VALUES (30, 4, false, 240, 0, 0, 0, 0, 0, 0, 312, (select id from working_time_types where description = 'Maternità CNR'), 0, 0, 0, now());

INSERT INTO working_time_type_days (break_ticket_time, day_of_week, holiday, meal_ticket_time, time_meal_from, time_meal_to, time_slot_entrance_from,time_slot_entrance_to,
time_slot_exit_from, time_slot_exit_to, working_time, working_time_type_id, ticket_afternoon_threshold, ticket_afternoon_working_time, version, updated_at)
VALUES (30, 5, false, 240, 0, 0, 0, 0, 0, 0, 312, (select id from working_time_types where description = 'Maternità CNR'), 0, 0, 0, now());

INSERT INTO working_time_type_days (break_ticket_time, day_of_week, holiday, meal_ticket_time, time_meal_from, time_meal_to, time_slot_entrance_from,time_slot_entrance_to,
time_slot_exit_from, time_slot_exit_to, working_time, working_time_type_id, ticket_afternoon_threshold, ticket_afternoon_working_time, version, updated_at)
VALUES (30, 6, true, 0, 0, 0, 0, 0, 0, 0, 312, (select id from working_time_types where description = 'Maternità CNR'), 0, 0, 0, now());

INSERT INTO working_time_type_days (break_ticket_time, day_of_week, holiday, meal_ticket_time, time_meal_from, time_meal_to, time_slot_entrance_from,time_slot_entrance_to,
time_slot_exit_from, time_slot_exit_to, working_time, working_time_type_id, ticket_afternoon_threshold, ticket_afternoon_working_time, version, updated_at)
VALUES (30, 7, true, 0, 0, 0, 0, 0, 0, 0, 312, (select id from working_time_types where description = 'Maternità CNR'), 0, 0, 0, now());

# --- !Downs
-- Non è necessaria una 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-23'
releaseDate: '2024-05-23'
url: 'https://github.com/consiglionazionaledellericerche/epas'
applicationSuite: epas
softwareVersion: 2.15.1
softwareVersion: 2.15.2
developmentStatus: stable
softwareType: standalone/web
platforms:
Expand Down

0 comments on commit 67059bc

Please sign in to comment.