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

ฉ

Browse source
This commit is contained in:
AdisakKanthawilang 2024-02-20 17:09:11 +07:00
parent bb79b0a3d0
commit 7f01e34045
3 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/controllers/PositionController.ts
View file

@ -121,7 +121,7 @@ export class PositionController extends Controller {
posExecutiveId: String(posDict.posExecutiveId), posExecutiveId: String(posDict.posExecutiveId),
posDictExecutiveField: posDict.posDictExecutiveField, posDictExecutiveField: posDict.posDictExecutiveField,
posDictArea: posDict.posDictArea, posDictArea: posDict.posDictArea,
isSpacial: posDict.isSpacial isSpecial: posDict.isSpecial
}, },
}); });
if (rowRepeated) { if (rowRepeated) {
@ -269,7 +269,7 @@ export class PositionController extends Controller {
posExecutiveName: item.posExecutive == null ? null : item.posExecutive.posExecutiveName, posExecutiveName: item.posExecutive == null ? null : item.posExecutive.posExecutiveName,
positionExecutiveField: item.posDictExecutiveField, positionExecutiveField: item.posDictExecutiveField,
positionArea: item.posDictArea, positionArea: item.posDictArea,
isSpacial: item.isSpacial, isSpecial: item.isSpecial,
positionIsSelected: false, positionIsSelected: false,
}; };
}), }),
@ -530,7 +530,7 @@ export class PositionController extends Controller {
position.posExecutiveId = x.posExecutiveId; position.posExecutiveId = x.posExecutiveId;
position.positionExecutiveField = x.posDictExecutiveField; position.positionExecutiveField = x.posDictExecutiveField;
position.positionArea = x.posDictArea; position.positionArea = x.posDictArea;
position.isSpacial = x.isSpacial; position.isSpecial = x.isSpecial;
position.positionIsSelected = false; position.positionIsSelected = false;
position.posMasterId = posMaster.id; position.posMasterId = posMaster.id;
position.createdUserId = request.user.sub; position.createdUserId = request.user.sub;
@ -747,7 +747,7 @@ export class PositionController extends Controller {
position.posExecutiveId = x.posExecutiveId; position.posExecutiveId = x.posExecutiveId;
position.positionExecutiveField = x.posDictExecutiveField; position.positionExecutiveField = x.posDictExecutiveField;
position.positionArea = x.posDictArea; position.positionArea = x.posDictArea;
position.isSpacial = x.isSpacial; position.isSpecial = x.isSpecial;
position.positionIsSelected = false; position.positionIsSelected = false;
position.posMasterId = posMaster.id; position.posMasterId = posMaster.id;
position.createdUserId = request.user.sub; position.createdUserId = request.user.sub;
@ -798,7 +798,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField, positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea, positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,
isSpacial: position.isSpacial, isSpecial: position.isSpecial,
})), })),
}; };
return new HttpSuccess(formattedData); return new HttpSuccess(formattedData);
@ -1142,7 +1142,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField, positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea, positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,
isSpacial: position.isSpacial, isSpecial: position.isSpecial,
})), })),
}; };
}), }),
@ -2286,7 +2286,7 @@ export class PositionController extends Controller {
positionExecutiveField: position.positionExecutiveField, positionExecutiveField: position.positionExecutiveField,
positionArea: position.positionArea, positionArea: position.positionArea,
positionIsSelected: position.positionIsSelected, positionIsSelected: position.positionIsSelected,
isSpacial: position.isSpacial, isSpecial: position.isSpecial,
})), })),
}; };
}), }),

4
src/entities/PosDict.ts
View file

@ -62,7 +62,7 @@ export class PosDict extends EntityBase {
comment: "ฉ", comment: "ฉ",
default: false, default: false,
}) })
isSpacial: boolean; isSpecial: boolean;
@ManyToOne(() => PosExecutive, (posExecutive) => posExecutive) @ManyToOne(() => PosExecutive, (posExecutive) => posExecutive)
@JoinColumn({ name: "posExecutiveId" }) @JoinColumn({ name: "posExecutiveId" })
@ -100,7 +100,7 @@ export class CreatePosDict {
posDictArea: string | null; posDictArea: string | null;
@Column() @Column()
isSpacial: boolean; isSpecial: boolean;
} }
export type UpdatePosDict = Partial<CreatePosDict>; export type UpdatePosDict = Partial<CreatePosDict>;

4
src/entities/Position.ts
View file

@ -75,7 +75,7 @@ export class Position extends EntityBase {
comment: "ฉ", comment: "ฉ",
default: false, default: false,
}) })
isSpacial: boolean; isSpecial: boolean;
@ManyToOne(() => PosMaster, (posMaster) => posMaster) @ManyToOne(() => PosMaster, (posMaster) => posMaster)
@JoinColumn({ name: "posMasterId" }) @JoinColumn({ name: "posMasterId" })
@ -116,7 +116,7 @@ export class CreatePosition {
positionArea: string; positionArea: string;
@Column() @Column()
isSpacial: boolean; isSpecial: boolean;
} }
export type UpdatePosition = Partial<CreatePosition>; export type UpdatePosition = Partial<CreatePosition>;