From eef561f91f5ae174966a2738c055f03daa9b77d0 Mon Sep 17 00:00:00 2001
From: setthawutttty <trx.setthawut@gmail.com>
Date: Tue, 4 Feb 2025 16:05:47 +0700
Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/org/api.org.ts                                   | 8 ++++++++
 src/modules/10_registry/02_Government/05_Actposition.vue | 4 ++--
 src/modules/10_registry/02_Government/06_Assistance.vue  | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/src/api/org/api.org.ts b/src/api/org/api.org.ts
index 8a5839a..e7aa0b7 100644
--- a/src/api/org/api.org.ts
+++ b/src/api/org/api.org.ts
@@ -38,6 +38,9 @@ export default {
   dataUserDuty: `${profileOrg}/duty/user`,
   dataUserDutyByType: (type: string) => `${org}/profile${type}/duty/user`,
 
+  dataUserActpositionByType: (type: string) => `${org}/profile${type}/actposition/user`,
+  dataUserAssistanceByType: (type: string) => `${org}/profile${type}/assistance/user`,
+
   dataUserSalary: `${profileOrg}/salary/user`,
   dataUserSalaryByType: (type: string) => `${org}/profile${type}/salary/user`,
   dataUserAssessments: `${profileOrg}/assessments/user`,
@@ -87,6 +90,11 @@ export default {
   dataUserDutyHistoryByType: (emType: string, id: string) =>
     `${org}/profile${emType}/duty/history/${id}`,
 
+  dataUserActpositionHistoryByType: (emType: string, id: string) =>
+    `${org}/profile${emType}/actposition/history/${id}`,
+  dataUserAssistanceHistoryByType: (emType: string, id: string) =>
+    `${org}/profile${emType}/assistance/history/${id}`,
+
   dataUserSalaryHistory: (id: string) => `${profileOrg}/salary/history/${id}`,
   dataUserSalaryHistoryByType: (emType: string, id: string) =>
     `${org}/profile${emType}/salary/history/${id}`,
diff --git a/src/modules/10_registry/02_Government/05_Actposition.vue b/src/modules/10_registry/02_Government/05_Actposition.vue
index 175bbf5..0d949fa 100644
--- a/src/modules/10_registry/02_Government/05_Actposition.vue
+++ b/src/modules/10_registry/02_Government/05_Actposition.vue
@@ -179,7 +179,7 @@ function onHistory(id: string) {
 function getData() {
   showLoader();
   http
-    .get(config.API.dataUserDutyByType(link.value))
+    .get(config.API.dataUserActpositionByType(link.value))
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
@@ -197,7 +197,7 @@ function getData() {
 function getHistory() {
   showLoader();
   http
-    .get(config.API.dataUserDutyHistoryByType(link.value, idByRow.value))
+    .get(config.API.dataUserActpositionHistoryByType(link.value, idByRow.value))
     .then((res) => {
       const data = res.data.result;
       rowsHistory.value = data;
diff --git a/src/modules/10_registry/02_Government/06_Assistance.vue b/src/modules/10_registry/02_Government/06_Assistance.vue
index 3881312..6f296d8 100644
--- a/src/modules/10_registry/02_Government/06_Assistance.vue
+++ b/src/modules/10_registry/02_Government/06_Assistance.vue
@@ -172,7 +172,7 @@ function onHistory(id: string) {
 function getData() {
   showLoader();
   http
-    .get(config.API.dataUserDutyByType(link.value))
+    .get(config.API.dataUserAssistanceByType(link.value))
     .then((res) => {
       const data = res.data.result;
       rows.value = data;
@@ -190,7 +190,7 @@ function getData() {
 function getHistory() {
   showLoader();
   http
-    .get(config.API.dataUserDutyHistoryByType(link.value, idByRow.value))
+    .get(config.API.dataUserAssistanceHistoryByType(link.value, idByRow.value))
     .then((res) => {
       const data = res.data.result;
       rowsHistory.value = data;