Improving the property worker process a bit more.

Author: renemadsen

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-worker-create-edit-modal/property-worker-create-edit-modal.component.html

@@ -17,7 +17,8 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 required
                 type="text"
                 id="firstName"
-                name="userName">
+                name="userName"
+                tabindex="1">
               <mat-error *ngIf="form.get('userFirstName').hasError('required')">
                 Required
               </mat-error>
@@ -29,7 +30,17 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 formControlName="workerEmail"
                 type="email"
                 id="workerEmail"
-                required>
+                required
+                tabindex="3">
+              <button
+                matSuffix
+                mat-icon-button
+                type="button"
+                (click)="generateRandomEmail()"
+                matTooltip="{{ 'Generate random email' | translate }}"
+                id="generateEmailBtn">
+                <mat-icon>autorenew</mat-icon>
+              </button>
               <mat-error *ngIf="form.get('workerEmail').hasError('invalidEmail')">
                 Invalid email address
               </mat-error>
@@ -43,11 +54,13 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 matInput
                 formControlName="employeeNo"
                 type="text"
-                id="employeeNo">
+                id="employeeNo"
+                tabindex="5">
             </mat-form-field>
             <mat-form-field>
               <mat-label>{{ 'Language' | translate }}</mat-label>
               <mtx-select
+                tabindex="7"
                 id="profileLanguageSelector"
                 [bindLabel]="'name'"
                 [bindValue]="'languageCode'"
@@ -71,7 +84,8 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 formControlName="userLastName"
                 type="text"
                 id="lastName"
-                required>
+                required
+                tabindex="2">
               <mat-error *ngIf="form.get('userLastName').hasError('required')">
                 Required
               </mat-error>
@@ -83,7 +97,8 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 formControlName="phoneNumber"
                 type="tel"
                 name="phoneNumber"
-                id="phoneNumber">
+                id="phoneNumber"
+                tabindex="4">
             </mat-form-field>
             <mat-form-field>
               <mat-label>{{ 'PIN code' | translate }}</mat-label>
@@ -93,14 +108,16 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 type="text"
                 name="pinCode"
                 pattern="([0-9]*|\*{4})"
-                id="pinCode">
+                id="pinCode"
+                tabindex="6">
             </mat-form-field>
           </div>
         </div>
         <div class="modal-columns">
           <mat-form-field>
             <mat-label>{{ 'Current tags' | translate }}</mat-label>
             <mtx-select
+              tabindex="8"
               class="custom"
               [dropdownPosition]="'bottom'"
               [bindValue]="'id'"
@@ -205,6 +222,7 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
         {{ 'Cancel' | translate }}
       </button>
       <button
+        tabindex="9"
         class="btn-primary btn-primary--icon-left"
         (click)="edit ? updateSingle() : createDeviceUser()"
         [disabled]="form.invalid"

eform-client/src/app/plugins/modules/backend-configuration-pn/modules/property-workers/components/property-worker-create-edit-modal/property-worker-create-edit-modal.component.ts

@@ -37,7 +37,8 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
       deviceUser: DeviceUserModel,
       assignments: PropertyAssignmentWorkerModel[],
       availableProperties: CommonDictionaryModel[],
-      availableTags: CommonDictionaryModel[];
+      availableTags: CommonDictionaryModel[],
+      alreadyUsedEmails: string[];
     }>(MAT_DIALOG_DATA);
 
   availableProperties: CommonDictionaryModel[] = [];
@@ -49,6 +50,7 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
   taskManagementEnabled: boolean = false;
   timeRegistrationEnabled: boolean = false;
   availableTags: CommonDictionaryModel[] = [];
+  alreadyUsedEmails: string[] = [];
   @Output() userUpdated: EventEmitter<void> = new EventEmitter<void>();
   tableHeaders: MtxGridColumn[] = [
     {
@@ -138,6 +140,7 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
     this.taskManagementEnabled = this.selectedDeviceUserCopy.taskManagementEnabled;
     this.timeRegistrationEnabled = this.selectedDeviceUserCopy.timeRegistrationEnabled;
     this.availableTags = [...this.model.availableTags];
+    this.alreadyUsedEmails = [...this.model.alreadyUsedEmails];
 
     this.form = this.fb.group({
       userFirstName: [this.selectedDeviceUser.userFirstName || '', Validators.required],
@@ -338,4 +341,20 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
       }))
       .subscribe();
   }
+
+  generateRandomEmail(): void {
+    const firstName = this.form.get('userFirstName')?.value?.toLowerCase().trim() || 'user';
+    const lastName = this.form.get('userLastName')?.value?.toLowerCase().trim() || 'name';
+    let email: string;
+    let randomNumber: number;
+
+    do {
+      randomNumber = Math.floor(Math.random() * (100000 - 1000 + 1)) + 1000;
+      email = `${firstName}_${lastName}_${randomNumber}[email protected]`;
+    } while (this.alreadyUsedEmails.includes(email));
+
+    this.form.patchValue({
+      workerEmail: email
+    });
+  }
 }

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

@@ -50,6 +50,7 @@ export class PropertyWorkersPageComponent implements OnInit, OnDestroy {
   sitesDto: Array<DeviceUserModel>;
   availableProperties: CommonDictionaryModel[];
   workersAssignments: PropertyAssignWorkersModel[];
+  alreadyUsedEmails: string[] = [];
 
   getSites$: Subscription;
   getPropertiesDictionary$: Subscription;
@@ -147,6 +148,7 @@ export class PropertyWorkersPageComponent implements OnInit, OnDestroy {
           assignments: [],
           availableProperties: this.availableProperties,
           availableTags: this.availableTags,
+          alreadyUsedEmails: this.alreadyUsedEmails,
         }), minWidth: 1024
       })
       .afterClosed().subscribe(data => data ? this.updateTable() : undefined);
@@ -225,6 +227,10 @@ export class PropertyWorkersPageComponent implements OnInit, OnDestroy {
       .subscribe((data) => {
         if (data && data.model) {
           data.model.forEach(site => {
+            // add the site.workerEmail to alreadyUsedEmails to prevent from creating new worker with the same email
+            if (!this.alreadyUsedEmails.includes(site.workerEmail)) {
+              this.alreadyUsedEmails.push(site.workerEmail);
+            }
             if (site.resigned) {
               anyIsResigned = true;
             }