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

7
src/entities/ProfileEmployee.ts
View file

@ -4,7 +4,6 @@ import { EmployeePosLevel } from "./EmployeePosLevel";
import { EmployeePosType } from "./EmployeePosType";
import { EmployeePosMaster } from "./EmployeePosMaster";
import { ProfileSalaryEmployee } from "./ProfileSalaryEmployee";
import { ProfileDisciplineEmployee } from "./ProfileDisciplineEmployee";
import { ProfileCertificate } from "./ProfileCertificate";
import { ProfileTraining } from "./ProfileTraining";
import { ProfileInsignia } from "./ProfileInsignia";
@ -15,7 +14,7 @@ import { ProfileDuty } from "./ProfileDuty";
import { ProfileNopaid } from "./ProfileNopaid";
import { ProfileDiscipline } from "./ProfileDiscipline";
import { ProfileChangeName } from "./ProfileChangeName";
import { ProfileChildren, ProfileFamilyHistory } from "./ProfileFamily";
import { ProfileFamilyHistory } from "./ProfileFamily";
import { ProfileEducation } from "./ProfileEducation";
import { ProfileAbility } from "./ProfileAbility";
import { ProfileOther } from "./ProfileOther";
@ -25,6 +24,7 @@ import { ProfileFamilyFather } from "./ProfileFamilyFather";
import { ProfileFamilyMother } from "./ProfileFamilyMother";
import { ProfileFamilyCouple } from "./ProfileFamilyCouple";
import { ProfileChildren } from "./ProfileChildren";
@Entity("profileEmployee")
export class ProfileEmployee extends EntityBase {
@Column({
@ -220,9 +220,6 @@ export class ProfileEmployee extends EntityBase {
@OneToMany(() => ProfileSalaryEmployee, (v) => v.profile)
profileSalary: ProfileSalaryEmployee[];
@OneToMany(() => ProfileDisciplineEmployee, (v) => v.profile)
profileDiscipline: ProfileDisciplineEmployee[];
@OneToMany(() => ProfileCertificate, (v) => v.profileEmployee)
profileCertificates: ProfileCertificate[];