From a5b0d2e911fb23917dd7d174ed5c8b650b9f4c8f Mon Sep 17 00:00:00 2001 From: Bright Date: Tue, 9 Apr 2024 11:58:37 +0700 Subject: [PATCH] ToThaiFullDate2 --- src/controllers/ReportController.ts | 4 ++-- src/interfaces/extension.ts | 12 ++++++++++++ 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts index a191b7d..9c957fb 100644 --- a/src/controllers/ReportController.ts +++ b/src/controllers/ReportController.ts @@ -453,7 +453,7 @@ export class ReportController extends Controller { reportName: "gov1-02", data: { date: Extension.ToThaiNumber( - Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)), + Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)), ), year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))), dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), @@ -922,7 +922,7 @@ export class ReportController extends Controller { reportName: "gov2-02", data: { date: Extension.ToThaiNumber( - Extension.ToThaiFullDate(new Date(`${salaryPeriod.year}-03-01`)), + Extension.ToThaiFullDate2(new Date(`${salaryPeriod.year}-03-01`)), ), year: Extension.ToThaiNumber(String(Extension.ToThaiYear(salaryPeriod.year))), dateNow: Extension.ToThaiNumber(Extension.ToThaiShortDate(new Date())), diff --git a/src/interfaces/extension.ts b/src/interfaces/extension.ts index 48975b6..02f84da 100644 --- a/src/interfaces/extension.ts +++ b/src/interfaces/extension.ts @@ -98,6 +98,18 @@ 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 ToThaiShortDate(value: Date) { let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear(); return (