From 4cfe61f0a2826bb4d6e16551be8d1216cca18fd2 Mon Sep 17 00:00:00 2001 From: AnandaTon Date: Wed, 29 May 2024 11:39:56 +0700 Subject: [PATCH] =?UTF-8?q?=E0=B9=81=E0=B8=81=E0=B9=89=E0=B9=84=E0=B8=82?= =?UTF-8?q?=20type=20=E0=B9=80=E0=B8=9E=E0=B8=B4=E0=B9=88=E0=B8=A1=20Rank?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/controllers/ProfileController.ts | 5 +++-- src/controllers/ProfileEmployeeController.ts | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/controllers/ProfileController.ts b/src/controllers/ProfileController.ts index 10b24067..17796845 100644 --- a/src/controllers/ProfileController.ts +++ b/src/controllers/ProfileController.ts @@ -310,7 +310,7 @@ export class ProfileController extends Controller { BirthDay: profiles?.birthDate ? new Date(profiles.birthDate).getDate().toString() : null, BirthDayText: profiles.birthDate != null - ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate)) + ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate).toString()) : "", BirthMonth: profiles?.birthDate ? new Date(profiles.birthDate).getMonth() + (1).toString() @@ -318,7 +318,7 @@ export class ProfileController extends Controller { BirthYear: profiles?.birthDate ? new Date(profiles.birthDate).getFullYear().toString() : null, BirthYearText: profiles.birthDate != null - ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate)) + ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate).toString()) : "", Address: "", District: "", @@ -423,6 +423,7 @@ export class ProfileController extends Controller { Position: item.position ?? null, PosNo: item.posNo ?? null, Salary: "", + Rank: item.positionLevel ?? null, RefAll: item.refCommandNo ?? null, PositionType: item.positionType ?? null, PositionLevel: item.positionLevel ?? null, diff --git a/src/controllers/ProfileEmployeeController.ts b/src/controllers/ProfileEmployeeController.ts index 2007fe1e..5e82667e 100644 --- a/src/controllers/ProfileEmployeeController.ts +++ b/src/controllers/ProfileEmployeeController.ts @@ -323,7 +323,7 @@ export class ProfileEmployeeController extends Controller { BirthDay: profiles?.birthDate ? new Date(profiles.birthDate).getDate().toString() : null, BirthDayText: profiles.birthDate != null - ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate)) + ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate).toString()) : "", BirthMonth: profiles?.birthDate ? new Date(profiles.birthDate).getMonth() + (1).toString() @@ -331,7 +331,7 @@ export class ProfileEmployeeController extends Controller { BirthYear: profiles?.birthDate ? new Date(profiles.birthDate).getFullYear().toString() : null, BirthYearText: profiles.birthDate != null - ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate)) + ? Extension.ToThaiNumber(Extension.ToThaiShortDate(profiles.birthDate).toString()) : "", Address: "", District: "", @@ -436,6 +436,7 @@ export class ProfileEmployeeController extends Controller { Position: item.position ?? null, PosNo: item.posNo ?? null, Salary: "", + Rank: item.positionLevel ?? null, RefAll: item.refCommandNo ?? null, PositionType: item.positionType ?? null, PositionLevel: item.positionLevel ?? null,