hrms-bangkok/hrms-api-org
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

แก้ไข type เพิ่ม Rank

Browse source
This commit is contained in:
AnandaTon 2024-05-29 11:39:56 +07:00
parent dcca84ac96
commit 4cfe61f0a2
2 changed files with 6 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/controllers/ProfileController.ts
View file

@ -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,

5
src/controllers/ProfileEmployeeController.ts
View file

@ -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,