Merge branch 'net-dav' into develop

src/entities/ProfileHonor.ts

@@ -13,12 +13,6 @@ export class ProfileHonor extends EntityBase {
   })
   profileId: string;
 
-  @Column({
-    comment: "สถานะการใช้งาน",
-    default: false,
-  })
-  isActive: boolean;
-
   @Column({
     nullable: true,
     length: 2000,
@@ -59,13 +53,6 @@ export class ProfileHonor extends EntityBase {
   })
   refCommandNo: string;
 
-  @Column({
-    nullable: true,
-    comment: "ประเภทช่วงเวลาการศึกษา",
-    default: null,
-  })
-  isDate: boolean;
-
   @OneToMany(() => ProfileHonorHistory, (profileHonorHistory) => profileHonorHistory.histories)
   profileHonorHistories: ProfileHonorHistory[];
 
@@ -76,21 +63,17 @@ export class ProfileHonor extends EntityBase {
 
 export class CreateProfileHonor {
   profileId: string | null;
-  isActive: boolean;
   detail: string | null;
   issueDate: Date | null;
   issuer: string | null;
   refCommandDate: Date | null;
   refCommandNo: string | null;
-  isDate: boolean | null;
 }
 
 export type UpdateProfileHonor = {
-  isActive?: boolean;
   detail?: string | null;
   issueDate?: Date | null;
   issuer?: string | null;
   refCommandDate?: Date | null;
   refCommandNo?: string | null;
-  isDate?: boolean | null;
 };

src/entities/ProfileInsignia.ts

@@ -57,14 +57,6 @@ export class ProfileInsignia extends EntityBase {
   })
   page: string;
 
-  @Column({
-    nullable: true,
-    type: "datetime",
-    comment: "ลงวันที่",
-    default: null,
-  })
-  receiveDate: Date;
-
   @Column({
     nullable: true,
     type: "datetime",
@@ -136,13 +128,13 @@ export class ProfileInsignia extends EntityBase {
 
 export class CreateProfileInsignia {
   profileId: string | null;
-  isActive: boolean;
+
   year: number;
   no: string | null;
   volume: string | null;
   section: string | null;
   page: string | null;
-  receiveDate: Date | null;
+
   insigniaId: string;
   dateAnnounce: Date | null;
   issue: string | null;
@@ -153,13 +145,12 @@ export class CreateProfileInsignia {
 }
 
 export type UpdateProfileInsignia = {
-  isActive?: boolean;
   year?: number;
   no?: string | null;
   volume?: string | null;
   section?: string | null;
   page?: string | null;
-  receiveDate?: Date | null;
+
   insigniaId?: string | null;
   insigniaType?: string | null;
   dateAnnounce?: Date | null;

src/entities/ProfileOther.ts

@@ -13,12 +13,6 @@ export class ProfileOther extends EntityBase {
   })
   profileId: string;
 
-  @Column({
-    comment: "สถานะการใช้งาน",
-    default: false,
-  })
-  isActive: boolean;
-
   @Column({
     nullable: true,
     comment: "รายละเอียด",
@@ -45,13 +39,11 @@ export class ProfileOther extends EntityBase {
 
 export class CreateProfileOther {
   profileId: string | null;
-  isActive: boolean;
   detail: string | null;
   date: Date | null;
 }
 
 export type UpdateProfileOther = {
-  isActive?: boolean;
   detail?: string | null;
   date?: Date | null;
 };

src/entities/ProfileOtherHistory.ts

@@ -12,12 +12,6 @@ export class ProfileOtherHistory extends EntityBase {
   })
   profileOtherId: string;
 
-  @Column({
-    comment: "สถานะการใช้งาน",
-    default: false,
-  })
-  isActive: boolean;
-
   @Column({
     nullable: true,
     comment: "รายละเอียด",

src/entities/ProfileTraining.ts

@@ -13,12 +13,6 @@ export class ProfileTraining extends EntityBase {
   })
   profileId: string;
 
-  @Column({
-    comment: "สถานะการใช้งาน",
-    default: false,
-  })
-  isActive: boolean;
-
   @Column({
     nullable: true,
     type: "datetime",
@@ -98,13 +92,6 @@ export class ProfileTraining extends EntityBase {
   })
   yearly: number;
 
-  @Column({
-    nullable: true,
-    comment: "ประเภทช่วงเวลาการศึกษา",
-    default: null,
-  })
-  isDate: boolean;
-
   @OneToMany(
     () => ProfileTrainingHistory,
     (profileTrainingHistory) => profileTrainingHistory.histories,
@@ -118,7 +105,6 @@ export class ProfileTraining extends EntityBase {
 
 export class CreateProfileTraining {
   profileId: string | null;
-  isActive: boolean;
   startDate: Date | null;
   endDate: Date | null;
   numberOrder: string | null;
@@ -129,11 +115,9 @@ export class CreateProfileTraining {
   duration: string | null;
   name: string | null;
   yearly: number | null;
-  isDate: boolean | null;
 }
 
 export type UpdateProfileTraining = {
-  isActive?: boolean;
   startDate?: Date | null;
   endDate?: Date | null;
   numberOrder?: string | null;
@@ -144,5 +128,4 @@ export type UpdateProfileTraining = {
   duration?: string | null;
   name?: string | null;
   yearly?: number | null;
-  isDate?: boolean | null;
 };

src/entities/ProfileTrainingHistory.ts

@@ -5,12 +5,6 @@ import { ProfileTraining } from "./ProfileTraining";
 
 @Entity("profileTrainingHistory")
 export class ProfileTrainingHistory extends EntityBase {
-  @Column({
-    comment: "สถานะการใช้งาน",
-    default: false,
-  })
-  isActive: boolean;
-
   @Column({
     nullable: true,
     type: "datetime",
@@ -98,13 +92,6 @@ export class ProfileTrainingHistory extends EntityBase {
   })
   profileTrainingId: string;
 
-  @Column({
-    nullable: true,
-    comment: "ประเภทช่วงเวลาการศึกษา",
-    default: null,
-  })
-  isDate: boolean;
-
   @ManyToOne(() => ProfileTraining, (profileTraining) => profileTraining.profileTrainingHistories)
   @JoinColumn({ name: "profileTrainingId" })
   histories: ProfileTraining;