From 0d42cf022cec1c9584c416cea4195d0157966a87 Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 9 Apr 2024 16:47:04 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1?= =?UTF-8?q?=E0=B8=9F=E0=B8=B4=E0=B8=A5=E0=B8=94=E0=B9=8C=20yearSlice=20?= =?UTF-8?q?=E0=B8=9A=E0=B8=B1=E0=B8=8D=E0=B8=8A=E0=B8=B5=E0=B8=81=E0=B8=B2?= =?UTF-8?q?=E0=B8=A3=E0=B8=84=E0=B8=B3=E0=B8=99=E0=B8=A7=E0=B8=93=E0=B9=82?= =?UTF-8?q?=E0=B8=84=E0=B8=A7=E0=B8=95=E0=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ReportController.ts | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index a92cf18..9e511f3 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -556,11 +556,12 @@ export class ReportController extends Controller { template: "gov1-02", reportName: "gov1-02", data: { - date: Extension.ToThaiNumber( - Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)), - ), + // date: Extension.ToThaiNumber( + // Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)), + // ), year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))), - dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), + yearSlice: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year)).slice(-2)), + // dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), agency: agency, data1: formattedData1, data2: formattedData2, @@ -1025,11 +1026,12 @@ export class ReportController extends Controller { template: "gov2-02", reportName: "gov2-02", data: { - date: Extension.ToThaiNumber( - Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)), - ), + // date: Extension.ToThaiNumber( + // Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)), + // ), year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))), - dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), + yearSlice: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year)).slice(-2)), + // dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), agency: agency, data1: formattedData1, data2: formattedData2,