From 77fc61c33fdc125bc07bab001bf175956502c613 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 9 May 2024 11:11:26 +0700 Subject: [PATCH 1/4] startDate nullable --- src/entities/kpiUserSpecial.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/entities/kpiUserSpecial.ts b/src/entities/kpiUserSpecial.ts index dc302df..91ddd54 100644 --- a/src/entities/kpiUserSpecial.ts +++ b/src/entities/kpiUserSpecial.ts @@ -235,9 +235,9 @@ export class UpdateKpiUserSpecial { kpiUserEvaluationId: string; @Column() documentInfoEvidence: string; - @Column() + @Column({ nullable: true }) startDate: Date; - @Column() + @Column({ nullable: true }) endDate: Date; @Column() period: string; From 3bfd309ae854ffc84da6c487cd1bffbb498fd031 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 9 May 2024 11:25:08 +0700 Subject: [PATCH 2/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B8=84?= =?UTF-8?q?=E0=B9=88=E0=B8=B2=20default?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/KpiUserEvaluationController.ts | 10 ++++++---- src/entities/kpiUserEvaluation.ts | 4 ++-- ...e_kpiUserEvaluation_add_evaluationReqEdit1.ts | 16 ++++++++++++++++ 3 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts index 7490744..0fa0fc6 100644 --- a/src/controllers/KpiUserEvaluationController.ts +++ b/src/controllers/KpiUserEvaluationController.ts @@ -240,7 +240,7 @@ export class KpiUserEvaluationController extends Controller { @Get("{id}") async GetKpiUserEvaluationById(@Path() id: string) { const kpiUserEvaluation = await this.kpiUserEvalutionRepository.findOne({ - relations:["kpiPeriod"], + relations: ["kpiPeriod"], where: { id: id }, }); if (!kpiUserEvaluation) { @@ -257,6 +257,7 @@ export class KpiUserEvaluationController extends Controller { lastName: kpiUserEvaluation.lastName, evaluationStatus: kpiUserEvaluation.evaluationStatus, evaluationResults: kpiUserEvaluation.evaluationResults, + evaluationReqEdit: kpiUserEvaluation.evaluationReqEdit, createdAt: kpiUserEvaluation.createdAt, evaluatorId: kpiUserEvaluation.evaluatorId, commanderId: kpiUserEvaluation.commanderId, @@ -267,8 +268,9 @@ export class KpiUserEvaluationController extends Controller { capacityPoint: kpiUserEvaluation.capacityPoint, kpiPeriodId: kpiUserEvaluation.kpiPeriodId, year: kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.year, - durationKPI: kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.durationKPI, - } + durationKPI: + kpiUserEvaluation.kpiPeriod == null ? null : kpiUserEvaluation.kpiPeriod.durationKPI, + }; return new HttpSuccess(mapData); } @@ -289,7 +291,7 @@ export class KpiUserEvaluationController extends Controller { ) { const [kpiUserEvaluation, total] = await AppDataSource.getRepository(KpiUserEvaluation) .createQueryBuilder("kpiUserEvaluation") - .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") + .leftJoinAndSelect("kpiUserEvaluation.kpiPeriod", "kpiPeriod") .andWhere(kpiPeriodId ? "kpiPeriodId LIKE :kpiPeriodId" : "1=1", { kpiPeriodId: kpiPeriodId, }) diff --git a/src/entities/kpiUserEvaluation.ts b/src/entities/kpiUserEvaluation.ts index 0754186..61955bb 100644 --- a/src/entities/kpiUserEvaluation.ts +++ b/src/entities/kpiUserEvaluation.ts @@ -80,7 +80,7 @@ export class KpiUserEvaluation extends EntityBase { length: 40, comment: "ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน", - default: null, + default: "PENDING", }) evaluationResults: string; @@ -88,7 +88,7 @@ export class KpiUserEvaluation extends EntityBase { nullable: true, length: 40, comment: "คำขอแก้ไข", - default: null, + default: "NEW", }) evaluationReqEdit: string; diff --git a/src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts b/src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts new file mode 100644 index 0000000..4f9c5fc --- /dev/null +++ b/src/migration/1715228658780-update_table_kpiUserEvaluation_add_evaluationReqEdit1.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateTableKpiUserEvaluationAddEvaluationReqEdit11715228658780 implements MigrationInterface { + name = 'UpdateTableKpiUserEvaluationAddEvaluationReqEdit11715228658780' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationResults\` \`evaluationResults\` varchar(40) NULL COMMENT 'ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน' DEFAULT 'PENDING'`); + await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข' DEFAULT 'NEW'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationReqEdit\` \`evaluationReqEdit\` varchar(40) NULL COMMENT 'คำขอแก้ไข'`); + await queryRunner.query(`ALTER TABLE \`kpiUserEvaluation\` CHANGE \`evaluationResults\` \`evaluationResults\` varchar(40) NULL COMMENT 'ผลการประเมิน ดังนี้ PENDING = รอดำเนินการ, PASSED = ผ่านการประเมิน, NOTPASSED = ไม่ผ่านการประเมิน'`); + } + +} From be48ab20f5ebe057fbee6781cad70e5fb31e9cc7 Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 9 May 2024 11:36:55 +0700 Subject: [PATCH 3/4] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=20type=20unit?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/KpiUserSpecialController.ts | 3 +++ src/entities/kpiSpecial.ts | 8 ++++---- src/entities/kpiUserSpecial.ts | 6 +++--- ...e_kpiUserEvaluation_add_evaluationReqEdit2.ts | 16 ++++++++++++++++ ...e_kpiUserEvaluation_add_evaluationReqEdit3.ts | 16 ++++++++++++++++ 5 files changed, 42 insertions(+), 7 deletions(-) create mode 100644 src/migration/1715229248848-update_table_kpiUserEvaluation_add_evaluationReqEdit2.ts create mode 100644 src/migration/1715229338637-update_table_kpiUserEvaluation_add_evaluationReqEdit3.ts diff --git a/src/controllers/KpiUserSpecialController.ts b/src/controllers/KpiUserSpecialController.ts index b66fadd..5987c50 100644 --- a/src/controllers/KpiUserSpecialController.ts +++ b/src/controllers/KpiUserSpecialController.ts @@ -238,6 +238,9 @@ export class KpiUserSpecialController extends Controller { achievement3: getKpiUserSpecial.achievement3, achievement4: getKpiUserSpecial.achievement4, achievement5: getKpiUserSpecial.achievement5, + startDate: getKpiUserSpecial.startDate, + endDate: getKpiUserSpecial.endDate, + documentInfoEvidence: getKpiUserSpecial.documentInfoEvidence, }; return new HttpSuccess(mapKpiUserSpecial); diff --git a/src/entities/kpiSpecial.ts b/src/entities/kpiSpecial.ts index cf73317..5983be2 100644 --- a/src/entities/kpiSpecial.ts +++ b/src/entities/kpiSpecial.ts @@ -44,7 +44,7 @@ export class KpiSpecial extends EntityBase { comment: "หน่วยนับ", default: null, }) - unit: number; + unit: string; @Column({ nullable: true, @@ -166,7 +166,7 @@ export class CreateKpiSpecial { @Column() target: string; @Column() - unit: number; + unit: string; @Column() weight: number; @Column() @@ -191,7 +191,7 @@ export class UpdateKpiSpecial { @Column() achievement2: string; @Column() - achievement3: string ; + achievement3: string; @Column() achievement4: string; @Column() @@ -199,7 +199,7 @@ export class UpdateKpiSpecial { @Column() target: string; @Column() - unit: number; + unit: string; @Column() weight: number; @Column() diff --git a/src/entities/kpiUserSpecial.ts b/src/entities/kpiUserSpecial.ts index 91ddd54..10434f6 100644 --- a/src/entities/kpiUserSpecial.ts +++ b/src/entities/kpiUserSpecial.ts @@ -45,7 +45,7 @@ export class KpiUserSpecial extends EntityBase { comment: "หน่วยนับ", default: null, }) - unit: number; + unit: string; @Column({ nullable: true, @@ -185,7 +185,7 @@ export class CreateKpiUserSpecial { @Column() target: string; @Column() - unit: number; + unit: string; @Column() weight: number; @Column() @@ -224,7 +224,7 @@ export class UpdateKpiUserSpecial { @Column() target: string; @Column() - unit: number; + unit: string; @Column() weight: number; @Column() diff --git a/src/migration/1715229248848-update_table_kpiUserEvaluation_add_evaluationReqEdit2.ts b/src/migration/1715229248848-update_table_kpiUserEvaluation_add_evaluationReqEdit2.ts new file mode 100644 index 0000000..dfd8fd9 --- /dev/null +++ b/src/migration/1715229248848-update_table_kpiUserEvaluation_add_evaluationReqEdit2.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateTableKpiUserEvaluationAddEvaluationReqEdit21715229248848 implements MigrationInterface { + name = 'UpdateTableKpiUserEvaluationAddEvaluationReqEdit21715229248848' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiUserSpecial\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiUserSpecial\` ADD \`unit\` varchar(255) NULL COMMENT 'หน่วยนับ'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiUserSpecial\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiUserSpecial\` ADD \`unit\` int NULL COMMENT 'หน่วยนับ'`); + } + +} diff --git a/src/migration/1715229338637-update_table_kpiUserEvaluation_add_evaluationReqEdit3.ts b/src/migration/1715229338637-update_table_kpiUserEvaluation_add_evaluationReqEdit3.ts new file mode 100644 index 0000000..855462f --- /dev/null +++ b/src/migration/1715229338637-update_table_kpiUserEvaluation_add_evaluationReqEdit3.ts @@ -0,0 +1,16 @@ +import { MigrationInterface, QueryRunner } from "typeorm"; + +export class UpdateTableKpiUserEvaluationAddEvaluationReqEdit31715229338637 implements MigrationInterface { + name = 'UpdateTableKpiUserEvaluationAddEvaluationReqEdit31715229338637' + + public async up(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiSpecial\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiSpecial\` ADD \`unit\` varchar(255) NULL COMMENT 'หน่วยนับ'`); + } + + public async down(queryRunner: QueryRunner): Promise { + await queryRunner.query(`ALTER TABLE \`kpiSpecial\` DROP COLUMN \`unit\``); + await queryRunner.query(`ALTER TABLE \`kpiSpecial\` ADD \`unit\` int NULL COMMENT 'หน่วยนับ'`); + } + +} From 82be38becf81cd375660ba616aae0b3b1a977f7f Mon Sep 17 00:00:00 2001 From: Kittapath Date: Thu, 9 May 2024 11:41:24 +0700 Subject: [PATCH 4/4] =?UTF-8?q?=E0=B8=A7=E0=B8=B1=E0=B8=99=E0=B8=97?= =?UTF-8?q?=E0=B8=B5=E0=B9=88=E0=B8=A3=E0=B8=AD=E0=B8=9A=E0=B8=9E=E0=B8=B4?= =?UTF-8?q?=E0=B9=80=E0=B8=A8=E0=B8=A9=E0=B8=A7=E0=B9=88=E0=B8=B2=E0=B8=87?= =?UTF-8?q?=E0=B9=84=E0=B8=94=E0=B9=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/entities/kpiUserSpecial.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/entities/kpiUserSpecial.ts b/src/entities/kpiUserSpecial.ts index 10434f6..d305240 100644 --- a/src/entities/kpiUserSpecial.ts +++ b/src/entities/kpiUserSpecial.ts @@ -196,9 +196,9 @@ export class CreateKpiUserSpecial { kpiUserEvaluationId: string; @Column() documentInfoEvidence: string; - @Column() + @Column({ nullable: true }) startDate: Date; - @Column() + @Column({ nullable: true }) endDate: Date; @Column() period: string;