Skip to content

Commit 2325804

Browse files
renemadsenrenemadsen
committed
Merge branch 'stable'
2 parents f26b119 + da87474 commit 2325804

File tree

9 files changed

+36
-56
lines changed

9 files changed

+36
-56
lines changed

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Infrastructure/Helpers/BackendConfigurationAssignmentWorkerServiceHelper.cs‎

Lines changed: 0 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -461,20 +461,6 @@ await core.EntityItemUpdate(entityItem.Id, entityItem.Name, entityItem.Descripti
461461
};
462462
await assignmentSite.Create(timePlanningDbContext).ConfigureAwait(false);
463463

464-
var newTaskId = await timePlanningDbContext.PluginConfigurationValues.SingleAsync(x => x.Name == "TimePlanningBaseSettings:EformId").ConfigureAwait(false);
465-
var folderId = await timePlanningDbContext.PluginConfigurationValues.SingleAsync(x => x.Name == "TimePlanningBaseSettings:FolderId").ConfigureAwait(false);;
466-
var folder = await sdkDbContext.Folders.SingleAsync(x => x.Id == int.Parse(folderId.Value)).ConfigureAwait(false);
467-
var mainElement = await core.ReadeForm(int.Parse(newTaskId.Value), language).ConfigureAwait(false);
468-
mainElement.CheckListFolderName = folder.MicrotingUid.ToString();
469-
mainElement.EndDate = DateTime.UtcNow.AddYears(10);
470-
mainElement.DisplayOrder = int.MinValue;
471-
mainElement.Repeated = 0;
472-
mainElement.PushMessageTitle = mainElement.Label;
473-
mainElement.EnableQuickSync = true;
474-
var caseId = await core.CaseCreate(mainElement, "", siteDto.SiteId, int.Parse(folderId.Value)).ConfigureAwait(false);
475-
assignmentSite.CaseMicrotingUid = caseId;
476-
await assignmentSite.Update(timePlanningDbContext).ConfigureAwait(false);
477-
478464
return new OperationDataResult<int>(true, siteDto.SiteId);
479465
}
480466
catch (Exception e)
@@ -546,22 +532,6 @@ public static async Task<OperationDataResult<int>> CreateDeviceUser(DeviceUserMo
546532
UpdatedByUserId = userId
547533
};
548534
await assignmentSite.Create(timePlanningDbContext).ConfigureAwait(false);
549-
// var option =
550-
var newTaskId = await timePlanningDbContext.PluginConfigurationValues.SingleAsync(x => x.Name == "TimePlanningBaseSettings:EformId").ConfigureAwait(false);
551-
var folderId = await timePlanningDbContext.PluginConfigurationValues.SingleAsync(x => x.Name == "TimePlanningBaseSettings:FolderId").ConfigureAwait(false);;
552-
553-
var folder = await sdkDbContext.Folders.SingleAsync(x => x.Id == int.Parse(folderId.Value)).ConfigureAwait(false);
554-
var language = await sdkDbContext.Languages.SingleAsync(x => x.Id == site.LanguageId).ConfigureAwait(false);
555-
var mainElement = await core.ReadeForm(int.Parse(newTaskId.Value), language).ConfigureAwait(false);
556-
mainElement.CheckListFolderName = folder.MicrotingUid.ToString();
557-
mainElement.EndDate = DateTime.UtcNow.AddYears(10);
558-
mainElement.DisplayOrder = int.MinValue;
559-
mainElement.Repeated = 0;
560-
mainElement.PushMessageTitle = mainElement.Label;
561-
mainElement.EnableQuickSync = true;
562-
var caseId = await core.CaseCreate(mainElement, "", (int)site.MicrotingUid, int.Parse(folderId.Value)).ConfigureAwait(false);
563-
assignmentSite.CaseMicrotingUid = caseId;
564-
await assignmentSite.Update(timePlanningDbContext).ConfigureAwait(false);
565535

566536
return new OperationDataResult<int>(true, site.Id);
567537
}

