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

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

Browse source
This commit is contained in:
AnandaTon 2024-05-28 12:05:25 +07:00
commit 5532d82a43
1 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/controllers/ProfileController.ts
View file

@ -183,7 +183,9 @@ export class ProfileController extends Controller {
profile.dateRetire != null profile.dateRetire != null
? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateRetire)) ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateRetire))
: "", : "",
RegistrationAddress: `${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`, RegistrationAddress: Extension.ToThaiNumber(
`${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`,
),
SalaryAmount: SalaryAmount:
profile.profileSalary.length > 0 && profile.profileSalary[0].amount != null profile.profileSalary.length > 0 && profile.profileSalary[0].amount != null
? Extension.ToThaiNumber(profile.profileSalary[0].amount.toLocaleString()) ? Extension.ToThaiNumber(profile.profileSalary[0].amount.toLocaleString())
@ -193,7 +195,10 @@ export class ProfileController extends Controller {
profile.profileEducations[profile.profileEducations.length - 1].institute != null profile.profileEducations[profile.profileEducations.length - 1].institute != null
? profile.profileEducations[profile.profileEducations.length - 1].institute ? profile.profileEducations[profile.profileEducations.length - 1].institute
: "", : "",
AppointText: profile.dateAppoint != null ? profile.dateAppoint : "", AppointText:
profile.dateAppoint != null
? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateAppoint))
: "",
SalaryDate: SalaryDate:
profile.profileSalary.length > 0 && profile.profileSalary[0].date != null profile.profileSalary.length > 0 && profile.profileSalary[0].date != null
? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.profileSalary[0].date)) ? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.profileSalary[0].date))