diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant-base/add-participant-base.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant-base/add-participant-base.component.ts
index a849a4d57..eb45170ef 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant-base/add-participant-base.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant-base/add-participant-base.component.ts
@@ -220,7 +220,7 @@ export abstract class AddParticipantBaseDirective extends BookingBaseComponent i
lastName: this.participantDetails.lastName?.trim(),
email: this.participantDetails.email?.trim() || '',
phone: this.participantDetails.phone?.trim() || '',
- displayName: this.participantDetails.display_Name?.trim() || '',
+ displayName: this.participantDetails.displayName?.trim() || '',
companyName: this.participantDetails.company?.trim() || '',
companyNameIndividual: this.participantDetails.company?.trim() || '',
representing: this.participantDetails.representee?.trim() || '',
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.spec.ts
index 3a5d12a31..42f2150a2 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.spec.ts
@@ -94,7 +94,7 @@ const participants: VHParticipant[] = [];
const p1 = new VHParticipant();
p1.firstName = 'John';
p1.lastName = 'Doe';
-p1.display_Name = 'John Doe';
+p1.displayName = 'John Doe';
p1.title = 'Mr.';
p1.email = 'test1@hmcts.net';
p1.phone = '32332';
@@ -107,7 +107,7 @@ p1.username = 'judge@user.name';
const p2 = new VHParticipant();
p2.firstName = 'Jane';
p2.lastName = 'Doe';
-p2.display_Name = 'Jane Doe';
+p2.displayName = 'Jane Doe';
p2.title = 'Mr.';
p2.email = 'test2@hmcts.net';
p2.phone = '32332';
@@ -120,7 +120,7 @@ p1.username = 'judge@user.name';
const p3 = new VHParticipant();
p3.firstName = 'Chris';
p3.lastName = 'Green';
-p3.display_Name = 'Chris Green';
+p3.displayName = 'Chris Green';
p3.title = 'Mr.';
p3.email = 'test3@hmcts.net';
p3.phone = '32332';
@@ -134,7 +134,7 @@ p3.userRoleName = 'Representative';
const p4 = new VHParticipant();
p4.firstName = 'Test';
p4.lastName = 'Participant';
-p4.display_Name = 'Test Participant';
+p4.displayName = 'Test Participant';
p4.title = 'Mr.';
p4.email = 'test4@hmcts.net';
p4.phone = '32332';
@@ -146,7 +146,7 @@ p4.userRoleName = 'Individual';
const p5 = new VHParticipant();
p5.firstName = 'Test7';
p5.lastName = 'Participant7';
-p5.display_Name = 'Test Participant7';
+p5.displayName = 'Test Participant7';
p5.title = 'Mr.';
p5.email = 'test7@hmcts.net';
p5.phone = '32332';
@@ -159,7 +159,7 @@ p5.interpreterFor = 'test4@hmcts.net';
const p6 = new VHParticipant();
p6.firstName = 'Test8';
p6.lastName = 'Participant8';
-p6.display_Name = 'Test Participant8';
+p6.displayName = 'Test Participant8';
p6.title = 'Mr.';
p6.email = 'test8@hmcts.net';
p6.phone = '32332';
@@ -202,7 +202,7 @@ function initParticipant() {
participant.firstName = 'Sam';
participant.lastName = 'Green';
participant.phone = '12345';
- participant.display_Name = 'Sam Green';
+ participant.displayName = 'Sam Green';
participant.title = 'Mr';
participant.hearingRoleName = 'Representative';
participant.company = 'CN';
@@ -401,7 +401,7 @@ describe('AddParticipantComponent', () => {
expect(email.value).toBe(participant.email);
expect(phone.value).toBe(participant.phone);
expect(title.value).toBe(participant.title);
- expect(displayName.value).toBe(participant.display_Name);
+ expect(displayName.value).toBe(participant.displayName);
expect(companyName.value).toBe(participant.company);
expect(component.displayNextButton).toBeFalsy();
expect(component.displayClearButton).toBeTruthy();
@@ -411,7 +411,7 @@ describe('AddParticipantComponent', () => {
it('should populate the form fields when values are null', () => {
participant.email = null;
participant.phone = null;
- participant.display_Name = null;
+ participant.displayName = null;
participant.company = null;
participant.representee = null;
component.getParticipant(participant);
@@ -642,14 +642,14 @@ describe('AddParticipantComponent', () => {
const pa1 = new VHParticipant();
pa1.firstName = 'firstname';
pa1.lastName = 'lastname-interpretee';
- pa1.display_Name = 'firstname lastname-interpretee';
+ pa1.displayName = 'firstname lastname-interpretee';
pa1.email = 'firstname.lastname-interpretee@email.com';
pa1.hearingRoleName = 'Litigant in Person';
const pa2 = new VHParticipant();
pa2.firstName = 'firstname';
pa2.lastName = 'lastname-interpreter';
- pa1.display_Name = 'firstname lastname-interpreter';
+ pa1.displayName = 'firstname lastname-interpreter';
pa2.email = 'firstname.lastname-interpreter@email.com';
pa2.hearingRoleName = 'Interpreter';
pa2.interpreterFor = 'firstname.lastname-interpretee@email.com';
@@ -674,14 +674,14 @@ describe('AddParticipantComponent', () => {
const part1 = new VHParticipant();
part1.firstName = 'firstname';
part1.lastName = 'lastname-interpretee';
- part1.display_Name = 'firstname lastname-interpretee';
+ part1.displayName = 'firstname lastname-interpretee';
part1.email = 'firstname.lastname-interpretee@email.com';
part1.hearingRoleName = 'Litigant in Person';
const part2 = new VHParticipant();
part2.firstName = 'firstname';
part2.lastName = 'lastname-interpreter';
- part2.display_Name = 'firstname lastname-interpreter';
+ part2.displayName = 'firstname lastname-interpreter';
part2.email = 'firstname.lastname-interpreter@email.com';
part2.hearingRoleName = 'Interpreter';
part2.interpreterFor = 'firstname.lastname-interpretee@email.com';
@@ -909,7 +909,7 @@ describe('AddParticipantComponent edit mode', () => {
role: 'Panel Member',
email: participant.email,
phone: participant.phone,
- displayName: participant.display_Name,
+ displayName: participant.displayName,
companyName: participant.company,
companyNameIndividual: participant.company,
representing: participant.representee,
@@ -1042,7 +1042,7 @@ describe('AddParticipantComponent edit mode', () => {
interpretee.setValue('test4@email.com');
component.updateParticipant();
const updatedParticipant = component.hearing.participants.find(x => x.email === 'mock@hmcts.net');
- expect(updatedParticipant.display_Name).toBe('Sam Green');
+ expect(updatedParticipant.displayName).toBe('Sam Green');
});
it('should before save booking check if all fields available', () => {
component.actionsBeforeSave();
@@ -1069,7 +1069,7 @@ describe('AddParticipantComponent edit mode', () => {
lastName: participant.lastName,
email: participant.email,
phone: participant.phone,
- displayName: participant.display_Name,
+ displayName: participant.displayName,
companyName: participant.company,
companyNameIndividual: participant.company,
representing: participant.representee,
@@ -1094,7 +1094,7 @@ describe('AddParticipantComponent edit mode', () => {
lastName: participant.lastName,
email: participant.email,
phone: participant.phone,
- displayName: participant.display_Name,
+ displayName: participant.displayName,
companyName: participant.company,
companyNameIndividual: participant.company,
representing: participant.representee,
@@ -1173,7 +1173,7 @@ describe('AddParticipantComponent edit mode', () => {
const part1 = new VHParticipant();
part1.firstName = 'firstname';
part1.lastName = 'lastname-interpretee';
- part1.display_Name = 'firstname lastname-interpretee';
+ part1.displayName = 'firstname lastname-interpretee';
part1.email = 'firstname.lastname-interpretee@email.com';
part1.hearingRoleName = 'Litigant in Person';
part1.id = '100';
@@ -1181,7 +1181,7 @@ describe('AddParticipantComponent edit mode', () => {
const part2 = new VHParticipant();
part2.firstName = 'firstname';
part2.lastName = 'lastname-interpreter';
- part2.display_Name = 'firstname lastname-interpreter';
+ part2.displayName = 'firstname lastname-interpreter';
part2.email = 'firstname.lastname-interpreter@email.com';
part2.hearingRoleName = 'Interpreter';
part2.interpreterFor = 'firstname.lastname-interpretee@email.com';
@@ -1221,7 +1221,7 @@ describe('AddParticipantComponent edit mode', () => {
interpretee.setValue('test8@email.com');
component.updateParticipant();
const updatedParticipant = component.hearing.participants.find(x => x.email === 'test8@hmcts.net');
- expect(updatedParticipant.display_Name).toBe('Test Participant8');
+ expect(updatedParticipant.displayName).toBe('Test Participant8');
});
});
describe('AddParticipantComponent edit mode no participants added', () => {
@@ -1348,7 +1348,7 @@ describe('AddParticipantComponent edit mode no participants added', () => {
lastName: participant.lastName,
email: participant.email,
phone: participant.phone,
- displayName: participant.display_Name,
+ displayName: participant.displayName,
companyName: participant.company,
companyNameIndividual: participant.company,
representing: participant.representee,
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.ts
index 537b399fd..b8a36f10f 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/add-participant/add-participant.component.ts
@@ -457,7 +457,7 @@ export class AddParticipantComponent extends AddParticipantBaseDirective impleme
newParticipant.hearingRoleCode = this.hearingRoles.find(h => h.name === this.role.value)?.code;
newParticipant.email = this.searchEmail ? this.searchEmail.email : '';
- newParticipant.display_Name = this.displayName.value;
+ newParticipant.displayName = this.displayName.value;
if (this.isRoleRepresentative(this.role.value)) {
newParticipant.company = this.companyName.value;
} else {
@@ -766,7 +766,7 @@ export class AddParticipantComponent extends AddParticipantBaseDirective impleme
private addLinkedParticipant(newParticipant: VHParticipant): void {
if (newParticipant.interpreterFor) {
const interpretee = this.getInterpretee(newParticipant.interpreterFor);
- newParticipant.interpreteeName = interpretee.display_Name;
+ newParticipant.interpreteeName = interpretee.displayName;
const linkedParticipant: LinkedParticipantModel = {
participantEmail: newParticipant.email,
linkedParticipantEmail: interpretee.email,
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.spec.ts
index de360218a..c1e66861b 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.spec.ts
@@ -29,7 +29,7 @@ import { HearingRoles } from 'src/app/common/model/hearing-roles.model';
function initHearingRequest(): VHBooking {
const participants: VHParticipant[] = [];
const p1 = new VHParticipant();
- p1.display_Name = 'display name1';
+ p1.displayName = 'display name1';
p1.email = 'test1@hmcts.net';
p1.contactEmail = 'test1@hmcts.net';
p1.firstName = 'first';
@@ -39,7 +39,7 @@ function initHearingRequest(): VHBooking {
p1.hearingRoleName = 'Judge';
const p2 = new VHParticipant();
- p2.display_Name = 'display name2';
+ p2.displayName = 'display name2';
p2.email = 'test2@hmcts.net';
p2.contactEmail = 'test2@hmcts.net';
p2.firstName = 'first2';
@@ -297,8 +297,8 @@ describe('AssignJudgeComponent', () => {
component.judgeDisplayNameFld.setValue('');
component.changeDisplayName();
expect(component.judgeDisplayNameFld.value).toBe(displayNameSanitized);
- expect(component.judge.display_Name).toBe(displayNameSanitized);
- expect(component.hearing.participants.find(x => x.isJudge).display_Name).toBe(displayNameSanitized);
+ expect(component.judge.displayName).toBe(displayNameSanitized);
+ expect(component.hearing.participants.find(x => x.isJudge).displayName).toBe(displayNameSanitized);
});
it('should unsubscribe all subcriptions on destroy component', () => {
@@ -351,14 +351,14 @@ describe('AssignJudgeComponent', () => {
const judge = new VHParticipant();
judge.username = 'JudgeUserName';
judge.email = 'JudgeEmail';
- judge.display_Name = 'JudgeDisplayName';
+ judge.displayName = 'JudgeDisplayName';
judge.phone = 'JudgePhone';
judge.isCourtroomAccount = true;
const alternateJudge = new VHParticipant();
alternateJudge.username = 'AlternateJudgeUserName';
alternateJudge.email = 'AlternateJudgeEmail';
- alternateJudge.display_Name = 'AlternateJudgeDisplayName';
+ alternateJudge.displayName = 'AlternateJudgeDisplayName';
alternateJudge.phone = 'AlternateJudgePhone';
alternateJudge.hearingRoleName = Constants.HearingRoles.Judge;
@@ -401,7 +401,7 @@ describe('AssignJudgeComponent', () => {
});
it('should set correct validation errors if display name is null', () => {
- component.judge.display_Name = null;
+ component.judge.displayName = null;
component.saveJudge();
expect(component.isJudgeParticipantError).toBe(false);
@@ -410,7 +410,7 @@ describe('AssignJudgeComponent', () => {
});
it('should set correct validation errors if display name is null', () => {
- component.judge.display_Name = null;
+ component.judge.displayName = null;
component.saveJudge();
expect(component.isJudgeParticipantError).toBe(false);
@@ -551,7 +551,7 @@ describe('AssignJudgeComponent', () => {
beforeEach(() => {
const updatedJudgeDisplayName = 'UpdatedJudgeDisplayName';
videoHearingsServiceSpy.canAddJudge.and.returnValue(true);
- component.judge.display_Name = updatedJudgeDisplayName;
+ component.judge.displayName = updatedJudgeDisplayName;
});
it('should add judge account when none present', () => {
@@ -569,7 +569,7 @@ describe('AssignJudgeComponent', () => {
expect(updatedJudges.length).toBe(1);
expect(component.courtAccountJudgeEmail).toEqual(judge.username);
- expect(component.judgeDisplayNameFld.value).toEqual(judge.display_Name);
+ expect(component.judgeDisplayNameFld.value).toEqual(judge.displayName);
expect(updatedJudges[0]).toBe(judge);
expect(updatedJudges[0].hearingRoleCode).toBe(Constants.HearingRoleCodes.Judge);
@@ -578,7 +578,7 @@ describe('AssignJudgeComponent', () => {
});
});
afterEach(() => {
- expect(component.judgeDisplayNameFld.value).toEqual(judge.display_Name);
+ expect(component.judgeDisplayNameFld.value).toEqual(judge.displayName);
expect(component.judgeEmailFld.value).toEqual(otherInformationDetailsJudgeEmail);
expect(component.judgePhoneFld.value).toEqual(otherInformationDetailsJudgePhone);
});
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.ts
index 7a28b162f..ef937501d 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/assign-judge/assign-judge.component.ts
@@ -105,7 +105,7 @@ export class AssignJudgeComponent extends BookingBaseComponent implements OnInit
const staffMemberExists = this.hearing?.participants.find(x => x.hearingRoleName === Constants.HearingRoles.StaffMember);
this.showAddStaffMemberFld = new FormControl(!!staffMemberExists);
- this.judgeDisplayNameFld = new FormControl(this.judge?.display_Name, {
+ this.judgeDisplayNameFld = new FormControl(this.judge?.displayName, {
validators: [Validators.required, Validators.pattern(Constants.TextInputPatternDisplayName), Validators.maxLength(255)],
updateOn: 'blur'
});
@@ -161,7 +161,7 @@ export class AssignJudgeComponent extends BookingBaseComponent implements OnInit
}),
this.judgeDisplayNameFld.valueChanges.subscribe(name => {
if (this.judge) {
- this.judge.display_Name = name;
+ this.judge.displayName = name;
}
}),
this.judgeEmailFld.valueChanges.subscribe(email => {
@@ -213,10 +213,10 @@ export class AssignJudgeComponent extends BookingBaseComponent implements OnInit
const text = SanitizeInputText(this.judgeDisplayNameFld.value);
this.judgeDisplayNameFld.setValue(text);
- if (this.judge?.display_Name) {
+ if (this.judge?.displayName) {
const judge = this.hearing.participants.find(x => x.isJudge);
if (judge) {
- this.hearing.participants.find(x => x.isJudge).display_Name = this.judge.display_Name;
+ this.hearing.participants.find(x => x.isJudge).displayName = this.judge.displayName;
}
}
}
@@ -245,13 +245,13 @@ export class AssignJudgeComponent extends BookingBaseComponent implements OnInit
this.logger.debug(`${this.loggerPrefix} Attempting to save judge.`);
if (this.judge?.email) {
- if (!this.judge.display_Name) {
+ if (!this.judge.displayName) {
this.logger.warn(`${this.loggerPrefix} No judge selected. Display name not set.`);
this.failedSubmission = true;
return;
}
- if (!this.hearingService.canAddJudge(this.judge.display_Name)) {
+ if (!this.hearingService.canAddJudge(this.judge.displayName)) {
this.logger.warn(`${this.loggerPrefix} Judge could not be a panel member or winger in the same hearing.`);
this.isJudgeParticipantError = true;
this.failedSubmission = true;
@@ -364,7 +364,7 @@ export class AssignJudgeComponent extends BookingBaseComponent implements OnInit
private setTextFieldValues() {
if (this.isJudgeSelected) {
- this.judgeDisplayNameFld.setValue(this.judge.display_Name);
+ this.judgeDisplayNameFld.setValue(this.judge.displayName);
let judgeEmail = '';
if (this.displayEmailField) {
judgeEmail = this.otherInformationDetails.JudgeEmail;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts
index 5147e738a..1482fdece 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.spec.ts
@@ -25,7 +25,7 @@ function initHearingRequest(): VHBooking {
firstName: 'John',
lastName: 'Doe',
email: 'john@doe.com',
- display_Name: 'John Doe',
+ displayName: 'John Doe',
userRoleName: 'Representative',
interpretation_language: undefined
}),
@@ -34,7 +34,7 @@ function initHearingRequest(): VHBooking {
firstName: 'Chris',
lastName: 'Green',
email: 'chris@green,com',
- display_Name: 'Chris Green',
+ displayName: 'Chris Green',
userRoleName: 'Representative',
interpretation_language: undefined
}),
@@ -43,7 +43,7 @@ function initHearingRequest(): VHBooking {
firstName: 'Jane',
lastName: 'Smith',
email: 'jane@smith.com',
- display_Name: 'Jane Smith',
+ displayName: 'Jane Smith',
userRoleName: 'Individual',
interpretation_language: undefined
})
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts
index e42ed3227..d2b936372 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/endpoints.component.ts
@@ -190,7 +190,7 @@ export class EndpointsComponent extends BookingBaseComponent implements OnInit,
displayName: e.displayName,
defenceAdvocate: defenceAdvocate
? {
- displayName: defenceAdvocate?.display_Name,
+ displayName: defenceAdvocate?.displayName,
email: defenceAdvocate?.email
}
: null,
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts
index 86500997b..291ae86ba 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.spec.ts
@@ -17,7 +17,7 @@ describe('VideoEndpointFormComponent', () => {
firstName: 'John',
lastName: 'Doe',
email: 'john@doe.com',
- display_Name: 'John Doe',
+ displayName: 'John Doe',
userRoleName: 'Representative',
interpretation_language: undefined
}),
@@ -26,7 +26,7 @@ describe('VideoEndpointFormComponent', () => {
firstName: 'Chris',
lastName: 'Green',
email: 'chris@green,com',
- display_Name: 'Chris Green',
+ displayName: 'Chris Green',
userRoleName: 'Representative',
interpretation_language: undefined
}),
@@ -35,7 +35,7 @@ describe('VideoEndpointFormComponent', () => {
firstName: 'Jane',
lastName: 'Smith',
email: 'jane@smith.com',
- display_Name: 'Jane Smith',
+ displayName: 'Jane Smith',
userRoleName: 'Individual',
interpretation_language: undefined
})
@@ -150,7 +150,7 @@ describe('VideoEndpointFormComponent', () => {
displayName: 'Test Endpoint',
defenceAdvocate: {
email: rep.email,
- displayName: rep.display_Name
+ displayName: rep.displayName
},
interpretationLanguage: undefined,
screening: undefined,
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts
index c76492a04..49d1f67f7 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/endpoints/video-endpoint-form/video-endpoint-form.component.ts
@@ -86,7 +86,7 @@ export class VideoEndpointFormComponent {
const representative = this.availableRepresentatives.find(p => p.email === this.form.value.linkedRepresentative);
defenceAdvocate = {
email: representative.email,
- displayName: representative.display_Name
+ displayName: representative.displayName
};
}
const dto: VideoAccessPointDto = {
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.spec.ts
index f1d5eb444..fc9764b8e 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.spec.ts
@@ -33,13 +33,13 @@ describe('ParticipantListComponent', () => {
const pat1 = new VHParticipant();
pat1.title = 'Mrs';
pat1.firstName = 'Sam';
- pat1.display_Name = 'Sam';
+ pat1.displayName = 'Sam';
pat1.addedDuringHearing = false;
pat1.hearingRoleCode = HearingRoleCodes.Applicant;
const pat2 = new VHParticipant();
pat2.title = 'Mr';
pat2.firstName = 'John';
- pat2.display_Name = 'Doe';
+ pat2.displayName = 'Doe';
pat2.addedDuringHearing = false;
pat2.hearingRoleCode = HearingRoleCodes.Applicant;
@@ -73,13 +73,13 @@ describe('ParticipantListComponent', () => {
it('should call sortParticipants when participant list changes', () => {
const sortSpy = spyOn(component, 'sortParticipants');
component.hearing.participants = [
- new VHParticipant({ display_Name: 'B', interpretation_language: undefined }),
- new VHParticipant({ display_Name: 'A', interpretation_language: undefined }),
- new VHParticipant({ display_Name: 'C', interpretation_language: undefined })
+ new VHParticipant({ displayName: 'B', interpretation_language: undefined }),
+ new VHParticipant({ displayName: 'A', interpretation_language: undefined }),
+ new VHParticipant({ displayName: 'C', interpretation_language: undefined })
];
component.sortedParticipants = [
- new VHParticipant({ display_Name: 'A', interpretation_language: undefined }),
- new VHParticipant({ display_Name: 'B', interpretation_language: undefined })
+ new VHParticipant({ displayName: 'A', interpretation_language: undefined }),
+ new VHParticipant({ displayName: 'B', interpretation_language: undefined })
];
component.ngDoCheck();
expect(sortSpy).toHaveBeenCalled();
@@ -88,12 +88,12 @@ describe('ParticipantListComponent', () => {
it('should not call sortParticipants when participant list does not change', () => {
const sortSpy = spyOn(component, 'sortParticipants');
component.hearing.participants = [
- new VHParticipant({ display_Name: 'A', interpretation_language: undefined, externalReferenceId: '1' }),
- new VHParticipant({ display_Name: 'B', interpretation_language: undefined, externalReferenceId: '2' })
+ new VHParticipant({ displayName: 'A', interpretation_language: undefined, externalReferenceId: '1' }),
+ new VHParticipant({ displayName: 'B', interpretation_language: undefined, externalReferenceId: '2' })
];
component.sortedParticipants = [
- new VHParticipant({ display_Name: 'A', interpretation_language: undefined, externalReferenceId: '1' }),
- new VHParticipant({ display_Name: 'B', interpretation_language: undefined, externalReferenceId: '2' })
+ new VHParticipant({ displayName: 'A', interpretation_language: undefined, externalReferenceId: '1' }),
+ new VHParticipant({ displayName: 'B', interpretation_language: undefined, externalReferenceId: '2' })
];
component.ngDoCheck();
expect(sortSpy).not.toHaveBeenCalled();
@@ -123,9 +123,9 @@ describe('ParticipantListComponent', () => {
component.ngDoCheck();
expect(component.sortedJudiciaryMembers[0].hearingRoleCode).toEqual('Judge');
expect(component.sortedJudiciaryMembers[1].hearingRoleCode).toEqual('PanelMember');
- expect(component.sortedJudiciaryMembers[1].display_Name).toEqual(johPm1.displayName);
+ expect(component.sortedJudiciaryMembers[1].displayName).toEqual(johPm1.displayName);
expect(component.sortedJudiciaryMembers[2].hearingRoleCode).toEqual('PanelMember');
- expect(component.sortedJudiciaryMembers[2].display_Name).toEqual(johPm2.displayName);
+ expect(component.sortedJudiciaryMembers[2].displayName).toEqual(johPm2.displayName);
});
it('should call sortJudiciaryMembers when interpreter language changes', () => {
@@ -381,7 +381,7 @@ describe('ParticipantListComponent-SortParticipants', () => {
new VHParticipant({
isExistPerson: true,
hearingRoleName: p.hearing_role_name,
- display_Name: p.display_name,
+ displayName: p.display_name,
linkedParticipants: p.linked_participant,
id: `${i + 1}`,
isCourtroomAccount: false,
@@ -609,68 +609,68 @@ describe('ParticipantListComponent-SortParticipants', () => {
const participantsArr = [
new VHParticipant({
hearingRoleName: 'Judge',
- display_Name: 'Judge1',
+ displayName: 'Judge1',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Judge',
- display_Name: 'Judge2',
+ displayName: 'Judge2',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Winger',
- display_Name: 'Winger1',
+ displayName: 'Winger1',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Winger',
- display_Name: 'Winger2',
+ displayName: 'Winger2',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Staff Member',
- display_Name: 'Staff Member',
+ displayName: 'Staff Member',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Panel Member',
- display_Name: 'Panel Member',
+ displayName: 'Panel Member',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Observer',
- display_Name: 'Observer',
+ displayName: 'Observer',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Litigant in Person',
- display_Name: 'Litigant in Person1',
+ displayName: 'Litigant in Person1',
linkedParticipants: linked_participantList1,
id: '7',
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Litigant in Person',
- display_Name: 'Litigant in Person2',
+ displayName: 'Litigant in Person2',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Litigant in Person',
- display_Name: 'Litigant in Person3',
+ displayName: 'Litigant in Person3',
linkedParticipants: null,
interpretation_language: undefined
}),
new VHParticipant({
hearingRoleName: 'Interpreter',
- display_Name: 'Interpreter1',
+ displayName: 'Interpreter1',
linkedParticipants: linked_participantList,
id: '9',
interpretation_language: undefined
@@ -692,7 +692,7 @@ describe('ParticipantListComponent-SortParticipants', () => {
component.hearing.participants.push(
new VHParticipant({
hearingRoleName: 'Winger',
- display_Name: 'Winger3',
+ displayName: 'Winger3',
interpretation_language: undefined
})
);
@@ -751,7 +751,7 @@ describe('ParticipantListComponent-SortParticipants', () => {
new VHParticipant({
isExistPerson: true,
hearingRoleName: p.hearing_role_name,
- display_Name: p.display_name,
+ displayName: p.display_name,
interpreterFor: p.interpreterFor,
email: p.email,
id: `${i + 1},`,
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.ts
index 8c11d862c..7b7c96e1e 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/participant/list/participant-list.component.ts
@@ -57,7 +57,7 @@ export class ParticipantListComponent implements OnInit, OnChanges, DoCheck, OnD
this.sortedJudiciaryMembers
?.map(j => ({
email: j.email,
- displayName: j.display_Name,
+ displayName: j.displayName,
role: j.hearingRoleCode,
interpretationLanguage: j.interpretation_language
}))
@@ -146,10 +146,10 @@ export class ParticipantListComponent implements OnInit, OnChanges, DoCheck, OnD
private sortByDisplayName() {
return (a: VHParticipant, b: VHParticipant) => {
- if (a.display_Name < b.display_Name) {
+ if (a.displayName < b.displayName) {
return -1;
}
- if (a.display_Name > b.display_Name) {
+ if (a.displayName > b.displayName) {
return 1;
}
return 0;
@@ -244,7 +244,7 @@ export class ParticipantListComponent implements OnInit, OnChanges, DoCheck, OnD
if (interpretee) {
interpretee.isInterpretee = true;
const insertIndex: number = sortedList.findIndex(pm => pm.email === interpretee.email) + 1;
- interpreterParticipant.interpreteeName = interpretee?.display_Name;
+ interpreterParticipant.interpreteeName = interpretee?.displayName;
sortedList.splice(insertIndex, 0, interpreterParticipant);
} else {
sortedList.push(interpreterParticipant);
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts
index 38471e3d6..8b2d925c7 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.spec.ts
@@ -18,12 +18,12 @@ describe('ScreeningFormComponent', () => {
const participant1 = new VHParticipant();
participant1.id = '1';
participant1.email = 'email1';
- participant1.display_Name = 'Participant1';
+ participant1.displayName = 'Participant1';
const participant2 = new VHParticipant();
participant2.id = '2';
participant2.email = 'email2';
- participant2.display_Name = 'Participant2';
+ participant2.displayName = 'Participant2';
const endpoint1 = new EndpointModel(null);
endpoint1.id = '3';
@@ -133,7 +133,7 @@ describe('ScreeningFormComponent', () => {
// Assert
expect(component.isEditMode).toBeTrue();
- expect(component.allParticipants.filter(p => p.displayName === newlyAddedParticipant.display_Name)).toEqual([]);
+ expect(component.allParticipants.filter(p => p.displayName === newlyAddedParticipant.displayName)).toEqual([]);
expect(component.allParticipants.filter(p => p.displayName === newlyAddedEndpoint.displayName)).toEqual([]);
expect(component.allParticipants.length).toBe(2);
expect(component.newParticipantRemovedFromOptions).toBeTrue();
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts
index 0446a508f..9bbc4287b 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-form.component.ts
@@ -31,7 +31,7 @@ export class ScreeningFormComponent {
.map(
participant =>
({
- displayName: participant.display_Name,
+ displayName: participant.displayName,
externalReferenceId: participant.externalReferenceId,
isNewlyAdded: participant.id === null || participant.id === undefined
} as GenericParticipantsModel)
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts
index c30fca244..db265a707 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.spec.ts
@@ -15,12 +15,12 @@ describe('ScreeningListItemComponent', () => {
hearing = new VHBooking();
const participantWithoutScreening = new VHParticipant();
participantWithoutScreening.id = '1';
- participantWithoutScreening.display_Name = 'Participant No Screening';
+ participantWithoutScreening.displayName = 'Participant No Screening';
participantWithoutScreening.email = 'email1@partipant.com';
const participantWithScreening = new VHParticipant();
participantWithScreening.id = '2';
- participantWithScreening.display_Name = 'Participant With Screening';
+ participantWithScreening.displayName = 'Participant With Screening';
participantWithScreening.email = 'email2@partipant.com';
participantWithScreening.screening = {
measureType: 'All',
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.ts
index 262e5f6da..045d41cf7 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list-item.component.ts
@@ -32,7 +32,7 @@ export class ScreeningListItemComponent implements OnChanges {
initModelForParticipant(hearing: VHBooking, participant: VHParticipant): ScreeningItemViewModel {
const protectFromMapped = this.initProtectFromViewModel(hearing, participant.screening);
return {
- displayName: participant.display_Name,
+ displayName: participant.displayName,
measureType: participant.screening?.measureType,
protectFrom: protectFromMapped
};
@@ -59,7 +59,7 @@ export class ScreeningListItemComponent implements OnChanges {
if (matchedParticipant) {
return {
contactEmail: matchedParticipant.email,
- displayName: matchedParticipant.display_Name
+ displayName: matchedParticipant.displayName
};
}
const matchedEndpoint = hearing.endpoints.find(x => x.externalReferenceId === p.externalReferenceId);
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts
index 7f888bdc6..9ef3d6967 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening-list.component.spec.ts
@@ -15,11 +15,11 @@ describe('ScreeningListComponent', () => {
hearing = new VHBooking();
const participantWithoutScreening = new VHParticipant();
participantWithoutScreening.id = '1';
- participantWithoutScreening.display_Name = 'Participant No Screening';
+ participantWithoutScreening.displayName = 'Participant No Screening';
const participantWithScreening = new VHParticipant();
participantWithScreening.id = '2';
- participantWithScreening.display_Name = 'Participant With Screening';
+ participantWithScreening.displayName = 'Participant With Screening';
participantWithScreening.screening = {
measureType: 'All',
protectFrom: []
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.spec.ts
index b1188ead8..f4e30f80d 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.spec.ts
@@ -19,17 +19,17 @@ function initHearingRequest(): VHBooking {
hearing.hearingId = '';
hearing.participants = [
new VHParticipant({
- display_Name: 'Jane',
+ displayName: 'Jane',
email: 'jane@doe.com',
externalReferenceId: '1Jane'
}),
new VHParticipant({
- display_Name: 'Johnny',
+ displayName: 'Johnny',
email: 'john@doe.com',
externalReferenceId: '2John'
}),
new VHParticipant({
- display_Name: 'Greeno',
+ displayName: 'Greeno',
email: 'james@green.com',
externalReferenceId: '3Green'
})
@@ -95,7 +95,7 @@ describe('ScreeningComponent', () => {
// Act
component.onScreeningSaved({
- participantDisplayName: participant.display_Name,
+ participantDisplayName: participant.displayName,
measureType: 'All',
protectFrom: []
});
@@ -116,7 +116,7 @@ describe('ScreeningComponent', () => {
// Act
component.onScreeningSaved({
- participantDisplayName: participant.display_Name,
+ participantDisplayName: participant.displayName,
measureType: 'Specific',
protectFrom: [{ externalReferenceId: '4Silver' }, { externalReferenceId: '2John' }]
});
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.ts
index 863ef7a2e..5ef5d3ec3 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/screening/screening.component.ts
@@ -40,7 +40,7 @@ export class ScreeningComponent implements OnInit, OnDestroy {
onScreeningSaved(seletecdMeasuresDto: SelectedScreeningDto) {
this.logger.debug(`${this.loggerPrefix} screening saved`, seletecdMeasuresDto);
- const participant = this.hearing.participants.find(p => p.display_Name === seletecdMeasuresDto.participantDisplayName);
+ const participant = this.hearing.participants.find(p => p.displayName === seletecdMeasuresDto.participantDisplayName);
const endpoint = this.hearing.endpoints.find(e => e.displayName === seletecdMeasuresDto.participantDisplayName);
if (participant) {
participant.screening = {
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.spec.ts
index aae654f4c..56fcf8129 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.spec.ts
@@ -20,7 +20,7 @@ describe('SearchEmailComponent', () => {
const participant1 = new VHParticipant();
participant1.firstName = 'FirstName1';
participant1.lastName = 'LastName1';
- participant1.display_Name = 'DisplayName1';
+ participant1.displayName = 'DisplayName1';
participant1.email = 'Email1';
participant1.username = 'Username1';
participant1.title = 'Title1';
@@ -28,7 +28,7 @@ describe('SearchEmailComponent', () => {
const participant2 = new VHParticipant();
participant2.firstName = 'FirstName2';
participant2.lastName = 'LastName2';
- participant2.display_Name = 'DisplayName2';
+ participant2.displayName = 'DisplayName2';
participant2.email = 'Email2';
participant2.username = 'Username2';
participant2.title = 'Title2';
@@ -42,7 +42,7 @@ describe('SearchEmailComponent', () => {
participantModel.title = 'Mrs';
participantModel.hearingRoleName = 'Litigant in person';
participantModel.phone = '12345678';
- participantModel.display_Name = 'Ann';
+ participantModel.displayName = 'Ann';
const configSettings = new ClientSettingsResponse();
configSettings.test_username_stem = '@hmcts.net';
@@ -186,7 +186,7 @@ describe('SearchEmailComponent', () => {
participantModel.title = 'Mr.';
participantModel.hearingRoleName = 'Litigant in person';
participantModel.phone = '12345678';
- participantModel.display_Name = 'Citizen One';
+ participantModel.displayName = 'Citizen One';
participantsList.push(participant);
component.results = participantsList;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.ts
index a31316140..9660a5852 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/search-email/search-email.component.ts
@@ -134,7 +134,7 @@ export class SearchEmailComponent implements OnInit, OnDestroy {
selectedResult.company = result.company;
selectedResult.isExistPerson = true;
selectedResult.username = result.username;
- selectedResult.display_Name = result.display_Name;
+ selectedResult.displayName = result.displayName;
selectedResult.isCourtroomAccount = result.isCourtroomAccount;
selectedResult.contactEmail = result.contactEmail;
this.isShowResult = false;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts
index e3050a5dd..6743da512 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.spec.ts
@@ -45,7 +45,7 @@ function initExistingHearingRequest(): VHBooking {
const pat1 = new VHParticipant();
pat1.email = 'aa@hmcts.net';
pat1.representee = 'citizen 01';
- pat1.display_Name = 'solicitor 01';
+ pat1.displayName = 'solicitor 01';
pat1.id = '123123-123';
const today = new Date();
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.ts
index 5caf2f0c6..bb166a4a4 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/booking/summary/summary.component.ts
@@ -499,7 +499,7 @@ export class SummaryComponent implements OnInit, OnDestroy {
let represents = '';
const participant = this.hearing.participants.find(p => p.email === defenceAdvocateConactEmail);
if (participant) {
- represents = participant.display_Name + ', representing ' + participant.representee;
+ represents = participant.displayName + ', representing ' + participant.representee;
}
return represents;
}
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-participant-list/booking-participant-list.component.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-participant-list/booking-participant-list.component.spec.ts
index ef2599596..18f3c0382 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-participant-list/booking-participant-list.component.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/booking-participant-list/booking-participant-list.component.spec.ts
@@ -106,7 +106,7 @@ describe('BookingParticipantListComponent', () => {
linkedParticipants: p.LinkedParticipants ?? null,
id: `${i + 1}`,
company: '',
- display_Name: '',
+ displayName: '',
email: '',
flag: false,
indexInList: 0,
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/hearing-details/hearing-details.component.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/hearing-details/hearing-details.component.ts
index 02e830ef2..66bfb1e48 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/hearing-details/hearing-details.component.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/bookings-list/hearing-details/hearing-details.component.ts
@@ -34,7 +34,7 @@ export class HearingDetailsComponent implements OnDestroy {
let represents = '';
const participant = this.participants.find(p => p.email === defenceAdvocateContactEmail);
if (participant) {
- represents = participant.display_Name + ', representing ' + participant.representee;
+ represents = participant.displayName + ', representing ' + participant.representee;
}
return represents;
}
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.spec.ts
index b01b14db9..4a216cc3b 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.spec.ts
@@ -165,7 +165,7 @@ describe('mapParticipantResponseToVHParticipant', () => {
expect(result.firstName).toBe(participant.first_name);
expect(result.lastName).toBe(participant.last_name);
expect(result.middleNames).toBe(participant.middle_names);
- expect(result.display_Name).toBe(participant.display_name);
+ expect(result.displayName).toBe(participant.display_name);
expect(result.username).toBe(participant.username);
expect(result.email).toBe(participant.contact_email);
expect(result.hearingRoleName).toBe(participant.hearing_role_name);
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.ts
index 70b26b58b..e5481bcd9 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/api-contract-to-client-model-mappers.ts
@@ -105,7 +105,7 @@ export function mapParticipantResponseToVHParticipant(response: ParticipantRespo
firstName: response.first_name,
lastName: response.last_name,
middleNames: response.middle_names,
- display_Name: response.display_name,
+ displayName: response.display_name,
username: response.username,
email: response.contact_email,
hearingRoleName: response.hearing_role_name,
@@ -193,7 +193,7 @@ export function mapJudgeResponseToVHParticipant(judge: JudgeResponse): VHPartici
? new VHParticipant({
firstName: judge.first_name,
lastName: judge.last_name,
- display_Name: judge.display_name,
+ displayName: judge.display_name,
email: judge.contact_email ?? judge.email,
username: judge.email,
isCourtroomAccount: judge.account_type === JudgeAccountType.Courtroom,
@@ -218,7 +218,7 @@ export function mapJudicialMemberDtoToVHParticipant(judicialMember: JudicialMemb
isJudiciaryMember: true,
hearingRoleCode: hearingRoleCode,
phone: judicialMember.telephone,
- display_Name: judicialMember.displayName,
+ displayName: judicialMember.displayName,
interpretation_language: judicialMember.interpretationLanguage
});
}
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/vh-participant.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/vh-participant.ts
index 5b3b745fd..5513cb91f 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/vh-participant.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/common/model/vh-participant.ts
@@ -12,7 +12,7 @@ export class VHParticipant {
firstName?: string;
lastName?: string;
middleNames?: string;
- display_Name?: string;
+ displayName?: string;
username?: string;
email?: string;
hearingRoleName?: string;
@@ -115,7 +115,7 @@ export class VHParticipant {
email: email,
hearingRoleName: hearingRoleName,
hearingRoleCode: hearingRoleCode,
- display_Name: displayName,
+ displayName: displayName,
middleNames: middleNames,
company: organisation,
representee: representee,
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/bookings-persist.service.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/bookings-persist.service.ts
index 5463b4870..356d9a9c6 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/bookings-persist.service.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/bookings-persist.service.ts
@@ -89,7 +89,7 @@ export class BookingPersistService {
}
const judge = hearing.participants.find(x => x.isJudge);
- return judge ? judge.display_Name : '';
+ return judge ? judge.displayName : '';
}
set bookingList(value: Array) {
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/search.service.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/search.service.spec.ts
index 44d2291a5..764115fce 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/search.service.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/search.service.spec.ts
@@ -74,19 +74,19 @@ const judgeList: JudgeResponse[] = [judge1, judge2, ejudJudge];
const judgeParticipant1 = new VHParticipant();
judgeParticipant1.firstName = 'judgeParticipant1FirstName';
judgeParticipant1.lastName = 'judgeParticipant1LastName';
-judgeParticipant1.display_Name = 'judgeParticipant1DisplayName';
+judgeParticipant1.displayName = 'judgeParticipant1DisplayName';
judgeParticipant1.email = 'judgeParticipant1Email';
const judgeParticipant2 = new VHParticipant();
judgeParticipant2.firstName = 'judgeParticipant2FirstName';
judgeParticipant2.lastName = 'judgeParticipant2LastName';
-judgeParticipant2.display_Name = 'judgeParticipant2DisplayName';
+judgeParticipant2.displayName = 'judgeParticipant2DisplayName';
judgeParticipant2.email = 'judgeParticipant2Email';
const judgeParticipant3 = new VHParticipant();
judgeParticipant2.firstName = 'judgeParticipant2FirstName';
judgeParticipant2.lastName = 'judgeParticipant2LastName';
-judgeParticipant2.display_Name = null;
+judgeParticipant2.displayName = null;
judgeParticipant2.email = 'judgeEjud';
const judgeParticipantList: VHParticipant[] = [judgeParticipant1, judgeParticipant2, judgeParticipant3];
@@ -94,13 +94,13 @@ const judgeParticipantList: VHParticipant[] = [judgeParticipant1, judgeParticipa
const participant1 = new VHParticipant();
participant1.firstName = 'participant1FirstName';
participant1.lastName = 'participant1LastName';
-participant1.display_Name = 'participant1DisplayName';
+participant1.displayName = 'participant1DisplayName';
participant1.email = 'participant1Email';
const participant2 = new VHParticipant();
participant2.firstName = 'participant2FirstName';
participant2.lastName = 'participant2LastName';
-participant2.display_Name = 'participant2DisplayName';
+participant2.displayName = 'participant2DisplayName';
participant2.email = 'participant2Email';
const participantList: VHParticipant[] = [participant1, participant2];
let clientApiSpy: jasmine.SpyObj;
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts
index 9a3fa6887..3205ef3ee 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.spec.ts
@@ -250,7 +250,7 @@ describe('Video hearing service', () => {
participant.middleNames = 'Ivan';
participant.lastName = 'Smith';
participant.username = 'dan@hmcts.net';
- participant.display_Name = 'Dan Smith';
+ participant.displayName = 'Dan Smith';
participant.email = 'dan@hmcts.net';
participant.phone = '123123123';
participant.hearingRoleName = 'Litigant in person';
@@ -263,7 +263,7 @@ describe('Video hearing service', () => {
expect(model[0].middle_names).toEqual(participant.middleNames);
expect(model[0].last_name).toEqual(participant.lastName);
expect(model[0].username).toEqual(participant.username);
- expect(model[0].display_name).toEqual(participant.display_Name);
+ expect(model[0].display_name).toEqual(participant.displayName);
expect(model[0].contact_email).toEqual(participant.email);
expect(model[0].telephone_number).toEqual(participant.phone);
});
@@ -276,7 +276,7 @@ describe('Video hearing service', () => {
participant.middleNames = 'Ivan';
participant.lastName = 'Smith';
participant.username = 'dan@hmcts.net';
- participant.display_Name = 'Dan Smith';
+ participant.displayName = 'Dan Smith';
participant.email = 'dan@hmcts.net';
participant.phone = '123123123';
participant.hearingRoleName = 'Litigant in person';
@@ -350,7 +350,7 @@ describe('Video hearing service', () => {
participant.middleNames = 'Ivan';
participant.lastName = 'Smith';
participant.username = 'dan@hmcts.net';
- participant.display_Name = 'Dan Smith';
+ participant.displayName = 'Dan Smith';
participant.email = 'dan@hmcts.net';
participant.phone = '123123123';
participant.hearingRoleName = 'Litigant in person';
@@ -760,7 +760,7 @@ describe('Video hearing service', () => {
new VHParticipant({
id: 'e09882e8-345c-4bbb-b412-af6f4f622a24',
email: 'app.litigant@email.com',
- display_Name: 'Litigant',
+ displayName: 'Litigant',
hearingRoleCode: 'APPL'
})
);
diff --git a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts
index d397a0cb9..7433a2b56 100644
--- a/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts
+++ b/AdminWebsite/AdminWebsite/ClientApp/src/app/services/video-hearings.service.ts
@@ -270,7 +270,7 @@ export class VideoHearingsService {
editParticipant.id = participant.id;
editParticipant.external_reference_id = participant.externalReferenceId;
editParticipant.contact_email = participant.email;
- editParticipant.display_name = participant.display_Name;
+ editParticipant.display_name = participant.displayName;
editParticipant.first_name = participant.firstName;
editParticipant.last_name = participant.lastName;
editParticipant.hearing_role_name = participant.hearingRoleName;
@@ -374,7 +374,7 @@ export class VideoHearingsService {
participant.middle_names = p.middleNames;
participant.last_name = p.lastName;
participant.username = p.username;
- participant.display_name = p.display_Name;
+ participant.display_name = p.displayName;
participant.contact_email = p.email;
participant.telephone_number = p.phone;
participant.hearing_role_code = p.hearingRoleCode;