From 4b34fc20b86bd76c6ee99a59e7e6d4b9b96a9c77 Mon Sep 17 00:00:00 2001
From: Bright <harid_pr61@live.rmutl.ac.th>
Date: Wed, 17 Jul 2024 13:58:37 +0700
Subject: [PATCH] no message

---
 src/controllers/ReportController.ts | 17 ++++++++++-------
 src/interfaces/extension.ts         | 10 ++++++++++
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/controllers/ReportController.ts b/src/controllers/ReportController.ts
index 6df295e..e1bbd9b 100644
--- a/src/controllers/ReportController.ts
+++ b/src/controllers/ReportController.ts
@@ -260,15 +260,15 @@ export class ReportController extends Controller {
       bookNoDate:
         getDevelopment.bookNoDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.bookNoDate)),
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.bookNoDate)),
       startDate:
         getDevelopment.startDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.startDate)),
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.startDate)),
       endDate:
         getDevelopment.endDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.endDate)),
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.endDate)),
       reportBackNo:
         getDevelopment.reportBackNo == null
           ? ""
@@ -276,16 +276,19 @@ export class ReportController extends Controller {
       reportBackNoDate:
         getDevelopment.reportBackNoDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.reportBackNoDate)),
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.reportBackNoDate)),
       governmentDate:
         getDevelopment.governmentDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.governmentDate)),
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.governmentDate)),
       graduatedDate:
         getDevelopment.graduatedDate == null
           ? ""
-          : Extension.ToThaiNumber(Extension.ToThaiFullDate(getDevelopment.graduatedDate)),
-      graduatedReason: getDevelopment.graduatedReason,
+          : Extension.ToThaiNumber(Extension.ToThaiFullDate3(getDevelopment.graduatedDate)),
+      graduatedReason: 
+        getDevelopment.graduatedReason == null
+          ? ""
+          : getDevelopment.graduatedReason,
       useOfficialTime: getDevelopment.useOfficialTime,
       useOffTime: getDevelopment.useOfficialTime == true ? "🗹 ใช้ ☐ ไม่ใช้" : "☐ ใช้ 🗹 ไม่ใช้",
       isGraduated: getDevelopment.isGraduated,
diff --git a/src/interfaces/extension.ts b/src/interfaces/extension.ts
index 1355587..5de8bd4 100644
--- a/src/interfaces/extension.ts
+++ b/src/interfaces/extension.ts
@@ -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) {
     let sum = 0;
     for (let i = 0; i < array.length; i++) {