From bb52efea76cbb7758df3a55e8408ca536c9d52de Mon Sep 17 00:00:00 2001 From: Valerio Castellana Date: Fri, 16 May 2025 18:00:43 +0200 Subject: [PATCH] [CARELLI] - gestione salvataggio activity_Types per calendario pv --- .../model/Migration_20250516175157.java | 24 +++++++++++++++++++ .../ems_model/entity/StbActivityPlan.java | 12 ++++++++++ .../ems_model/entity/StbActivityType.java | 12 ++++++++++ .../ems/activity/service/ActivityService.java | 1 + 4 files changed, 49 insertions(+) create mode 100644 ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250516175157.java diff --git a/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250516175157.java b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250516175157.java new file mode 100644 index 0000000000..b4c66590af --- /dev/null +++ b/ems-core/src/main/java/it/integry/ems/migration/model/Migration_20250516175157.java @@ -0,0 +1,24 @@ +package it.integry.ems.migration.model; + +import it.integry.ems.migration._base.BaseMigration; +import it.integry.ems.migration._base.MigrationModelInterface; + +public class Migration_20250516175157 extends BaseMigration implements MigrationModelInterface { + + @Override + public void up() throws Exception { + if (isHistoryDB()) + return; + + executeStatement("ALTER TABLE stb_activity_plan ADD flag_tipologia varchar DEFAULT 'A' NOT NULL"); + executeStatement("alter table dbo.stb_activity_plan\n" + + " add constraint fk__stb_activity_plan_stb_activity_type\n" + + " foreign key (activity_type_id, flag_tipologia) references dbo.stb_activity_type"); + + + } + + @Override + public void down() throws Exception { + } +} \ No newline at end of file diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityPlan.java b/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityPlan.java index e799336d1f..dde315ea18 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityPlan.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityPlan.java @@ -31,6 +31,9 @@ public class StbActivityPlan extends EntityBase { @SqlField("activity_type_id") private String activityTypeId; + @SqlField("flag_tipologia") + private String flagTipologia; + @SqlField("first_occurrence") private LocalDate firstOccurrence; @@ -208,6 +211,15 @@ public class StbActivityPlan extends EntityBase { return this; } + public String getFlagTipologia() { + return flagTipologia; + } + + public StbActivityPlan setFlagTipologia(String flagTipologia) { + this.flagTipologia = flagTipologia; + return this; + } + @Override protected void deleteChilds() throws Exception { String whereCond = getPkWhereCond(); diff --git a/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityType.java b/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityType.java index bcc7433e0f..53fc7049c8 100644 --- a/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityType.java +++ b/ems-core/src/main/java/it/integry/ems_model/entity/StbActivityType.java @@ -53,6 +53,9 @@ public class StbActivityType extends EntityBase { @SqlField(value = "flag_generate_mov", maxLength = 1, nullable = false, defaultObjectValue = "S") private String flagGenerateMov; + @SqlField("flag_view_calendar") + private boolean flagViewCalendar; + @EntityChild private List stbActivityTyper = new ArrayList<>(); @@ -159,6 +162,15 @@ public class StbActivityType extends EntityBase { this.srlActivityTypeUser = srlActivityTypeUser; } + public boolean isFlagViewCalendar() { + return flagViewCalendar; + } + + public StbActivityType setFlagViewCalendar(boolean flagViewCalendar) { + this.flagViewCalendar = flagViewCalendar; + return this; + } + @Override protected void insertChilds() throws Exception { for (SrlActivityTypeUser srlActivityTypeUser : getSrlActivityTypeUser()) { diff --git a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java index 148b30a855..d5af135a61 100644 --- a/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java +++ b/ems-engine/src/main/java/it/integry/ems/activity/service/ActivityService.java @@ -1769,6 +1769,7 @@ public class ActivityService { plan .setId(dto.getId()) .setActivityTypeId(dto.getActivityTypeId()) + .setFlagTipologia("A") .setFirstOccurrence(dto.getFirstOccurrence()) .setLastOccurrence(dto.getLastOccurrence()) .setStartTime(dto.getStartTime())