Merge branch 'develop' into nice_dev

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

@@ -2,6 +2,7 @@ import env from "../index";
 const placement = `${env.API_PLACEMENT_URI}/placement`;
 const orgTree = `${env.API_URI_ORG_TREE}`;
 const order = `${env.API_PLACEMENT_URI}`;
+const receive = `${env.API_PLACEMENT_URI}/placement/Receive`;
 
 export default {
   MainDetail: (year: number) => `${placement}/exam/${year}`,
@@ -54,8 +55,14 @@ export default {
 
   // order
   yearOptionsOrder: () => `${order}/order/fiscal-year`,
+  createOrder: () => `${order}/order/detail`,
   listOrder: () => `${order}/order`,
-  detailOrder:(orderId:string) => `${order}/order/${orderId}`,
+  detailOrder:(orderId:string) => `${order}/order/detail/${orderId}`,
+  deleteOrder:(orderId:string) => `${order}/order/${orderId}`,
   typeOrder: () => `${order}/order/order-type`,
   examroundOrder: () => `${order}/order/detail/exam-round`,
+
+  receiveData: () => `${receive}`,
+  receiveDataId: (id: string) => `${receive}/${id}`,
+  receivePosition: (id: string) => `${receive}/position/${id}`,
 };

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

@@ -0,0 +1,14 @@
+import env from "../index";
+const dataOptions = `${env.API_PROBATION_URI}/data-options`;
+const personal = `${env.API_PROBATION_URI}/personal`;
+
+export default {
+  competencyOptions: () => `${dataOptions}/competency`,
+  competencyGroupOptions: () => `${dataOptions}/competency-group`,
+  knowledgeOptions: () => `${dataOptions}/knowledge`,
+  skillOptions: () => `${dataOptions}/skill`,
+  lawOptions: () => `${dataOptions}/law`,
+
+  personalAdd: () => `${personal}/add`,
+  // clearPosition: (personalId:string) => `${placement}/position/clear/${personalId}`
+};

src/api/index.ts

@@ -26,6 +26,7 @@ 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: "http://192.168.1.151:7776/v1",
   },
   test: {
     API_URI: "http://localhost:5010/api/v1",
@@ -70,6 +71,7 @@ const API_RETIREMENT_URI = ref<string>(
   config.value[env.value].API_RETIREMENT_URI
 );
 const API_URI_ORG_TREE = ref<string>(config.value[env.value].API_URI_ORG_TREE);
+const API_PROBATION_URI = ref<string>(config.value[env.value].API_PROBATION_URI);
 
 export default {
   env: env.value,
@@ -84,4 +86,5 @@ export default {
   API_URI_ORG_TREE: API_URI_ORG_TREE.value,
   MEET_URI: MEET_URI.value,
   API_RETIREMENT_URI:API_RETIREMENT_URI.value,
+  API_PROBATION_URI: API_PROBATION_URI.value
 };