no message
This commit is contained in:
parent
3debbe1602
commit
bc49bb1e90
2 changed files with 12 additions and 0 deletions
|
|
@ -2578,8 +2578,13 @@ export class ProfileController extends Controller {
|
||||||
datePeriodStart.getMonth() - 6,
|
datePeriodStart.getMonth() - 6,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
const specialPosition = item.positions.find(
|
||||||
|
(position) => position.positionIsSelected === true,
|
||||||
|
);
|
||||||
|
const isSpecial = specialPosition ? specialPosition.isSpecial : null;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
profileId: item.current_holder.id,
|
||||||
prefix: item.current_holder.prefix,
|
prefix: item.current_holder.prefix,
|
||||||
rank: item.current_holder.rank,
|
rank: item.current_holder.rank,
|
||||||
firstName: item.current_holder.firstName,
|
firstName: item.current_holder.firstName,
|
||||||
|
|
@ -2629,6 +2634,7 @@ export class ProfileController extends Controller {
|
||||||
calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
|
calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
|
||||||
? false
|
? false
|
||||||
: true,
|
: true,
|
||||||
|
isSpecial: isSpecial,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1812,8 +1812,13 @@ export class ProfileEmployeeController extends Controller {
|
||||||
datePeriodStart.getMonth() - 6,
|
datePeriodStart.getMonth() - 6,
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
|
// const specialPosition = item.positions.find(
|
||||||
|
// (position) => position.positionIsSelected === true,
|
||||||
|
// );
|
||||||
|
// const isSpecial = specialPosition ? specialPosition.isSpecial : null;
|
||||||
|
|
||||||
return {
|
return {
|
||||||
|
profileId: item.current_holder.id,
|
||||||
salaryLevel: item.current_holder.salaryLevel,
|
salaryLevel: item.current_holder.salaryLevel,
|
||||||
group: item.current_holder.group,
|
group: item.current_holder.group,
|
||||||
rank: item.current_holder.rank,
|
rank: item.current_holder.rank,
|
||||||
|
|
@ -1865,6 +1870,7 @@ export class ProfileEmployeeController extends Controller {
|
||||||
calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
|
calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
|
||||||
? false
|
? false
|
||||||
: true,
|
: true,
|
||||||
|
isSpecial: false,
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue