Merge branch 'develop' into devTee

# Conflicts:
#	src/modules/08_KPI/interface/request/index.ts

src/modules/08_KPI/interface/index/Main.ts

@@ -1,8 +1,12 @@
 interface DataOptions {
-    id:string
-    name:string
+  id: string;
+  name: string;
+}
+interface Pagination {
+  descending: boolean;
+  page: number;
+  rowsPerPage: number;
+  sortBy: string;
 }
 
-export type {
-    DataOptions
-}
+export type { DataOptions, Pagination };

src/modules/08_KPI/interface/request/index.ts

@@ -63,6 +63,13 @@ interface FormCommentByRole {
   reasonCommanderHigh: string;
 }
 
+interface FormQuery {
+  page: number;
+  pageSize: number;
+  round: string;
+  keyword: string;
+}
+
 export type {
   FormProfile,
   FormDataAssigned,
@@ -71,4 +78,5 @@ export type {
   ListCapacity,
   FormComment,
   FormCommentByRole,
+  FormQuery,
 };

src/modules/08_KPI/interface/response/index.ts

@@ -12,4 +12,33 @@ interface ResEvaluator {
   type: string;
 }
 
-export type { ResEvaluator };
+interface ResRound {
+  createdAt: string;
+  createdFullName: string;
+  createdUserId: string;
+  durationKPI: string;
+  endDate: string;
+  id: string;
+  isActive: boolean;
+  lastUpdateFullName: string;
+  lastUpdateUserId: string;
+  lastUpdatedAt: string;
+  startDate: string;
+  year: number;
+}
+interface ResEvaluatorAssessor {
+  commanderHighId: string | null;
+  commanderId: string | null;
+  createdAt: string;
+  evaluationResults: string;
+  evaluationStatus: string;
+  evaluatorId: string;
+  firstname: string;
+  id: string;
+  kpiPeriodId: string;
+  lastname: string;
+  prefix: string;
+  profileId: string;
+}
+
+export type { ResEvaluator, ResRound, ResEvaluatorAssessor };