Merge branch 'support-develop' into EMBCDFA-1313-outage-banner

bcgov · Sep 5, 2024 · 91d4ce3 · 91d4ce3
2 parents 6ac9850 + d53b299
commit 91d4ce3
Show file tree

Hide file tree

Showing 15 changed files with 76 additions and 79 deletions.
diff --git a/dfa/src/UI/embc-dfa/src/app/core/components/dfa-attachment/dfa-attachment.component.html b/dfa/src/UI/embc-dfa/src/app/core/components/dfa-attachment/dfa-attachment.component.html
@@ -11,7 +11,7 @@
         >
           + Add {{ title }}
         </button>
-        <mat-card appearance="outlined" *ngIf="showFileUpload">
+        <mat-card appearance="outlined" *ngIf="showFileUpload" style="padding: 12px;">
           <div class="row">
             <div class="col-md-6">
               <b>{{title}}<span style="color:red;" *ngIf="requiredDocumentType !== null">*</span></b><br/>

diff --git a/...nents/dialog-components/dfa-cleanuplog-delete-dialog/dfa-cleanuplog-delete.component.html b/...nents/dialog-components/dfa-cleanuplog-delete-dialog/dfa-cleanuplog-delete.component.html
@@ -4,7 +4,7 @@ <h2 class="dialog-title"><b>Delete Cleanup Log Confirmation</b></h2>
   <div class="col-md-12" [innerHTML]="content"></div>
 </mat-dialog-content>
 
-<mat-dialog-actions style="display: flex; gap:12px;">
+<mat-dialog-actions>
   <div class="col-md-6">
     <button class="button-s button-width" mat-button (click)="cancel()">
      No, don't delete

diff --git a/...nents/dialog-components/dfa-cleanuplog-delete-dialog/dfa-cleanuplog-delete.component.scss b/...nents/dialog-components/dfa-cleanuplog-delete-dialog/dfa-cleanuplog-delete.component.scss
@@ -28,7 +28,6 @@ h1 {
 }
 
 .button-width {
-    width: 100%;
+    width: 95%;
     margin-bottom: 10px;
-    height: 80px;
 }
diff --git a/...ents/secondary-applicant-warning-dialog/secondary-applicant-warning-dialog.component.html b/...ents/secondary-applicant-warning-dialog/secondary-applicant-warning-dialog.component.html
@@ -1,4 +1,4 @@
-<h2><b>Add Secondary Applicant</b></h2>
+<h2 class="dialog-title"><b>Add Secondary Applicant</b></h2>
 
 <mat-dialog-content>
   <div class="row">

diff --git a/...p/sharedModules/forms/dfa-application-main-forms/clean-up-log/clean-up-log.component.html b/...p/sharedModules/forms/dfa-application-main-forms/clean-up-log/clean-up-log.component.html
@@ -131,7 +131,7 @@
                 + Add to clean up log
               </button>
 
-              <mat-card appearance="outlined" *ngIf="showCleanUpWorkForm">
+              <mat-card appearance="outlined" *ngIf="showCleanUpWorkForm" style="padding: 12px;">
                 <p class="sub-heading" style="font-size: 15px">
                   New Clean Up Log
                 </p>
@@ -212,7 +212,7 @@
                       >
                     </mat-form-field>
                   </div>
-                  <div class="col-md-4">
+                  <div class="col-md-4" style="padding-top: 10px;">
                     <mat-form-field appearance="outline">
                       <mat-label>Description</mat-label>
                       <input formControlName="description" matInput placeholder="Description" required maxlength="200" />
@@ -275,7 +275,7 @@
       </div>
   </form>
 
-  <ng-container>
+  <ng-container >
     <div class="row">
       <div class="col-md-8">
         <app-dfa-attachment
@@ -372,7 +372,7 @@
         </table>
 
         <div  *ngIf="cleanUpWorkFileDataSource.data.length > 0">
-          <br /><br/>
+          <br/>
         </div>
         <div  *ngIf="cleanUpWorkFileDataSource.data.length == 0">
           <br />No cleanup photos were added.<br/>

diff --git a/...rms/dfa-application-main-forms/damaged-items-by-room/damaged-items-by-room.component.html b/...rms/dfa-application-main-forms/damaged-items-by-room/damaged-items-by-room.component.html
@@ -100,7 +100,7 @@
                 + Add Room & Items
               </button>
 
-              <mat-card appearance="outlined" *ngIf="showDamagedRoomForm">
+              <mat-card appearance="outlined" *ngIf="showDamagedRoomForm" style="padding: 12px;">
                 <p class="sub-heading" style="font-size: 15px">
                   New room and items
                 </p>

