From 41d2317ebdd6d388b50b18aa9d00e3491010c84a Mon Sep 17 00:00:00 2001
From: William Craig <mr.craig1991@gmail.com>
Date: Mon, 18 Sep 2023 11:04:16 +0100
Subject: [PATCH] changed new labels to use existing NO JUDGE ASSIGNED badge

---
 .../booking-details/booking-details.component.html        | 8 +-------
 .../bookings-list/bookings-list.component.html            | 8 ++++----
 .../bookings-list/bookings-list.component.scss            | 4 ----
 AdminWebsite/AdminWebsite/ClientApp/src/styles.css        | 5 -----
 4 files changed, 5 insertions(+), 20 deletions(-)

diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.html b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.html
index e567f29c2..b67229dab 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.html
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.html
@@ -12,16 +12,10 @@ <h1 class="govuk-heading-l" id="hearingNumber">{{ hearing.HearingCaseNumber }}</
         <div *ngIf="hearing.isCancelled" id="lblCancelled" class="vh-cancelled-booking">{{ hearing.Status }}</div>
         <div *ngIf="hearing.isCancelled" id="lblCancelledDetails" class="vh-cancelled-reason">{{ hearing.CancelReason }}</div>
       </div>
-      <div *ngIf="hearing.isCreated" id="lblCreated" class="vh-status vh-status vh-created-booking">Confirmed</div>
+      <div *ngIf="hearing.isCreated" id="lblCreated" class="vh-status vh-created-booking">Confirmed</div>
       <div *ngIf="hearing.hasBookingConfirmationFailed" id="lblFailedConfirmation" class="vh-status vh-created-confirmation-failed">
         Failed
       </div>
-      <div *ngIf="hearing.hasBookingWithNoJudge" id="vh-confirmed-with-no-judge" class="vh-status vh-created-booking-with-no-judge">
-        No Judge
-      </div>
-      <div *ngIf="hearing.hasConfirmationWithNoJudge" id="vh-booked-with-no-judge" class="vh-status vh-confirmed-booking-with-no-judge">
-        Confirmed No Judge
-      </div>
     </div>
   </div>
 
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.html b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.html
index 5ba3965df..db833b089 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.html
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.html
@@ -144,14 +144,14 @@ <h1 class="govuk-heading-l">{{ title }}</h1>
       >
         <div class="govuk-grid-row vh-row vh-a" (click)="rowSelected(b, i)" [attr.id]="b + '_' + i">
           <div class="govuk-grid-column-one-quarter">
-            <span *ngIf="!detail?.JudgeName && ejudFeatureFlag" class="vh-sml vh-nojudge">NO JUDGE ASSIGNED</span>
+            <span *ngIf="detail.hasBookingWithNoJudge || detail.hasConfirmationWithNoJudge" class="vh-sml vh-nojudge"
+              >NO JUDGE ASSIGNED</span
+            >
             <div class="vh-sml vh-col govuk-!-margin-top-2">{{ detail.StartTime | amLocal | amDateFormat : 'h:mm a' }}</div>
             <div class="govuk-hint vh-sml vh-col vh-font-black">listed for {{ detail.DurationInHoursAndMinutes }}</div>
             <div *ngIf="detail.isCancelled" class="vh-status vh-cancelled-booking">{{ detail.Status }}</div>
-            <div *ngIf="detail.isCreated" class="vh-status vh-created-booking">Confirmed</div>
+            <div *ngIf="detail.isCreated || detail.hasConfirmationWithNoJudge" class="vh-status vh-created-booking">Confirmed</div>
             <div *ngIf="detail.hasBookingConfirmationFailed" class="vh-status vh-confirmation-failed">Failed</div>
-            <div *ngIf="detail.hasBookingWithNoJudge" class="vh-status vh-created-booking-no-judge">No Judge</div>
-            <div *ngIf="detail.hasConfirmationWithNoJudge" class="vh-status vh-confirmed-booking-no-judge">Confirmed No Judge</div>
           </div>
           <div class="govuk-grid-column-one-quarter">
             <div class="vh-sml">{{ detail.HearingCaseNumber }}</div>
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.scss b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.scss
index 370c695ef..6f7a55f15 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.scss
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.scss
@@ -83,10 +83,6 @@ p {
 .vh-created-booking {
   background-color: #3868c2;
 }
-.vh-confirmed-booking-no-judge,
-.vh-created-booking-no-judge {
-  background-color: #d53880;
-}
 
 .vh-row-cancelled {
   background-color: lightgray;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/styles.css b/AdminWebsite/AdminWebsite/ClientApp/src/styles.css
index 2eae2df06..73a0d7d66 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/styles.css
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/styles.css
@@ -150,11 +150,6 @@
     background-color: #d4351c;
 }
 
-.vh-created-booking-with-no-judge,
-.vh-confirmed-booking-with-no-judge{
-    background-color: #d53880;
-}
-
 .vh-btncancel {
     background-color: #dee0e2 !important;
     color: #0b0b0b !important;