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

แก้ไข profile

Browse source
This commit is contained in:
AnandaTon 2024-05-29 18:04:56 +07:00
parent 0e8be06181
commit 20703b6afb
1 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/controllers/ProfileController.ts
View file

@ -378,7 +378,7 @@ export class ProfileController extends Controller {
IssueDate: Extension.ToThaiNumber(Extension.ToThaiShortDate(item.issueDate)) ?? null,
}));
const trainings = await this.trainingRepository.find({
select: ["startDate", "endDate", "place", "department"],
select: ["startDate", "endDate", "place", "department", "name"],
where: { profileId: id },
});
const Training = trainings.map((item) => ({
@ -386,14 +386,18 @@ export class ProfileController extends Controller {
Start:
item.startDate == null
? ""
: Extension.ToThaiNumber(Extension.ToThaiShortDate(item.startDate).toString()),
: Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString()),
End:
item.endDate == null
? ""
: Extension.ToThaiNumber(Extension.ToThaiShortDate(item.endDate).toString()),
: Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
Date:
item.startDate && item.endDate
? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}`
: "",
Level: "",
Degree: "",
Field: item.place ?? "",
Degree: item.name,
Field: "",
}));
const disciplines = await this.disciplineRepository.find({
@ -421,8 +425,12 @@ export class ProfileController extends Controller {
item.endDate == null
? ""
: Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString()),
Date:
item.startDate && item.endDate
? `${Extension.ToThaiNumber(new Date(item.startDate).getFullYear().toString())} - ${Extension.ToThaiNumber(new Date(item.endDate).getFullYear().toString())}`
: "",
Level: item.educationLevel ?? "",
Degree: item.degree,
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
Field: item.field ?? "-",
}));
const salarys = await this.salaryRepository.find({