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

Merge branch 'develop' into develop-Bright

Browse source 
# Conflicts:
#	src/entities/Profile.ts
#	src/entities/ProfileEmployee.ts
This commit is contained in:
Bright 2024-05-14 17:42:38 +07:00
commit 3e0bcd8a08
26 changed files with 660 additions and 351 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/entities/Profile.ts
View file

@ -4,7 +4,6 @@ import { PosMaster } from "./PosMaster";
import { PosLevel } from "./PosLevel";
import { PosType } from "./PosType";
import { ProfileSalary } from "./ProfileSalary";
import { ProfileDiscipline } from "./ProfileDiscipline";
import { ProfileCertificate } from "./ProfileCertificate";
import { ProfileEducation } from "./ProfileEducation";
import { ProfileTraining } from "./ProfileTraining";
@ -16,7 +15,7 @@ import { ProfileAbility } from "./ProfileAbility";
import { ProfileDuty } from "./ProfileDuty";
import { ProfileNopaid } from "./ProfileNopaid";
import { ProfileOther } from "./ProfileOther";
import { ProfileChildren, ProfileFamilyHistory } from "./ProfileFamily";
import { ProfileFamilyHistory } from "./ProfileFamily";
import { ProfileGovernment } from "./ProfileGovernment";
import { Province } from "./Province";
import { SubDistrict } from "./SubDistrict";
@ -25,6 +24,8 @@ import { ProfileAvatar } from "./ProfileAvatar";
import { ProfileFamilyFather } from "./ProfileFamilyFather";
import { ProfileFamilyMother } from "./ProfileFamilyMother";
import { ProfileFamilyCouple } from "./ProfileFamilyCouple";
import { ProfileChildren } from "./ProfileChildren";
import { ProfileDiscipline } from "./ProfileDiscipline";
@Entity("profile")
export class Profile extends EntityBase {
@ -270,7 +271,7 @@ export class Profile extends EntityBase {
profileSalary: ProfileSalary[];
@OneToMany(() => ProfileDiscipline, (profileDiscipline) => profileDiscipline.profile)
profileDiscipline: ProfileDiscipline[];
profileDisciplines: ProfileDiscipline[];
@OneToMany(() => ProfileCertificate, (profileCertificate) => profileCertificate.profile)
profileCertificates: ProfileCertificate[];
@ -312,7 +313,7 @@ export class Profile extends EntityBase {
profileFamily: ProfileFamilyHistory[];
@OneToMany(() => ProfileChildren, (profileChildren) => profileChildren.profile)
profileChildren: ProfileChildren[];
profileChildrens: ProfileChildren[];
@OneToMany(() => ProfileGovernment, (profileGovernment) => profileGovernment.profile)
profileGovernment: ProfileGovernment[];