Merge branch 'develop' into devTee

src/modules/15_development/interface/index/Main.ts

@@ -5,7 +5,7 @@ interface DataOption {
 
 interface DataOptionCheckBox {
   label: string;
-  value: string;
+  value: boolean;
 }
 
 interface FormFilter {
@@ -13,7 +13,7 @@ interface FormFilter {
   pageSize: number;
   keyword: string;
   type: string;
-  year:number
+  year: number;
   posType: string;
   posLevel: string;
   retireYear: string | null;
@@ -36,4 +36,10 @@ interface NewPagination {
   sortBy: string;
 }
 
-export type { DataOption, DataOptionCheckBox, ItemsMenu, NewPagination ,FormFilter};
+export type {
+  DataOption,
+  DataOptionCheckBox,
+  ItemsMenu,
+  NewPagination,
+  FormFilter,
+};

src/modules/15_development/interface/request/Main.ts

@@ -17,8 +17,8 @@ interface FormGroupTarget {
   groupTarget: string;
   groupTargetSub: string;
   position: string;
-  posType: string;
-  level: string;
+  posType: string | null;
+  level: string | null;
   type: string;
   amount: number | null;
 }
@@ -100,7 +100,7 @@ interface FormAddHistoryEmployee {
 }
 
 interface FormAddHistoryProject {
-  id:string
+  id: string;
   project: string;
   year: string;
   trainingStart: string;
@@ -114,8 +114,79 @@ interface FormAddHistoryProject {
   [key: string]: any;
 }
 
+/** form เพิ่มรายการโครงการ/หลักสูตรการฝึกอบรม*/
+interface FormAddProject {
+  year: number;
+  projectName: string;
+  reason: string;
+  objective: string;
+  metricType: string;
+  indicators: string;
+  target: string;
+  calculation: string;
+  measuRement: string;
+  results: string;
+  obstacles: string;
+  suggestions: string;
+  project: string;
+  isPassAllocate: boolean;
+  isPassNoAllocate: boolean;
+  isNoPass: boolean;
+  isBudget: boolean;
+  isOutBudget: boolean;
+  dateStart: Date | null;
+  dateEnd: Date | null;
+  totalDate: number | null;
+  address: string;
+  provinceId: string | null;
+  budget: string;
+  accept: number | string | null;
+  receive: number | string | null;
+  approved: number | string | null;
+  budgetPay: number | string | null;
+  issues: string;
+  chance: string;
+  effects: string;
+  riskLevel: string;
+  riskManagement: string;
+  expect: string;
+  topicAcademic: string;
+  addressAcademic: string;
+  provinceActualId: string | null;
+  actualPeoples: People[];
+  plannedPeoples: People[];
+  actualGoals: actualGoals[];
+  plannedGoals: PlannedGoals[];
+}
+
+interface People {
+  groupTarget: string;
+  amount: number | null;
+}
+
+interface actualGoals {
+  groupTarget: string;
+  groupTargetSub: string;
+  position: string;
+  posTypeActualId: string | null;
+  posLevelActualId: string | null;
+  type: string;
+  amount: number | null;
+}
+
+interface PlannedGoals {
+  groupTarget: string;
+  groupTargetSub: string;
+  position: string;
+  posTypePlannedId: string | null;
+  posLevelPlannedId: string | null;
+  type: string;
+  amount: number | null;
+}
+
 export type {
   FormQueryListProject,
+  FormAddProject,
   FormBasicinfo,
   FormGroupTarget,
   FormGroupRelate,