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

Merge branch 'develop' of github.com:Frappet/bma-ehr-organization into develop

Browse source
This commit is contained in:
kittapath 2024-08-19 17:58:45 +07:00
commit 078b1acdd4
1 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/controllers/PositionController.ts
View file

@ -3042,7 +3042,6 @@ export class PositionController extends Controller {
node = 0;
nodeId = posMaster.orgRootId;
}
return {
id: posMaster.id,
node: node,
@ -3058,6 +3057,16 @@ export class PositionController extends Controller {
orgShortname: shortName,
isSit: posMaster.isSit,
isPosition: posMaster.positions.filter((x) => x.positionName == body.position).length > 0,
// current_holder: posMaster.current_holderId ? posMaster.current_holderId : null,
// next_holder: posMaster.next_holderId ? posMaster.next_holderId : null,
fullNameCurrentHolder:
posMaster.current_holder == null
? null
: `${posMaster.current_holder.prefix}${posMaster.current_holder.firstName} ${posMaster.current_holder.lastName}`,
fullNameNextHolder:
posMaster.next_holder == null
? null
: `${posMaster.next_holder.prefix}${posMaster.next_holder.firstName} ${posMaster.next_holder.lastName}`,
positions: posMaster.positions.map((position) => ({
id: position.id,
positionName: position.positionName,