This commit is contained in:
harid 2026-03-06 10:23:41 +07:00
parent 71b56d4204
commit a3dd5c59f5
2 changed files with 4 additions and 2 deletions

View file

@ -330,7 +330,7 @@ export class DevelopmentScholarshipController extends Controller {
id: item.id,
year: item.scholarshipYear,
citizenId: item.citizenId,
fullName: `${item.prefix ?? ""}${item.firstName ?? ""} ${item.lastName ?? ""}`,
fullName: `${item.prefix ?? ""}${item.firstName ?? ""} ${item.lastName ?? ""}`.trim(),
position: item.position,
posType: item.posType ? item.posType.posTypeName : null,
posLevel: item.posLevel ? item.posLevel.posLevelName : null,
@ -339,7 +339,7 @@ export class DevelopmentScholarshipController extends Controller {
scholarshipType: item.scholarshipType,
startDate: item.startDate,
endDate: item.endDate,
fullNameGuarantor: `${item.guarantorPrefix ?? ""}${item.guarantorFirstName ?? ""} ${item.guarantorLastName ?? ""}` ,
fullNameGuarantor: `${item.guarantorPrefix ?? ""}${item.guarantorFirstName ?? ""} ${item.guarantorLastName ?? ""}`.trim(),
guarantorCitizenId: item.guarantorCitizenId,
}));