Merge branch 'develop' into devTee

src/api/14_KPI/api.KPI.ts

@@ -3,39 +3,68 @@ const KPI = `${env.API_URI}/kpi`;
 const kpiPeriod = `${env.API_URI}/kpi/period`;
 const kpiEvaluation = `${env.API_URI}/kpi/evaluation`;
 const kpiUserEvaluation = `${env.API_URI}/kpi/user/evaluation`;
-const kpiAchievement = `${env.API_URI}/kpi/user/achievement`;
-const kpiGroup = `${env.API_URI}/kpi/group`;
 const kpiPlan = `${env.API_URI}/kpi/plan`;
+const kpiRole = `${env.API_URI}/kpi/role`;
 const kpiSpecial = `${env.API_URI}/kpi/special`;
 const kpiCapacity = `${env.API_URI}/kpi/capacity`;
-const kpiLink = `${env.API_URI}/kpi/link`;
-const KpiUser = `${env.API_URI}/kpi/user`;
 const KpiFile = `${env.API_URI}/salary/file`;
+const KpiEvaluationInfo = `${env.API_URI}/kpi/evaluation`;
+const Kpiorg = `${env.API_URI}/org/profile/commander`;
+
+const KpiUser = `${env.API_URI}/kpi/user`;
+const kpiAchievement = `${env.API_URI}/kpi/user/achievement`;
+const kpiReason = `${env.API_URI}/kpi/reason`;
+
+const urlFile = `${env.API_URI}/salary`;
+
+const kpiGroup = `${env.API_URI}/kpi/group`;
+const kpiLink = `${env.API_URI}/kpi/link`;
+
 export default {
   KPI,
+  kpiUserEvaluation,
   /** รอบการประเมินผล*/
   kpiPeriod,
   kpiPeriodById: (id: string) => `${kpiPeriod}/${id}`,
+
   kpiEvaluation,
-  kpiFile: KpiFile,
+  kpiPlan,
+  kpiPlanById: (id: string) => `${kpiPlan}/${id}`,
 
   /** role */
+  kpiRole,
   kpiRoleMainList: `${KPI}/role`,
 
+  kpiSpecial,
+  kpiCapacity,
+  KpiFile: KpiFile,
+
+  kpiAchievement: (type: string) => `${kpiAchievement}/${type}`,
+  kpiAchievementPoint: (type: string) => `${kpiAchievement}/${type}/point`,
+
+  kpiScoreTotal: () => `${kpiEvaluation}/point`,
+
+  /** ผลสัมฤทธิ์ของงาน*/
+  fileByFile: (name: string, group: string, id: string, fileName: string) =>
+    `${urlFile}/file/${name}/${group}/${id}/${fileName}`,
+  kpiUserCapacity: `${KpiUser}/capacity`,
+  KpiEvaluationInfo,
+  Kpiorg,
+  kpiEvaluationCheck: `${kpiEvaluation}/check`,
+  kpiSendToStatus: (id: string) => `${kpiEvaluation}/status/${id}`,
+  kpiReqEdit: (id: string) => `${kpiEvaluation}/edit/${id}`,
+  /**ประเมิน*/
+  kpiAchievementDevelop: `${kpiAchievement}/development`,
+
+  kpiCommentP: (typP: string, type: string, role: string, id: string) =>
+    `${kpiReason}/${typP}/${type}/${role}/${id}`,
+
   kpiGroup,
   kpiGroupById: (id: string) => `${kpiGroup}/${id}`,
-  kpiPlan,
-  kpiPlanById: (id: string) => `${kpiPlan}/${id}`,
-  kpiSpecial,
 
   /** สมรรถนะ */
-  kpiCapacity,
 
   kpiLink,
 
-  kpiUserEvaluation,
   profilePosition: () => `${env.API_URI}/org/profile/keycloak/position`,
-  kpiAchievement: (type: string) => `${kpiAchievement}/${type}`,
-  kpiAchievementPoint: (type: string) => `${kpiAchievement}/${type}/point`,
-  kpiUserCapacity: `${KpiUser}/capacity`,
 };

src/api/registry/api.registry.ts

@@ -176,4 +176,6 @@ export default {
   //ข้อมูลครอบครับ
   profileFamily: (empType: string, type: string) =>
     `${registryNew}${empType}/family/${type}`,
+  profileFamilyHistory: (id: string, empType: string, type: string) =>
+    `${registryNew}${empType}/family/${type}/history/${id}`,
 };