add fields
This commit is contained in:
parent
d83a6ca363
commit
648baabaf1
1 changed files with 27 additions and 1 deletions
|
|
@ -2369,6 +2369,8 @@ export class OrganizationDotnetController extends Controller {
|
||||||
"profileSalary",
|
"profileSalary",
|
||||||
"profileInsignias",
|
"profileInsignias",
|
||||||
"profileInsignias.insignia",
|
"profileInsignias.insignia",
|
||||||
|
"profileDisciplines",
|
||||||
|
"profileAssessments",
|
||||||
"current_holders",
|
"current_holders",
|
||||||
"current_holders.orgRevision",
|
"current_holders.orgRevision",
|
||||||
"current_holders.orgRoot",
|
"current_holders.orgRoot",
|
||||||
|
|
@ -2564,6 +2566,16 @@ export class OrganizationDotnetController extends Controller {
|
||||||
x.orgRevision?.orgRevisionIsCurrent == true,
|
x.orgRevision?.orgRevisionIsCurrent == true,
|
||||||
)?.orgChild4?.ancestorDNA ?? null,
|
)?.orgChild4?.ancestorDNA ?? null,
|
||||||
posNo: shortName ?? "",
|
posNo: shortName ?? "",
|
||||||
|
markDiscipline: profile.profileDisciplines.length > 0
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
|
markLeave: false,
|
||||||
|
markRate: profile.profileAssessments.length > 0
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
|
markInsignia: profile.profileInsignias.length > 0
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
@ -2739,6 +2751,8 @@ export class OrganizationDotnetController extends Controller {
|
||||||
"profileSalary",
|
"profileSalary",
|
||||||
"profileInsignias",
|
"profileInsignias",
|
||||||
"profileInsignias.insignia",
|
"profileInsignias.insignia",
|
||||||
|
"profileDisciplines",
|
||||||
|
"profileAssessments",
|
||||||
"current_holders",
|
"current_holders",
|
||||||
"current_holders.orgRevision",
|
"current_holders.orgRevision",
|
||||||
"current_holders.orgRoot",
|
"current_holders.orgRoot",
|
||||||
|
|
@ -2832,7 +2846,9 @@ export class OrganizationDotnetController extends Controller {
|
||||||
currentZipCode: profile.currentZipCode,
|
currentZipCode: profile.currentZipCode,
|
||||||
// dutyTimeId: profile.dutyTimeId,
|
// dutyTimeId: profile.dutyTimeId,
|
||||||
// dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
|
// dutyTimeEffectiveDate: profile.dutyTimeEffectiveDate,
|
||||||
posLevel: profile.posLevel?.posLevelName ?? "",
|
posLevel: profile.posType?.posTypeShortName && profile.posLevel?.posLevelName
|
||||||
|
? `${profile.posType.posTypeShortName} ${profile.posLevel.posLevelName}`
|
||||||
|
: profile.posType?.posTypeShortName || profile.posLevel?.posLevelName || "",
|
||||||
posType: profile.posType?.posTypeName ?? "",
|
posType: profile.posType?.posTypeName ?? "",
|
||||||
profileSalary: profile.profileSalary.map((x) => {
|
profileSalary: profile.profileSalary.map((x) => {
|
||||||
return { ...x, date: x.commandDateAffect ?? new Date() };
|
return { ...x, date: x.commandDateAffect ?? new Date() };
|
||||||
|
|
@ -2935,6 +2951,16 @@ export class OrganizationDotnetController extends Controller {
|
||||||
x.orgRevision?.orgRevisionIsCurrent == true,
|
x.orgRevision?.orgRevisionIsCurrent == true,
|
||||||
)?.orgChild4?.ancestorDNA ?? null,
|
)?.orgChild4?.ancestorDNA ?? null,
|
||||||
posNo: shortName ?? "",
|
posNo: shortName ?? "",
|
||||||
|
markDiscipline: profile.profileDisciplines.length > 0
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
|
markLeave: false,
|
||||||
|
markRate: profile.profileAssessments.length > 0
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
|
markInsignia: profile.profileInsignias.length > 0
|
||||||
|
? true
|
||||||
|
: false,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue