Skip to content

Commit 86841c9

Browse files
masudul-tikwebmasudul-tikweb
authored
Merge pull request #14 from microting/master
Master changes
2 parents c1be81c + a79bdb1 commit 86841c9

File tree

142 files changed

+1541
-1241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

142 files changed

+1541
-1241
lines changed

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationCompliancesService/BackendConfigurationCompliancesService.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ public async Task<OperationDataResult<CompliancesStatsModel>> Stats()
394394
var complianceList = _backendConfigurationPnDbContext.Compliances;
395395
var oneWeekInTheFutureCount = await complianceList.CountAsync(x => x.Deadline >= DateTime.UtcNow && x.Deadline <= DateTime.UtcNow.AddDays(7));
396396
var todayCount = await complianceList.CountAsync(x => x.Deadline.Date <= DateTime.UtcNow.Date && x.WorkflowState != Constants.WorkflowStates.Removed);
397-
var NumberOfPlannedEnvironmentInspectionTagTasks = complianceList.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed).ToList().Where(x =>
397+
var numberOfPlannedEnvironmentInspectionTagTasks = complianceList.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed).ToList().Where(x =>
398398
{
399399
var planningTags = _itemsPlanningPnDbContext.PlanningsTags
400400
.Where(y => y.PlanningId == x.PlanningId && y.PlanningTagId == envTag.Id)
@@ -457,8 +457,8 @@ public async Task<OperationDataResult<CompliancesStatsModel>> Stats()
457457
TodayCountEnvironmentInspectionTag = todayCountEnvironmentInspectionTag,
458458
DateOfOldestEnvironmentInspectionTagPlannedTask = oldestEnvironmentInspectionTagPlannedTask,
459459
NumberOfAdHocTasks = numberOfWorkorderTasks,
460-
DateOfOldestAdHocTask = oldestWorkorderTask.CreatedAt,
461-
NumberOfPlannedEnvironmentInspectionTagTasks = NumberOfPlannedEnvironmentInspectionTagTasks
460+
DateOfOldestAdHocTask = oldestWorkorderTask?.CreatedAt,
461+
NumberOfPlannedEnvironmentInspectionTagTasks = numberOfPlannedEnvironmentInspectionTagTasks
462462
};
463463

464464
return new OperationDataResult<CompliancesStatsModel>(true, statsModel);

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationReportService/BackendConfigurationReportService.cs‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -677,16 +677,18 @@ await sdkDbContext.CheckListTranslations.FirstOrDefaultAsync(x =>
677677
group.ItemHeaders.Add(kvp);
678678
}
679679

680-
var templateCaseIds = eformIdAndCases.cases.Select(x => (int?)x.MicrotingSdkCaseId).ToArray();
680+
var templateCaseIds = eformIdAndCases.cases.Select(x => x.MicrotingSdkCaseId).ToList();
681+
681682
// images
682683
var allImagesFromCases = await sdkDbContext.FieldValues
683684
.Include(x => x.UploadedData)
684-
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed)
685-
.Where(x => x.UploadedData.WorkflowState != Constants.WorkflowStates.Removed)
686-
.Where(x => x.Field.FieldTypeId == 5) // magic number 5 - it is FieldTypes.Picture
687-
.Where(x => templateCaseIds.Contains(x.CaseId))
688-
.Where(x => x.UploadedDataId != null)
685+
.Where(x => x.WorkflowState != Constants.WorkflowStates.Removed
686+
&& x.UploadedData.WorkflowState != Constants.WorkflowStates.Removed
687+
&& x.Field.FieldTypeId == 5 // magic number 5 - it is FieldTypes.Picture
688+
&& x.CaseId.HasValue && templateCaseIds.Contains(x.CaseId.Value)
689+
&& x.UploadedDataId != null)
689690
.OrderBy(x => x.CaseId)
691+
.AsNoTracking()
690692
.ToListAsync();
691693

692694
foreach (var planningCase in eformIdAndCases.cases.OrderBy(x => x.MicrotingSdkCaseDoneAt).ToList())

‎eFormAPI/Plugins/BackendConfiguration.Pn/BackendConfiguration.Pn/Services/BackendConfigurationTaskWizardService/BackendConfigurationTaskWizardService.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -802,6 +802,7 @@ public async Task<OperationResult> UpdateTask(TaskWizardCreateModel updateModel)
802802
areaRulePlanning.AreaRule.RepeatEvery = updateModel.RepeatEvery;
803803
areaRulePlanning.AreaRule.RepeatType = (int?)updateModel.RepeatType;
804804
areaRulePlanning.AreaRule.UpdatedByUserId = _userService.UserId;
805+
areaRulePlanning.AreaRule.ComplianceEnabled = updateModel.ComplianceEnabled;
805806
if (!oldStatus && areaRulePlanning.Status)
806807
{
807808
areaRulePlanning.StartDate = updateModel.StartDate;

‎eform-client/cypress/e2e/plugins/backend-configuration-pn/BackendConfigurationPropertyWorkers.page.ts‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -141,6 +141,7 @@ class BackendConfigurationPropertyWorkersPage extends PageWithNavbarPage {
141141
selectLanguage('#profileLanguageSelector', propertyWorker.language);
142142
}
143143
if (propertyWorker.properties) {
144+
cy.get('#propertiesTab').should('be.visible').click();
144145
cy.wait(500);
145146
for (let i = 0; i < propertyWorker.properties.length; i++) {
146147
const row = () => cy.get('#pairingModalTableBody > div > div > div > table > tbody > .mat-mdc-row').contains(propertyWorker.properties[i]).parent().parent().parent().scrollIntoView();

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,7 @@ describe('Area rules type 1', () => {
172172
//cy.get('.editBtn > .mat-mdc-button-touch-target').click();
173173
cy.get('#checkboxUpdateAssignment1-input').check();
174174
cy.intercept('PUT', '**/api/backend-configuration-pn/task-wizard').as('updateTask');
175-
cy.get('#updateTaskBtn > .mdc-button__label').click();
175+
cy.get('#updateTaskBtn').click();
176176
cy.wait('@updateTask', { timeout: 60000 });
177177
cy.wait(500);
178178
backendConfigurationPropertiesPage.goToPlanningPage();
@@ -182,7 +182,7 @@ describe('Area rules type 1', () => {
182182
row().find('mat-checkbox').should('have.class', 'mat-mdc-checkbox-checked');
183183
row = () => cy.get('#pairingModalTableBody > div > div > div > table > tbody > .mat-mdc-row').contains(workerForCreate2.name).parent().parent().parent().scrollIntoView();
184184
row().find('mat-checkbox').should('have.class', 'mat-mdc-checkbox-checked');
185-
cy.get('#changeAssignmentsCancel > .mdc-button__label').click();
185+
cy.get('#changeAssignmentsCancel').click();
186186
cy.get('#backend-configuration-pn-task-wizard').click();
187187
cy.intercept('GET', '**/api/backend-configuration-pn/properties/get-folder-dtos?**').as('getFolders');
188188
cy.intercept('POST', '**/api/templates/index').as('getTemplates');
@@ -204,7 +204,7 @@ describe('Area rules type 1', () => {
204204
//cy.get('.editBtn > .mat-mdc-button-touch-target').click();
205205
cy.get('#checkboxUpdateAssignment0-input').uncheck();
206206
cy.intercept('PUT', '**/api/backend-configuration-pn/task-wizard').as('updateTask');
207-
cy.get('#updateTaskBtn > .mdc-button__label').click();
207+
cy.get('#updateTaskBtn').click();
208208
cy.wait('@updateTask', { timeout: 60000 });
209209
cy.wait(500);
210210
backendConfigurationPropertiesPage.goToPlanningPage();

‎eform-client/e2e/Page objects/BackendConfiguration/BackendConfigurationPropertyWorkers.page.ts‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,7 +225,12 @@ class BackendConfigurationPropertyWorkersPage extends Page {
225225
await value.click();
226226
await browser.pause(500);
227227
}
228+
if(propertyWorker.workOrderFlow === true){
229+
await (await this.TaskManagementEnableToggleInput()).click();
230+
await browser.pause(500);
231+
}
228232
if (propertyWorker.properties) {
233+
await (await $('#propertiesTab')).click();
229234
await browser.pause(500);
230235
for (let i = 0; i < propertyWorker.properties.length; i++) {
231236
await (
@@ -238,10 +243,6 @@ class BackendConfigurationPropertyWorkersPage extends Page {
238243
await browser.pause(500);
239244
}
240245
}
241-
if(propertyWorker.workOrderFlow === true){
242-
await (await this.TaskManagementEnableToggleInput()).click();
243-
await browser.pause(500);
244-
}
245246
}
246247
}
247248

@@ -377,6 +378,7 @@ export class PropertyWorkerRowObject {
377378
await browser.pause(500);
378379
}
379380
if (propertyWorker.properties) {
381+
await (await $('#propertiesTab')).click();
380382
for (let i = 0; i < propertyWorker.properties.length; i++) {
381383
await (
382384
await (
@@ -413,6 +415,8 @@ export class PropertyWorkerRowObject {
413415
> {
414416
await this.clickActionsMenu();
415417
await this.openEditModal();
418+
await (await $('#propertiesTab')).click();
419+
await browser.pause(500);
416420
const pairingEditModalTableBody = await $('#pairingModalTableBody');
417421
let masForReturn: { propertyName: string; checked: boolean }[] = new Array<{
418422
propertyName: string;

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/area-rule-entity-list-modal/area-rule-entity-list-modal.component.ts‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
import {Component, EventEmitter, Inject, OnDestroy, OnInit,} from '@angular/core';
1+
import {Component, EventEmitter, OnDestroy, OnInit,
2+
inject
3+
} from '@angular/core';
24
import {EntityItemModel} from 'src/app/common/models';
35
import { EntityItemEditNameComponent } from 'src/app/common/modules/eform-shared/components';
46
import {EntitySelectService} from 'src/app/common/services';
@@ -16,21 +18,23 @@ import {Subscription} from 'rxjs';
1618
standalone: false
1719
})
1820
export class AreaRuleEntityListModalComponent implements OnInit, OnDestroy {
21+
private entitySelectService = inject(EntitySelectService);
22+
public dialog = inject(MatDialog);
23+
private overlay = inject(Overlay);
24+
public dialogRef = inject(MatDialogRef<AreaRuleEntityListModalComponent>);
25+
private groupId = inject<number | undefined>(MAT_DIALOG_DATA);
26+
1927
entityListChanged: EventEmitter<Array<EntityItemModel>> = new EventEmitter<Array<EntityItemModel>>();
2028
entityList: Array<EntityItemModel> = [];
2129

2230
entityItemEditNameComponentAfterClosedSub$: Subscription;
2331
getEntitySelectableGroupSub$: Subscription;
2432

25-
constructor(
26-
private entitySelectService: EntitySelectService,
27-
public dialog: MatDialog,
28-
private overlay: Overlay,
29-
public dialogRef: MatDialogRef<AreaRuleEntityListModalComponent>,
30-
@Inject(MAT_DIALOG_DATA) groupId?: number
31-
) {
32-
if (groupId) {
33-
this.getEntitySelectableGroupSub$ = this.entitySelectService.getEntitySelectableGroup(groupId)
33+
34+
35+
ngOnInit() {
36+
if (this.groupId) {
37+
this.getEntitySelectableGroupSub$ = this.entitySelectService.getEntitySelectableGroup(this.groupId)
3438
.subscribe(data => {
3539
if (data && data.success && data.model) {
3640
this.entityList = [...data.model.entityGroupItemLst];
@@ -43,9 +47,7 @@ export class AreaRuleEntityListModalComponent implements OnInit, OnDestroy {
4347
}
4448
})
4549
}
46-
}
47-
48-
ngOnInit() {}
50+
}
4951

5052
hide() {
5153
this.dialogRef.close();

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/area-rule-plan-modal/area-rule-plan-modal.component.ts‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
import {
22
Component,
33
EventEmitter,
4-
Inject,
54
OnInit,
5+
inject
66
} from '@angular/core';
77
import {format} from 'date-fns';
88
import {
@@ -32,6 +32,15 @@ import {generateWeeksList} from '../../helpers';
3232
standalone: false
3333
})
3434
export class AreaRulePlanModalComponent implements OnInit {
35+
private translate = inject(TranslateService);
36+
public dialogRef = inject(MatDialogRef<AreaRulePlanModalComponent>);
37+
private model = inject<{
38+
areaRule: AreaRuleSimpleModel | AreaRuleNameAndTypeSpecificFields,
39+
propertyId: number,
40+
area: AreaModel,
41+
areaRulePlan: AreaRulePlanningModel,
42+
}>(MAT_DIALOG_DATA);
43+
3544
updateAreaRulePlan: EventEmitter<AreaRulePlanningModel> = new EventEmitter<AreaRulePlanningModel>();
3645
selectedArea: AreaModel = new AreaModel();
3746
selectedAreaRulePlanning: AreaRulePlanningModel = new AreaRulePlanningModel();
@@ -104,23 +113,14 @@ export class AreaRulePlanModalComponent implements OnInit {
104113
return this.selectedArea.availableWorkers.filter(x => assignedSites.some(y => y === x.siteId));
105114
}
106115

107-
constructor(
108-
private translate: TranslateService,
109-
public dialogRef: MatDialogRef<AreaRulePlanModalComponent>,
110-
@Inject(MAT_DIALOG_DATA) model: {
111-
areaRule: AreaRuleSimpleModel | AreaRuleNameAndTypeSpecificFields,
112-
propertyId: number,
113-
area: AreaModel,
114-
areaRulePlan: AreaRulePlanningModel,
115-
},
116-
) {
117-
this.setData(model.areaRule, model.propertyId, model.area, model.areaRulePlan);
118-
}
116+
119117

120118
ngOnInit() {
119+
this.setData(this.model.areaRule, this.model.propertyId, this.model.area, this.model.areaRulePlan);
120+
121121
this.repeatTypeDay = R.map(x => {
122122
return {name: x === 1 ? this.translate.instant('Every') : x.toString(), id: x};
123-
}, R.range(1, 31)); // 1, 2, ..., 29, 30.
123+
}, R.range(1, 31)); // 1, 2, ..., 29, 30.
124124
this.repeatTypeWeek = R.map(x => {
125125
return {name: x === 1 ? this.translate.instant('Every') : x.toString(), id: x};
126126
}, R.range(1, 51)); // 1, 2, ..., 49, 50.

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/backend-configuration-case/backend-configuration-case-page/backend-configuration-case-page.component.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import {
44
QueryList,
55
ViewChild,
66
ViewChildren,
7+
inject
78
} from '@angular/core';
89
import {ActivatedRoute, Router} from '@angular/router';
910
import {EFormService, CasesService} from 'src/app/common/services';
@@ -27,6 +28,13 @@ import {Store} from '@ngrx/store';
2728
standalone: false
2829
})
2930
export class BackendConfigurationCasePageComponent implements OnInit {
31+
private activateRoute = inject(ActivatedRoute);
32+
private casesService = inject(CasesService);
33+
private store = inject(Store);
34+
private eFormService = inject(EFormService);
35+
private router = inject(Router);
36+
private backendConfigurationPnCasesService = inject(BackendConfigurationPnCasesService);
37+
3038
@ViewChildren(CaseEditElementComponent)
3139
editElements: QueryList<CaseEditElementComponent>;
3240
@ViewChild('caseConfirmation', { static: false }) caseConfirmation;
@@ -41,14 +49,9 @@ export class BackendConfigurationCasePageComponent implements OnInit {
4149
maxDate: Date;
4250
initialDate: Date;
4351

44-
constructor(
45-
private activateRoute: ActivatedRoute,
46-
private casesService: CasesService,
47-
private store: Store,
48-
private eFormService: EFormService,
49-
private router: Router,
50-
private backendConfigurationPnCasesService: BackendConfigurationPnCasesService
51-
) {
52+
53+
54+
ngOnInit() {
5255
this.activateRoute.params.subscribe((params) => {
5356
this.id = +params['id'];
5457
this.planningId = +params['planningId'];
@@ -57,9 +60,7 @@ export class BackendConfigurationCasePageComponent implements OnInit {
5760
this.activateRoute.queryParams.subscribe((queryParams) => {
5861
this.reverseRoute = queryParams['reverseRoute'];
5962
})
60-
}
6163

62-
ngOnInit() {
6364
this.loadTemplateInfo();
6465
this.maxDate = new Date();
6566
}

‎eform-client/src/app/plugins/modules/backend-configuration-pn/components/properties/properties-page/properties-container/properties-container.component.html‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<eform-new-subheader>
22
<button
33
*ngIf="authStateService.checkClaim('properties_create')"
4-
class="btn-secondary btn-secondary--icon-rounded-border"
4+
class="btn-primary btn-primary--icon-left"
55
id="propertyCreateBtn"
66
matTooltip="{{ 'Create Property' | translate }}"
77
(click)="showPropertyCreateModal()"
88
[matTooltipPosition]="'left'"
99
>
1010
<mat-icon>add</mat-icon>
11+
<span>{{'New property' | translate}}</span>
1112
</button>
1213
</eform-new-subheader>
1314

0 commit comments

Comments
 (0)