ปรับ fe sprint2

src/modules/04_registry/interface/request/Assessment.ts

@@ -6,7 +6,12 @@ interface DataProps {
 //ข้อมูล
 interface RequestItemsObject {
   id: string;
-  point: number;
+  point1Total: number;
+  point1: number;
+  point2Total: number;
+  point2: number;
+  pointSumTotal: number;
+  pointSum: number;
   name: string;
   date: Date;
   createdFullName: string;

src/modules/04_registry/interface/request/Government.ts

@@ -16,11 +16,13 @@ interface RequestItemsObject {
 interface RequestItemsHistoryObject {
   oc: string | null;
   position: string | null;
+  positionPathSide: string | null;
   posNo: string | null;
   positionLine: string | null;
   positionType: string | null;
   positionLevel: string | null;
   positionExecutive: string | null;
+  positionExecutiveSide: string | null;
   dateAppoint: Date;
   dateStart: Date;
   retireDate: string | null;

src/modules/04_registry/interface/request/Leave.ts

@@ -6,20 +6,24 @@ interface DataProps {
 //ข้อมูล
 interface RequestItemsObject {
   id: string;
-  year: number;
-  sickDay: number;
-  personalDay: number;
-  maternityDay: number;
-  wifeDay: number;
-  sickCount: number;
-  ordainDay: number;
-  absentDay: number;
-  studyDay: number;
-  agencyDay: number;
-  coupleDay: number;
-  therapyDay: number;
-  createdFullName: string;
-  createdAt: Date;
+  typeLeave: string;
+  dateStartLeave: Date;
+  dateEndLeave: Date;
+  numLeave: number;
+  sumLeave: number;
+  totalLeave: number;
+  status: string;
+  reason: string;
+  typeLeaveId: string;
+}
+
+//ข้อมูล
+interface RequestItemsTotalObject {
+  typeLeaveId: string;
+  typeLeave: string;
+  totalLeave: number;
+  limitLeave: string;
+  remainLeave: string;
 }
 
 //columns
@@ -35,4 +39,4 @@ interface Columns {
   };
 }
 
-export type { RequestItemsObject, Columns, DataProps };
+export type { RequestItemsObject, Columns, DataProps, RequestItemsTotalObject };

src/modules/04_registry/interface/request/Main.ts

@@ -2,20 +2,35 @@
 interface RequestItemsObject {
   id: number;
   fullname: String;
+  fullnameOld: String;
   avatar: String;
   citizenId: String;
-  //   oc: String;
+  oc: String;
   position: String;
-  numberPosition: String;
+  positionPathSide: String;
+  numberPosition: String | null;
   positionLine: String;
   positionType: String;
   govAge: number;
   positionLevel: String;
-  positionExecutive: String;
-  dateAppoint: Date | null;
-  dateStart: Date | null;
-  createdAt: Date | null;
-  salaryDate: Date | null;
+  positionExecutive: String | null;
+  positionExecutiveSide: String | null;
+  refSalary: String;
+  positionEmployeePosition: String | null;
+  positionEmployeePositionSide: String | null;
+  positionEmployeeLevel: String | null;
+  positionEmployeeGroup: String | null;
+  dateAppoint: Date | string | null;
+  dateStart: Date | string | null;
+  createdAt: Date | string | null;
+  salaryDate: Date | string | null;
+  leaveReason: String;
+  age: String;
+  amount: String;
+  insignia: String;
+  insigniaLast: String;
+  isLeave: String;
+  leaveDateOrder: Date | string | null;
 }
 
 //columns

src/modules/04_registry/interface/request/OldName.ts

@@ -0,0 +1,32 @@
+interface DataProps {
+  row: RequestItemsObject;
+  rowIndex: number;
+}
+
+//ข้อมูล
+interface RequestItemsObject {
+  id: string;
+  prefix: string;
+  prefixId: string;
+  firstName: string;
+  lastName: string;
+  status: string;
+  file: string | null;
+  createdFullName: string;
+  createdAt: Date;
+}
+
+//columns
+interface Columns {
+  [index: number]: {
+    name: String;
+    align: String;
+    label: String;
+    sortable: Boolean;
+    field: String;
+    headerStyle: String;
+    style: String;
+  };
+}
+
+export type { RequestItemsObject, Columns, DataProps };

src/modules/04_registry/interface/request/Salary.ts

@@ -3,6 +3,11 @@ interface DataProps {
   rowIndex: number;
 }
 
+interface DataPropsEmployee {
+  row: RequestItemsEmployee;
+  rowIndex: number;
+}
+
 //ข้อมูล
 interface RequestItemsObject {
   id: string;
@@ -34,6 +39,31 @@ interface RequestItemsObject {
   createdAt: Date;
 }
 
+interface RequestItemsEmployee {
+  amount: number;
+  createdAt: Date;
+  createdFullName: string;
+  date: Date;
+  id: string;
+  mouthSalaryAmount: number;
+  oc: string | null;
+  ocId: string | null;
+  posNo: string | null;
+  posNoId: string | null;
+  posNoEmployee: string | null;
+  positionEmployeeGroup: string | null;
+  positionEmployeeGroupId: string | null;
+  positionEmployeeLevel: string | null;
+  positionEmployeeLevelId: string | null;
+  positionEmployeePosition: string | null;
+  positionEmployeePositionId: string | null;
+  positionEmployeePositionSide: string | null;
+  positionEmployeePositionSideId: string | null;
+  positionSalaryAmount: number;
+  salaryClass: string | null;
+  salaryRef: string | null;
+}
+
 //columns
 interface Columns {
   [index: number]: {
@@ -47,4 +77,10 @@ interface Columns {
   };
 }
 
-export type { RequestItemsObject, Columns, DataProps };
+export type {
+  RequestItemsObject,
+  Columns,
+  DataProps,
+  RequestItemsEmployee,
+  DataPropsEmployee,
+};