From b60b364b2a502a7b1ac1decbab3b1deb4f6b0cea Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Wed, 16 Oct 2024 15:11:13 +0700
Subject: [PATCH 1/2] fix type field develop create update function

---
 src/entities/ProfileDevelopment.ts | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

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[];
 };

From a0398c93544c070b73e042fd636345c87078127e Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 16 Oct 2024 16:34:36 +0700
Subject: [PATCH 2/2] =?UTF-8?q?fix=20=E0=B8=AD=E0=B8=AD=E0=B8=81=E0=B8=84?=
 =?UTF-8?q?=E0=B8=B3=E0=B8=AA=E0=B8=B1=E0=B9=88=E0=B8=87,=20email=20keyclo?=
 =?UTF-8?q?ak?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/controllers/CommandController.ts | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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":