Merge branch 'stable'

Author: renemadsen

Dockerfile

@@ -35,7 +35,7 @@ RUN mkdir -p ./Plugins/BackendConfiguration.Pn
 COPY --from=build-env /app/ItemsPlanning.Pn/out ./Plugins/ItemsPlanning.Pn
 COPY --from=build-env /app/BackendConfiguration.Pn/out ./Plugins/BackendConfiguration.Pn
 COPY --from=build-env /app/TimePlanning.Pn/out ./Plugins/TimePlanning.Pn
-COPY --from=node-env /app/dist wwwroot
+COPY --from=node-env /app/dist/browser wwwroot
 
 ENV DEBIAN_FRONTEND noninteractive
 ENV Logging__Console__FormatterName=

eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn.Integration.Test/SQL/420_eform-angular-time-planning-plugin.sql

@@ -165,6 +165,8 @@ CREATE TABLE `AssignedSiteVersions` (
   `StartWednesday4ThShift` int(11) DEFAULT NULL,
   `StartWednesday5ThShift` int(11) DEFAULT NULL,
   `UseOneMinuteIntervals` tinyint(1) NOT NULL DEFAULT 0,
+  `UseGoogleSheetAsDefault` tinyint(1) NOT NULL DEFAULT 0,
+  `UseOnlyPlanHours` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;
@@ -318,6 +320,8 @@ CREATE TABLE `AssignedSites` (
   `StartWednesday4ThShift` int(11) DEFAULT NULL,
   `StartWednesday5ThShift` int(11) DEFAULT NULL,
   `UseOneMinuteIntervals` tinyint(1) NOT NULL DEFAULT 0,
+  `UseGoogleSheetAsDefault` tinyint(1) NOT NULL DEFAULT 0,
+  `UseOnlyPlanHours` tinyint(1) NOT NULL DEFAULT 0,
   PRIMARY KEY (`Id`)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_general_ci;
 /*!40101 SET character_set_client = @saved_cs_client */;