VIH-10160 Added new booking status to display in booking list and detail views

.gitignore

@@ -351,3 +351,4 @@ jasmine-tests
 
 .env
 .angular/
+/AdminWebsite/AdminWebsite/ClientApp/karma.conf.js

AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json

@@ -152,8 +152,8 @@
       },
       "BookingsApi.Client": {
         "type": "Transitive",
-        "resolved": "1.44.57",
-        "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==",
+        "resolved": "1.47.1-pr-0720-0003",
+        "contentHash": "xxk51jERKtcoNU8L1iLENJLJJFD1Hwxffwo1gbsyZLzhVVx5MmRKS+ypFy/wzkk9zhP3mHZsCPYG2HuAgl4q8g==",
         "dependencies": {
           "Microsoft.AspNetCore.Mvc.Core": "2.2.5"
         }
@@ -2632,7 +2632,7 @@
       "adminwebsite": {
         "type": "Project",
         "dependencies": {
-          "BookingsApi.Client": "[1.44.57, )",
+          "BookingsApi.Client": "[1.47.1-pr-0720-0003, )",
           "FluentValidation.AspNetCore": "[10.4.0, )",
           "LaunchDarkly.ServerSdk": "[7.0.3, )",
           "MicroElements.Swashbuckle.FluentValidation": "[5.7.0, )",

AdminWebsite/AdminWebsite.IntegrationTests/packages.lock.json

@@ -93,8 +93,8 @@
       },
       "BookingsApi.Client": {
         "type": "Transitive",
-        "resolved": "1.44.57",
-        "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==",
+        "resolved": "1.47.1-pr-0720-0003",
+        "contentHash": "xxk51jERKtcoNU8L1iLENJLJJFD1Hwxffwo1gbsyZLzhVVx5MmRKS+ypFy/wzkk9zhP3mHZsCPYG2HuAgl4q8g==",
         "dependencies": {
           "Microsoft.AspNetCore.Mvc.Core": "2.2.5"
         }
@@ -2064,7 +2064,7 @@
       "adminwebsite": {
         "type": "Project",
         "dependencies": {
-          "BookingsApi.Client": "[1.44.57, )",
+          "BookingsApi.Client": "[1.47.1-pr-0720-0003, )",
           "FluentValidation.AspNetCore": "[10.4.0, )",
           "LaunchDarkly.ServerSdk": "[7.0.3, )",
           "MicroElements.Swashbuckle.FluentValidation": "[5.7.0, )",

AdminWebsite/AdminWebsite.UnitTests/packages.lock.json

@@ -98,8 +98,8 @@
       },
       "BookingsApi.Client": {
         "type": "Transitive",
-        "resolved": "1.44.57",
-        "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==",
+        "resolved": "1.47.1-pr-0720-0003",
+        "contentHash": "xxk51jERKtcoNU8L1iLENJLJJFD1Hwxffwo1gbsyZLzhVVx5MmRKS+ypFy/wzkk9zhP3mHZsCPYG2HuAgl4q8g==",
         "dependencies": {
           "Microsoft.AspNetCore.Mvc.Core": "2.2.5"
         }
@@ -1938,7 +1938,7 @@
       "adminwebsite": {
         "type": "Project",
         "dependencies": {
-          "BookingsApi.Client": "[1.44.57, )",
+          "BookingsApi.Client": "[1.47.1-pr-0720-0003, )",
           "FluentValidation.AspNetCore": "[10.4.0, )",
           "LaunchDarkly.ServerSdk": "[7.0.3, )",
           "MicroElements.Swashbuckle.FluentValidation": "[5.7.0, )",

AdminWebsite/AdminWebsite/AdminWebsite.csproj

@@ -31,7 +31,7 @@
     <ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="BookingsApi.Client" Version="1.44.57" />
+    <PackageReference Include="BookingsApi.Client" Version="1.47.1-pr-0720-0003" />
     <PackageReference Include="LaunchDarkly.ServerSdk" Version="7.0.3" />
     <PackageReference Include="MicroElements.Swashbuckle.FluentValidation" Version="5.7.0" />
     <PackageReference Include="Microsoft.Identity.Client" Version="4.51.0" />

AdminWebsite/AdminWebsite/ClientApp/package.json

@@ -77,7 +77,7 @@
     "eslint-plugin-import": "^2.27.5",
     "jasmine-core": "~3.7.1",
     "jasmine-spec-reporter": "~6.0.0",
-    "karma": "^6.4.1",
+    "karma": "^6.4.2",
     "karma-chrome-launcher": "~3.1.0",
     "karma-coverage": "^2.0.3",
     "karma-jasmine": "~4.0.1",

AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.html

@@ -12,8 +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-created-booking">Confirmed</div>
-      <div *ngIf="hearing.hasBookingConfirmationFailed" id="lblFailedConfirmation" class="vh-created-confirmation-failed">Failed</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>
   </div>
 

AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.css

@@ -0,0 +1,40 @@
+.vh-sml {
+    font-size: smaller;
+}
+
+.vh-status {
+    color: #ffffff;
+    margin-left: 9px;
+    padding-top: 3px;
+    padding-bottom: 3px;
+    width: 50%;
+    font-weight: 200;
+    text-align: center;
+}
+
+.vh-cancelled-booking,
+.vh-confirmation-failed {
+    background-color: #d4351c;
+}
+
+.vh-created-booking {
+    background-color: #3868c2;
+}
+
+.vh-nojudge {
+    background: #d4351c;
+    color: #ffffff;
+    padding: 0px 4px;
+}
+
+.vh-col {
+    margin-left: 10px;
+}
+
+.govuk-hint {
+    margin-bottom: 0;
+}
+
+.vh-font-black {
+    color: #0b0c0c;
+}

AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.html

@@ -0,0 +1,14 @@
+<span *ngIf="this.hasNoJudge" class="vh-sml vh-nojudge">NO JUDGE ASSIGNED</span>
+<div class="vh-sml vh-col govuk-!-margin-top-2">{{ bookingDetails.StartTime | amLocal | amDateFormat : 'h:mm a' }}</div>
+<div class="govuk-hint vh-sml vh-col vh-font-black">listed for {{ bookingDetails.DurationInHoursAndMinutes }}</div>
+<div
+  *ngIf="statusMessage !== null"
+  class="vh-status"
+  [ngClass]="{
+    'vh-cancelled-booking': bookingDetails.isCancelled,
+    'vh-created-booking': bookingDetails.isCreated || bookingDetails.hasConfirmationWithNoJudge,
+    'vh-confirmation-failed': bookingDetails.hasBookingConfirmationFailed
+  }"
+>
+  {{ this.statusMessage }}
+</div>

AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.ts

@@ -0,0 +1,28 @@
+import { Component, Input } from '@angular/core';
+import { BookingsDetailsModel } from '../../common/model/bookings-list.model';
+@Component({
+    selector: 'app-booking-status',
+    templateUrl: './booking-status.component.html',
+    styleUrls: ['./booking-status.component.css']
+})
+export class BookingStatusComponent {
+    @Input() bookingDetails: BookingsDetailsModel;
+
+    public get statusMessage(): string {
+        switch (this.bookingDetails.Status) {
+            case 'Created':
+            case 'hasConfirmationWithNoJudge':
+                return 'Confirmed';
+            case 'Cancelled':
+                return 'Cancelled';
+            case 'Failed':
+                return 'Failed';
+            default:
+                return null;
+        }
+    }
+
+    public get hasNoJudge(): boolean {
+        return this.bookingDetails.Status === 'BookedWithoutJudge' || this.bookingDetails.Status === 'ConfirmedWithoutJudge';
+    }
+}

AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list.module.ts

@@ -12,6 +12,7 @@ import { CopySipComponent } from './copy-sip/copy-sip.component';
 import { CopyConferencePhoneComponent } from './copy-conference-phone/copy-conference-phone.component';
 import { CopyJoinLinkComponent } from './copy-join-link/copy-join-link.component';
 import { NgSelectModule } from '@ng-select/ng-select';
+import { BookingStatusComponent } from './booking-status/booking-status.component';
 
 @NgModule({
     imports: [SharedModule, BookingsListRoutingModule, PopupModule, MomentModule, NgSelectModule],
@@ -23,15 +24,17 @@ import { NgSelectModule } from '@ng-select/ng-select';
         HearingDetailsComponent,
         CopySipComponent,
         CopyConferencePhoneComponent,
-        CopyJoinLinkComponent
+        CopyJoinLinkComponent,
+        BookingStatusComponent
     ],
     providers: [],
     exports: [
         BookingsListComponent,
         BookingDetailsComponent,
         ParticipantDetailsComponent,
         BookingParticipantListComponent,
-        HearingDetailsComponent
+        HearingDetailsComponent,
+        BookingStatusComponent
     ]
 })
 export class BookingsListModule {}

AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.html

@@ -144,12 +144,7 @@ <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>
-            <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-cancelled-booking">{{ detail.Status }}</div>
-            <div *ngIf="detail.isCreated" class="vh-created-booking">Confirmed</div>
-            <div *ngIf="detail.hasBookingConfirmationFailed" class="vh-confirmation-failed">Failed</div>
+            <app-booking-status [bookingDetails]="detail"></app-booking-status>
           </div>
           <div class="govuk-grid-column-one-quarter">
             <div class="vh-sml">{{ detail.HearingCaseNumber }}</div>

AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list/bookings-list.component.scss

@@ -66,29 +66,6 @@ p {
   text-decoration: none;
 }
 
-.vh-cancelled-booking,
-.vh-confirmation-failed {
-  color: #ffffff;
-  background-color: #d4351c;
-  margin-left: 9px;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  width: 50%;
-  font-weight: 200;
-  text-align: center;
-}
-
-.vh-created-booking {
-  color: #ffffff;
-  background-color: #3868c2;
-  margin-left: 9px;
-  padding-top: 3px;
-  padding-bottom: 3px;
-  width: 50%;
-  font-weight: 200;
-  text-align: center;
-}
-
 .vh-row-cancelled {
   background-color: lightgray;
   padding-top: 3px;
@@ -114,12 +91,6 @@ p {
   box-shadow: none;
 }
 
-.vh-nojudge {
-  background: govuk-colour('red');
-  color: govuk-colour('white');
-  padding: 0px 4px;
-}
-
 .vh-searchicon {
   height: 12px;
   margin-right: 6px;

AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/bookings-list.model.ts

@@ -105,4 +105,12 @@ export class BookingsDetailsModel {
     public get hasBookingConfirmationFailed(): boolean {
         return this.Status === 'Failed';
     }
+
+    public get hasBookingWithNoJudge(): boolean {
+        return this.Status === 'BookedWithoutJudge';
+    }
+
+    public get hasConfirmationWithNoJudge(): boolean {
+        return this.Status === 'ConfirmedWithoutJudge';
+    }
 }

AdminWebsite/AdminWebsite/ClientApp/src/styles.css

@@ -129,9 +129,8 @@
     float: left;
 }
 
-.vh-created-booking {
+.vh-status{
     color: #ffffff;
-    background-color: #3868c2;
     padding-top: 7px;
     padding-bottom: 7px;
     width: 10%;
@@ -143,18 +142,12 @@
     float: left;
 }
 
+.vh-created-booking {
+    background-color: #3868c2;
+}
+
 .vh-created-confirmation-failed {
-    color: #ffffff;
     background-color: #d4351c;
-    padding-top: 7px;
-    padding-bottom: 7px;
-    width: 10%;
-    font-weight: 300;
-    text-align: center;
-    margin-top: 1px;
-    font-size: 18px;
-    font-family: 'nta', Arial, sans-serif;
-    float: left;
 }
 
 .vh-btncancel {

AdminWebsite/AdminWebsite/Contracts/Enums/BookingStatus.cs

@@ -4,5 +4,7 @@ public enum BookingStatus
     Booked = 1,
     Created = 2,
     Cancelled = 3,
-    Failed = 4
+    Failed = 4,
+    BookedWithoutJudge = 5,
+    ConfirmedWithoutJudge = 6
 }

AdminWebsite/AdminWebsite/packages.lock.json

@@ -4,9 +4,9 @@
     "net6.0": {
       "BookingsApi.Client": {
         "type": "Direct",
-        "requested": "[1.44.57, )",
-        "resolved": "1.44.57",
-        "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==",
+        "requested": "[1.47.1-pr-0720-0003, )",
+        "resolved": "1.47.1-pr-0720-0003",
+        "contentHash": "xxk51jERKtcoNU8L1iLENJLJJFD1Hwxffwo1gbsyZLzhVVx5MmRKS+ypFy/wzkk9zhP3mHZsCPYG2HuAgl4q8g==",
         "dependencies": {
           "Microsoft.AspNetCore.Mvc.Core": "2.2.5"
         }