diff --git a/...a-application-main-forms/damaged-property-address/damaged-property-address.component.html b/...a-application-main-forms/damaged-property-address/damaged-property-address.component.html
@@ -35,11 +35,11 @@
                   [readOnly]="isReadOnly"
                 ></app-bc-address>
               </div>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row">
+        <div class="row" style="padding-top: 24px;">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Excluding luxury/non-essential items and landscaping, do your losses total more than $1,000?<span style="color:red" >*</span>
@@ -52,9 +52,9 @@
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
             </mat-radio-group>
           </div>
-        </div><br/><br/>
+        </div>
 
-        <div class="row" *ngIf="isHomeowner === true || isResidentialTenant === true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isHomeowner === true || isResidentialTenant === true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Did you occupy the damaged property as your principal residence at the time of the event?<span style="color:red" >*</span>
@@ -67,7 +67,6 @@
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
             </mat-radio-group>
             <div *ngIf="damagedPropertyAddressForm.get('occupyAsPrimaryResidence').value != 'false'">
-              <br/><br/>
             </div>
             <div class="row radio-extra-label" *ngIf="damagedPropertyAddressForm.get('occupyAsPrimaryResidence').value == 'false'">
               You must have occupied the property as your principal residence at the time of te event to be eligible for DFA. <br/><br/>
@@ -76,7 +75,7 @@
           </div>
         </div>
 
-        <div class="row" *ngIf="isSmallBusinessOwner == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isSmallBusinessOwner == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Is your business managed by all owners on a day to day basis?<span style="color:red" >*</span>
@@ -91,7 +90,7 @@
           </div>
         </div>
 
-        <div class="row" *ngIf="isSmallBusinessOwner == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isSmallBusinessOwner == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Are the gross revenues of the business more than $10,000 but less than $2
@@ -103,11 +102,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isSmallBusinessOwner == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isSmallBusinessOwner == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Does the business employ less than 50 employees at any one time?<span style="color:red" >*</span>
@@ -118,11 +117,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isFarmOwner == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isFarmOwner == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Is the farm operation identified in the current assessment of the British Columbia Assessment Authority as a developing or established agricultural operation?<span style="color:red" >*</span>
@@ -133,11 +132,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isFarmOwner == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isFarmOwner == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Is the farm operation owned and operated by a person(s) who full-time employment is as a farmer?<span style="color:red" >*</span>
@@ -148,11 +147,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isFarmOwner == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isFarmOwner == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Is the farm operation the means by which the owner(s) derives the majority of that person’s income?<span style="color:red" >*</span>
@@ -163,11 +162,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isCharitableOrganization == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isCharitableOrganization == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Does the charitable/non-profit organization provide a benefit or service to the community?<span style="color:red" >*</span>
@@ -178,11 +177,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isCharitableOrganization == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isCharitableOrganization == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Has the charitable/non-profit organization been in existence for at least 12 months?<span style="color:red" >*</span>
@@ -193,11 +192,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isCharitableOrganization == true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isCharitableOrganization == true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Is the charitable/non-profit organization registered under the BC <i>Societies Act</i>?<span style="color:red" >*</span>
@@ -208,11 +207,11 @@
               required
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isSmallBusinessOwner === true || isFarmOwner === true || isCharitableOrganization === true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isSmallBusinessOwner === true || isFarmOwner === true || isCharitableOrganization === true">
           <div class="col-md-6 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Provide the {{ accountLegalNameLabel }} legal name.<span style="color:red" >*</span>
@@ -246,11 +245,11 @@
                 {{accountPlaceHolderLabel + ' Legal Name is required'}}</mat-error
               >
             </mat-form-field>
-            <br/><br/>
+
           </div>
         </div>
 
-        <div class="row">
+        <div class="row" style="padding-top: 24px;">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Is this address on a First Nations reserve?<span style="color:red" >*</span>
@@ -266,7 +265,7 @@
         </div>
 
         <!-- TODO: drop down list from ERA -->
-        <div class="row" *ngIf="damagedPropertyAddressForm.get('onAFirstNationsReserve').value == 'true'">
+        <div class="row" style="padding-top: 24px;" *ngIf="damagedPropertyAddressForm.get('onAFirstNationsReserve').value == 'true'">
           <div class="col-md-6 bottomspace">
             <mat-form-field appearance="outline">
               <mat-label>Name of First Nations Reserve</mat-label>
@@ -296,15 +295,15 @@
                 Maximum length is 100 characters</mat-error
               >
             </mat-form-field>
-            <br/><br/><br/>
+
           </div>
         </div>
 
         <div *ngIf="damagedPropertyAddressForm.get('onAFirstNationsReserve').value != 'true'">
-          <br/><br/>
+
         </div>
 
