From 7938797e9ab70074e4288ebb7e94f5b2d311da8e Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 6 Jun 2024 16:55:58 +0700
Subject: [PATCH 1/2] fix format date

---
 src/controllers/ProfileController.ts | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 76870169..9ec77be6 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -177,11 +177,11 @@ export class ProfileController extends Controller {
       LastName: profile.lastName != null ? profile.lastName : "",
       DateOfBirth:
         profile.birthDate != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.birthDate))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.birthDate))
           : "",
       DateRetire:
         profile.dateRetire != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateRetire))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.dateRetire))
           : "",
       RegistrationAddress: Extension.ToThaiNumber(
         `${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`,
@@ -197,11 +197,13 @@ export class ProfileController extends Controller {
           : "",
       AppointText:
         profile.dateAppoint != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateAppoint))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.dateAppoint))
           : "",
       SalaryDate:
         profile.profileSalary.length > 0 && profile.profileSalary[0].date != null
-          ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.profileSalary[0].date))
+          ? Extension.ToThaiNumber(
+              Extension.ToThaiShortDate_noPrefix(profile.profileSalary[0].date),
+            )
           : "",
       PositionName: profile.position != null ? profile.position : "",
       OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,

From 594371d23f8aced032907c472d796340e6f6e165 Mon Sep 17 00:00:00 2001
From: AdisakKanthawilang <adisak@frappet.com>
Date: Thu, 6 Jun 2024 17:18:05 +0700
Subject: [PATCH 2/2] fix

---
 src/controllers/ProfileController.ts |  8 ++++----
 src/interfaces/extension.ts          | 11 +++++++++++
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts
index 9ec77be6..882942ce 100644
--- a/src/controllers/ProfileController.ts
+++ b/src/controllers/ProfileController.ts
@@ -177,11 +177,11 @@ export class ProfileController extends Controller {
       LastName: profile.lastName != null ? profile.lastName : "",
       DateOfBirth:
         profile.birthDate != null
-          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.birthDate))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_perfixMonthYear(profile.birthDate))
           : "",
       DateRetire:
         profile.dateRetire != null
-          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.dateRetire))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_perfixMonthYear(profile.dateRetire))
           : "",
       RegistrationAddress: Extension.ToThaiNumber(
         `${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`,
@@ -197,12 +197,12 @@ export class ProfileController extends Controller {
           : "",
       AppointText:
         profile.dateAppoint != null
-          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_noPrefix(profile.dateAppoint))
+          ? Extension.ToThaiNumber(Extension.ToThaiShortDate_perfixMonthYear(profile.dateAppoint))
           : "",
       SalaryDate:
         profile.profileSalary.length > 0 && profile.profileSalary[0].date != null
           ? Extension.ToThaiNumber(
-              Extension.ToThaiShortDate_noPrefix(profile.profileSalary[0].date),
+              Extension.ToThaiShortDate_perfixMonthYear(profile.profileSalary[0].date),
             )
           : "",
       PositionName: profile.position != null ? profile.position : "",
diff --git a/src/interfaces/extension.ts b/src/interfaces/extension.ts
index df25f448..cedb9ba5 100644
--- a/src/interfaces/extension.ts
+++ b/src/interfaces/extension.ts
@@ -123,6 +123,17 @@ class Extension {
     );
   }
 
+  public static ToThaiShortDate_perfixMonthYear(value: Date) {
+    let yy = value.getFullYear() < 2400 ? value.getFullYear() + 543 : value.getFullYear();
+    return (
+      value.getDate() +
+      " เดือน " +
+      Extension.ToThaiShortMonth(value.getMonth() + 1) +
+      " พ.ศ. " +
+      yy
+    );
+  }
+
   public static sumObjectValues(array: any, propertyName: any) {
     let sum = 0;
     for (let i = 0; i < array.length; i++) {