Adding more tests.

Author: renemadsen

.github/workflows/dotnet-core-master.yml

@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: [a,b]
+        test: [a,b,c]
     steps:
     - uses: actions/checkout@v3
       with:
@@ -127,7 +127,7 @@ jobs:
       if: matrix.test == 'a'
       run: cd eform-angular-frontend/eform-client && npm run testheadlessplugin2${{matrix.test}}
     - name: Create database
-      if: matrix.test == 'b'
+      if: matrix.test != 'a'
       run: |
         docker exec -i mariadbtest mariadb -u root --password=secretpassword -e 'update 420_Angular.EformPlugins set Status = 1'
         docker exec -i mariadbtest mariadb -u root --password=secretpassword -e 'create database `420_eform-angular-time-planning-plugin`'

.github/workflows/dotnet-core-pr.yml

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: [a,b]
+        test: [a,b,c]
     steps:
     - uses: actions/checkout@v3
       with:
@@ -121,7 +121,7 @@ jobs:
       if: matrix.test == 'a'
       run: cd eform-angular-frontend/eform-client && npm run testheadlessplugin2${{matrix.test}}
     - name: Create database
-      if: matrix.test == 'b'
+      if: matrix.test != 'a'
       run: |
         docker exec -i mariadbtest mariadb -u root --password=secretpassword -e 'update 420_Angular.EformPlugins set Status = 1'
         docker exec -i mariadbtest mariadb -u root --password=secretpassword -e 'create database `420_eform-angular-time-planning-plugin`'

eFormAPI/Plugins/TimePlanning.Pn/TimePlanning.Pn/Services/TimePlanningSettingService/TimeSettingService.cs

