Merge branch 'develop' into devTee

src/modules/11_discipline/interface/index/Main.ts

@@ -8,13 +8,15 @@ interface DataNumberOption {
   name: string;
 }
 
-interface investigatefactsDataRowType {
+interface InvestigatefactsDataRowType {
   id:string,
   subject: string;
   interrogated: string;
-  fault: string | undefined;
-  status: string | undefined;
-  active: string | undefined;
+  complaintOffenseDetails: string,
+  investigationDetail: string,
+  dateInvestigate: string,
+  statusResult: string,
+  status: string
 }
 
 interface investigateDisDataRowType {
@@ -40,7 +42,7 @@ interface directorType {
 
 export type {
   DataOption,
-  investigatefactsDataRowType,
+  InvestigatefactsDataRowType,
   investigateDisDataRowType,
   directorType,
   DataNumberOption

src/modules/11_discipline/interface/request/investigate.ts

@@ -14,6 +14,7 @@ interface FormData {
   statusResult: string;
   causeText: string;
   complaintStatus:string
+  reason: string
 }
 interface MyObjectInvestigateRef {
   complaint: object | null;
@@ -28,6 +29,7 @@ interface MyObjectInvestigateRef {
   daysExtend: object | null;
   statusResult: object | null;
   causeText: object | null;
+  reason: object | null;
   [key: string]: any;
 }
 export type { FormData, MyObjectInvestigateRef };

src/modules/11_discipline/interface/request/investigateFact.ts

@@ -0,0 +1,35 @@
+interface FormData {
+  complaint: string;
+  complaintdetail: string;
+  detail: string;
+  fault: string;
+  other: string;
+  evidenceFiles: File | null;
+  fileComplaint: File | null;
+  clickTime: boolean;
+  date: Date | null;
+  dateEnd: Date;
+  daysExtend: number | null;
+  investigation: string;
+  statusResult: string;
+  causeText: string;
+  complaintStatus:string
+  reason: string
+}
+interface MyObjectInvestigateRef {
+  complaint: object | null;
+  complaintdetail: object | null;
+  detail: object | null;
+  fault: object | null;
+  evidenceFiles: object | null;
+  fileComplaint: object | null;
+  date: object | null;
+  dateEnd: object | null;
+  investigation: object | null;
+  daysExtend: object | null;
+  statusResult: object | null;
+  causeText: object | null;
+  reason: object | null;
+  [key: string]: any;
+}
+export type { FormData, MyObjectInvestigateRef };

src/modules/11_discipline/interface/response/investigate.ts

@@ -0,0 +1,13 @@
+interface ListData {
+  id: string;
+  subject: string;
+  interrogated: string;
+  complaintOffenseDetails: string;
+  investigationDetail: string;
+  startDate: Date | null;
+  endDate: Date | null;
+  statusResult: string;
+  status: string;
+}
+
+export type { ListData };