id = _super.id;
+ public final StringPath keycloakId = createString("keycloakId");
+
public final StringPath label = createString("label");
public final QOffice owner;
diff --git a/app/views/AbsenceGroups/consistencyGroups.html b/app/views/AbsenceGroups/consistencyGroups.html
index 07d352fc1..dfd3745af 100755
--- a/app/views/AbsenceGroups/consistencyGroups.html
+++ b/app/views/AbsenceGroups/consistencyGroups.html
@@ -272,7 +272,7 @@
${absenceType.justifiedTime} |
${absenceType.consideredWeekEnd} |
- ${absenceType.timeForMealTicket} |
+ ${absenceType.mealTicketBehaviour.description} |
${absenceType.replacingType?.name} |
${absenceType.replacingTime} |
${absenceType.validFrom?.format()} |
@@ -319,7 +319,7 @@
${absenceType.justifiedTime} |
${absenceType.consideredWeekEnd} |
- ${absenceType.timeForMealTicket} |
+ ${absenceType.mealTicketBehaviour.description} |
${absenceType.replacingType?.name} |
${absenceType.replacingTime} |
${absenceType.validFrom?.format()} |
diff --git a/db/evolutions/188.sql b/db/evolutions/188.sql
new file mode 100644
index 000000000..91435b6e0
--- /dev/null
+++ b/db/evolutions/188.sql
@@ -0,0 +1,11 @@
+# --- !Ups
+
+DELETE FROM person_configurations pc
+using person_configurations pc2
+WHERE pc.id > pc2.id
+AND pc.person_id = pc2.person_id AND pc.epas_param = pc2.epas_param;
+
+ALTER TABLE person_configurations
+ADD CONSTRAINT unique_param UNIQUE (person_id, epas_param);
+
+# --- !Downs
diff --git a/db/evolutions/189.sql b/db/evolutions/189.sql
new file mode 100644
index 000000000..2d6060632
--- /dev/null
+++ b/db/evolutions/189.sql
@@ -0,0 +1,15 @@
+# --- !Ups
+
+ALTER TABLE absence_types ADD COLUMN meal_ticket_behaviour TEXT;
+ALTER TABLE absence_types_history ADD COLUMN meal_ticket_behaviour TEXT;
+UPDATE absence_types SET meal_ticket_behaviour = 'notAllowMealTicket' WHERE time_for_mealticket = false;
+UPDATE absence_types SET meal_ticket_behaviour = 'allowMealTicket' WHERE time_for_mealticket = true;
+UPDATE absence_types SET meal_ticket_behaviour = 'preventMealTicket' WHERE code = '103RT';
+ALTER TABLE absence_types DROP COLUMN time_for_mealticket;
+UPDATE absence_types_history SET meal_ticket_behaviour = 'notAllowMealTicket' WHERE time_for_mealticket = false;
+UPDATE absence_types_history SET meal_ticket_behaviour = 'allowMealTicket' WHERE time_for_mealticket = true;
+UPDATE absence_types_history SET meal_ticket_behaviour = 'preventMealTicket' WHERE code = '103RT';
+ALTER TABLE absence_types_history DROP COLUMN time_for_mealticket;
+
+
+# --- !Downs
\ No newline at end of file