no message

src/controllers/KpiReasonController.ts

@@ -134,21 +134,21 @@ export class kpiReasonController extends Controller {
       }
 
       if (user.trim().toUpperCase() == "EVALUATOR") {
-        kpiReason.reasonEvaluator = requestBody.reason;
+        kpiReason.reasonEvaluator = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == null ||
           kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderId == ""
             ? "DONE"
             : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
-        kpiReason.reasonCommander = requestBody.reason;
+        kpiReason.reasonCommander = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderHighId == null ||
           kpiReason.kpiUserPlanned.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
-        kpiReason.reasonCommanderHigh = requestBody.reason;
+        kpiReason.reasonCommanderHigh = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status = "DONE";
       }
       kpiReason.lastUpdateUserId = request.user.sub;
@@ -187,7 +187,7 @@ export class kpiReasonController extends Controller {
       kpiReason.kpiUserPlanned.kpiUserEvaluation.evaluatorId == ""
         ? "DONE"
         : "EVALUATOR";
-    kpiReason.reason = requestBody.reason;
+    kpiReason.reason = requestBody.reason == null ? "" : requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
     await this.kpiUserEvaluationReasonPlan.save(kpiReason);
@@ -322,21 +322,21 @@ export class kpiReasonController extends Controller {
       }
 
       if (user.trim().toUpperCase() == "EVALUATOR") {
-        kpiReason.reasonEvaluator = requestBody.reason;
+        kpiReason.reasonEvaluator = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == null ||
           kpiReason.kpiUserRole.kpiUserEvaluation.commanderId == ""
             ? "DONE"
             : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
-        kpiReason.reasonCommander = requestBody.reason;
+        kpiReason.reasonCommander = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserRole.kpiUserEvaluation.commanderHighId == null ||
           kpiReason.kpiUserRole.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
-        kpiReason.reasonCommanderHigh = requestBody.reason;
+        kpiReason.reasonCommanderHigh = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status = "DONE";
       }
       kpiReason.lastUpdateUserId = request.user.sub;
@@ -375,7 +375,7 @@ export class kpiReasonController extends Controller {
       kpiReason.kpiUserRole.kpiUserEvaluation.evaluatorId == ""
         ? "DONE"
         : "EVALUATOR";
-    kpiReason.reason = requestBody.reason;
+    kpiReason.reason = requestBody.reason == null ? "" : requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
     await this.kpiUserEvaluationReasonRole.save(kpiReason);
@@ -512,21 +512,21 @@ export class kpiReasonController extends Controller {
       }
 
       if (user.trim().toUpperCase() == "EVALUATOR") {
-        kpiReason.reasonEvaluator = requestBody.reason;
+        kpiReason.reasonEvaluator = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == null ||
           kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderId == ""
             ? "DONE"
             : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
-        kpiReason.reasonCommander = requestBody.reason;
+        kpiReason.reasonCommander = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderHighId == null ||
           kpiReason.kpiUserSpecial.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
-        kpiReason.reasonCommanderHigh = requestBody.reason;
+        kpiReason.reasonCommanderHigh = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status = "DONE";
       }
       kpiReason.lastUpdateUserId = request.user.sub;
@@ -565,7 +565,7 @@ export class kpiReasonController extends Controller {
       kpiReason.kpiUserSpecial.kpiUserEvaluation.evaluatorId == ""
         ? "DONE"
         : "EVALUATOR";
-    kpiReason.reason = requestBody.reason;
+    kpiReason.reason = requestBody.reason == null ? "" : requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
     await this.kpiUserEvaluationReasonSpecial.save(kpiReason);
@@ -702,21 +702,21 @@ export class kpiReasonController extends Controller {
       }
 
       if (user.trim().toUpperCase() == "EVALUATOR") {
-        kpiReason.reasonEvaluator = requestBody.reason;
+        kpiReason.reasonEvaluator = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == null ||
           kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderId == ""
             ? "DONE"
             : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
-        kpiReason.reasonCommander = requestBody.reason;
+        kpiReason.reasonCommander = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderHighId == null ||
           kpiReason.kpiUserDevelopment.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
-        kpiReason.reasonCommanderHigh = requestBody.reason;
+        kpiReason.reasonCommanderHigh = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status = "DONE";
       }
       kpiReason.lastUpdateUserId = request.user.sub;
@@ -755,7 +755,7 @@ export class kpiReasonController extends Controller {
       kpiReason.kpiUserDevelopment.kpiUserEvaluation.evaluatorId == ""
         ? "DONE"
         : "EVALUATOR";
-    kpiReason.reason = requestBody.reason;
+    kpiReason.reason = requestBody.reason == null ? "" : requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
     await this.kpiUserEvaluationReasonDevelopment.save(kpiReason);
@@ -896,21 +896,21 @@ export class kpiReasonController extends Controller {
       }
 
       if (user.trim().toUpperCase() == "EVALUATOR") {
-        kpiReason.reasonEvaluator = requestBody.reason;
+        kpiReason.reasonEvaluator = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == null ||
           kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderId == ""
             ? "DONE"
             : "COMMANDER";
       } else if (user.trim().toUpperCase() == "COMMANDER") {
-        kpiReason.reasonCommander = requestBody.reason;
+        kpiReason.reasonCommander = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status =
           kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderHighId == null ||
           kpiReason.kpiUserCapacity.kpiUserEvaluation.commanderHighId == ""
             ? "DONE"
             : "COMMANDERHIGH";
       } else if (user.trim().toUpperCase() == "COMMANDERHIGH") {
-        kpiReason.reasonCommanderHigh = requestBody.reason;
+        kpiReason.reasonCommanderHigh = requestBody.reason == null ? "" : requestBody.reason;
         kpiReason.status = "DONE";
       }
       kpiReason.lastUpdateUserId = request.user.sub;
@@ -949,7 +949,7 @@ export class kpiReasonController extends Controller {
       kpiReason.kpiUserCapacity.kpiUserEvaluation.evaluatorId == ""
         ? "DONE"
         : "EVALUATOR";
-    kpiReason.reason = requestBody.reason;
+    kpiReason.reason = requestBody.reason == null ? "" : requestBody.reason;
     kpiReason.lastUpdateUserId = request.user.sub;
     kpiReason.lastUpdateFullName = request.user.name;
     await this.kpiUserEvaluationReasonCapacity.save(kpiReason);

src/controllers/KpiUserDevelopmentController.ts

@@ -59,7 +59,7 @@ export class KpiUserDevelopmentController extends Controller {
     }
 
     const chkName = await this.kpiUserDevelopmentRepository.findOne({
-      where: { name: requestBody.name},
+      where: { name: requestBody.name },
     });
     if (chkName) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "มีชื่อนี้ในระบบแล้ว");
@@ -120,10 +120,10 @@ export class KpiUserDevelopmentController extends Controller {
     const chkName = await this.kpiUserDevelopmentRepository.find({
       where: {
         id: Not(id),
-        name: requestBody.name
+        name: requestBody.name,
       },
     });
-    
+
     if (chkName && chkName.length > 0) {
       throw new HttpError(HttpStatusCode.NOT_FOUND, "มีชื่อนี้ในระบบแล้ว");
     }
@@ -190,6 +190,7 @@ export class KpiUserDevelopmentController extends Controller {
       evaluationId: getKpiUserDevelopment.kpiUserEvaluation.id,
       target: getKpiUserDevelopment.target,
       summary: getKpiUserDevelopment.summary,
+      point: getKpiUserDevelopment.point,
       name: getKpiUserDevelopment.name,
       achievement10: getKpiUserDevelopment.achievement10,
       achievement5: getKpiUserDevelopment.achievement5,
@@ -223,6 +224,7 @@ export class KpiUserDevelopmentController extends Controller {
       evaluationId: item.kpiUserEvaluation.id,
       target: item.target,
       summary: item.summary,
+      point: item.point,
       name: item.name,
       achievement10: item.achievement10,
       achievement5: item.achievement5,

src/controllers/KpiUserPlannedController.ts

@@ -200,6 +200,8 @@ export class KpiUserPlannedController extends Controller {
       unit: getKpiUserPlanned.unit,
       meaning: getKpiUserPlanned.meaning,
       formula: getKpiUserPlanned.formula,
+      summary: getKpiUserPlanned.summary,
+      point: getKpiUserPlanned.point,
       achievement1: getKpiUserPlanned.achievement1,
       achievement2: getKpiUserPlanned.achievement2,
       achievement3: getKpiUserPlanned.achievement3,
@@ -239,6 +241,7 @@ export class KpiUserPlannedController extends Controller {
       unit: item.unit,
       meaning: item.meaning,
       formula: item.formula,
+      summary: item.summary,
       point: item.point,
       achievement:
         item.point === 1

src/controllers/KpiUserRoleController.ts

@@ -202,6 +202,8 @@ export class KpiUserRoleController extends Controller {
       unit: getKpiUserRole.unit,
       meaning: getKpiUserRole.meaning,
       formula: getKpiUserRole.formula,
+      summary: getKpiUserRole.summary,
+      point: getKpiUserRole.point,
       achievement1: getKpiUserRole.achievement1,
       achievement2: getKpiUserRole.achievement2,
       achievement3: getKpiUserRole.achievement3,
@@ -242,6 +244,7 @@ export class KpiUserRoleController extends Controller {
       unit: item.unit,
       meaning: item.meaning,
       formula: item.formula,
+      summary: item.summary,
       point: item.point,
       achievement:
         item.point === 1

src/controllers/KpiUserSpecialController.ts

@@ -224,6 +224,7 @@ export class KpiUserSpecialController extends Controller {
       unit: getKpiUserSpecial.unit,
       meaning: getKpiUserSpecial.meaning,
       formula: getKpiUserSpecial.formula,
+      summary: getKpiUserSpecial.summary,
       point: getKpiUserSpecial.point,
       achievement:
         getKpiUserSpecial.point === 1
@@ -276,6 +277,7 @@ export class KpiUserSpecialController extends Controller {
       unit: item.unit,
       meaning: item.meaning,
       formula: item.formula,
+      summary: item.summary,
       point: item.point,
       achievement:
         item.point === 1

src/entities/kpiSpecial.ts

@@ -217,4 +217,5 @@ export class UpdateKpiSpecial {
 export class KpiUserSpecialDataPoint {
   id: string;
   point: number;
+  summary: number;
 }

src/entities/kpiUserEvaluationReasonCapacity.ts

@@ -19,6 +19,14 @@ export class KpiUserEvaluationReasonCapacity extends EntityBase {
   })
   reason: string;
 
+  @Column({
+    nullable: true,
+    comment: "คะแนน",
+    length: 255,
+    default: null,
+  })
+  score: string;
+
   @Column({
     nullable: true,
     comment: "หมายเหตุ ผู้ประเมิน",
@@ -77,7 +85,9 @@ export class KpiUserEvaluationReasonCapacity extends EntityBase {
 
 export class updateKpiUserReasonEvaluation {
   @Column()
-  reason: string;
+  reason?: string | null;
   @Column()
   topic?: string | null;
+  @Column()
+  score?: string | null;
 }

src/entities/kpiUserEvaluationReasonDevelopment.ts

@@ -19,6 +19,14 @@ export class KpiUserEvaluationReasonDevelopment extends EntityBase {
   })
   reason: string;
 
+  @Column({
+    nullable: true,
+    comment: "คะแนน",
+    length: 255,
+    default: null,
+  })
+  score: string;
+
   @Column({
     nullable: true,
     comment: "หมายเหตุ ผู้ประเมิน",

src/entities/kpiUserEvaluationReasonPlan.ts

@@ -19,6 +19,14 @@ export class KpiUserEvaluationReasonPlan extends EntityBase {
   })
   reason: string;
 
+  @Column({
+    nullable: true,
+    comment: "คะแนน",
+    length: 255,
+    default: null,
+  })
+  score: string;
+
   @Column({
     nullable: true,
     comment: "หมายเหตุ ผู้ประเมิน",

src/entities/kpiUserEvaluationReasonRole.ts

@@ -19,6 +19,14 @@ export class KpiUserEvaluationReasonRole extends EntityBase {
   })
   reason: string;
 
+  @Column({
+    nullable: true,
+    comment: "คะแนน",
+    length: 255,
+    default: null,
+  })
+  score: string;
+
   @Column({
     nullable: true,
     comment: "หมายเหตุ ผู้ประเมิน",

src/entities/kpiUserEvaluationReasonSpecial.ts

@@ -19,6 +19,14 @@ export class KpiUserEvaluationReasonSpecial extends EntityBase {
   })
   reason: string;
 
+  @Column({
+    nullable: true,
+    comment: "คะแนน",
+    length: 255,
+    default: null,
+  })
+  score: string;
+
   @Column({
     nullable: true,
     comment: "หมายเหตุ ผู้ประเมิน",

src/migration/1718715171176-update_table_kpi_add_summary.ts

@@ -0,0 +1,22 @@
+import { MigrationInterface, QueryRunner } from "typeorm";
+
+export class UpdateTableKpiAddSummary1718715171176 implements MigrationInterface {
+    name = 'UpdateTableKpiAddSummary1718715171176'
+
+    public async up(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonPlan\` ADD \`score\` varchar(255) NULL COMMENT 'คะแนน'`);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonRole\` ADD \`score\` varchar(255) NULL COMMENT 'คะแนน'`);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonCapacity\` ADD \`score\` varchar(255) NULL COMMENT 'คะแนน'`);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonDevelopment\` ADD \`score\` varchar(255) NULL COMMENT 'คะแนน'`);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonSpecial\` ADD \`score\` varchar(255) NULL COMMENT 'คะแนน'`);
+    }
+
+    public async down(queryRunner: QueryRunner): Promise<void> {
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonSpecial\` DROP COLUMN \`score\``);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonDevelopment\` DROP COLUMN \`score\``);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonCapacity\` DROP COLUMN \`score\``);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonRole\` DROP COLUMN \`score\``);
+        await queryRunner.query(`ALTER TABLE \`kpiUserEvaluationReasonPlan\` DROP COLUMN \`score\``);
+    }
+
+}