Merge pull request #1376 from bcgov/feature/ALCS-1624

SRW Fixes
bcgov · Feb 2, 2024 · 3f6ad6e · 3f6ad6e
2 parents f06e943 + ebad493
commit 3f6ad6e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/...p/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html b/...p/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.html
@@ -44,6 +44,7 @@
             <input id="lookup-pid" matInput [placeholder]="pidPinPlaceholder" formControlName="pidPin" />
           </mat-form-field>
           <button
+            type="button"
             class="lookup-search-button"
             mat-flat-button
             color="primary"
@@ -54,7 +55,9 @@
           </button>
         </div>
         <div class="lookup-bottom-row">
-          <button class="reset-button" mat-stroked-button color="accent" (click)="onReset()">Reset</button>
+          <button type="button" class="reset-button" mat-stroked-button color="accent" (click)="onReset()">
+            Reset
+          </button>
           <span class="float-right">
             <a class="subtext" href=" https://ltsa.ca/products-services/parcelmap-bc/" target="_blank" rel="noreferrer">
               Powered by PMBC!

diff --git a/...app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts b/...app/features/notifications/edit-submission/parcels/parcel-entry/parcel-entry.component.ts
@@ -105,8 +105,8 @@ export class ParcelEntryComponent implements OnInit {
       result = await this.parcelService.getByPid(this.pidPin.getRawValue()!);
     }
 
-    this.onReset();
     if (result) {
+      this.onReset();
       this.legalDescription.setValue(result.legalDescription);
       this.mapArea.setValue(result.mapArea);
 

diff --git a/...app/features/notifications/edit-submission/primary-contact/primary-contact.component.html b/...app/features/notifications/edit-submission/primary-contact/primary-contact.component.html
@@ -64,7 +64,14 @@ <h4>Primary Contact Information</h4>
         <div>
           <label for="email">Email</label>
           <mat-form-field appearance="outline">
-            <input id="email" type="email" matInput placeholder="Enter Email" formControlName="email" />
+            <input
+              (change)="onChangeConfirmationEmail()"
+              id="email"
+              type="email"
+              matInput
+              placeholder="Enter Email"
+              formControlName="email"
+            />
           </mat-form-field>
           <div *ngIf="email.invalid && (email.dirty || email.touched)" class="field-error">
             <mat-icon>warning</mat-icon>
@@ -85,7 +92,10 @@ <h4>Primary Contact Information</h4>
               autocomplete="off"
             />
           </mat-form-field>
-          <div *ngIf="confirmEmail.invalid && (confirmEmail.dirty || confirmEmail.touched)" class="field-error">
+          <div
+            *ngIf="confirmEmail.invalid && (email.dirty || email.touched || confirmEmail.dirty || confirmEmail.touched)"
+            class="field-error"
+          >
             <mat-icon>warning</mat-icon>
             <div *ngIf="confirmEmail.errors?.['required']">This field is required</div>
             <div *ngIf="confirmEmail.errors?.['email']">Invalid format</div>