From c1980534e424381953850ac04c436a4bf47acb56 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 12 Oct 2015 13:28:57 +0200 Subject: [PATCH] =?utf8?q?do=20not=20persist=20this=20data=20as=20the=20us?= =?utf8?q?er=20should=20not=20be=20able=20to=20enter=20such=20data=20(only?= =?utf8?q?=20admin)=20+=20updated=20jar(s)=20Signed-off-by:Roland=20H?= =?utf8?q?=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- lib/jcontacts-core.jar | Bin 19902 -> 19902 bytes lib/jphone-core.jar | Bin 19469 -> 19613 bytes .../branch/CompanyBranchOffice.java | 2 ++ .../department/CompanyDepartment.java | 3 +++ .../employee/CompanyEmployee.java | 3 +++ .../headquarters/CompanyHeadQuartersData.java | 2 ++ 6 files changed, 10 insertions(+) diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index d1599646edb47bc737ba6e93b27c1d992ed0ed88..b977044176df140d0a842f3cd87d2d9913325158 100644 GIT binary patch delta 199 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 { */ @JoinColumn (name = "department_company_id", nullable = false, updatable = false) @ManyToOne (targetEntity = CompanyContact.class, cascade = CascadeType.ALL, optional = false) + @Transient private BusinessContact departmentCompany; /** @@ -66,6 +68,7 @@ public class CompanyDepartment implements Department, Comparable { */ @JoinColumn (name = "department_lead_id", nullable = false) @OneToOne (targetEntity = CompanyEmployee.class, cascade = CascadeType.ALL) + @Transient private Employee departmentLead; /** diff --git a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java index 78f68d5..a21dfdc 100644 --- a/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java +++ b/src/org/mxchange/jcontactsbusiness/employee/CompanyEmployee.java @@ -25,6 +25,7 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; +import javax.persistence.Transient; import org.mxchange.jcontacts.contact.Contact; import org.mxchange.jcontacts.contact.UserContact; import org.mxchange.jcontactsbusiness.branch.BranchOffice; @@ -96,6 +97,7 @@ public class CompanyEmployee implements Employee, Comparable { */ @JoinColumn (name = "employee_personal_data_id", nullable = false, updatable = false) @OneToOne (targetEntity = UserContact.class, cascade = CascadeType.ALL, optional = false) + @Transient private Contact employeePersonalData; /** @@ -109,6 +111,7 @@ public class CompanyEmployee implements Employee, Comparable { */ @JoinColumn (name = "employee_position_id") @OneToOne (targetEntity = EmployeePosition.class, cascade = CascadeType.ALL) + @Transient private JobPosition employeePosition; @Override diff --git a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java index 12776ee..3c76923 100644 --- a/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java +++ b/src/org/mxchange/jcontactsbusiness/headquarters/CompanyHeadQuartersData.java @@ -26,6 +26,7 @@ import javax.persistence.Id; import javax.persistence.JoinColumn; import javax.persistence.OneToOne; import javax.persistence.Table; +import javax.persistence.Transient; import org.mxchange.jcountry.data.Country; import org.mxchange.jcountry.data.CountryData; import org.mxchange.jphone.phonenumbers.fax.DialableFaxNumber; @@ -59,6 +60,7 @@ public class CompanyHeadQuartersData implements HeadQuartersData, Comparable