diff --git a/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts b/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts index 8781c8a..6881e97 100644 --- a/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts +++ b/apps/mina-sidor-fa/src/app/shared/models/employee.model.ts @@ -1,4 +1,5 @@ import { RoleEnum } from '@msfa-enums/role.enum'; +import { capitalizeWords } from '@msfa-utils/capitalize-words.util'; import { mapStringToSsn } from '@msfa-utils/map-string-to-ssn.util'; import { EmployeeCompactResponse, EmployeeResponse } from './api/employee.response.model'; import { EmployeeTjanst, mapResponseToEmployeeTjanst } from './employee-tjanst.model'; @@ -37,7 +38,7 @@ export function mapResponseToEmployeeCompact(data: EmployeeCompactResponse): Emp const { ciamUserId, name, tjanst, allaUtforandeVerksamheter, utforandeVerksamhet } = data; return { id: ciamUserId, - fullName: name, + fullName: capitalizeWords(name), tjanster: tjanst || [], allaUtforandeVerksamheter: allaUtforandeVerksamheter, utforandeVerksamheter: utforandeVerksamhet || [], @@ -45,17 +46,11 @@ export function mapResponseToEmployeeCompact(data: EmployeeCompactResponse): Emp } export function mapResponseToEmployee(data: EmployeeResponse): Employee { - const { - ciamUserId, - firstName, - lastName, - email, - ssn, - roles, - tjanster, - allaUtforandeVerksamheter, - utforandeVerksamheter, - } = data; + const { ciamUserId, email, ssn, roles, tjanster, allaUtforandeVerksamheter, utforandeVerksamheter } = data; + + const firstName = capitalizeWords(data.firstName); + const lastName = capitalizeWords(data.lastName); + return { id: ciamUserId, firstName, diff --git a/apps/mina-sidor-fa/src/app/shared/utils/capitalize-words.util.ts b/apps/mina-sidor-fa/src/app/shared/utils/capitalize-words.util.ts new file mode 100644 index 0000000..c47ddde --- /dev/null +++ b/apps/mina-sidor-fa/src/app/shared/utils/capitalize-words.util.ts @@ -0,0 +1,6 @@ +export function capitalizeWords(words: string): string { + return words + .split(' ') + .map(word => `${word.charAt(0).toUpperCase()}${word.slice(1).toLowerCase()}`) + .join(' '); +}