Merge branch 'master' into develop

ems-core/src/main/java/it/integry/ems/migration/model/Migration_20251013103907.java

@@ -0,0 +1,20 @@
+package it.integry.ems.migration.model;
+
+import it.integry.ems.migration._base.BaseMigration;
+import it.integry.ems.migration._base.MigrationModelInterface;
+
+public class Migration_20251013103907 extends BaseMigration implements MigrationModelInterface {
+
+    @Override
+    public void up() throws Exception {
+        if (isHistoryDB())
+            return;
+
+        executeStatement("ALTER TABLE stb_activity ADD extra_project BIT DEFAULT 0 NOT NULL",
+                        "ALTER TABLE stb_activity ADD view_in_meeting BIT  DEFAULT 0 NOT NULL");
+    }
+
+    @Override
+    public void down() throws Exception {
+    }
+}

ems-core/src/main/java/it/integry/ems_model/entity/StbActivity.java

@@ -182,6 +182,12 @@ public class StbActivity extends EntityBase {
     @SqlField(value = "id_posizione")
     private Long idPosizione;
 
+    @SqlField(value = "extra_project", nullable = false, defaultObjectValue = "0")
+    private Boolean extraProject;
+
+    @SqlField(value = "view_in_meeting", nullable = false, defaultObjectValue = "0")
+    private Boolean viewInMeeting;
+
     @EntityChild
     private List<StbActivityCosts> stbActivityCosts = new ArrayList<>();
 
@@ -618,6 +624,24 @@ public class StbActivity extends EntityBase {
         return this;
     }
 
+    public Boolean getExtraProject() {
+        return extraProject;
+    }
+
+    public StbActivity setExtraProject(Boolean extraProject) {
+        this.extraProject = extraProject;
+        return this;
+    }
+
+    public Boolean getViewInMeeting() {
+        return viewInMeeting;
+    }
+
+    public StbActivity setViewInMeeting(Boolean viewInMeeting) {
+        this.viewInMeeting = viewInMeeting;
+        return this;
+    }
+
     public LocalDateTime getEstimatedTime() {
         return estimatedTime;
     }