Merge branch 'develop' into devTee

src/api/registry/api.registry.ts

@@ -30,12 +30,13 @@ export default {
     `${registryNew}${type}/address/history/${dataId}`,
 
   // บันทึกวันที่ไม่ได้รับเงินเดือนฯ
-  profileNewNoPaid: `${registryNew}/nopaid`,
-  profileNewNoPaidByProfileId: (profileId: string) =>
-    `${registryNew}/nopaid/${profileId}`,
-  profileNewNoPaidById: (dataId: string) => `${registryNew}/nopaid/${dataId}`,
-  profileNewNoPaidHisById: (dataId: string) =>
-    `${registryNew}/nopaid/history/${dataId}`,
+  profileNewNoPaid: (type: string) => `${registryNew}${type}/nopaid`,
+  profileNewNoPaidByProfileId: (profileId: string, type: string) =>
+    `${registryNew}${type}/nopaid/${profileId}`,
+  profileNewNoPaidById: (dataId: string, type: string) =>
+    `${registryNew}${type}/nopaid/${dataId}`,
+  profileNewNoPaidHisById: (dataId: string, type: string) =>
+    `${registryNew}${type}/nopaid/history/${dataId}`,
 
   // เครื่องราชฯ
   profileNewInsign: `${registryNew}/insignia`,
@@ -72,22 +73,22 @@ export default {
     `${registryNew}/training/history/${trainingId}`,
 
   // ประวัติการศึกษา
-  profileNewEducation: `${registryNew}/educations`,
-  profileNewEducationByProfileId: (profileId: string) =>
-    `${registryNew}/educations/${profileId}`,
-  profileNewEducationByEducationId: (educationId: string) =>
-    `${registryNew}/educations/${educationId}`,
-  profileNewEducationHisByEducationId: (educationsId: string) =>
-    `${registryNew}/educations/history/${educationsId}`,
+  profileNewEducation: (type: string) => `${registryNew}${type}/educations`,
+  profileNewEducationByProfileId: (profileId: string, type: string) =>
+    `${registryNew}${type}/educations/${profileId}`,
+  profileNewEducationByEducationId: (educationId: string, type: string) =>
+    `${registryNew}${type}/educations/${educationId}`,
+  profileNewEducationHisByEducationId: (educationsId: string, type: string) =>
+    `${registryNew}${type}/educations/history/${educationsId}`,
 
   // ความสามารถพิเศษ
-  profileNewAbility: `${registryNew}/ability`,
-  profileNewAbilityByProfileId: (profileId: string) =>
-    `${registryNew}/ability/${profileId}`,
-  profileNewAbilityByAbilityId: (abilityId: string) =>
-    `${registryNew}/ability/${abilityId}`,
-  profileNewAbilityHisByAbilityId: (abilityId: string) =>
-    `${registryNew}/ability/history/${abilityId}`,
+  profileNewAbility: (type: string) => `${registryNew}${type}/ability`,
+  profileNewAbilityByProfileId: (profileId: string, type: string) =>
+    `${registryNew}${type}/ability/${profileId}`,
+  profileNewAbilityByAbilityId: (abilityId: string, type: string) =>
+    `${registryNew}${type}/ability/${abilityId}`,
+  profileNewAbilityHisByAbilityId: (abilityId: string, type: string) =>
+    `${registryNew}${type}/ability/history/${abilityId}`,
 
   // ใบอนุญาตประกอบวิชาชีพ
   profileNewCertificate: `${registryNew}/certificate`,
@@ -107,51 +108,56 @@ export default {
     `${registryNew}/other/history/${dataId}`,
 
   // ข้อมูลครอบครัว
-  profileNewFamily: `${registryNew}/family`,
-  profileNewFamilyByProfileId: (profileId: string) =>
-    `${registryNew}/family/${profileId}`,
-  profileNewFamilyByFamilyId: (familyId: string) =>
-    `${registryNew}/family/${familyId}`,
-  profileNewFamilyHisByFamilyId: (familyId: string) =>
-    `${registryNew}/family/history/${familyId}`,
+  profileNewFamily: (type: string) => `${registryNew}${type}/family`,
+  profileNewFamilyByProfileId: (profileId: string, type: string) =>
+    `${registryNew}${type}/family/${profileId}`,
+  profileNewFamilyByFamilyId: (familyId: string, type: string) =>
+    `${registryNew}${type}/family/${familyId}`,
+  profileNewFamilyHisByFamilyId: (familyId: string, type: string) =>
+    `${registryNew}${type}/family/history/${familyId}`,
 
   // วินัย
-  profileNewDiscipline: `${registryNew}/discipline`,
-  profileNewDisciplineByProfileId: (profileId: string) =>
-    `${registryNew}/discipline/${profileId}`,
-  profileNewDisciplineByDisciplineId: (disciplineId: string) =>
-    `${registryNew}/discipline/${disciplineId}`,
-  profileNewDisciplineHisByDisciplineId: (disciplineId: string) =>
-    `${registryNew}/discipline/history/${disciplineId}`,
+  profileNewDiscipline: (type: string) => `${registryNew}${type}/discipline`,
+  profileNewDisciplineByProfileId: (profileId: string, type: string) =>
+    `${registryNew}${type}/discipline/${profileId}`,
+  profileNewDisciplineByDisciplineId: (disciplineId: string, type: string) =>
+    `${registryNew}${type}/discipline/${disciplineId}`,
+  profileNewDisciplineHisByDisciplineId: (disciplineId: string, type: string) =>
+    `${registryNew}${type}/discipline/history/${disciplineId}`,
 
   // ปฏิบัติราชการพิเศษ
-  profileNewDuty: `${registryNew}/duty`,
-  profileNewDutyByProfileId: (profileId: string) =>
-    `${registryNew}/duty/${profileId}`,
-  profileNewDutyByDutyId: (dutyId: string) => `${registryNew}/duty/${dutyId}`,
-  profileNewDutyHisByDutyId: (dutyId: string) =>
-    `${registryNew}/duty/history/${dutyId}`,
+  profileNewDuty: (type: string) => `${registryNew}${type}/duty`,
+  profileNewDutyByProfileId: (profileId: string, type: string) =>
+    `${registryNew}${type}/duty/${profileId}`,
+  profileNewDutyByDutyId: (dutyId: string, type: string) =>
+    `${registryNew}${type}/duty/${dutyId}`,
+  profileNewDutyHisByDutyId: (dutyId: string, type: string) =>
+    `${registryNew}${type}/duty/history/${dutyId}`,
 
   //ข้อมูลราชการ
-  profileNewGovernment: () => `${registryNew}/government`,
-  profileNewGovernmentById: (id: string) => `${registryNew}/government/${id}`,
-  profileNewGovernmentHistory: (id: string) =>
-    `${registryNew}/government/history/${id}`,
+  profileNewGovernment: (type: string) => `${registryNew}${type}/government`,
+  profileNewGovernmentById: (id: string, type: string) =>
+    `${registryNew}${type}/government/${id}`,
+  profileNewGovernmentHistory: (id: string, type: string) =>
+    `${registryNew}${type}/government/history/${id}`,
 
   //การลา
-  profileNewLeave: () => `${registryNew}/leave`,
-  profileNewLeaveById: (id: string) => `${registryNew}/leave/${id}`,
-  profileNewLeaveHistory: (id: string) => `${registryNew}/leave/history/${id}`,
+  profileNewLeave: (type: string) => `${registryNew}${type}/leave`,
+  profileNewLeaveById: (id: string, type: string) =>
+    `${registryNew}${type}/leave/${id}`,
+  profileNewLeaveHistory: (id: string, type: string) =>
+    `${registryNew}${type}/leave/history/${id}`,
   profileCheckDate: () => `${env.API_URI}/leave/user/check`,
   profileNewLeaveType: () => `${env.API_URI}/leave/type`,
 
   /** ตำแหน่งเงินเดือน*/
-  profileSalaryNew: `${salaryNew}`,
-  profileListSalaryNew: (id: string) => `${salaryNew}/${id}`,
-  profileListSalaryHistoryNew: (profileId: string) =>
-    `${salaryNew}/history/${profileId}`,
-  profileSalarySwapNew: (type: string, id: string) =>
-    `${salaryNew}/swap/${type}/${id}`,
+  profileSalaryNew: (type: string) => `${registryNew}${type}/salary`,
+  profileListSalaryNew: (id: string, type: string) =>
+    `${registryNew}${type}/salary/${id}`,
+  profileListSalaryHistoryNew: (profileId: string, type: string) =>
+    `${registryNew}${type}/salary/history/${profileId}`,
+  profileSalarySwapNew: (type: string, id: string, type2: string) =>
+    `${registryNew}${type2}/salary/swap/${type}/${id}`,
 
   // ประวัติการเปลี่ยนชื่อ-นามสกุล
   profileNewChangeName: (type: string) => `${registryNew}${type}/changeName`,