‎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
@@ -101,7 +101,7 @@ describe('Area rules type 1', () => {
101101
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
102102
cy.get('.cdk-row .cdk-column-folder span').should('have.text', bindArea);
103103
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
104-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
104+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
105105
cy.get('.cdk-row .cdk-column-startDate span')
106106
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
107107
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ describe('Area rules type 1', () => {
9999
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
100100
cy.get('.cdk-row .cdk-column-folder span').should('have.text', bindArea);
101101
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
102-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
102+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
103103
cy.get('.cdk-row .cdk-column-startDate span')
104104
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
105105
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatType}`);

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

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ describe('Area rules type 1', () => {
124124
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
125125
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
126126
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
127-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
127+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
128128
cy.get('.cdk-row .cdk-column-startDate span')
129129
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
130130
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -145,8 +145,8 @@ describe('Area rules type 1', () => {
145145
cy.get('.cdk-row .cdk-column-folder span').eq(1).should('have.text', '00. Logbøger');
146146
cy.get('.cdk-row .cdk-column-taskName span').eq(0).should('have.text', task.translations[0]);
147147
cy.get('.cdk-row .cdk-column-taskName span').eq(1).should('have.text', task.translations[0]);
148-
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (13)');
149-
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (13)');
148+
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (9)');
149+
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (9)');
150150
cy.get('.cdk-row .cdk-column-startDate span').eq(0)
151151
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
152152
cy.get('.cdk-row .cdk-column-startDate span').eq(1)
@@ -177,9 +177,9 @@ describe('Area rules type 1', () => {
177177
cy.get('.cdk-row .cdk-column-taskName span').eq(0).should('have.text', task.translations[0]);
178178
cy.get('.cdk-row .cdk-column-taskName span').eq(1).should('have.text', task.translations[0]);
179179
cy.get('.cdk-row .cdk-column-taskName span').eq(2).should('have.text', task.translations[0]);
180-
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (13)');
181-
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (13)');
182-
cy.get('.cdk-row .cdk-column-eform span').eq(2).should('have.text', editedTask.eformName + ' (7)');
180+
cy.get('.cdk-row .cdk-column-eform span').eq(0).should('have.text', task.eformName + ' (9)');
181+
cy.get('.cdk-row .cdk-column-eform span').eq(1).should('have.text', task.eformName + ' (9)');
182+
cy.get('.cdk-row .cdk-column-eform span').eq(2).should('have.text', editedTask.eformName + ' (3)');
183183
});
184184
after(() => {
185185
backendConfigurationPropertiesPage.goToProperties();

‎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
@@ -127,7 +127,7 @@ describe('Area rules type 1', () => {
127127
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
128128
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
129129
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
130-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
130+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
131131
cy.get('.cdk-row .cdk-column-startDate span')
132132
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
133133
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('Area rules type 1', () => {
125125
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
126126
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
127127
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
128-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
128+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
129129
cy.get('.cdk-row .cdk-column-startDate span')
130130
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
131131
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -161,7 +161,7 @@ describe('Area rules type 1', () => {
161161
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
162162
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
163163
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
164-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
164+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
165165
cy.get('.cdk-row .cdk-column-startDate span')
166166
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
167167
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -214,7 +214,7 @@ describe('Area rules type 1', () => {
214214
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
215215
cy.get('.cdk-row .cdk-column-folder span').should('have.text', newFolderName);
216216
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', editedTask.translations[0]);
217-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', editedTask.eformName + ' (7)');
217+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', editedTask.eformName + ' (3)');
218218
cy.get('.cdk-row .cdk-column-startDate span')
219219
.should('have.text', `${editedTask.startFrom.day}.${editedTask.startFrom.month >= 10 ? '' : '0'}${editedTask.startFrom.month}.${editedTask.startFrom.year}`);
220220
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${editedTask.repeatType}`);

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ describe('Area rules type 1', () => {
125125
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
126126
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
127127
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
128-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
128+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
129129
cy.get('.cdk-row .cdk-column-startDate span')
130130
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
131131
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -159,7 +159,7 @@ describe('Area rules type 1', () => {
159159
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
160160
cy.get('.cdk-row .cdk-column-folder span').should('have.text', '00. Logbøger');
161161
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', task.translations[0]);
162-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (13)');
162+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', task.eformName + ' (9)');
163163
cy.get('.cdk-row .cdk-column-startDate span')
164164
.should('have.text', `${task.startFrom.day}.${task.startFrom.month >= 10 ? '' : '0'}${task.startFrom.month}.${task.startFrom.year}`);
165165
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${task.repeatEvery} ${task.repeatType}`);
@@ -212,7 +212,7 @@ describe('Area rules type 1', () => {
212212
cy.get('.cdk-row .cdk-column-property span').should('have.text', task.property);
213213
cy.get('.cdk-row .cdk-column-folder span').should('have.text', newFolderName);
214214
cy.get('.cdk-row .cdk-column-taskName span').should('have.text', editedTask.translations[0]);
215-
cy.get('.cdk-row .cdk-column-eform span').should('have.text', editedTask.eformName + ' (7)');
215+
cy.get('.cdk-row .cdk-column-eform span').should('have.text', editedTask.eformName + ' (3)');
216216
cy.get('.cdk-row .cdk-column-startDate span')
217217
.should('have.text', `${editedTask.startFrom.day}.${editedTask.startFrom.month >= 10 ? '' : '0'}${editedTask.startFrom.month}.${editedTask.startFrom.year}`);
218218
cy.get('.cdk-row .cdk-column-repeat span').should('have.text', `${editedTask.repeatEvery} ${editedTask.repeatType}`);

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

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -22,14 +22,20 @@
2222
>
2323
</mtx-select>
2424
</mat-form-field>
25-
<button
26-
mat-icon-button
27-
id="updateEntityList"
28-
(click)="onShowEditEntityListModal()"
29-
matTooltip="{{ 'Edit list of areas for task management' | translate }}"
30-
>
31-
<mat-icon>list</mat-icon>
32-
</button>
25+
<ng-container *ngIf="propertyIsSelected">
26+
<div class="p-2">
27+
<button
28+
mat-raised-button
29+
color="accent"
30+
id="updateEntityList"
31+
(click)="onShowEditEntityListModal()"
32+
matTooltip="{{ 'Edit list of areas for task management' | translate }}"
33+
>
34+
{{ 'Areas' | translate }}
35+
<!-- <mat-icon>list</mat-icon>-->
36+
</button>
37+
</div>
38+
</ng-container>
3339
</div>
3440
<div class="d-flex flex-row need-wrapper">
3541
<mat-form-field>

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

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ export class TaskManagementFiltersComponent implements OnInit, OnDestroy {
5959
propertyUpdateSub$: Subscription;
6060
getEntitySelectableGroupSub$: Subscription;
6161
updateEntitySelectableGroupSub$: Subscription;
62+
propertyIsSelected: boolean = false;
6263

6364
selectFiltersSub$: Subscription;
6465
propertyIdValueChangesSub$: Subscription;
@@ -110,11 +111,11 @@ export class TaskManagementFiltersComponent implements OnInit, OnDestroy {
110111
}),
111112
date: new FormGroup({
112113
dateFrom: new FormControl({
113-
value: new Date(),
114+
value: null,
114115
disabled: !filters.propertyId,
115116
}),
116117
dateTo: new FormControl({
117-
value: new Date(),
118+
value: null,
118119
disabled: !filters.propertyId,
119120
}),
120121
}),
@@ -135,14 +136,17 @@ export class TaskManagementFiltersComponent implements OnInit, OnDestroy {
135136
if (this.taskManagementStateService.getCurrentPropertyId() !== value) {
136137
if (value !== -1) {
137138
this.getPropertyAreas(value);
139+
this.propertyIsSelected = true;
140+
} else {
141+
this.propertyIsSelected = false;
138142
}
139143
this.getSites(value);
140144
this.taskManagementStateService.updatePropertyId(value);
141145
this.filtersForm.patchValue({
142146
areaName: null,
143147
createdBy: null,
144148
lastAssignedTo: null,
145-
statuses: [1,3,4],
149+
statuses: [],
146150
date: {
147151
dateTo: null,
148152
dateFrom: null,

0 commit comments

Comments
 (0)