hrms-bangkok/hrms-api-eva
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix eva

Browse source
This commit is contained in:
AdisakKanthawilang 2025-04-08 16:40:11 +07:00
parent cf947e9fa9
commit 0604185e25
4 changed files with 160 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/controllers/ReportController.ts
View file

@ -286,9 +286,9 @@ export class ReoportController {
evaluationOld.length > 0 ? evaluationOld.map((x) => x.subject).join(", ") : "ไม่มี";
let thaiYear: number = new Date().getFullYear() + 543;
let years = {
lastTwoYear: thaiYear ? Extension.ToThaiNumber((thaiYear - 2).toString()):"-",
lastOneYear: thaiYear ? Extension.ToThaiNumber((thaiYear - 1).toString()):"-",
currentYear: thaiYear ? Extension.ToThaiNumber(thaiYear.toString()):"-",
lastTwoYear: Extension.ToThaiNumber((thaiYear - 2).toString()),
lastOneYear: Extension.ToThaiNumber((thaiYear - 1).toString()),
currentYear: Extension.ToThaiNumber(thaiYear.toString()),
};
const dataEvaluation = {
isEducationalQft: evaluation.isEducationalQft,
@ -340,13 +340,13 @@ export class ReoportController {
startDate: education.startDate,
endDate: education.endDate,
finishDate: education.finishDate
? Extension.ToThaiNumber(
? `(${Extension.ToThaiNumber(
Extension.ToThaiShortDate(education.finishDate).toString(),
)
)})`
: "-",
isEducation: education.isEducation,
degree: education.degree ? Extension.ToThaiNumber(education.degree) : "-",
field: education.field ? Extension.ToThaiNumber(education.field) : "-",
field: education.field ? `(${Extension.ToThaiNumber(education.field)})` : "-",
fundName: education.fundName,
gpa: education.gpa,
country: education.country,