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-14 10:33:48 +07:00
commit a826726c80
14 changed files with 313 additions and 340 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/entities/ProfileEmployee.ts
View file

@ -18,6 +18,7 @@ import { ProfileChangeName } from "./ProfileChangeName";
import { ProfileChildren, ProfileFamilyHistory } from "./ProfileFamily";
import { ProfileEducation } from "./ProfileEducation";
import { ProfileAbility } from "./ProfileAbility";
import { ProfileOther } from "./ProfileOther";
@Entity("profileEmployee")
export class ProfileEmployee extends EntityBase {
@Column({
@ -251,6 +252,9 @@ export class ProfileEmployee extends EntityBase {
@OneToMany(() => ProfileAbility, (v) => v.profileEmployee)
profileAbilities: ProfileAbility[];
@OneToMany(() => ProfileOther, (v) => v.profileEmployee)
profileOthers: ProfileOther[];
@ManyToOne(() => EmployeePosLevel, (v) => v.profiles)
posLevel: EmployeePosLevel;
@ -294,7 +298,7 @@ export class CreateProfileEmployee {
gender: string | null;
relationship: string | null;
bloodGroup: string | null;
email: string | null ;
email: string | null;
phone: string | null;
}