Merge branch 'phatt_dev' into develop

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,

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,

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);

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;

src/modules/04_registryNew/interface/request/Insignia.ts

@@ -1,5 +1,5 @@
 interface RequestItemsObject {
-  profileId: string;
+  profileId?: string;
   isActive: boolean;
   year: number;
   no: string;

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;