Merge branch 'develop' into devTee

# Conflicts:
#	src/api/registry/api.registry.ts

src/modules/04_registryNew/interface/index/salary.ts

@@ -6,4 +6,16 @@ interface RowList {
   refCommandNo: string;
   refCommandDate: Date | null;
 }
-export type { RowList };
+
+interface ObjectSalaryRef {
+  date: object | null;
+  posNo: object | null;
+  position: object | null;
+  typePosition: object | null;
+  levelPosition: object | null;
+  salary: object | null;
+  doc: object | null;
+
+  [key: string]: any;
+}
+export type { RowList, ObjectSalaryRef };

src/modules/04_registryNew/interface/request/DeclarationHonor.ts

@@ -1,37 +1,11 @@
 interface RequestItemsObject {
   profileId?: string;
-  isActive: boolean;
   detail: string;
   issueDate: Date | null;
   issuer: string;
   refCommandDate: Date | null;
   refCommandNo: string;
-  isDate: boolean;
+  isDate: boolean | string;
 }
 
-interface FormData {
-  id: string;
-  isActive: boolean;
-  isDate: string | null;
-  issuer: string;
-  detail: string;
-  issueDate: Date | null;
-  issueDateYear: number;
-  refCommandNo: string;
-  refCommandDate: Date | null;
-}
-
-//columns
-interface Columns {
-  [index: number]: {
-    name: String;
-    align: String;
-    label: String;
-    sortable: Boolean;
-    field: String;
-    headerStyle: String;
-    style: String;
-  };
-}
-
-export type { RequestItemsObject, FormData, Columns };
+export type { RequestItemsObject };

src/modules/04_registryNew/interface/request/Profile.ts

@@ -0,0 +1,24 @@
+interface RequestObject {
+  bloodGroupId: string | null;
+  relationshipId: string | null;
+  genderId: string | null;
+  posTypeId: string;
+  posLevelId: string;
+  religionId: string | null;
+  citizenId: string;
+  telephoneNumber: string | null;
+  // nationality: string | null;
+  ethnicity: string | null;
+  birthDate: Date | null;
+  dateRetire: Date | null;
+  isProbation: boolean;
+  keycloak: string;
+  phone: string | null;
+  email: string | null;
+  position: string;
+  lastName: string;
+  firstName: string;
+  prefix: string;
+}
+
+export type { RequestObject };

src/modules/04_registryNew/interface/response/Profile.ts

@@ -0,0 +1,108 @@
+interface ResponseObject {
+  id: string;
+  createdAt: Date;
+  createdUserId: string;
+  lastUpdatedAt: Date;
+  lastUpdateUserId: string;
+  createdFullName: string;
+  lastUpdateFullName: string;
+  prefix: string;
+  firstName: string;
+  lastName: string;
+  citizenId: string;
+  position: string;
+  posLevelId: string | null;
+  posTypeId: string | null;
+  email: string | null;
+  phone: string | null;
+  keycloak: string | null;
+  isProbation: boolean;
+  dateRetire: Date | null;
+  birthDate: Date;
+  ethnicity: string | null;
+  religionId: string | null;
+  religion: Religion | null;
+  telephoneNumber: null | null;
+  genderId: string | null;
+  gender: Gender | null;
+  relationshipId: string | null;
+  relationship: Relationship | null;
+  bloodGroupId: string | null;
+  bloodGroup: BloodGroup | null;
+  posLevel: PosLevel | null;
+  posType: PosType | null;
+
+  nationality?: string;
+}
+
+interface Religion {
+  id: string;
+  createdAt: Date;
+  lastUpdatedAt: Date;
+  createdFullName: string;
+  lastUpdateFullName: string;
+  name: string;
+}
+
+interface Gender {
+  id: string;
+  createdAt: Date;
+  lastUpdatedAt: Date;
+  createdFullName: string;
+  lastUpdateFullName: string;
+  name: string;
+}
+
+interface Relationship {
+  id: string;
+  createdAt: Date;
+  lastUpdatedAt: Date;
+  createdFullName: string;
+  lastUpdateFullName: string;
+  name: string;
+}
+
+interface BloodGroup {
+  id: string;
+  createdAt: Date;
+  lastUpdatedAt: Date;
+  createdFullName: string;
+  lastUpdateFullName: string;
+  name: string;
+}
+
+interface PosLevel {
+  id: string;
+  createdAt: Date;
+  createdUserId: string;
+  lastUpdatedAt: Date;
+  lastUpdateUserId: string;
+  createdFullName: string;
+  lastUpdateFullName: string;
+  posLevelName: string;
+  posLevelRank: number;
+  posLevelAuthority: null;
+  posTypeId: string;
+}
+
+interface PosType {
+  id: string;
+  createdAt: Date;
+  createdUserId: string;
+  lastUpdatedAt: Date;
+  lastUpdateUserId: string;
+  createdFullName: string;
+  lastUpdateFullName: string;
+  posTypeName: string;
+  posTypeRank: number;
+}
+
+export type {
+  ResponseObject,
+  Religion,
+  Gender,
+  Relationship,
+  BloodGroup,
+  PosLevel,
+  PosType,
+};