From: Roland Haeder Date: Mon, 12 Oct 2015 11:28:57 +0000 (+0200) Subject: do not persist this data as the user should not be able to enter such data (only... X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c1980534e424381953850ac04c436a4bf47acb56;p=jcontacts-business-core.git do not persist this data as the user should not be able to enter such data (only admin) + updated jar(s) Signed-off-by:Roland Häder --- diff --git a/lib/jcontacts-core.jar b/lib/jcontacts-core.jar index d159964..b977044 100644 Binary files a/lib/jcontacts-core.jar and b/lib/jcontacts-core.jar differ diff --git a/lib/jphone-core.jar b/lib/jphone-core.jar index 09d31d0..b8dca2d 100644 Binary files a/lib/jphone-core.jar and b/lib/jphone-core.jar differ diff --git a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java index 1210be1..57cbf71 100644 --- a/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.java +++ b/src/org/mxchange/jcontactsbusiness/branch/CompanyBranchOffice.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; @@ -58,6 +59,7 @@ public class CompanyBranchOffice implements BranchOffice, Comparable { */ @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