@@ -627,27 +627,30 @@ public async Task<OperationResult> UpdateAssignedSite(Infrastructure.Models.Sett
         dbAssignedSite.BreakFriday2NdShift = site.BreakFriday2NdShift;
         dbAssignedSite.BreakSaturday2NdShift = site.BreakSaturday2NdShift;
         dbAssignedSite.BreakSunday2NdShift = site.BreakSunday2NdShift;
-        dbAssignedSite.MondayBreakMinutesDivider = site.MondayBreakMinutesDivider;
-        dbAssignedSite.TuesdayBreakMinutesDivider = site.TuesdayBreakMinutesDivider;
-        dbAssignedSite.WednesdayBreakMinutesDivider = site.WednesdayBreakMinutesDivider;
-        dbAssignedSite.ThursdayBreakMinutesDivider = site.ThursdayBreakMinutesDivider;
-        dbAssignedSite.FridayBreakMinutesDivider = site.FridayBreakMinutesDivider;
-        dbAssignedSite.SaturdayBreakMinutesDivider = site.SaturdayBreakMinutesDivider;
-        dbAssignedSite.SundayBreakMinutesDivider = site.SundayBreakMinutesDivider;
-        dbAssignedSite.MondayBreakMinutesPrDivider = site.MondayBreakMinutesPrDivider;
-        dbAssignedSite.TuesdayBreakMinutesPrDivider = site.TuesdayBreakMinutesPrDivider;
-        dbAssignedSite.WednesdayBreakMinutesPrDivider = site.WednesdayBreakMinutesPrDivider;
-        dbAssignedSite.ThursdayBreakMinutesPrDivider = site.ThursdayBreakMinutesPrDivider;
-        dbAssignedSite.FridayBreakMinutesPrDivider = site.FridayBreakMinutesPrDivider;
-        dbAssignedSite.SaturdayBreakMinutesPrDivider = site.SaturdayBreakMinutesPrDivider;
-        dbAssignedSite.SundayBreakMinutesPrDivider = site.SundayBreakMinutesPrDivider;
-        dbAssignedSite.MondayBreakMinutesUpperLimit = site.MondayBreakMinutesUpperLimit;
-        dbAssignedSite.TuesdayBreakMinutesUpperLimit = site.TuesdayBreakMinutesUpperLimit;
-        dbAssignedSite.WednesdayBreakMinutesUpperLimit = site.WednesdayBreakMinutesUpperLimit;
-        dbAssignedSite.ThursdayBreakMinutesUpperLimit = site.ThursdayBreakMinutesUpperLimit;
-        dbAssignedSite.FridayBreakMinutesUpperLimit = site.FridayBreakMinutesUpperLimit;
-        dbAssignedSite.SaturdayBreakMinutesUpperLimit = site.SaturdayBreakMinutesUpperLimit;
-        dbAssignedSite.SundayBreakMinutesUpperLimit = site.SundayBreakMinutesUpperLimit;
+        if (dbAssignedSite.AutoBreakCalculationActive)
+        {
+            dbAssignedSite.MondayBreakMinutesDivider = site.MondayBreakMinutesDivider;
+            dbAssignedSite.TuesdayBreakMinutesDivider = site.TuesdayBreakMinutesDivider;
+            dbAssignedSite.WednesdayBreakMinutesDivider = site.WednesdayBreakMinutesDivider;
+            dbAssignedSite.ThursdayBreakMinutesDivider = site.ThursdayBreakMinutesDivider;
+            dbAssignedSite.FridayBreakMinutesDivider = site.FridayBreakMinutesDivider;
+            dbAssignedSite.SaturdayBreakMinutesDivider = site.SaturdayBreakMinutesDivider;
+            dbAssignedSite.SundayBreakMinutesDivider = site.SundayBreakMinutesDivider;
+            dbAssignedSite.MondayBreakMinutesPrDivider = site.MondayBreakMinutesPrDivider;
+            dbAssignedSite.TuesdayBreakMinutesPrDivider = site.TuesdayBreakMinutesPrDivider;
+            dbAssignedSite.WednesdayBreakMinutesPrDivider = site.WednesdayBreakMinutesPrDivider;
+            dbAssignedSite.ThursdayBreakMinutesPrDivider = site.ThursdayBreakMinutesPrDivider;
+            dbAssignedSite.FridayBreakMinutesPrDivider = site.FridayBreakMinutesPrDivider;
+            dbAssignedSite.SaturdayBreakMinutesPrDivider = site.SaturdayBreakMinutesPrDivider;
+            dbAssignedSite.SundayBreakMinutesPrDivider = site.SundayBreakMinutesPrDivider;
+            dbAssignedSite.MondayBreakMinutesUpperLimit = site.MondayBreakMinutesUpperLimit;
+            dbAssignedSite.TuesdayBreakMinutesUpperLimit = site.TuesdayBreakMinutesUpperLimit;
+            dbAssignedSite.WednesdayBreakMinutesUpperLimit = site.WednesdayBreakMinutesUpperLimit;
+            dbAssignedSite.ThursdayBreakMinutesUpperLimit = site.ThursdayBreakMinutesUpperLimit;
+            dbAssignedSite.FridayBreakMinutesUpperLimit = site.FridayBreakMinutesUpperLimit;
+            dbAssignedSite.SaturdayBreakMinutesUpperLimit = site.SaturdayBreakMinutesUpperLimit;
+            dbAssignedSite.SundayBreakMinutesUpperLimit = site.SundayBreakMinutesUpperLimit;
+        }
         dbAssignedSite.MondayPlanHours = site.MondayPlanHours;
         dbAssignedSite.TuesdayPlanHours = site.TuesdayPlanHours;
         dbAssignedSite.WednesdayPlanHours = site.WednesdayPlanHours;

eform-client/cypress/e2e/plugins/time-planning-pn/c/activate-plugin.spec.cy.ts

@@ -0,0 +1,15 @@
+import loginPage from '../../../Login.page';
+import pluginPage from '../../../Plugin.page';
+
+describe('Enable Backend Config plugin', () => {
+  beforeEach(() => {
+    cy.visit('http://localhost:4200');
+    loginPage.login();
+    pluginPage.Navbar.goToPluginsPage();
+  });
+
+  it('should activate the plugin', () => {
+    const pluginName = 'Microting Time Planning Plugin';
+    pluginPage.enablePluginByName(pluginName);
+  });
+});