Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop
This commit is contained in:
commit
a87b03262d
3 changed files with 48 additions and 21 deletions
|
|
@ -228,14 +228,20 @@ export class ProfileController extends Controller {
|
|||
where: { profileId: id },
|
||||
order: { lastUpdatedAt: "DESC" },
|
||||
});
|
||||
const Education = educations.map((item) => ({
|
||||
institute: item.institute ? item.institute : "-",
|
||||
date:
|
||||
item.startDate && item.endDate
|
||||
? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
|
||||
: "-",
|
||||
degree: item.degree && item.field ? `${item.degree} ${item.field}` : "-",
|
||||
}));
|
||||
const Education = educations && educations.length > 0
|
||||
? educations.map((item) => ({
|
||||
institute: item.institute ? item.institute : "-",
|
||||
date:
|
||||
item.startDate && item.endDate
|
||||
? `${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.startDate))} - ${Extension.ToThaiNumber(Extension.ToThaiFullDate2(item.endDate))}`
|
||||
: "-",
|
||||
degree: item.degree && item.field ? `${item.degree} ${item.field}` : "-",
|
||||
}))
|
||||
: [{
|
||||
institute: "-",
|
||||
date: "-",
|
||||
degree: "-",
|
||||
}]
|
||||
|
||||
const mapData = {
|
||||
// Id: profile.id,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue