Merge branch 'develop' of github.com:Frappet/bma-ehr-frontend into me

# Conflicts:
#	src/api/06_retirement/api.retirement.ts
#	src/modules/05_placement/router.ts

src/api/05_placement/api.placement.ts

@@ -4,6 +4,11 @@ const orgTree = `${env.API_URI_ORG_TREE}`;
 const order = `${env.API_PLACEMENT_URI}`;
 const receive = `${env.API_PLACEMENT_URI}/placement/Receive`;
 const transfer = `${placement}/transfer`;
+const placemenHelpGov = `${placement}/officer`;
+const placemenRepatriation = `${placement}/repatriation`;
+const placemenRelocation = `${placement}/relocation`;
+const placemenOther = `${env.API_URI}/retirement/other`;
+const placemenAppointment = `${env.API_URI}/retirement/appointment`;
 
 export default {
   MainDetail: (year: number) => `${placement}/exam/${year}`,
@@ -99,4 +104,27 @@ export default {
   transferUser: `${transfer}/user`,
   transferUserId: (id: string) => `${transfer}/user/${id}`,
   transferConfirmId: (id: string) => `${transfer}/confirm/${id}`,
+
+
+  // แต่งตั้ง-เลื่อน
+  placemenAppointment,
+
+  // ช่วยราชการ
+  placemenHelpGov,
+  officerMain: () => `${placement}/officer`,
+  officerDetail: (id:string) => `${placement}/officer/${id}`,
+  officerMainDelete: (id:string) => `${placement}/officer/${id}`,
+  officerMainReport: () => `${placement}/officer/report`,
+
+  // ส่งตัวกลับ
+  placemenRepatriation,
+  repatriationMain: () => `${placement}/repatriation`,
+  repatriationDetail: (id:string) => `${placement}/repatriation/${id}`,
+  repatriationMainDelete: (id:string) => `${placement}/repatriation/${id}`,
+  repatriationMainReport: () => `${placement}/repatriation/report`,
+  // ขอย้าย
+  placemenRelocation,
+
+  // อื่นๆ
+  placemenOther,
 };

src/api/05_placement/api.probation.ts

@@ -3,6 +3,8 @@ const dataOptions = `${env.API_PROBATION_URI}/data-options`;
 const personal = `${env.API_PROBATION_URI}/personal`;
 const calculate = `${env.API_PROBATION_URI}/calculate`;
 const finish = `${env.API_PROBATION_URI}/assign`;
+const evaluate = `${env.API_PROBATION_URI}`;
+
 
 export default {
   competencyOptions: (personalId: string) =>
@@ -25,6 +27,36 @@ export default {
   personalAdd: () => `${personal}/add`,
   probationGetAssignList: (personalId:string) => 
   `${finish}/probation-assign-list?personal_id=${personalId}`,
-  probationsGetAssign: (assignId:string) =>`${finish}/probation-assign?assign_id=${assignId}`
+  probationsGetAssign: (assignId:string) =>`${finish}/probation-assign?assign_id=${assignId}`,
+  // probationGetAssignList: (personalId: string) =>
+  //   `${finish}/probation-assign-list?personal_id=${personalId}`,
   // clearPosition: (personalId:string) => `${placement}/position/clear/${personalId}`
+
+  // บันทึกผล
+  formevaluate: (id: string) => `${evaluate}/evaluate-record?assign_id=${id}`,
+  formevaluateround: (id: string, no: string) => `${evaluate}/evaluate-record?assign_id=${id}&evaluate_no=${no}`,
+  formevaluateRecord: (id: string) => `${evaluate}/evaluate-record/create?assign_id=${id}`,
+  createformevaluate: (id: string) => `${evaluate}/evaluate-record?id=${id}`,
+
+  //แบบประเมินผล (ผู้บังคับบัญชา)
+  evaluateCreate: (id: string) => `${evaluate}/evaluate/create?assign_id=${id}`,
+  evaluatecommader: (id: string, no: string) => `${evaluate}/evaluate?assign_id=${id}&evaluate_no=${no}`,
+  createformCommader: (id: string) => `${evaluate}/evaluate?id=${id}`,
+
+  //แบบประเมินผล (คณะกรรมการ)
+  evaluateChairman: (id: string) => `${evaluate}/evaluate-chairman/create?assign_id=${id}`,
+  evaluateRoundChairman: (id: string, no: string) => `${evaluate}/evaluate-chairman?assign_id=${id}&evaluate_no=${no}`,
+  createformChairman: (id: string) => `${evaluate}/evaluate-chairman?id=${id}`,
+
+  //แบบรายงาน
+  evaluateReportcreate: (id: string) => `${evaluate}/evaluate-result/create?assign_id=${id}`,
+  evaluateReport: (id: string) => `${evaluate}/evaluate-result?assign_id=${id}`,
+  createformReport: (id: string) => `${evaluate}/evaluate-result?id=${id}`,
+
+
+
+
+
+
+
 };

src/api/06_retirement/api.retirement.ts

@@ -1,5 +1,8 @@
 import env from "../index";
 const retirement = `${env.API_URI}/retirement`;
+const retirementDischarge = `${retirement}/discharge`;
+const retirementExpulsion = `${retirement}/expulsion`;
+const retirementOut = `${retirement}/out`;
 
 export default {
   profile: (type: string, year: string) =>
@@ -23,4 +26,12 @@ export default {
   resingByid: (id: string) => `${retirement}/resign/${id}`,
   resignConfirm: (id: string) => `${retirement}/resign/confirm/${id}`,
   resignReject: (id: string) => `${retirement}/resign/reject/${id}`,
+  // ปลดออก
+  retirementDischarge,
+
+  // ไล่ออก
+  retirementExpulsion,
+
+  // ให้ออก
+  retirementOut,
 };

src/api/index.ts

@@ -26,7 +26,8 @@ const config = ref<any>({
       "https://s3cluster.frappet.com/bma-ehr-fpt/organization/strueture/tree_20230712_172702.json",
     MEET_URI: "meet.frappet.com",
     API_RETIREMENT_URI: "https://bma-ehr.frappet.synology.me/api/v1",
-    API_PROBATION_URI: "https://ehr.joolsoft.com/v1",
+    API_PROBATION_URI: "https://bmaehr.joolsoft.com/nodeapi/v1",
+    // API_PROBATION_URI: "http://192.168.1.151:7776/v1",
   },
   test: {
     API_URI: "http://localhost:5010/api/v1",