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

fix field

Browse source
This commit is contained in:
AdisakKanthawilang 2024-06-12 17:58:16 +07:00
parent 0a054d91ce
commit 33b68fdb19
2 changed files with 46 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

46
src/controllers/ProfileController.ts
View file

@ -2127,29 +2127,29 @@ export class ProfileController extends Controller {
posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName,
profileEducation: latestProfileEducation
? {
id: latestProfileEducation.id,
degree: latestProfileEducation.degree,
country: latestProfileEducation.country,
duration: latestProfileEducation.duration,
durationYear: latestProfileEducation.durationYear,
field: latestProfileEducation.field,
finishDate: latestProfileEducation.finishDate,
fundName: latestProfileEducation.fundName,
gpa: latestProfileEducation.gpa,
institute: latestProfileEducation.institute,
other: latestProfileEducation.other,
startDate: latestProfileEducation.startDate,
endDate: latestProfileEducation.endDate,
educationLevel: latestProfileEducation.educationLevel,
positionPath: latestProfileEducation.positionPath,
positionPathId: latestProfileEducation.positionPathId,
isDate: latestProfileEducation.isDate,
isEducation: latestProfileEducation.isEducation,
note: latestProfileEducation.note,
}
: null,
profileEducation: latestProfileEducation?.degree ?? null,
// ? {
// id: latestProfileEducation.id,
// degree: latestProfileEducation.degree,
// country: latestProfileEducation.country,
// duration: latestProfileEducation.duration,
// durationYear: latestProfileEducation.durationYear,
// field: latestProfileEducation.field,
// finishDate: latestProfileEducation.finishDate,
// fundName: latestProfileEducation.fundName,
// gpa: latestProfileEducation.gpa,
// institute: latestProfileEducation.institute,
// other: latestProfileEducation.other,
// startDate: latestProfileEducation.startDate,
// endDate: latestProfileEducation.endDate,
// educationLevel: latestProfileEducation.educationLevel,
// positionPath: latestProfileEducation.positionPath,
// positionPathId: latestProfileEducation.positionPathId,
// isDate: latestProfileEducation.isDate,
// isEducation: latestProfileEducation.isEducation,
// note: latestProfileEducation.note,
// }
// : null,
};
}),
);

46
src/controllers/ProfileEmployeeController.ts
View file

@ -1548,29 +1548,29 @@ export class ProfileEmployeeController extends Controller {
posTypeName: item.posType?.posTypeName,
posLevelId: item.posLevelId,
posLevelName: item.posLevel?.posLevelName,
profileEducation: latestProfileEducation
? {
id: latestProfileEducation.id,
degree: latestProfileEducation.degree,
country: latestProfileEducation.country,
duration: latestProfileEducation.duration,
durationYear: latestProfileEducation.durationYear,
field: latestProfileEducation.field,
finishDate: latestProfileEducation.finishDate,
fundName: latestProfileEducation.fundName,
gpa: latestProfileEducation.gpa,
institute: latestProfileEducation.institute,
other: latestProfileEducation.other,
startDate: latestProfileEducation.startDate,
endDate: latestProfileEducation.endDate,
educationLevel: latestProfileEducation.educationLevel,
positionPath: latestProfileEducation.positionPath,
positionPathId: latestProfileEducation.positionPathId,
isDate: latestProfileEducation.isDate,
isEducation: latestProfileEducation.isEducation,
note: latestProfileEducation.note,
}
: null,
profileEducation: latestProfileEducation?.degree ?? null,
// ? {
// id: latestProfileEducation.id,
// degree: latestProfileEducation.degree,
// country: latestProfileEducation.country,
// duration: latestProfileEducation.duration,
// durationYear: latestProfileEducation.durationYear,
// field: latestProfileEducation.field,
// finishDate: latestProfileEducation.finishDate,
// fundName: latestProfileEducation.fundName,
// gpa: latestProfileEducation.gpa,
// institute: latestProfileEducation.institute,
// other: latestProfileEducation.other,
// startDate: latestProfileEducation.startDate,
// endDate: latestProfileEducation.endDate,
// educationLevel: latestProfileEducation.educationLevel,
// positionPath: latestProfileEducation.positionPath,
// positionPathId: latestProfileEducation.positionPathId,
// isDate: latestProfileEducation.isDate,
// isEducation: latestProfileEducation.isEducation,
// note: latestProfileEducation.note,
// }
// : null,
};
}),
);