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

no message

Browse source
This commit is contained in:
Bright 2024-09-05 11:05:02 +07:00
parent ccd544b8d5
commit 64792a698d
2 changed files with 32 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/controllers/ProfileController.ts
View file

@ -199,47 +199,47 @@ export class ProfileController extends Controller {
order: { lastUpdatedAt: "DESC" }, order: { lastUpdatedAt: "DESC" },
}); });
const Education = educations.map((item) => ({ const Education = educations.map((item) => ({
Institute: item.institute, Institute: item.institute ? item.institute : "-",
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}` ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
: "", : "-",
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "-",
})); }));
const mapData = { const mapData = {
Id: profile.id, Id: profile.id,
CitizenId: profile.citizenId != null ? Extension.ToThaiNumber(profile.citizenId) : "", CitizenId: profile.citizenId != null ? Extension.ToThaiNumber(profile.citizenId) : "-",
Prefix: profile.prefix != null ? profile.prefix : "", Prefix: profile.prefix != null ? profile.prefix : null,
FirstName: profile.firstName != null ? profile.firstName : "", FirstName: profile.firstName != null ? profile.firstName : null,
LastName: profile.lastName != null ? profile.lastName : "", LastName: profile.lastName != null ? profile.lastName : null,
DateOfBirth: DateOfBirth:
profile.birthDate != null profile.birthDate != null
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.birthDate)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.birthDate))
: "", : "-",
DateRetire: DateRetire:
profile.dateRetire != null profile.dateRetire != null
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.dateRetire)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.dateRetire))
: "", : "-",
RegistrationAddress: Extension.ToThaiNumber( RegistrationAddress: Extension.ToThaiNumber(
`${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`, `${_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())
: "", : "-",
Education: Education, Education: Education,
AppointText: AppointText:
profile.dateAppoint != null profile.dateAppoint != null
? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.dateAppoint)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(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.ToThaiNumber(
Extension.ToThaiShortDate_monthYear(profile.profileSalary[0].date), Extension.ToThaiShortDate_monthYear(profile.profileSalary[0].date),
) )
: "", : "-",
PositionName: profile.position != null ? profile.position : "", PositionName: profile.position != null ? profile.position : "-",
OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
}; };

35
src/controllers/ProfileEmployeeController.ts
View file

@ -205,44 +205,47 @@ export class ProfileEmployeeController extends Controller {
order: { lastUpdatedAt: "DESC" }, order: { lastUpdatedAt: "DESC" },
}); });
const Education = educations.map((item) => ({ const Education = educations.map((item) => ({
Institute: item.institute, Institute: item.institute ? item.institute : "-",
Date: Date:
item.startDate && item.endDate item.startDate && item.endDate
? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}` ? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
: "", : "-",
Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "", Degree: item.degree && item.field ? `${item.degree} ${item.field}` : "-",
})); }));
const mapData = { const mapData = {
Id: profile.id, Id: profile.id,
CitizenId: profile.citizenId != null ? Extension.ToThaiNumber(profile.citizenId) : "", CitizenId: profile.citizenId != null ? Extension.ToThaiNumber(profile.citizenId) : "-",
Prefix: profile.prefix != null ? profile.prefix : "", Prefix: profile.prefix != null ? profile.prefix : null,
FirstName: profile.firstName != null ? profile.firstName : "", FirstName: profile.firstName != null ? profile.firstName : null,
LastName: profile.lastName != null ? profile.lastName : "", LastName: profile.lastName != null ? profile.lastName : null,
DateOfBirth: DateOfBirth:
profile.birthDate != null profile.birthDate != null
? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.birthDate)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.birthDate))
: "", : "-",
DateRetire: DateRetire:
profile.dateRetire != null profile.dateRetire != null
? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.dateRetire)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.dateRetire))
: "", : "-",
RegistrationAddress: `${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`, RegistrationAddress: `${_regisAddres}${_subDistrict}${_district}${_province}${registrationZipCode}`,
SalaryAmount: SalaryAmount:
profile.profileSalarys.length > 0 && profile.profileSalarys[0].amount != null profile.profileSalarys.length > 0 && profile.profileSalarys[0].amount != null
? Extension.ToThaiNumber(profile.profileSalarys[0].amount.toLocaleString()) ? Extension.ToThaiNumber(profile.profileSalarys[0].amount.toLocaleString())
: "", : "-",
Education: Education, Education: Education,
// profile.profileEducations.length > 0 && // profile.profileEducations.length > 0 &&
// 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.ToThaiShortDate_monthYear(profile.dateAppoint))
: "-",
SalaryDate: SalaryDate:
profile.profileSalarys.length > 0 && profile.profileSalarys[0].date != null profile.profileSalarys.length > 0 && profile.profileSalarys[0].date != null
? Extension.ToThaiNumber(Extension.ToThaiFullDate(profile.profileSalarys[0].date)) ? Extension.ToThaiNumber(Extension.ToThaiShortDate_monthYear(profile.profileSalarys[0].date))
: "", : "-",
PositionName: profile.position != null ? profile.position : "", PositionName: profile.position != null ? profile.position : "-",
OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`, OcFullPath: `${_child4}${_child3}${_child2}${_child1}${_root}`,
}; };