no message

This commit is contained in:
Kittapath 2024-06-19 10:17:15 +07:00
parent ac9e184ee7
commit b7aa867f82
12 changed files with 99 additions and 24 deletions

View file

@ -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);

View file

@ -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,

View file

@ -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

View file

@ -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

View file

@ -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