LCSD-7524, 7304, 6363: Update SEP banner formatting, Add 'Outdoor Eve…

…nt Venue' Establishment Type, Filter Police Review Queue (#4336) * update sep banner formatting * remove duplicate occupant field and add establishment type * added check for police pending review table
bcgov · Dec 18, 2024 · 092bc1f · 092bc1f
1 parent d47fc1c
commit 092bc1f
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 12 deletions.
diff --git a/...blic-app/ClientApp/src/app/components/applications/application/application.component.html b/...blic-app/ClientApp/src/app/components/applications/application/application.component.html
@@ -1585,13 +1585,14 @@ <h3 class="blue-header" *ngIf="this.isLP()">ESTABLISHMENT TYPE</h3>
                         <li>Movie Theatre</li>
                         <li>Museum</li>
                         <li>Night Club/Cabaret</li>
+                        <li>Outdoor Event Venue</li>
                         <li>Private Club</li>
                         <li>Public House (Pub)</li>
-                        <li>Recreation Facility</li>
                       </ul>
                     </td>
                     <td>
                       <ul>
+                        <li>Recreation Facility</li>
                         <li>Rental Hall</li>
                         <li>Resort</li>
                         <li>Retail Store</li>
@@ -1853,13 +1854,6 @@ <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>

diff --git a/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.html b/cllc-public-app/ClientApp/src/app/components/sep/drink-planner/drink-planner.component.html
@@ -155,14 +155,14 @@ <h3>Enter the number of each drink type appropriate for your event:</h3>
     <div class="row">
       <div style="width:100%;" *ngIf="hideGuestsAndHours">
         <div class="status yellow" *ngIf="totalPercentage < (totalServings || 0)">
-          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink Servings Must Add To 100%
+          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink servings must add to 100%
         </div>
         <div class="status red" *ngIf="totalPercentage > (totalServings || 0)">
-          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink Servings Must Not Exceed
+          <fa-icon [icon]="faExclamationTriange" style="margin-right:10px;"></fa-icon>Drink servings must not exceed
           100%
         </div>
         <div class="status green" *ngIf="totalPercentage == (totalServings || 0)">
-          <fa-icon [icon]="faCheckCircle" style="margin-right:10px;"></fa-icon>Servings Add To 100%
+          <fa-icon [icon]="faCheckCircle" style="margin-right:10px;"></fa-icon>Servings add to 100%
         </div>
       </div>
       <div class="col-md-8 offset-md-4 col-12" *ngIf="!hideGuestsAndHours">

diff --git a/cllc-public-app/Controllers/SpecialEventsController.cs b/cllc-public-app/Controllers/SpecialEventsController.cs
@@ -1761,7 +1761,7 @@ public IActionResult GetPolicePendingReview([FromQuery] int pageIndex = 0, [From
             }
 
             // Application Status == Pending Review && Police Decision == Under Review
-            var result = GetPagedSepSummaries($"_adoxio_policejurisdictionid_value eq {userAccount._adoxioPolicejurisdictionidValue} and adoxio_policeapproval eq {(int?)ApproverStatus.PendingReview}", pageIndex, pageSize, sort, sortdir);
+            var result = GetPagedSepSummaries($"_adoxio_policejurisdictionid_value eq {userAccount._adoxioPolicejurisdictionidValue} and adoxio_policeapproval eq {(int?)ApproverStatus.PendingReview} and statuscode ne {(int?)EventStatus.Cancelled}", pageIndex, pageSize, sort, sortdir);
 
             return new JsonResult(result);