diff --git a/src/controllers/KpiUserEvaluationController.ts b/src/controllers/KpiUserEvaluationController.ts index e4d7a6b..e9fb26b 100644 --- a/src/controllers/KpiUserEvaluationController.ts +++ b/src/controllers/KpiUserEvaluationController.ts @@ -723,30 +723,30 @@ export class KpiUserEvaluationController extends Controller { } else if (profileId == item.commanderHighId) { role = "COMMANDERHIGH"; } - if (requestBody.status.trim().toUpperCase() == "DONE") { - if (role == "EVALUATOR") { - if (item.evaluationStatus == "EVALUATING_EVALUATOR") { - if (item.commanderId == null || item.commanderId == "") { - item.evaluationStatus = "COMPLETE"; - } else { - item.evaluationStatus = "EVALUATING_COMMANDER"; - } - item.evaluationResults = requestBody.status.trim().toUpperCase(); + // if (requestBody.status.trim().toUpperCase() == "DONE") { + if (role == "EVALUATOR") { + if (item.evaluationStatus == "EVALUATING_EVALUATOR") { + if (item.commanderId == null || item.commanderId == "") { + item.evaluationStatus = "COMPLETE"; + } else { + item.evaluationStatus = "EVALUATING_COMMANDER"; } - } else if (role == "COMMANDER") { - if (item.evaluationStatus == "EVALUATING_COMMANDER") { - if (item.commanderHighId == null || item.commanderHighId == "") { - item.evaluationStatus = "COMPLETE"; - } else { - item.evaluationStatus = "EVALUATING_COMMANDER_HIGH"; - } + item.evaluationResults = requestBody.status.trim().toUpperCase(); + } + } else if (role == "COMMANDER") { + if (item.evaluationStatus == "EVALUATING_COMMANDER") { + if (item.commanderHighId == null || item.commanderHighId == "") { + item.evaluationStatus = "COMPLETE"; + } else { + item.evaluationStatus = "EVALUATING_COMMANDER_HIGH"; } - } else { - item.evaluationStatus = "COMPLETE"; } } else { - // item.evaluationStatus = requestBody.status.trim().toUpperCase(); + item.evaluationStatus = "COMPLETE"; } + // } else { + // // item.evaluationStatus = requestBody.status.trim().toUpperCase(); + // } item.lastUpdateUserId = request.user.sub; item.lastUpdateFullName = request.user.name; await this.kpiUserEvalutionRepository.save(item);