From efb60a0c0412a559d0a94eaa461c3662dc29272a Mon Sep 17 00:00:00 2001 From: Net <93821485+somnetsak123@users.noreply.github.com> Date: Mon, 18 Mar 2024 17:25:04 +0700 Subject: [PATCH] =?UTF-8?q?fix:=20=E0=B8=A5=E0=B8=9A=20type?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/ProfileAbilityHistory.ts | 32 +--------------- src/entities/ProfileAssessmentHistory.ts | 47 ++++-------------------- src/entities/ProfileDutyHistory.ts | 31 ---------------- src/entities/ProfileTrainingHistory.ts | 43 ---------------------- 4 files changed, 8 insertions(+), 145 deletions(-) diff --git a/src/entities/ProfileAbilityHistory.ts b/src/entities/ProfileAbilityHistory.ts index 61f6364b..04974946 100644 --- a/src/entities/ProfileAbilityHistory.ts +++ b/src/entities/ProfileAbilityHistory.ts @@ -5,13 +5,12 @@ import { ProfileAbility } from "./ProfileAbility"; @Entity("profileAbilityHistory") export class ProfileAbilityHistory extends EntityBase { - @Column({ comment: "สถานะการใช้งาน", default: false, }) isActive: boolean; - + @Column({ nullable: true, comment: "หมายเหตุ", @@ -72,32 +71,3 @@ export class ProfileAbilityHistory extends EntityBase { @JoinColumn({ name: "profileAbilityId" }) histories: ProfileAbility; } - -export class CreateProfileAbilityHistory { - - @Column() - isActive: boolean; - - @Column() - remark: string | null; - - @Column() - detail: string | null; - - @Column() - reference: string | null; - - @Column() - dateStart: Date | null; - - @Column() - dateEnd: Date | null; - - @Column() - field: string | null; - - @Column("uuid") - ProfileAbilityId: string | null; -} - -export type UpdateProfileAbilityHistory = Partial; diff --git a/src/entities/ProfileAssessmentHistory.ts b/src/entities/ProfileAssessmentHistory.ts index 2e8b9acf..46c5d533 100644 --- a/src/entities/ProfileAssessmentHistory.ts +++ b/src/entities/ProfileAssessmentHistory.ts @@ -5,7 +5,6 @@ import { ProfileAssessment } from "./ProfileAssessment"; @Entity("profileAssessmentHistory") export class ProfileAssessmentHistory extends EntityBase { - @Column({ comment: "สถานะการใช้งาน", default: false, @@ -15,11 +14,11 @@ export class ProfileAssessmentHistory extends EntityBase { @Column({ nullable: true, comment: "ชื่อแบบประเมิน", - type: "text", + type: "text", default: null, }) name: string; - + @Column({ nullable: true, type: "datetime", @@ -83,43 +82,11 @@ export class ProfileAssessmentHistory extends EntityBase { default: null, }) profileAssessmentId: string; - - @ManyToOne(() => ProfileAssessment, (profileAssessment) => profileAssessment.profileAssessmentHistorys) + + @ManyToOne( + () => ProfileAssessment, + (profileAssessment) => profileAssessment.profileAssessmentHistorys, + ) @JoinColumn({ name: "profileAssessmentId" }) histories: ProfileAssessment; } - -export class CreateProfileAssessmentHistory { - - @Column() - isActive: boolean; - - @Column() - name: string | null; - - @Column() - date: Date | null; - - @Column() - point1: number | null; - - @Column() - point1Total: number | null; - - @Column() - point2: number | null; - - @Column() - point2Total: number | null; - - @Column() - pointSum: number | null; - - @Column() - pointSumTotal: number | null; - - @Column("uuid") - profileAssessmentId: string | null; -} - -export type UpdateProfileAssessmentHistory = Partial; diff --git a/src/entities/ProfileDutyHistory.ts b/src/entities/ProfileDutyHistory.ts index 8f7da298..989cefba 100644 --- a/src/entities/ProfileDutyHistory.ts +++ b/src/entities/ProfileDutyHistory.ts @@ -5,7 +5,6 @@ import { ProfileDuty } from "./ProfileDuty"; @Entity("profileDutyHistory") export class ProfileDutyHistory extends EntityBase { - @Column({ comment: "สถานะการใช้งาน", default: false, @@ -68,37 +67,7 @@ export class ProfileDutyHistory extends EntityBase { }) profileDutyId: string; - @ManyToOne(() => ProfileDuty, (profileDuty) => profileDuty.profileDutyHistories) @JoinColumn({ name: "profileDutyId" }) histories: ProfileDuty; } - -export class CreateProfileDutyHistory { - - @Column() - isActive: boolean; - - @Column() - dateStart: Date | null; - - @Column() - dateEnd: Date | null; - - @Column() - detail: string | null; - - @Column() - reference: string | null; - - @Column() - refCommandDate: Date | null; - - @Column() - refCommandNo: string | null; - - @Column("uuid") - profileDutyId: string | null; -} - -export type UpdateProfileDutyHistory = Partial; diff --git a/src/entities/ProfileTrainingHistory.ts b/src/entities/ProfileTrainingHistory.ts index fe0e076e..cfab7363 100644 --- a/src/entities/ProfileTrainingHistory.ts +++ b/src/entities/ProfileTrainingHistory.ts @@ -109,46 +109,3 @@ export class ProfileTrainingHistory extends EntityBase { @JoinColumn({ name: "profileTrainingId" }) histories: ProfileTraining; } - -export class CreateProfileTrainingHistory { - @Column() - isActive: boolean; - - @Column() - startDate: Date | null; - - @Column() - endDate: Date | null; - - @Column() - numberOrder: string | null; - - @Column() - topic: string | null; - - @Column() - place: string | null; - - @Column() - dateOrder: Date | null; - - @Column() - department: string | null; - - @Column() - duration: string | null; - - @Column() - name: string | null; - - @Column() - yearly: number | null; - - @Column() - isDate: boolean | null; - - @Column("uuid") - profileTrainingId: string | null; -} - -export type UpdateProfileTrainingHistory = Partial;