Merge branch 'develop' into anandadev

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

@@ -46,22 +46,61 @@ export default {
 
   //education
   placementEducationId: (id: string) => `${placement}/education/${id}`,
-  // position 
+  // position
   placementPosition: () => `${placement}/position/use`,
   // putPositiom
   putPosition: (id: any) => `${placement}/position/${id}`,
   // clear Position
-  clearPosition: (personalId: string) => `${placement}/position/clear/${personalId}`,
+  clearPosition: (personalId: string) =>
+    `${placement}/position/clear/${personalId}`,
 
   // order
   yearOptionsOrder: () => `${order}/order/fiscal-year`,
-  createOrder: () => `${order}/order/detail`,
   listOrder: () => `${order}/order`,
-  detailOrder:(orderId:string) => `${order}/order/detail/${orderId}`,
-  deleteOrder:(orderId:string) => `${order}/order/${orderId}`,
+  detailOrder: (orderId: string) => `${order}/order/detail/${orderId}`,
+  deleteOrder: (orderId: string) => `${order}/order/${orderId}`,
   typeOrder: () => `${order}/order/order-type`,
+  nextStep: (orderId: string) => `${order}/order/next/${orderId}`,
+  prevStep: (orderId: string) => `${order}/order/prev/${orderId}`,
+
+  createOrder: () => `${order}/order/detail`,
+
   examroundOrder: () => `${order}/order/detail/exam-round`,
 
+  //ข้อมูลเลือกรายชื่อออกคำสั่ง, ลบรายชื่อ
+  personsOrder: (orderId: string) => `${order}/order/persons/${orderId}`,
+
+  //เปลี่ยน status ของคำสั่งไปขั้นตอนถัดไป
+  nextOrder: (orderId: string) => `${order}/order/next/${orderId}`,
+  //เปลี่ยน status ของคำสั่งไปขั้นตอนถัดไป
+  preventOrder: (orderId: string) => `${order}/order/prev/${orderId}`,
+
+  //สลับลำดับข้อมูลในบัญชีแนบท้ายขึ้น
+  swapUpOrder: (personalId: string) => `${order}/order/swap/up/${personalId}`,
+  //สลับลำดับข้อมูลในบัญชีแนบท้ายลง
+  swapDownOrder: (personalId: string) =>
+    `${order}/order/swap/down/${personalId}`,
+
+  //บันทึกข้อมูลเงินเดือนสำหรับผู้บรรจุ
+  salaryOrder: (id: string) => `${order}/order/salary/${id}`,
+
+  // popup แสดงรายชื่อตามหน่วยงานที่เลือก , popup เลือกรายชื่อส่งสำเนา
+  copyOrderPersonsId: (id: string) => `${order}/order/copy-order/persons/${id}`,
+
+  copyOrder: `${order}/order/copy-order`,
+
+  copyOrderId: (id: string) => `${order}/order/copy-order/${id}`,
+
+  attachmentId: (id: string) => `${order}/order/attachment/${id}`,
+
+  attachmentOrderId: (orderId: string) =>
+    `${order}/order/attachment/order-file/${orderId}`,
+  attachmentFileId: (orderId: string) =>
+    `${order}/order/attachment/file/${orderId}`,
+
+  orderReady: (id: string) => `${order}/order/ready/${id}`,
+  attachmentOrder: (orderId: string) => `${order}/order/attachment/${orderId}`,
+
   receiveData: () => `${receive}`,
   receiveDataId: (id: string) => `${receive}/${id}`,
   receivePosition: (id: string) => `${receive}/position/${id}`,

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

@@ -6,7 +6,9 @@ export default {
     profile: (type: string, year: string) => `${retirement}/profile/${type}/${year}`,
     profileRetire: (retireProfileId: string) => `${retirement}/profile/${retireProfileId}`,
     listRetire: (retireId: string) => `${retirement}/${retireId}`,
-    createnote: () => `${retirement}/reason`,
-    reasonId: (retireId:string) => `${retirement}/reason/${retireId}`,
-    retirement:(type:string,year:string) => `${retirement}/${type}/${year}`
+    createnote: () => `${retirement}/edit`,
+    removeProfile: () => `${retirement}/remove`,
+    reasonId: (retireId: string) => `${retirement}/reason/${retireId}`,
+    retirement: (type: string, year: string) => `${retirement}/${type}/${year}`,
+    createProfile: () => `${retirement}/profile`,
 };