Merge to Master

cllc-public-app/ClientApp/src/app/components/applications/application/application.component.html

@@ -1853,6 +1853,13 @@ <h3 class="blue-header" *ngIf="this.isLP()">ESTABLISHMENT TYPE</h3>
                 style="width: 250px;" type="number" min="1"  placeholder="Total occupant load"  (input)="validateInput($event)"  /></app-field>
               </section>
              </div>
+
+             <div>
+              <section  *ngIf="application.applicationType.serviceAreas" > <p>Enter the total occupant load as indicated by your local government. This number can be either the total stamped on the floor plan or the sum of occupant loads across all service areas, as listed in the occupant load stamp. </p>
+                <app-field [required]="true"   label="Total occupant load" [valid]="!showValidationMessages || form.get('totalOccupantLoad').valid"  errorMessage="Total occupant load is required.">   <input class="form-control" formControlName="totalOccupantLoad" id="totalOccupantLoad"
+                style="width: 250px;" type="number" min="1"  placeholder="Total occupant load"  (input)="validateInput($event)"  /></app-field>
+              </section>
+             </div>
             </div> 
 
           </section>
@@ -1868,20 +1875,21 @@ <h3 class="blue-header" *ngIf="application.applicationType.serviceAreas">SERVICE
               <app-capacity-table formControlName="serviceAreas" [areaCategory]="getAreaCategoryNumber('Service')"
                                   [enabled]="!isOpenedByLGForApproval && !lGHasApproved()">
               </app-capacity-table>
+      <!-- Occupant load cheackbox -->
+      <div  *ngIf="!hideOcupantLoadFields()" >
+        <div *ngIf="!isOccupantLoadCorrect()">
+          <br>
+          <p  class="error-text">The sum of occupant loads across all service areas does not match the total occupant load entered in the total occupant load field.</p>
+
+          </div>
 
-              <div  *ngIf="!hideOcupantLoadFields()" >
-                <div *ngIf="!isOccupantLoadCorrect()">
-                  <br>
-                   <p  class="error-text">The sum of occupant loads across all service areas does not match the total occupant load entered in the total occupant load field.</p>
-
-                  </div>
-
-                  <div *ngIf="!showOccupantLoadCheckBox">
-                    <mat-checkbox formControlName="totalOccupantLoadExceed"  > <span class="error-states">*</span>
-                      I affirm that the combined service area capacity exceeds the total occupant load.
-                    </mat-checkbox>
-                  </div>
-              </div>
+          <div *ngIf="showOccupantLoadCheckBox">
+            <br>
+            <mat-checkbox formControlName="totalOccupantLoadExceed"  > <span class="error-states">*</span>
+              I affirm that the combined service area capacity exceeds the total occupant load.
+            </mat-checkbox>
+          </div>
+      </div>
             </app-field>
 
             <mat-card class="mat-elevation-z0 mb-3" *ngIf="showHoldsOtherManufactureLicence()">
@@ -1944,6 +1952,7 @@ <h3 class="blue-header" *ngIf="application.applicationType.outsideAreas">OUTSIDE
             </div>
           </section>
 
+
           <!-- Capacity Area -->
           <h3 class="blue-header" *ngIf="application.applicationType.capacityArea
              && application?.applicationType?.name != ApplicationTypeNames.TemporaryExtensionOfLicensedAreaLP">
@@ -2270,7 +2279,7 @@ <h3 class="blue-header">HOURS OF SALE</h3>
               </p>
             </div>
           </section>
-
+          
           <!-- Licensed Producer -->
           <div *ngIf="application?.applicationType?.name === ApplicationTypeNames.Marketer">
             <h3 class="blue-header">INFORMATION ABOUT THE LICENSED PRODUCER</h3>

cllc-public-app/ClientApp/src/app/components/applications/application/application.component.ts

@@ -672,6 +672,7 @@ export class ApplicationComponent extends FormBase implements OnInit {
       this.form.get('serviceHoursSaturdayClose').disable();
     }
 
+
     if (this.application.applicationType.name !== ApplicationTypeNames.Marketer) {
       this.form.get('federalProducerNames').disable();
     }
@@ -848,6 +849,7 @@ export class ApplicationComponent extends FormBase implements OnInit {
     return true;
   }
 
+
   lgHasReviewedZoning(): boolean {
     let hasReviewed = false;
     if (this.application && this.application.lGDecisionSubmissionDate && this.application.lgZoning) {
@@ -1328,6 +1330,7 @@ export class ApplicationComponent extends FormBase implements OnInit {
       this.validationMessages.push('At least one service area is required.');
     }else{
 
+
         if(!this.isOccupantLoadCorrect()){
           valid = false;
           this.validationMessages.push('The sum of occupant loads across all service areas does not match the total occupant load entered in the total occupant load field.');
@@ -1424,6 +1427,7 @@ export class ApplicationComponent extends FormBase implements OnInit {
       this.validationMessages.push('Hours of sale are required');
     }
 
+
     if (this.application.applicationType.showOwnershipDeclaration) {
 
       if (!this.form.get('isOwner').value && !(this.form.get('isOwnerBusiness') && this.form.get('isOwnerBusiness').value)) {
@@ -1997,22 +2001,26 @@ export class ApplicationComponent extends FormBase implements OnInit {
    }
 
    isOccupantLoadCorrect(): Boolean{
+
     if(this.hideOcupantLoadFields()){
        this.form.get('totalOccupantLoadExceed').disable();
       return true;
     }
+
     const serviceArea = ('areas' in this.form.get('serviceAreas').value) ? this.form.get('serviceAreas').value['areas'] : this.form.get('serviceAreas').value;
     let totalCapacity = serviceArea.reduce((sum,item)=> Number(sum+(+item.capacity)),0);
     let totalOccupantLoad = this.form.get('totalOccupantLoad').value | 0;
-    const isExceeded:boolean = totalOccupantLoad>=totalCapacity
+    const isExceeded:boolean = totalCapacity > totalOccupantLoad
     if(isExceeded){
+      this.form.get('totalOccupantLoadExceed').enable();
       this.form.get('totalOccupantLoadExceed').enable();
       this.showOccupantLoadCheckBox = true;
     }else{
+      this.form.get('totalOccupantLoadExceed').disable();
       this.form.get('totalOccupantLoadExceed').disable();
       this.showOccupantLoadCheckBox = false;
     }
-    return  this.form.get('totalOccupantLoadExceed').value === true || isExceeded;
+    return  this.form.get('totalOccupantLoadExceed').value === true || !isExceeded;
    }
 
 //Check if applicant is waiting for LG approcval or has been approved by LG.