diff --git a/.gitignore b/.gitignore index f826b48e1..48c8a6dd2 100644 --- a/.gitignore +++ b/.gitignore @@ -350,4 +350,4 @@ jasmine-tests .DS_Store .env -.angular/ +.angular/ \ No newline at end of file diff --git a/AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json b/AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json index 5188b3d0c..f194f08f3 100644 --- a/AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json +++ b/AdminWebsite/AdminWebsite.AcceptanceTests/packages.lock.json @@ -161,8 +161,8 @@ }, "BookingsApi.Client": { "type": "Transitive", - "resolved": "1.44.57", - "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==", + "resolved": "1.47.6", + "contentHash": "O9oihWH0vAm2A4l3SFRCyq/cyQR+in3JmkLLotnf0kvVk1Uk5MqScYcthHlCmIUa1EODQfFZBaMrkGKGl488bA==", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "2.2.5" } @@ -2669,7 +2669,7 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.Uris": "[6.0.3, )", - "BookingsApi.Client": "[1.44.57, )", + "BookingsApi.Client": "[1.47.6, )", "FluentValidation.AspNetCore": "[10.4.0, )", "LaunchDarkly.ServerSdk": "[7.0.3, )", "MicroElements.Swashbuckle.FluentValidation": "[5.7.0, )", diff --git a/AdminWebsite/AdminWebsite.IntegrationTests/packages.lock.json b/AdminWebsite/AdminWebsite.IntegrationTests/packages.lock.json index 33b8b08a4..ee4cbd0ee 100644 --- a/AdminWebsite/AdminWebsite.IntegrationTests/packages.lock.json +++ b/AdminWebsite/AdminWebsite.IntegrationTests/packages.lock.json @@ -102,8 +102,8 @@ }, "BookingsApi.Client": { "type": "Transitive", - "resolved": "1.44.57", - "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==", + "resolved": "1.47.6", + "contentHash": "O9oihWH0vAm2A4l3SFRCyq/cyQR+in3JmkLLotnf0kvVk1Uk5MqScYcthHlCmIUa1EODQfFZBaMrkGKGl488bA==", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "2.2.5" } @@ -2101,7 +2101,7 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.Uris": "[6.0.3, )", - "BookingsApi.Client": "[1.44.57, )", + "BookingsApi.Client": "[1.47.6, )", "FluentValidation.AspNetCore": "[10.4.0, )", "LaunchDarkly.ServerSdk": "[7.0.3, )", "MicroElements.Swashbuckle.FluentValidation": "[5.7.0, )", diff --git a/AdminWebsite/AdminWebsite.UnitTests/packages.lock.json b/AdminWebsite/AdminWebsite.UnitTests/packages.lock.json index ed9c84a80..f8436486d 100644 --- a/AdminWebsite/AdminWebsite.UnitTests/packages.lock.json +++ b/AdminWebsite/AdminWebsite.UnitTests/packages.lock.json @@ -107,8 +107,8 @@ }, "BookingsApi.Client": { "type": "Transitive", - "resolved": "1.44.57", - "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==", + "resolved": "1.47.6", + "contentHash": "O9oihWH0vAm2A4l3SFRCyq/cyQR+in3JmkLLotnf0kvVk1Uk5MqScYcthHlCmIUa1EODQfFZBaMrkGKGl488bA==", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "2.2.5" } @@ -1979,7 +1979,7 @@ "type": "Project", "dependencies": { "AspNetCore.HealthChecks.Uris": "[6.0.3, )", - "BookingsApi.Client": "[1.44.57, )", + "BookingsApi.Client": "[1.47.6, )", "FluentValidation.AspNetCore": "[10.4.0, )", "LaunchDarkly.ServerSdk": "[7.0.3, )", "MicroElements.Swashbuckle.FluentValidation": "[5.7.0, )", diff --git a/AdminWebsite/AdminWebsite/AdminWebsite.csproj b/AdminWebsite/AdminWebsite/AdminWebsite.csproj index 6b11a5b02..41d01c457 100644 --- a/AdminWebsite/AdminWebsite/AdminWebsite.csproj +++ b/AdminWebsite/AdminWebsite/AdminWebsite.csproj @@ -32,7 +32,7 @@ - + diff --git a/AdminWebsite/AdminWebsite/ClientApp/package-lock.json b/AdminWebsite/AdminWebsite/ClientApp/package-lock.json index e038a6445..3c931d0a7 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/package-lock.json +++ b/AdminWebsite/AdminWebsite/ClientApp/package-lock.json @@ -64,7 +64,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", @@ -10185,9 +10185,9 @@ ] }, "node_modules/karma": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz", - "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.2.tgz", + "integrity": "sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==", "dev": true, "dependencies": { "@colors/colors": "1.5.0", @@ -10272,9 +10272,9 @@ } }, "node_modules/karma-jasmine": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz", - "integrity": "sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz", + "integrity": "sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g==", "dev": true, "dependencies": { "jasmine-core": "^3.6.0" @@ -22960,9 +22960,9 @@ "dev": true }, "karma": { - "version": "6.4.1", - "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.1.tgz", - "integrity": "sha512-Cj57NKOskK7wtFWSlMvZf459iX+kpYIPXmkNUzP2WAFcA7nhr/ALn5R7sw3w+1udFDcpMx/tuB8d5amgm3ijaA==", + "version": "6.4.2", + "resolved": "https://registry.npmjs.org/karma/-/karma-6.4.2.tgz", + "integrity": "sha512-C6SU/53LB31BEgRg+omznBEMY4SjHU3ricV6zBcAe1EeILKkeScr+fZXtaI5WyDbkVowJxxAI6h73NcFPmXolQ==", "dev": true, "requires": { "@colors/colors": "1.5.0", @@ -23078,9 +23078,9 @@ } }, "karma-jasmine": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.1.tgz", - "integrity": "sha512-h8XDAhTiZjJKzfkoO1laMH+zfNlra+dEQHUAjpn5JV1zCPtOIVWGQjLBrqhnzQa/hrU2XrZwSyBa6XjEBzfXzw==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/karma-jasmine/-/karma-jasmine-4.0.2.tgz", + "integrity": "sha512-ggi84RMNQffSDmWSyyt4zxzh2CQGwsxvYYsprgyR1j8ikzIduEdOlcLvXjZGwXG/0j41KUXOWsUCBfbEHPWP9g==", "dev": true, "requires": { "jasmine-core": "^3.6.0" diff --git a/AdminWebsite/AdminWebsite/ClientApp/package.json b/AdminWebsite/AdminWebsite/ClientApp/package.json index 809acc4a2..27ec3473f 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/package.json +++ b/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", diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.spec.ts index 20507d24e..49400af44 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.spec.ts +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.spec.ts @@ -155,6 +155,21 @@ describe('BookingConfirmationComponent', () => { // assert expect(component.bookingConfirmedSuccessfully).toBe(true); }); + it('should return true, when booking successful but without a judge', () => { + // arrange: set spy to return Failed status hearing + newHearing.status = BookingStatus.BookedWithoutJudge; + videoHearingsServiceSpy.getHearingById.and.returnValue(of(newHearing)); + TestBed.overrideProvider(VideoHearingsService, { useValue: videoHearingsServiceSpy }); + TestBed.compileComponents(); + fixture = TestBed.createComponent(BookingConfirmationComponent); + component = fixture.componentInstance; + fixture.detectChanges(); + // act + component.ngOnInit(); + component.retrieveSavedHearing(); + // assert + expect(component.bookingConfirmedSuccessfully).toBe(true); + }); it('should return false, when booking unsuccessful', () => { // arrange: set spy to return Failed status hearing newHearing.status = BookingStatus.Failed; diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.ts index 8fe3eaad0..1eb030254 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.ts +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/booking-confirmation/booking-confirmation.component.ts @@ -31,7 +31,12 @@ export class BookingConfirmationComponent implements OnInit { ) {} get bookingConfirmedSuccessfully(): boolean { - return this.status === BookingStatus.Booked || this.status === BookingStatus.Created; + return ( + this.status === BookingStatus.Booked || + this.status === BookingStatus.Created || + this.status === BookingStatus.BookedWithoutJudge || + this.status === BookingStatus.ConfirmedWithoutJudge + ); } ngOnInit() { diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.css b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.css index 005dfe41b..e082a206c 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.css +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-details/booking-details.component.css @@ -14,3 +14,10 @@ color: #ffffff; background-color: #d4351c; } + +.vh-booking-detail-status { + width: 25%; + padding-top: 7px; + padding-bottom: 7px; + float: left; +} 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 0fbb2b543..1541102aa 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 @@ -9,11 +9,11 @@

{{ hearing.HearingCaseNumber }}

-
{{ hearing.Status }}
+
+ +
{{ hearing.CancelReason }}
-
Confirmed
-
Failed
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.html b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.html new file mode 100644 index 000000000..0261a599b --- /dev/null +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.html @@ -0,0 +1,16 @@ +NO JUDGE ASSIGNED +
+
{{ bookingDetails.StartTime | amLocal | amDateFormat : 'h:mm a' }}
+
listed for {{ bookingDetails.DurationInHoursAndMinutes }}
+
+
+ {{ this.statusMessage }} +
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.scss b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.scss new file mode 100644 index 000000000..cac299e77 --- /dev/null +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.scss @@ -0,0 +1,41 @@ +@import 'govuk-frontend/govuk/base'; +.vh-sml { + font-size: smaller; +} + +.vh-status { + color: govuk-colour('white'); + 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: govuk-colour('red'); +} + +.vh-created-booking { + background-color: govuk-colour('blue'); +} + +.vh-nojudge { + background: govuk-colour('red'); + color: govuk-colour('white'); + padding: 0px 4px; +} + +.vh-col { + margin-left: 10px; +} + +.govuk-hint { + margin-bottom: 0; +} + +.vh-font-black { + color: govuk-colour('black'); +} diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.spec.ts new file mode 100644 index 000000000..b59c9fc10 --- /dev/null +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.spec.ts @@ -0,0 +1,59 @@ +import { BookingStatusComponent } from './booking-status.component'; +import { ComponentFixture, TestBed } from '@angular/core/testing'; +import { MomentModule } from 'ngx-moment'; + +describe('BookingStatusComponent', () => { + let component: BookingStatusComponent; + let fixture: ComponentFixture; + + beforeEach(async () => { + await TestBed.configureTestingModule({ + declarations: [BookingStatusComponent], + imports: [MomentModule] + }).compileComponents(); + + fixture = TestBed.createComponent(BookingStatusComponent); + component = fixture.componentInstance; + component.bookingDetails = {} as any; + fixture.detectChanges(); + }); + + it('should create', () => { + expect(component).toBeTruthy(); + }); + + describe('statusMessage', () => { + it('should return Confirmed when status is Created', () => { + component.bookingDetails = { Status: 'Created' } as any; + expect(component.statusMessage).toBe('Confirmed'); + }); + it('should return Confirmed when status is ConfirmedWithoutJudge', () => { + component.bookingDetails = { Status: 'ConfirmedWithoutJudge' } as any; + expect(component.statusMessage).toBe('Confirmed'); + }); + it('should return Cancelled when status is Cancelled', () => { + component.bookingDetails = { Status: 'Cancelled' } as any; + expect(component.statusMessage).toBe('Cancelled'); + }); + it('should return Failed when status is Failed', () => { + component.bookingDetails = { Status: 'Failed' } as any; + expect(component.statusMessage).toBe('Failed'); + }); + it('should return null when status is anything else', () => { + component.bookingDetails = { Status: 'anything else' } as any; + expect(component.statusMessage).toBe(null); + }); + }); + + describe('hasNoJudge', () => { + it('should return true when status is BookedWithoutJudge', () => { + component.bookingDetails = { Status: 'BookedWithoutJudge' } as any; + expect(component.hasNoJudge).toBe(true); + }); + + it('should return false when status is ConfirmedWithoutJudge', () => { + component.bookingDetails = { Status: 'ConfirmedWithoutJudge' } as any; + expect(component.hasNoJudge).toBe(true); + }); + }); +}); diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.ts new file mode 100644 index 000000000..1d17d0c45 --- /dev/null +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-status/booking-status.component.ts @@ -0,0 +1,29 @@ +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.scss'] +}) +export class BookingStatusComponent { + @Input() bookingDetails: BookingsDetailsModel; + @Input() showTime = false; + + public get statusMessage(): string { + switch (this.bookingDetails.Status) { + case 'Created': + case 'ConfirmedWithoutJudge': + 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'; + } +} diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list.module.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list.module.ts index 092c288ea..b562f935a 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/bookings-list.module.ts +++ b/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,7 +24,8 @@ import { NgSelectModule } from '@ng-select/ng-select'; HearingDetailsComponent, CopySipComponent, CopyConferencePhoneComponent, - CopyJoinLinkComponent + CopyJoinLinkComponent, + BookingStatusComponent ], providers: [], exports: [ @@ -31,7 +33,8 @@ import { NgSelectModule } from '@ng-select/ng-select'; BookingDetailsComponent, ParticipantDetailsComponent, BookingParticipantListComponent, - HearingDetailsComponent + HearingDetailsComponent, + BookingStatusComponent ] }) export class BookingsListModule {} 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 cea3ae7ac..8dd192dc5 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,12 +144,7 @@

