Skip to content

Commit 2a347ea

Browse files
renemadsenrenemadsen
committed
Merge branch 'stable' of github.com:microting/eform-backendconfiguration-plugin into stable
2 parents 2984ec7 + 5daf801 commit 2a347ea

File tree

7 files changed

+48
-26
lines changed

7 files changed

+48
-26
lines changed

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/c/task-wizard.create-daily.spec.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ describe('Area rules type 1', () => {
113113
.should('eq', 'Aktiv');
114114
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
115115
.invoke('text')
116-
.should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
116+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
117117
});
118118
after(() => {
119119
backendConfigurationPropertiesPage.goToProperties();

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/c/task-wizard.create.spec.cy.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,13 @@ describe('Area rules type 1', () => {
105105
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
106106
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
107107
.invoke('text')
108-
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
108+
.should('eq', `${task.repeatType}`);
109109
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
110110
.invoke('text')
111111
.should('eq', 'Aktiv');
112112
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
113113
.invoke('text')
114-
.should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
114+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
115115
});
116116
after(() => {
117117
backendConfigurationPropertiesPage.goToProperties();

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/d/task-wizard.copy.cy.ts‎

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,8 @@ describe('Area rules type 1', () => {
134134
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
135135
.invoke('text')
136136
.should('eq', 'Aktiv');
137-
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
137+
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
138+
.invoke('text').should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
138139

139140
// Copy task
140141
cy.get('.cdk-row .cdk-column-actions .copyBtn').first().click();
@@ -158,21 +159,22 @@ describe('Area rules type 1', () => {
158159
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
159160
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
160161
.eq(0).invoke('text')
161-
.should('have.text', `${task.repeatEvery} ${task.repeatType}`);
162+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
162163
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
163164
.eq(1).invoke('text')
164-
.should('have.text', `${task.repeatEvery} ${task.repeatType}`);
165+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
165166
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
166167
.eq(0).invoke('text')
167-
.should('have.text', 'Aktiv');
168+
.should('eq', 'Aktiv');
168169
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
169170
.eq(1).invoke('text')
170-
.should('have.text', 'Aktiv');
171+
.should('eq', 'Aktiv');
171172
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
172173
.eq(0).invoke('text')
173-
.should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
174+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
174175
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
175-
.eq(1).invoke('text').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
176+
.eq(1).invoke('text')
177+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
176178

177179
// Copy and set new eform
178180
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit-assignment.spec.cy.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ describe('Area rules type 1', () => {
140140
.should('eq', 'Aktiv');
141141
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
142142
.invoke('text')
143-
.should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
143+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
144144
/* ==== Generated with Cypress Studio ==== */
145145
cy.get('#mat-expansion-panel-header-2 > .mat-content').click();
146146

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit-frequency.spec.cy.ts‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,9 @@ describe('Area rules type 1', () => {
135135
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
136136
.invoke('text')
137137
.should('eq', 'Aktiv');
138-
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
138+
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
139+
.invoke('text')
140+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
139141
// edit task
140142
cy.get('#advanced').click();
141143
cy.get('#folders').click();
@@ -177,7 +179,7 @@ describe('Area rules type 1', () => {
177179
.should('eq', 'Ikke aktiv');
178180
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
179181
.invoke('text')
180-
.should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
182+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
181183

182184
cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
183185
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
@@ -230,13 +232,13 @@ describe('Area rules type 1', () => {
230232
.should('have.text', `${editedTask.startFrom.day}.${editedTask.startFrom.month >= 10 ? '' : '0'}${editedTask.startFrom.month}.${editedTask.startFrom.year}`);
231233
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
232234
.invoke('text')
233-
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
235+
.should('eq', `${editedTask.repeatType}`);
234236
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
235237
.invoke('text')
236238
.should('eq', 'Aktiv');
237239
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
238240
.invoke('text')
239-
.should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
241+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
240242
});
241243
after(() => {
242244
backendConfigurationPropertiesPage.goToProperties();

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/g/task-wizard.edit.spec.cy.ts‎

Lines changed: 27 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,15 @@ describe('Area rules type 1', () => {
129129
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
130130
cy.get('.cdk-row .cdk-column-startDate span')
131131
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
132-
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
133-
cy.get('.cdk-row .cdk-column-status span').should('have.text', 'Aktiv');
134-
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
132+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
133+
.invoke('text')
134+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
135+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
136+
.invoke('text')
137+
.should('eq', 'Aktiv');
138+
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
139+
.invoke('text')
140+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
135141
// edit task
136142
cy.get('#advanced').click();
137143
cy.get('#folders').click();
@@ -163,9 +169,15 @@ describe('Area rules type 1', () => {
163169
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (11)');
164170
cy.get('.cdk-row .cdk-column-startDate span')
165171
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
166-
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
167-
cy.get('.cdk-row .cdk-column-status span').should('have.text', 'Ikke aktiv');
168-
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
172+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
173+
.invoke('text')
174+
.should('eq', `${task.repeatEvery} ${task.repeatType}`);
175+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
176+
.invoke('text')
177+
.should('eq', 'Ikke aktiv');
178+
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
179+
.invoke('text')
180+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
169181

170182
cy.get('.cdk-row .cdk-column-actions .editBtn').first().click();
171183
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
@@ -216,9 +228,15 @@ describe('Area rules type 1', () => {
216228
cy.get('.cdk-row .cdk-column-eform span').should('have.text', editedTask.eformName + ' (3)');
217229
cy.get('.cdk-row .cdk-column-startDate span')
218230
.should('have.text', `${editedTask.startFrom.day}.${editedTask.startFrom.month >= 10 ? '' : '0'}${editedTask.startFrom.month}.${editedTask.startFrom.year}`);
219-
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${editedTask.repeatEvery} ${editedTask.repeatType}`);
220-
cy.get('.cdk-row .cdk-column-status span').should('have.text', 'Aktiv');
221-
cy.get('.cdk-row .cdk-column-assignedTo span').should('have.text', `${workerForCreate.name} ${workerForCreate.surname}`);
231+
cy.get('.cdk-row .cdk-column-repeat mat-chip span.mat-mdc-chip-action-label')
232+
.invoke('text')
233+
.should('eq', `${editedTask.repeatEvery} ${editedTask.repeatType}`);
234+
cy.get('.cdk-row .cdk-column-status mat-chip span.mat-mdc-chip-action-label')
235+
.invoke('text')
236+
.should('eq', 'Aktiv');
237+
cy.get('.cdk-row .cdk-column-assignedTo mat-chip span.mat-mdc-chip-action-label')
238+
.invoke('text')
239+
.should('eq', `${workerForCreate.name} ${workerForCreate.surname}`);
222240
});
223241
after(() => {
224242
backendConfigurationPropertiesPage.goToProperties();

‎eform-client/src/app/plugins/modules/backend-configuration-pn/modules/task-management/components/task-management-table/task-management-table.component.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@
4646

4747
<ng-template #priorityTpl let-row>
4848
<mat-chip color="primary" [ngClass]="getPriorityClass(row.priority)">
49-
<div>{{TaskManagementPrioritiesEnum[row.priority] | translate}}</div>
49+
<span>{{TaskManagementPrioritiesEnum[row.priority] | translate}}</span>
5050
</mat-chip>
5151
</ng-template>
5252

5353
<ng-template #statusTpl let-row>
5454
<mat-chip color="primary">
55-
<div>{{row.status | translate}}</div>
55+
<span>{{row.status | translate}}</span>
5656
</mat-chip>
5757
</ng-template>

0 commit comments

Comments
 (0)