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

no message

Browse source
This commit is contained in:
Bright 2024-07-17 13:58:37 +07:00
parent 3fb7770344
commit 4b34fc20b8
2 changed files with 20 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/controllers/ReportController.ts
View file

@ -260,15 +260,15 @@ export class ReportController extends Controller {
bookNoDate: bookNoDate:
getDevelopment.bookNoDate == null getDevelopment.bookNoDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.bookNoDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.bookNoDate)),
startDate: startDate:
getDevelopment.startDate == null getDevelopment.startDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.startDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.startDate)),
endDate: endDate:
getDevelopment.endDate == null getDevelopment.endDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.endDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.endDate)),
reportBackNo: reportBackNo:
getDevelopment.reportBackNo == null getDevelopment.reportBackNo == null
? "" ? ""
@ -276,16 +276,19 @@ export class ReportController extends Controller {
reportBackNoDate: reportBackNoDate:
getDevelopment.reportBackNoDate == null getDevelopment.reportBackNoDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.reportBackNoDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.reportBackNoDate)),
governmentDate: governmentDate:
getDevelopment.governmentDate == null getDevelopment.governmentDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.governmentDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.governmentDate)),
graduatedDate: graduatedDate:
getDevelopment.graduatedDate == null getDevelopment.graduatedDate == null
? "" ? ""
: Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.graduatedDate)), : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.graduatedDate)),
graduatedReason: getDevelopment.graduatedReason, graduatedReason:
getDevelopment.graduatedReason == null
? ""
: getDevelopment.graduatedReason,
useOfficialTime: getDevelopment.useOfficialTime, useOfficialTime: getDevelopment.useOfficialTime,
useOffTime: getDevelopment.useOfficialTime == true ? "🗹 ใช้ ☐ ไม่ใช้" : "☐ ใช้ 🗹 ไม่ใช้", useOffTime: getDevelopment.useOfficialTime == true ? "🗹 ใช้ ☐ ไม่ใช้" : "☐ ใช้ 🗹 ไม่ใช้",
isGraduated: getDevelopment.isGraduated, isGraduated: getDevelopment.isGraduated,

10
src/interfaces/extension.ts
View file

@ -67,6 +67,16 @@ class Extension {
); );
} }
public static ToThaiFullDate2(value: Date) {
let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
return value.getDate() + " " + Extension.ToThaiMonth(value.getMonth() + 1) + " " + yy;
}
public static ToThaiFullDate3(value: Date) {
let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
return value.getDate() + " เดือน " + Extension.ToThaiMonth(value.getMonth() + 1) + " พ.ศ. " + yy;
}
public static sumObjectValues(array: any, propertyName: any) { public static sumObjectValues(array: any, propertyName: any) {
let sum = 0; let sum = 0;
for (let i = 0; i < array.length; i++) { for (let i = 0; i < array.length; i++) {