diff --git a/src/controllers/CommandController.ts b/src/controllers/CommandController.ts index 8f291634..91a95124 100644 --- a/src/controllers/CommandController.ts +++ b/src/controllers/CommandController.ts @@ -2286,7 +2286,7 @@ export class CommandController extends Controller { const userKeycloakId = await createUser(profile.citizenId, profile.citizenId, { firstName: profile.firstName, lastName: profile.lastName, - email: profile.email, + // email: profile.email, }); if (typeof userKeycloakId !== "string") { throw new Error(userKeycloakId.errorMessage); @@ -2305,6 +2305,7 @@ export class CommandController extends Controller { ); if (!result) throw new Error("Failed. Cannot set user's role."); profile.keycloak = userKeycloakId; + profile.email = item.bodyProfile.email; await this.profileRepository.save(profile); setLogDataDiff(req, { before, after: profile }); } @@ -2773,7 +2774,7 @@ export class CommandController extends Controller { case "C-PM-05": return "/placement/appointment/appoint/report"; case "C-PM-06": - return "/placement/appointment/slip/report"; + return "/placement/slip/report"; case "C-PM-07": return "/placement/appointment/move/report"; case "C-PM-08": @@ -2839,7 +2840,7 @@ export class CommandController extends Controller { case "C-PM-38": return "/org/command/command38/officer/report"; case "C-PM-39": - return "/placement/slip/report"; + return "/placement/appointment/slip/report"; case "C-PM-40": return "/org/command/command40/officer/report"; case "C-PM-41": diff --git a/src/entities/ProfileDevelopment.ts b/src/entities/ProfileDevelopment.ts index 73b5d6f5..66a79b50 100644 --- a/src/entities/ProfileDevelopment.ts +++ b/src/entities/ProfileDevelopment.ts @@ -192,9 +192,9 @@ export class CreateProfileDevelopment { isDevelopment10: boolean | null; // summary?: number | null; // point?: number | null; - developmentTarget?: number | null; - developmentResults?: number | null; - developmentReport?: number | null; + developmentTarget?: string | null; + developmentResults?: string | null; + developmentReport?: string | null; developmentProjects?: string[]; } @@ -215,9 +215,9 @@ export class CreateProfileEmployeeDevelopment { isDevelopment10: boolean | null; // summary?: number | null; // point?: number | null; - developmentTarget?: number | null; - developmentResults?: number | null; - developmentReport?: number | null; + developmentTarget?: string | null; + developmentResults?: string | null; + developmentReport?: string | null; developmentProjects?: string[]; } @@ -237,8 +237,8 @@ export type UpdateProfileDevelopment = { isDevelopment10: boolean | null; // summary?: number | null; // point?: number | null; - developmentTarget?: number | null; - developmentResults?: number | null; - developmentReport?: number | null; + developmentTarget?: string | null; + developmentResults?: string | null; + developmentReport?: string | null; developmentProjects?: string[]; };