-        <div class="row" *ngIf="isHomeowner === true || isResidentialTenant === true">
+        <div class="row" style="padding-top: 24px;" *ngIf="isHomeowner === true || isResidentialTenant === true">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               Is your home a manufactured home?
@@ -315,11 +314,11 @@
               class="primary-radio-group horizontal-radio-group"
               aria-label="Select an option">
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
-            </mat-radio-group><br/><br/>
+            </mat-radio-group>
           </div>
         </div>
 
-        <div class="row" *ngIf="isHomeowner">
+        <div class="row" style="padding-top: 24px;" *ngIf="isHomeowner">
           <div class="col-md-12 bottomspace">
             <p class="sub-heading" style="font-size: 15px">
               As the Home Owner, are you eligible for a BC Home Owner Grant for this property?<span style="color:red" >*</span>
@@ -334,7 +333,7 @@
           </div>
         </div>
 
-        <div class="row" *ngIf="isResidentialTenant">
+        <div class="row" style="padding-top: 24px;" *ngIf="isResidentialTenant">
           <p class="sub-heading" style="font-size: 15px">
            Provide at least one registered building owner and/or landlord name and phone number.<span style="color:red" >*</span>
           </p>
@@ -453,7 +452,7 @@
           </div>
         </div>
 
-        <div class="row" *ngIf="isResidentialTenant">
+        <div class="row" style="padding-top: 24px;" *ngIf="isResidentialTenant">
           <p class="sub-heading" style="font-size: 15px">
            You may also provide a second registered building owner and/or landlord name and phone number, if applicable.
           </p>

diff --git a/...src/app/sharedModules/forms/dfa-application-main-forms/occupants/occupants.component.html b/...src/app/sharedModules/forms/dfa-application-main-forms/occupants/occupants.component.html
@@ -304,7 +304,7 @@
                 + Add secondary applicant
               </button>
 
-              <mat-card appearance="outlined" *ngIf="showSecondaryApplicantForm">
+              <mat-card appearance="outlined" *ngIf="showSecondaryApplicantForm" style="padding: 12px;">
                 <p class="sub-heading" style="font-size: 15px">
                   New secondary applicant
                 </p>
@@ -584,7 +584,7 @@
                 + Add Other Contact
               </button>
 
-              <mat-card appearance="outlined" *ngIf="showOtherContactForm">
+              <mat-card appearance="outlined" *ngIf="showOtherContactForm" style="padding: 12px;">
                 <p class="sub-heading" style="font-size: 15px">
                   {{otherContactText}}
                 </p>

diff --git a/...edModules/forms/dfa-application-main-forms/property-damage/property-damage.component.html b/...edModules/forms/dfa-application-main-forms/property-damage/property-damage.component.html
@@ -61,10 +61,10 @@
               >
             </mat-form-field>
             <mat-error *ngIf="propertyDamageForm.hasError('noCauseOfDamage')">
-              <br/>At least one cause of damage is required.
+              At least one cause of damage is required.
             </mat-error>
           </div>
-        </div><br/><br/>
+        </div><br/>
 
         <div class="row">
           <p class="sub-heading" style="font-size: 15px">
@@ -146,7 +146,7 @@
               >
             </mat-form-field>
           </div>
-        </div><br/><br/>
+        </div><br/>
 
         <div class="row">
           <p class="sub-heading" style="font-size: 15px">
@@ -175,7 +175,7 @@
                 Maximum length is 2000 characters</mat-error
               >
           </mat-form-field>
-        </div><br/>
+        </div>
 
         <div class="row" *ngIf="isResidentialTenant === true || isHomeowner === true">
           <div class="col-md-12 bottomspace">
@@ -190,7 +190,7 @@
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
             </mat-radio-group>
           </div>
-        </div><br/><br/>
+        </div><br/>
 
         <div class="row" *ngIf="propertyDamageForm.get('wereYouEvacuated').value == 'true' && (isResidentialTenant === true || isHomeowner === true)">
           <p class="sub-heading" style="font-size: 15px">
@@ -234,10 +234,10 @@
               <mat-radio-button value=true>Yes</mat-radio-button>&nbsp;&nbsp;<mat-radio-button value=false>No</mat-radio-button>
             </mat-radio-group>
           </div>
-        </div><br/><br/>
+        </div>
 
         <div class="row">
-          <div class="col-md-12 bottomspace">
+          <div class="col-md-12">
             <p class="sub-heading" style="font-size: 15px">
               In the past, have you submitted a DFA application for the same property?<span style="color:red" >*</span>
             </p>

diff --git a/...edModules/forms/dfa-application-main-forms/property-damage/property-damage.component.scss b/...edModules/forms/dfa-application-main-forms/property-damage/property-damage.component.scss
@@ -9,7 +9,7 @@ mat-form-field {
 }
 
 .primary-radio-button {
-    margin: 5px;
+   margin: 5px;
 }
 
 .highlight {