Fixing generate random email so it's possible when time registration is enabled. If enabled after the user was created the email will be checked and if it's invalid the email is removed, so the user is forced to enter a valid email.

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

@@ -18,7 +18,8 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 type="text"
                 id="firstName"
                 name="userName"
-                tabindex="1">
+                tabindex="1"
+                cdkFocusInitial>
               <mat-error *ngIf="form.get('userFirstName').hasError('required')">
                 Required
               </mat-error>
@@ -33,6 +34,7 @@ <h3 mat-dialog-title>{{ (edit ? 'Edit employee' : 'New employee') | translate }}
                 required
                 tabindex="3">
               <button
+                *ngIf="shouldShowGenerateEmailButton()"
                 matSuffix
                 mat-icon-button
                 type="button"

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

@@ -16,7 +16,15 @@ import {MtxGridColumn} from '@ng-matero/extensions/grid';
 import {TranslateService} from '@ngx-translate/core';
 import {tap} from 'rxjs/operators';
 import {AppSettingsStateService} from 'src/app/modules/application-settings/components/store';
-import {FormBuilder, FormControl, FormGroup, Validators} from '@angular/forms';
+import {
+  AbstractControl,
+  FormBuilder,
+  FormControl,
+  FormGroup,
+  ValidationErrors,
+  ValidatorFn,
+  Validators
+} from '@angular/forms';
 import validator from 'validator';
 
 @AutoUnsubscribe()
@@ -34,12 +42,12 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
   public dialogRef = inject(MatDialogRef<PropertyWorkerCreateEditModalComponent>);
   private appSettingsStateService = inject(AppSettingsStateService);
   private model = inject<{
-      deviceUser: DeviceUserModel,
-      assignments: PropertyAssignmentWorkerModel[],
-      availableProperties: CommonDictionaryModel[],
-      availableTags: CommonDictionaryModel[],
-      alreadyUsedEmails: string[];
-    }>(MAT_DIALOG_DATA);
+    deviceUser: DeviceUserModel,
+    assignments: PropertyAssignmentWorkerModel[],
+    availableProperties: CommonDictionaryModel[],
+    availableTags: CommonDictionaryModel[],
+    alreadyUsedEmails: string[];
+  }>(MAT_DIALOG_DATA);
 
   availableProperties: CommonDictionaryModel[] = [];
   edit: boolean = false;
@@ -77,15 +85,14 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
   form: FormGroup;
 
 
-
   private updateDisabledFieldsBasedOnResigned() {
     const isResigned = this.form.get('resigned')?.value;
     Object.keys(this.form.controls).forEach(key => {
       if (key !== 'resigned' && key !== 'resignedAtDate') {
         if (isResigned) {
-          this.form.get(key)?.disable({ emitEvent: false });
+          this.form.get(key)?.disable({emitEvent: false});
         } else {
-          this.form.get(key)?.enable({ emitEvent: false });
+          this.form.get(key)?.enable({emitEvent: false});
         }
       }
     });
@@ -183,6 +190,20 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
       Object.assign(this.selectedDeviceUser, formValue);
     });
 
+    this.form.get('timeRegistrationEnabled')?.valueChanges.subscribe(enabled => {
+      const emailControl = this.form.get('workerEmail');
+      const currentEmail = emailControl?.value || '';
+
+      if (enabled && currentEmail.includes('invalid')) {
+        emailControl?.patchValue('');
+        emailControl?.markAsTouched();
+      }
+
+      this.updateEmailValidation();
+    });
+
+    this.updateEmailValidation();
+
     this.updateDisabledFieldsBasedOnResigned();
 
     this.form.get('resigned')?.valueChanges.subscribe(() => {
@@ -357,4 +378,33 @@ export class PropertyWorkerCreateEditModalComponent implements OnInit, OnDestroy
       workerEmail: email
     });
   }
+
+  shouldShowGenerateEmailButton(): boolean {
+    return !this.form?.get('timeRegistrationEnabled')?.value;
+  }
+
+  private updateEmailValidation(): void {
+    const emailControl = this.form.get('workerEmail');
+    const timeRegistrationEnabled = this.form.get('timeRegistrationEnabled')?.value;
+
+    if (timeRegistrationEnabled) {
+      emailControl?.setValidators([Validators.required, Validators.email, this.validEmailValidator()]);
+    } else {
+      emailControl?.setValidators([Validators.required, this.validEmailValidator()]);
+    }
+
+    emailControl?.updateValueAndValidity();
+  }
+
+  private validEmailValidator(): ValidatorFn {
+    return (control: AbstractControl): ValidationErrors | null => {
+      const email = control.value;
+      const timeRegistrationEnabled = this.form?.get('timeRegistrationEnabled')?.value;
+
+      if (timeRegistrationEnabled && email && email.includes('invalid')) {
+        return {invalidEmail: true};
+      }
+      return null;
+    };
+  }
 }

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

@@ -60,6 +60,7 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy, OnChange
   @Input() workersAssignments: PropertyAssignWorkersModel[] = [];
   @Input() showResigned: boolean = false;
   @Input() availableTags: CommonDictionaryModel[] = [];
+  @Input() alreadyUsedEmails: string[] = [];
   propertyWorkerOtpModalComponentAfterClosedSub$: Subscription;
   propertyWorkerEditModalComponentAfterClosedSub$: Subscription;
   //availableProperties: CommonDictionaryModel[];
@@ -262,6 +263,7 @@ export class PropertyWorkerTableComponent implements OnInit, OnDestroy, OnChange
           //assignments: [],
           availableProperties: this.availableProperties,
           availableTags: this.availableTags,
+          alreadyUsedEmails: this.alreadyUsedEmails
         }), minWidth: 1024
       })
 

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

@@ -31,6 +31,7 @@
   [sitesDto]="sitesDto"
   [showResigned]="showResigned"
   [availableTags]="availableTags"
+  [alreadyUsedEmails]="alreadyUsedEmails"
 >
 </app-property-worker-table>