Merge pull request #1040 from masudul-tikweb/master

Fetching downstream changes

Author: renemadsen

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

@@ -48,7 +48,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: [a,b,c,d,e,f]
+        test: [a,b,c,d,e,f,g]
     steps:
     - uses: actions/checkout@v3
       with:

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

@@ -45,7 +45,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: [a,b,c,d,e,f]
+        test: [a,b,c,d,e,f,g]
     steps:
     - uses: actions/checkout@v3
       with:

.gitignore

@@ -351,4 +351,6 @@ MigrationBackup/
 
 eform-client/.idea/
 /eFormAPI/eFormAPI.Web
-.idea
+.idea
+
+.DS_Store

eform-client/cypress/e2e/plugins/time-planning-pn/d/dashboard-edit-a.spec.cy.ts

@@ -60,33 +60,16 @@ describe('Dashboard edit values', () => {
   afterEach(() => {
     cy.get('#cell0_0').click();
 
-    cy.get('#plannedStartOfShift1')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#plannedEndOfShift1')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#start1StartedAt')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#stop1StoppedAt')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
+    ['#plannedStartOfShift1', '#plannedEndOfShift1', '#start1StartedAt', '#stop1StoppedAt'].forEach(
+      (selector) => {
+        cy.get(selector)
+          .closest('.flex-row')
+          .find('button mat-icon')
+          .contains('delete')
+          .click({ force: true });
+        cy.wait(500);
+      }
+    );
 
     cy.get('#saveButton').click();
     cy.wait('@saveWorkdayEntity', {timeout: 60000});

eform-client/cypress/e2e/plugins/time-planning-pn/e/dashboard-edit-a.spec.cy.ts

@@ -62,33 +62,16 @@ describe('Dashboard edit values', () => {
   afterEach(() => {
     cy.get('#cell0_0').click();
 
-    cy.get('#plannedStartOfShift1')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#plannedEndOfShift1')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#start1StartedAt')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#stop1StoppedAt')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
+    ['#plannedStartOfShift1', '#plannedEndOfShift1', '#start1StartedAt', '#stop1StoppedAt'].forEach(
+      (selector) => {
+        cy.get(selector)
+          .closest('.flex-row')
+          .find('button mat-icon')
+          .contains('delete')
+          .click({ force: true });
+        cy.wait(500);
+      }
+    );
 
     cy.get('#saveButton').click();
     cy.wait('@saveWorkdayEntity', {timeout: 60000});

eform-client/cypress/e2e/plugins/time-planning-pn/f/dashboard-edit-a.spec.cy.ts

@@ -14,33 +14,16 @@ describe('Dashboard edit values', () => {
     cy.get('.ng-option').contains('ac ad').click();
     cy.get('#cell0_0').click();
 
-    cy.get('#plannedStartOfShift1')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#plannedEndOfShift1')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#start1StartedAt')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
-
-    cy.get('#stop1StoppedAt')
-      .closest('.flex-row')
-      .find('button mat-icon')
-      .contains('delete')
-      .click({force: true});
-    cy.wait(500);
+    ['#plannedStartOfShift1', '#plannedEndOfShift1', '#start1StartedAt', '#stop1StoppedAt'].forEach(
+      (selector) => {
+        cy.get(selector)
+          .closest('.flex-row')
+          .find('button mat-icon')
+          .contains('delete')
+          .click({ force: true });
+        cy.wait(500);
+      }
+    );
   });
 
   // Set a timepicker value