From 051d4bf38780d6da8457328b7311ed90dbc670cd Mon Sep 17 00:00:00 2001
From: puriphatt <puriphat@frappet.com>
Date: Wed, 20 Mar 2024 14:10:53 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B8=97=E0=B8=B0=E0=B9=80=E0=B8=9A=E0=B8=B5?=
 =?UTF-8?q?=E0=B8=A2=E0=B8=99=E0=B8=9B=E0=B8=A3=E0=B8=B0=E0=B8=A7=E0=B8=B1?=
 =?UTF-8?q?=E0=B8=95=E0=B8=B4:=20=E0=B8=82=E0=B9=89=E0=B8=AD=E0=B8=A1?=
 =?UTF-8?q?=E0=B8=B9=E0=B8=A5=E0=B8=9C=E0=B8=A5=E0=B8=87=E0=B8=B2=E0=B8=99?=
 =?UTF-8?q?=20=E0=B9=81=E0=B8=81=E0=B9=89=20reqBody?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/detail/Achievement/03_Insignia.vue        | 2 +-
 .../detail/Achievement/04_DeclarationHonor.vue           | 9 +++++----
 .../detail/Achievement/05_ResultsPerformance.vue         | 5 +++--
 .../04_registryNew/interface/request/DeclarationHonor.ts | 2 +-
 src/modules/04_registryNew/interface/request/Insignia.ts | 2 +-
 .../interface/request/ResultsPerformance.ts              | 2 +-
 6 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
index 0a9387cd2..e04a9d725 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/03_Insignia.vue
@@ -489,7 +489,7 @@ async function addEditData(editStatus: boolean = false) {
     : config.API.profileNewInsign;
   const method = editStatus ? "patch" : "post";
   const reqBody: RequestItemsObject = {
-    profileId: profileId.value,
+    profileId: editStatus ? undefined : profileId.value,
     isActive: insigniaData.isActive,
     year: insigniaData.year,
     no: insigniaData.no,
diff --git a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
index 371c696d1..7e0796b33 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/04_DeclarationHonor.vue
@@ -238,12 +238,13 @@ async function addEditData(editStatus: boolean = false) {
     : config.API.profileNewHonor;
   const method = editStatus ? "patch" : "post";
   const reqBody: RequestItemsObject = {
-    profileId: profileId.value,
+    profileId: editStatus ? undefined : profileId.value,
     isActive: declHonorData.isActive,
     detail: declHonorData.detail,
-    issueDate: declHonorData.isDate
-      ? declHonorData.issueDate
-      : new Date(`${declHonorData.issueDateYear}-1-1`),
+    issueDate:
+      declHonorData.isDate === "true"
+        ? declHonorData.issueDate
+        : new Date(`${declHonorData.issueDateYear}-01-01`),
     issuer: declHonorData.issuer,
     refCommandDate: declHonorData.refCommandDate,
     refCommandNo: declHonorData.refCommandNo,
diff --git a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
index 771ffa1a4..859fafaff 100644
--- a/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
+++ b/src/modules/04_registryNew/components/detail/Achievement/05_ResultsPerformance.vue
@@ -295,7 +295,7 @@ async function addEditData(editStatus: boolean = false) {
     : config.API.profileNewAssessments;
   const method = editStatus ? "patch" : "post";
   const reqBody: RequestItemsObject = {
-    profileId: profileId.value,
+    profileId: editStatus ? undefined : profileId.value,
     isActive: resPerformData.isActive,
     name: resPerformData.name,
     date: resPerformData.date,
@@ -337,7 +337,6 @@ function onClickOpenDialog(editStatus: boolean = false, row?: ResponseObject) {
   isEdit.value = editStatus;
 
   if (editStatus && row) {
-    console.log(row.id);
     Object.assign(resPerformData, row);
   } else {
     (resPerformData.id = ""),
@@ -376,6 +375,8 @@ async function clickHistory(row: ResponseObject) {
   showLoader();
   try {
     const res = await http.get(config.API.profileAssessmentHisId(row.id));
+    console.log(res.data);
+    
     rowsHistory.value = res.data.result;
   } catch (e) {
     messageError($q, e);
diff --git a/src/modules/04_registryNew/interface/request/DeclarationHonor.ts b/src/modules/04_registryNew/interface/request/DeclarationHonor.ts
index c4668fef0..c0ad5799e 100644
--- a/src/modules/04_registryNew/interface/request/DeclarationHonor.ts
+++ b/src/modules/04_registryNew/interface/request/DeclarationHonor.ts
@@ -1,5 +1,5 @@
 interface RequestItemsObject {
-  profileId: string;
+  profileId?: string;
   isActive: boolean;
   detail: string;
   issueDate: Date | null;
diff --git a/src/modules/04_registryNew/interface/request/Insignia.ts b/src/modules/04_registryNew/interface/request/Insignia.ts
index a01b0f4bf..8ac1c8c6d 100644
--- a/src/modules/04_registryNew/interface/request/Insignia.ts
+++ b/src/modules/04_registryNew/interface/request/Insignia.ts
@@ -1,5 +1,5 @@
 interface RequestItemsObject {
-  profileId: string;
+  profileId?: string;
   isActive: boolean;
   year: number;
   no: string;
diff --git a/src/modules/04_registryNew/interface/request/ResultsPerformance.ts b/src/modules/04_registryNew/interface/request/ResultsPerformance.ts
index e83f7b1d4..78ba419d1 100644
--- a/src/modules/04_registryNew/interface/request/ResultsPerformance.ts
+++ b/src/modules/04_registryNew/interface/request/ResultsPerformance.ts
@@ -1,5 +1,5 @@
 interface RequestItemsObject {
-  profileId: string;
+  profileId?: string;
   isActive: boolean;
   name: string;
   date: Date | null;