{{ title }}

>
- NO JUDGE ASSIGNED -
{{ detail.StartTime | amLocal | amDateFormat : 'h:mm a' }}
-
listed for {{ detail.DurationInHoursAndMinutes }}
-
{{ detail.Status }}
-
Confirmed
-
Failed
+
{{ detail.HearingCaseNumber }}
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 fdbac3e2f..1439a5dcf 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 @@ -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; @@ -132,3 +103,10 @@ p { .ng-select.custom ::ng-deep .ng-placeholder { color: govuk-colour('black'); } + +.vh-booking-detail-status { + width: 90%; + padding-top: 7px; + padding-bottom: 7px; + float: left; +} diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/bookings-list.model.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/bookings-list.model.ts index 09073b464..27de3ed3d 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/bookings-list.model.ts +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/bookings-list.model.ts @@ -105,4 +105,8 @@ export class BookingsDetailsModel { public get hasBookingConfirmationFailed(): boolean { return this.Status === 'Failed'; } + + public get hasConfirmationWithNoJudge(): boolean { + return this.Status === 'ConfirmedWithoutJudge'; + } } diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/clients/api-client.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/clients/api-client.ts index bf315d2cc..8a297fc11 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/clients/api-client.ts +++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/clients/api-client.ts @@ -5288,7 +5288,9 @@ export enum BookingStatus { Booked = 'Booked', Created = 'Created', Cancelled = 'Cancelled', - Failed = 'Failed' + Failed = 'Failed', + BookedWithoutJudge = 'BookedWithoutJudge', + ConfirmedWithoutJudge = 'ConfirmedWithoutJudge' } export enum JudgeAccountType { @@ -8188,7 +8190,9 @@ export enum BookingStatus2 { Booked = 'Booked', Created = 'Created', Cancelled = 'Cancelled', - Failed = 'Failed' + Failed = 'Failed', + BookedWithoutJudge = 'BookedWithoutJudge', + ConfirmedWithoutJudge = 'ConfirmedWithoutJudge' } export class EditJusticeUserRequest implements IEditJusticeUserRequest { diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/styles.css b/AdminWebsite/AdminWebsite/ClientApp/src/styles.css index 7c8b85e89..73a0d7d66 100644 --- a/AdminWebsite/AdminWebsite/ClientApp/src/styles.css +++ b/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 { diff --git a/AdminWebsite/AdminWebsite/Contracts/Enums/BookingStatus.cs b/AdminWebsite/AdminWebsite/Contracts/Enums/BookingStatus.cs index 67db5110b..89b6d1d1b 100644 --- a/AdminWebsite/AdminWebsite/Contracts/Enums/BookingStatus.cs +++ b/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 } \ No newline at end of file diff --git a/AdminWebsite/AdminWebsite/packages.lock.json b/AdminWebsite/AdminWebsite/packages.lock.json index 6757074aa..2009a5bb2 100644 --- a/AdminWebsite/AdminWebsite/packages.lock.json +++ b/AdminWebsite/AdminWebsite/packages.lock.json @@ -14,9 +14,9 @@ }, "BookingsApi.Client": { "type": "Direct", - "requested": "[1.44.57, )", - "resolved": "1.44.57", - "contentHash": "TcoiHRRew9LRr6eXlNOjRIna8/9vigUTVdCXI2xwr6gnWbMUhq9D0Xfl9kBD+hhW8ATPKL7x9NIcv+fxqf6wJw==", + "requested": "[1.47.6, )", + "resolved": "1.47.6", + "contentHash": "O9oihWH0vAm2A4l3SFRCyq/cyQR+in3JmkLLotnf0kvVk1Uk5MqScYcthHlCmIUa1EODQfFZBaMrkGKGl488bA==", "dependencies": { "Microsoft.AspNetCore.Mvc.Core": "2.2.5" } diff --git a/charts/vh-admin-web/values.dev.template.yaml b/charts/vh-admin-web/values.dev.template.yaml index 119a08454..c653d0aa1 100644 --- a/charts/vh-admin-web/values.dev.template.yaml +++ b/charts/vh-admin-web/values.dev.template.yaml @@ -8,5 +8,4 @@ java: AZUREAD__POSTLOGOUTREDIRECTURI: https://${SERVICE_FQDN}/logout AZUREAD__REDIRECTURI: https://${SERVICE_FQDN}/home DOM1__POSTLOGOUTREDIRECTURI: https://${SERVICE_FQDN}/logout - DOM1__REDIRECTURI: https://${SERVICE_FQDN}/home - DOM1__REDIRECTURI: https://${SERVICE_FQDN}/home + DOM1__REDIRECTURI: https://${SERVICE_FQDN}/home \ No newline at end of file