diff --git a/src/entities/LeaveType.ts b/src/entities/LeaveType.ts index 86ae595c..e723ee5f 100644 --- a/src/entities/LeaveType.ts +++ b/src/entities/LeaveType.ts @@ -1,6 +1,5 @@ import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; - import { ProfileLeave } from "./ProfileLeave"; @Entity("leaveType") diff --git a/src/entities/MetaStateOperator.ts b/src/entities/MetaStateOperator.ts index f23c1c7f..5f67618d 100644 --- a/src/entities/MetaStateOperator.ts +++ b/src/entities/MetaStateOperator.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { MetaState } from "./MetaState"; diff --git a/src/entities/OrgChild1.ts b/src/entities/OrgChild1.ts index 4af47cb2..52adaff7 100644 --- a/src/entities/OrgChild1.ts +++ b/src/entities/OrgChild1.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany, PrimaryGeneratedColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { OrgChild2 } from "./OrgChild2"; diff --git a/src/entities/OrgChild2.ts b/src/entities/OrgChild2.ts index 91822992..842423c8 100644 --- a/src/entities/OrgChild2.ts +++ b/src/entities/OrgChild2.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { OrgChild1 } from "./OrgChild1"; diff --git a/src/entities/OrgChild4.ts b/src/entities/OrgChild4.ts index 23a34bde..e8cb2170 100644 --- a/src/entities/OrgChild4.ts +++ b/src/entities/OrgChild4.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { OrgChild1 } from "./OrgChild1"; diff --git a/src/entities/OrgRevision.ts b/src/entities/OrgRevision.ts index 66ef05da..b0a290f5 100644 --- a/src/entities/OrgRevision.ts +++ b/src/entities/OrgRevision.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgRoot } from "./OrgRoot"; import { PosMaster } from "./PosMaster"; diff --git a/src/entities/OrgRoot.ts b/src/entities/OrgRoot.ts index 0beabb2c..47e51706 100644 --- a/src/entities/OrgRoot.ts +++ b/src/entities/OrgRoot.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany, ManyToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { OrgChild1 } from "./OrgChild1"; import { OrgRevision } from "./OrgRevision"; @@ -6,7 +6,6 @@ import { OrgChild2 } from "./OrgChild2"; import { OrgChild3 } from "./OrgChild3"; import { OrgChild4 } from "./OrgChild4"; import { PosMaster } from "./PosMaster"; -import { Profile } from "./Profile"; import { PermissionOrg } from "./PermissionOrg"; enum OrgRootRank { diff --git a/src/entities/PosDict.ts b/src/entities/PosDict.ts index f88b7e3b..a03fcbda 100644 --- a/src/entities/PosDict.ts +++ b/src/entities/PosDict.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosExecutive } from "./PosExecutive"; import { PosType } from "./PosType"; diff --git a/src/entities/PosExecutive.ts b/src/entities/PosExecutive.ts index 696fbddf..20b8a549 100644 --- a/src/entities/PosExecutive.ts +++ b/src/entities/PosExecutive.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, OneToMany } from "typeorm"; import { EntityBase } from "./base/Base"; import { Position } from "./Position"; import { PosDict } from "./PosDict"; diff --git a/src/entities/Position.ts b/src/entities/Position.ts index 8fd16b50..df2812aa 100644 --- a/src/entities/Position.ts +++ b/src/entities/Position.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToOne, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosMaster } from "./PosMaster"; import { PosLevel } from "./PosLevel"; diff --git a/src/entities/Profile.ts b/src/entities/Profile.ts index 6b1cdec3..9038291e 100644 --- a/src/entities/Profile.ts +++ b/src/entities/Profile.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, JoinColumn, ManyToOne, ManyToMany } from "typeorm"; +import { Entity, Column, OneToMany, JoinColumn, ManyToOne } from "typeorm"; import { EntityBase } from "./base/Base"; import { PosMaster } from "./PosMaster"; import { PosLevel } from "./PosLevel"; diff --git a/src/entities/ProfileAbilityHistory.ts b/src/entities/ProfileAbilityHistory.ts index 17f05d2e..f3b4d7ab 100644 --- a/src/entities/ProfileAbilityHistory.ts +++ b/src/entities/ProfileAbilityHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileAbility } from "./ProfileAbility"; @Entity("profileAbilityHistory") diff --git a/src/entities/ProfileAssessmentHistory.ts b/src/entities/ProfileAssessmentHistory.ts index 46c5d533..573a3946 100644 --- a/src/entities/ProfileAssessmentHistory.ts +++ b/src/entities/ProfileAssessmentHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileAssessment } from "./ProfileAssessment"; @Entity("profileAssessmentHistory") diff --git a/src/entities/ProfileCertificateHistory.ts b/src/entities/ProfileCertificateHistory.ts index eee63916..8b2dad8d 100644 --- a/src/entities/ProfileCertificateHistory.ts +++ b/src/entities/ProfileCertificateHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileCertificate } from "./ProfileCertificate"; @Entity("profileCertificateHistory") diff --git a/src/entities/ProfileChangeName.ts b/src/entities/ProfileChangeName.ts index 0da7a53c..25a7cc84 100644 --- a/src/entities/ProfileChangeName.ts +++ b/src/entities/ProfileChangeName.ts @@ -1,6 +1,5 @@ import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileChangeNameHistory } from "./ProfileChangeNameHistory"; import { ProfileEmployee } from "./ProfileEmployee"; // import { ProfileChangeNameHistory } from "./ProfileChangeNameHistory"; diff --git a/src/entities/ProfileChangeNameHistory.ts b/src/entities/ProfileChangeNameHistory.ts index d9f1489f..619344dd 100644 --- a/src/entities/ProfileChangeNameHistory.ts +++ b/src/entities/ProfileChangeNameHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileChangeName } from "./ProfileChangeName"; @Entity("profileChangeNameHistory") diff --git a/src/entities/ProfileChildrenHistory.ts b/src/entities/ProfileChildrenHistory.ts index 2ce86751..39e34b74 100644 --- a/src/entities/ProfileChildrenHistory.ts +++ b/src/entities/ProfileChildrenHistory.ts @@ -1,7 +1,5 @@ -import { Column, Entity, ManyToOne, OneToMany, JoinColumn } from "typeorm"; +import { Column, Entity, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; import { ProfileChildren } from "./ProfileChildren"; @Entity("profileChildrenHistory") diff --git a/src/entities/ProfileDisciplineHistory.ts b/src/entities/ProfileDisciplineHistory.ts index afafed17..33769257 100644 --- a/src/entities/ProfileDisciplineHistory.ts +++ b/src/entities/ProfileDisciplineHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileDiscipline } from "./ProfileDiscipline"; @Entity("profileDisciplineHistory") diff --git a/src/entities/ProfileDutyHistory.ts b/src/entities/ProfileDutyHistory.ts index af470777..31b1a01e 100644 --- a/src/entities/ProfileDutyHistory.ts +++ b/src/entities/ProfileDutyHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileDuty } from "./ProfileDuty"; @Entity("profileDutyHistory") diff --git a/src/entities/ProfileEdit.ts b/src/entities/ProfileEdit.ts index f15f4842..75c07e55 100644 --- a/src/entities/ProfileEdit.ts +++ b/src/entities/ProfileEdit.ts @@ -1,4 +1,4 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { Profile } from "./Profile"; import { ProfileEmployee } from "./ProfileEmployee"; diff --git a/src/entities/ProfileEducationHistory.ts b/src/entities/ProfileEducationHistory.ts index f7e661da..f44e2836 100644 --- a/src/entities/ProfileEducationHistory.ts +++ b/src/entities/ProfileEducationHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileEducation } from "./ProfileEducation"; @Entity("profileEducationHistory") diff --git a/src/entities/ProfileEmployee.ts b/src/entities/ProfileEmployee.ts index 08abcadd..48809b88 100644 --- a/src/entities/ProfileEmployee.ts +++ b/src/entities/ProfileEmployee.ts @@ -24,7 +24,7 @@ import { ProfileFamilyFather } from "./ProfileFamilyFather"; import { ProfileFamilyMother } from "./ProfileFamilyMother"; import { ProfileFamilyCouple } from "./ProfileFamilyCouple"; import { ProfileChildren } from "./ProfileChildren"; -import { Profile, ProfileAddressHistory } from "./Profile"; +import { ProfileAddressHistory } from "./Profile"; import { Province } from "./Province"; import { District } from "./District"; import { SubDistrict } from "./SubDistrict"; diff --git a/src/entities/ProfileFamily.ts b/src/entities/ProfileFamily.ts index baee34ff..57cb84aa 100644 --- a/src/entities/ProfileFamily.ts +++ b/src/entities/ProfileFamily.ts @@ -1,4 +1,4 @@ -import { Column, Entity, ManyToOne, OneToMany, JoinColumn } from "typeorm"; +import { Column, Entity, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { Profile } from "./Profile"; import { ProfileEmployee } from "./ProfileEmployee"; diff --git a/src/entities/ProfileFamilyCoupleHistory.ts b/src/entities/ProfileFamilyCoupleHistory.ts index 13f682ff..340d6783 100644 --- a/src/entities/ProfileFamilyCoupleHistory.ts +++ b/src/entities/ProfileFamilyCoupleHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileFamilyCouple } from "./ProfileFamilyCouple"; diff --git a/src/entities/ProfileFamilyFatherHistory.ts b/src/entities/ProfileFamilyFatherHistory.ts index 3c471b2c..614e0853 100644 --- a/src/entities/ProfileFamilyFatherHistory.ts +++ b/src/entities/ProfileFamilyFatherHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileFamilyFather } from "./ProfileFamilyFather"; diff --git a/src/entities/ProfileFamilyMotherHistory.ts b/src/entities/ProfileFamilyMotherHistory.ts index f43b667d..457dc15a 100644 --- a/src/entities/ProfileFamilyMotherHistory.ts +++ b/src/entities/ProfileFamilyMotherHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileFamilyMother } from "./ProfileFamilyMother"; diff --git a/src/entities/ProfileHonorHistory.ts b/src/entities/ProfileHonorHistory.ts index a4cea3dc..c2a45581 100644 --- a/src/entities/ProfileHonorHistory.ts +++ b/src/entities/ProfileHonorHistory.ts @@ -1,6 +1,5 @@ import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileHonor } from "./ProfileHonor"; @Entity("profileHonorHistory") diff --git a/src/entities/ProfileInsigniaHistory.ts b/src/entities/ProfileInsigniaHistory.ts index b5aa3d5e..8dfde589 100644 --- a/src/entities/ProfileInsigniaHistory.ts +++ b/src/entities/ProfileInsigniaHistory.ts @@ -1,4 +1,4 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { ProfileInsignia } from "./ProfileInsignia"; import { Insignia } from "./Insignia"; diff --git a/src/entities/ProfileNopaidHistory.ts b/src/entities/ProfileNopaidHistory.ts index a995d4c6..28fa9afa 100644 --- a/src/entities/ProfileNopaidHistory.ts +++ b/src/entities/ProfileNopaidHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, OneToMany, ManyToOne, JoinColumn } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileNopaid } from "./ProfileNopaid"; @Entity("profileNopaidHistory") diff --git a/src/entities/ProfileTrainingHistory.ts b/src/entities/ProfileTrainingHistory.ts index 4541725d..4ce0eada 100644 --- a/src/entities/ProfileTrainingHistory.ts +++ b/src/entities/ProfileTrainingHistory.ts @@ -1,6 +1,5 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; import { ProfileTraining } from "./ProfileTraining"; @Entity("profileTrainingHistory") diff --git a/src/entities/Relationship.ts b/src/entities/Relationship.ts index 6c018435..19b3629a 100644 --- a/src/entities/Relationship.ts +++ b/src/entities/Relationship.ts @@ -1,9 +1,6 @@ -import { Entity, Column, OneToMany } from "typeorm"; +import { Entity, Column } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; - @Entity("relationship") export class Relationship extends EntityBase { @Column({ diff --git a/src/entities/Religion.ts b/src/entities/Religion.ts index a39b55fb..8898c3bc 100644 --- a/src/entities/Religion.ts +++ b/src/entities/Religion.ts @@ -1,7 +1,5 @@ -import { Entity, Column, OneToMany } from "typeorm"; +import { Entity, Column } from "typeorm"; import { EntityBase } from "./base/Base"; -import { Profile } from "./Profile"; -import { ProfileEmployee } from "./ProfileEmployee"; @Entity("religion") export class Religion extends EntityBase { diff --git a/src/entities/StateOperator.ts b/src/entities/StateOperator.ts index 4e0406d3..07ae241c 100644 --- a/src/entities/StateOperator.ts +++ b/src/entities/StateOperator.ts @@ -1,7 +1,6 @@ -import { Entity, Column, ManyToOne, JoinColumn, OneToMany } from "typeorm"; +import { Entity, Column, ManyToOne, JoinColumn } from "typeorm"; import { EntityBase } from "./base/Base"; import { State } from "./State"; -import { StateOperatorUser } from "./StateOperatorUser"; @Entity("stateOperator") export class StateOperator extends EntityBase {