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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
JoolsoftAdmin 2024-08-13 11:03:55 +07:00
commit 6895e764ad
2 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/controllers/ProfileController.ts
View file

@ -486,7 +486,7 @@ export class ProfileController extends Controller {
? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
: "",
Level: item.educationLevel ?? "",
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
Degree: item.degree ? `${item.degree} ${item.field ? item.field : "" }`: "",
Field: item.field ?? "-",
}));
const salarys = await this.salaryRepository.find({

2
src/controllers/ProfileEmployeeController.ts
View file

@ -481,7 +481,7 @@ export class ProfileEmployeeController extends Controller {
? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
: "",
Level: item.educationLevel ?? "",
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "",
Degree: item.degree ? `${item.degree} ${item.field ? item.field : "" }`: "",
Field: item.field ?? "-",
}));
const salarys = await this.salaryRepository.find({