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

แก้ไขวันที่ใน profile training /education

Browse source
This commit is contained in:
AnandaTon 2024-05-31 10:47:52 +07:00
parent 77c7574809
commit 0ab26752b6
2 changed files with 6 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/controllers/ProfileController.ts
View file

@ -386,14 +386,12 @@ export class ProfileController extends Controller {
Start: Start:
item.startDate == null item.startDate == null
? "" ? ""
: Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString()), : Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate)),
End: End:
item.endDate == null item.endDate == null ? "" : Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate)),
? ""
: Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}` ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
: "", : "",
Level: "", Level: "",
Degree: item.name, Degree: item.name,
@ -427,7 +425,7 @@ export class ProfileController extends Controller {
: Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()), : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}` ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
: "", : "",
Level: item.educationLevel ?? "", Level: item.educationLevel ?? "",
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",

4
src/controllers/ProfileEmployeeController.ts
View file

@ -406,7 +406,7 @@ export class ProfileEmployeeController extends Controller {
: Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()), : Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}` ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
: "", : "",
Level: "", Level: "",
Degree: item.name, Degree: item.name,
@ -433,7 +433,7 @@ export class ProfileEmployeeController extends Controller {
End: new Date(item.endDate).getFullYear().toString() ?? null, End: new Date(item.endDate).getFullYear().toString() ?? null,
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}` ? `${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate))}`
: "", : "",
Level: item.educationLevel ?? null, Level: item.educationLevel ?? null,
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",