fix kpi1, kpi2, kpi7
This commit is contained in:
Bright
parent
b859a81995
commit
12160da78f
1 changed files with 36 additions and 29 deletions
|
|
@ -120,7 +120,8 @@ export class ReportController extends Controller {
|
|||
/*ROOT*/
|
||||
const userEvaluationOrg = await this.kpiUserEvaluationRepository.find({
|
||||
where: {
|
||||
orgId: String(requestBody.root),
|
||||
orgId: String(requestBody?.root),
|
||||
kpiPeriodId: String(requestBody?.periodId)
|
||||
// child1Id: "" || IsNull(),
|
||||
// child2Id: "" || IsNull(),
|
||||
// child3Id: "" || IsNull(),
|
||||
|
|
@ -135,7 +136,7 @@ export class ReportController extends Controller {
|
|||
userEvaluationOrg.length > 0
|
||||
? Extension.ToThaiNumber(
|
||||
userEvaluationOrg
|
||||
.filter((x: any) => x.evaluationResults != "PENDING")
|
||||
.filter((x: any) => x.evaluationStatus == "KP7")
|
||||
.length.toString(),
|
||||
)
|
||||
: "๐";
|
||||
|
|
@ -143,7 +144,7 @@ export class ReportController extends Controller {
|
|||
userEvaluationOrg.length > 0
|
||||
? Extension.ToThaiNumber(
|
||||
userEvaluationOrg
|
||||
.filter((x: any) => x.evaluationResults == "EXCELLENT")
|
||||
.filter((x: any) => x.evaluationResults == "EXCELLENT" && x.evaluationStatus == "KP7")
|
||||
.length.toString(),
|
||||
)
|
||||
: "๐";
|
||||
|
|
@ -151,27 +152,31 @@ export class ReportController extends Controller {
|
|||
userEvaluationOrg.length > 0
|
||||
? Extension.ToThaiNumber(
|
||||
userEvaluationOrg
|
||||
.filter((x: any) => x.evaluationResults == "VERY_GOOD")
|
||||
.filter((x: any) => x.evaluationResults == "VERY_GOOD" && x.evaluationStatus == "KP7")
|
||||
.length.toString(),
|
||||
)
|
||||
: "๐";
|
||||
const good =
|
||||
userEvaluationOrg.length > 0
|
||||
? Extension.ToThaiNumber(
|
||||
userEvaluationOrg.filter((x: any) => x.evaluationResults == "GOOD").length.toString(),
|
||||
userEvaluationOrg
|
||||
.filter((x: any) => x.evaluationResults == "GOOD" && x.evaluationStatus == "KP7")
|
||||
.length.toString(),
|
||||
)
|
||||
: "๐";
|
||||
const fair =
|
||||
userEvaluationOrg.length > 0
|
||||
? Extension.ToThaiNumber(
|
||||
userEvaluationOrg.filter((x: any) => x.evaluationResults == "FAIR").length.toString(),
|
||||
userEvaluationOrg
|
||||
.filter((x: any) => x.evaluationResults == "FAIR" && x.evaluationStatus == "KP7")
|
||||
.length.toString(),
|
||||
)
|
||||
: "๐";
|
||||
const improvment =
|
||||
userEvaluationOrg.length > 0
|
||||
? Extension.ToThaiNumber(
|
||||
userEvaluationOrg
|
||||
.filter((x: any) => x.evaluationResults == "IMPROVEMENT")
|
||||
.filter((x: any) => x.evaluationResults == "IMPROVEMENT" && x.evaluationStatus == "KP7")
|
||||
.length.toString(),
|
||||
)
|
||||
: "๐";
|
||||
|
|
@ -206,6 +211,7 @@ export class ReportController extends Controller {
|
|||
const excellent =
|
||||
data.kpiUserEvaluations.length > 0
|
||||
? data.kpiUserEvaluations
|
||||
.filter((x: any) => x.evaluationResults == "EXCELLENT")
|
||||
.map((x: any, idx: number) => ({
|
||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
||||
|
|
@ -213,11 +219,11 @@ export class ReportController extends Controller {
|
|||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
||||
org: x.org ? x.org : "",
|
||||
}))
|
||||
.filter((x: any) => x.evaluationResults == "EXCELLENT")
|
||||
: [{}];
|
||||
const verygood =
|
||||
data.kpiUserEvaluations.length > 0
|
||||
? data.kpiUserEvaluations
|
||||
.filter((x: any) => x.evaluationResults == "VERY_GOOD")
|
||||
.map((x: any, idx: number) => ({
|
||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
||||
|
|
@ -225,11 +231,11 @@ export class ReportController extends Controller {
|
|||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
||||
org: x.org ? x.org : "",
|
||||
}))
|
||||
.filter((x: any) => x.evaluationResults == "VERY_GOOD")
|
||||
: [{}];
|
||||
const good =
|
||||
data.kpiUserEvaluations.length > 0
|
||||
? data.kpiUserEvaluations
|
||||
.filter((x: any) => x.evaluationResults == "GOOD")
|
||||
.map((x: any, idx: number) => ({
|
||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
||||
|
|
@ -237,11 +243,11 @@ export class ReportController extends Controller {
|
|||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
||||
org: x.org ? x.org : "",
|
||||
}))
|
||||
.filter((x: any) => x.evaluationResults == "GOOD")
|
||||
: [{}];
|
||||
const fair =
|
||||
data.kpiUserEvaluations.length > 0
|
||||
? data.kpiUserEvaluations
|
||||
.filter((x: any) => x.evaluationResults == "FAIR")
|
||||
.map((x: any, idx: number) => ({
|
||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
||||
|
|
@ -249,11 +255,11 @@ export class ReportController extends Controller {
|
|||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
||||
org: x.org ? x.org : "",
|
||||
}))
|
||||
.filter((x: any) => x.evaluationResults == "FAIR")
|
||||
: [{}];
|
||||
const improvment =
|
||||
data.kpiUserEvaluations.length > 0
|
||||
? data.kpiUserEvaluations
|
||||
.filter((x: any) => x.evaluationResults == "IMPROVEMENT")
|
||||
.map((x: any, idx: number) => ({
|
||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
||||
|
|
@ -261,7 +267,6 @@ export class ReportController extends Controller {
|
|||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
||||
org: x.org ? x.org : "",
|
||||
}))
|
||||
.filter((x: any) => x.evaluationResults == "IMPROVEMENT")
|
||||
: [{}];
|
||||
formattedData = {
|
||||
year: data?.year ? Extension.ToThaiNumber((data.year + 543).toString()) : "-",
|
||||
|
|
@ -970,18 +975,19 @@ export class ReportController extends Controller {
|
|||
const userEvaluations_ = await Promise.all(
|
||||
data.kpiUserEvaluations.length > 0
|
||||
? data.kpiUserEvaluations.map(async (x: any, idx: number) => {
|
||||
const target_ = await this.kpiUserDevelopmentRepository.findOne({
|
||||
where: { kpiUserEvaluationId: x.id },
|
||||
});
|
||||
const isDev70 = target_ && target_?.isDevelopment70 === true
|
||||
? "🗹 70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"
|
||||
: ""
|
||||
const isDev20 = target_ && target_?.isDevelopment20 === true
|
||||
? "🗹 20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)"
|
||||
: ""
|
||||
const isDev10 = target_ && target_?.isDevelopment10 === true
|
||||
? "🗹 10 การฝึกอบรมอื่นๆ"
|
||||
: ""
|
||||
/*รอ Fe เพิ่ม UI*/
|
||||
// const target_ = await this.kpiUserDevelopmentRepository.findOne({
|
||||
// where: { kpiUserEvaluationId: x.id },
|
||||
// });
|
||||
// const isDev70 = target_ && target_?.isDevelopment70 === true
|
||||
// ? "🗹 70 การลงมือปฏิบัติ (โดยผู้บังคับบัญชามอบหมาย)"
|
||||
// : ""
|
||||
// const isDev20 = target_ && target_?.isDevelopment20 === true
|
||||
// ? "🗹 20 การเรียนรู้จากผู้อื่น (Coach/Mentor/Consulting)"
|
||||
// : ""
|
||||
// const isDev10 = target_ && target_?.isDevelopment10 === true
|
||||
// ? "🗹 10 การฝึกอบรมอื่นๆ"
|
||||
// : ""
|
||||
return {
|
||||
no: Extension.ToThaiNumber((idx + 1).toString()),
|
||||
fullName: `${x.prefix}${x.firstName} ${x.lastName}`,
|
||||
|
|
@ -989,12 +995,13 @@ export class ReportController extends Controller {
|
|||
posLevelName: x.posLevelName ? x.posLevelName : "",
|
||||
developName: x.topicEvaluator ? x.topicEvaluator : "",
|
||||
developEvaluator: x.developEvaluator ? x.developEvaluator : "",
|
||||
target: target_ ? target_.target : "",
|
||||
// target: target_ ? target_.target : "",
|
||||
target: "-",
|
||||
timeEvaluator: x.timeEvaluator ? Extension.ToThaiNumber(x.timeEvaluator) : "",
|
||||
developResults: "", //วิธีการวัดผลการพัฒนา
|
||||
isDev70,
|
||||
isDev20,
|
||||
isDev10,
|
||||
developResults: "-", //วิธีการวัดผลการพัฒนา
|
||||
// isDev70,
|
||||
// isDev20,
|
||||
// isDev10,
|
||||
evaluationResults: x.evaluationResults
|
||||
? Extension.EvaluationResult(x.evaluationResults)
|
||||
: "",
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue