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

Merge branch 'develop' into adiDev

Browse source
This commit is contained in:
AdisakKanthawilang 2024-05-28 15:02:07 +07:00
commit e75f41fe2a
2 changed files with 12 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/controllers/ProfileController.ts
View file

@ -2595,8 +2595,13 @@ export class ProfileController extends Controller {
datePeriodStart.getMonth() - 6,
),
);
const specialPosition = item.positions.find(
(position) => position.positionIsSelected === true,
);
const isSpecial = specialPosition ? specialPosition.isSpecial : null;
return {
profileId: item.current_holder.id,
prefix: item.current_holder.prefix,
rank: item.current_holder.rank,
firstName: item.current_holder.firstName,
@ -2646,6 +2651,7 @@ export class ProfileController extends Controller {
calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
? false
: true,
isSpecial: isSpecial,
};
});

6
src/controllers/ProfileEmployeeController.ts
View file

@ -1823,8 +1823,13 @@ export class ProfileEmployeeController extends Controller {
datePeriodStart.getMonth() - 6,
),
);
// const specialPosition = item.positions.find(
// (position) => position.positionIsSelected === true,
// );
// const isSpecial = specialPosition ? specialPosition.isSpecial : null;
return {
profileId: item.current_holder.id,
salaryLevel: item.current_holder.salaryLevel,
group: item.current_holder.group,
rank: item.current_holder.rank,
@ -1876,6 +1881,7 @@ export class ProfileEmployeeController extends Controller {
calculateRetireDate(item.current_holder.birthDate).getFullYear() != body.year
? false
: true,
isSpecial: false,
};
});