diff --git a/cust-services/pom.xml b/cust-services/pom.xml
index 357f99a..e2a7593 100644
--- a/cust-services/pom.xml
+++ b/cust-services/pom.xml
@@ -105,6 +105,7 @@
false
8000
${project.basedir}/src/test/tomee/conf
+ cust-webapp
org.postgresql:postgresql:9.4.1212.jre7
diff --git a/cust-services/src/main/java/de/hsadmin/bo/customer/Contact.java b/cust-services/src/main/java/de/hsadmin/bo/customer/Contact.java
index da997c7..4db6af4 100644
--- a/cust-services/src/main/java/de/hsadmin/bo/customer/Contact.java
+++ b/cust-services/src/main/java/de/hsadmin/bo/customer/Contact.java
@@ -260,4 +260,12 @@ public class Contact implements Serializable {
this.roles = roles;
}
+ public List getPacAdminList() {
+ return pacAdminList;
+ }
+
+ public void setPacAdminList(List pacAdminList) {
+ this.pacAdminList = pacAdminList;
+ }
+
}
diff --git a/cust-services/src/main/java/de/hsadmin/bo/customer/PacAdministration.java b/cust-services/src/main/java/de/hsadmin/bo/customer/PacAdministration.java
index 313a792..8327f5a 100644
--- a/cust-services/src/main/java/de/hsadmin/bo/customer/PacAdministration.java
+++ b/cust-services/src/main/java/de/hsadmin/bo/customer/PacAdministration.java
@@ -26,7 +26,7 @@ public class PacAdministration {
private Contact contact;
@ManyToOne(fetch=FetchType.EAGER)
- @JoinColumn(name="packet_id")
+ @JoinColumn(name="pac_id")
private Pac pac;
public PacAdministration() {
diff --git a/cust-services/src/main/java/de/hsadmin/service/customer/ContactVO.java b/cust-services/src/main/java/de/hsadmin/service/customer/ContactVO.java
index 8336683..bcf3aca 100644
--- a/cust-services/src/main/java/de/hsadmin/service/customer/ContactVO.java
+++ b/cust-services/src/main/java/de/hsadmin/service/customer/ContactVO.java
@@ -1,11 +1,14 @@
package de.hsadmin.service.customer;
+import java.util.List;
+
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import de.hsadmin.common.error.TechnicalException;
import de.hsadmin.module.ValueObject;
import de.hsadmin.module.impl.AbstractVO;
+import de.hsadmin.module.property.ElementsType;
import de.hsadmin.module.property.ReadWrite;
import de.hsadmin.module.property.ReadWritePolicy;
import de.hsadmin.module.property.Required;
@@ -26,6 +29,11 @@ public class ContactVO extends AbstractVO implements ValueObject {
@Search(SearchPolicy.EQUALS)
private String customer;
+ @Pattern(regexp="[a-z0-9\\-]*")
+ @Size(min=0,max=40)
+ @ReadWrite(ReadWritePolicy.READWRITE)
+ private String login;
+
@Pattern(regexp="[A-Za-z]*")
@Size(min=0,max=16)
@ReadWrite(ReadWritePolicy.READWRITE)
@@ -103,6 +111,10 @@ public class ContactVO extends AbstractVO implements ValueObject {
@ReadWrite(ReadWritePolicy.READWRITE)
private final StringSet roles;
+
+ @ReadWrite(ReadWritePolicy.READWRITE)
+ @ElementsType(PacAdministrationVO.class)
+ private List pacAdminList;
public ContactVO() throws TechnicalException {
super();
@@ -117,6 +129,14 @@ public class ContactVO extends AbstractVO implements ValueObject {
this.customer = customer;
}
+ public String getLogin() {
+ return login;
+ }
+
+ public void setLogin(String login) {
+ this.login = login;
+ }
+
public String getSalut() {
return salut;
}
@@ -245,4 +265,12 @@ public class ContactVO extends AbstractVO implements ValueObject {
roles.setStrings(changedRoles);
}
+ public List getPacAdminList() {
+ return pacAdminList;
+ }
+
+ public void setPacAdminList(List pacAdminList) {
+ this.pacAdminList = pacAdminList;
+ }
+
}
diff --git a/cust-services/src/main/java/de/hsadmin/service/customer/PacAdministrationVO.java b/cust-services/src/main/java/de/hsadmin/service/customer/PacAdministrationVO.java
new file mode 100644
index 0000000..fc844ee
--- /dev/null
+++ b/cust-services/src/main/java/de/hsadmin/service/customer/PacAdministrationVO.java
@@ -0,0 +1,63 @@
+package de.hsadmin.service.customer;
+
+import de.hsadmin.common.error.TechnicalException;
+import de.hsadmin.module.ValueObject;
+import de.hsadmin.module.impl.AbstractVO;
+import de.hsadmin.module.property.ReadWrite;
+import de.hsadmin.module.property.ReadWritePolicy;
+import de.hsadmin.module.property.mapping.DefaultStringParameterMapMapper;
+import de.hsadmin.module.property.mapping.Mapping;
+import de.hsadmin.module.property.mapping.ReferredStringPersistentObjectMapper;
+
+public class PacAdministrationVO extends AbstractVO implements ValueObject {
+
+ @Mapping(
+ boMapping=ReferredStringPersistentObjectMapper.class,
+ rpcMapping=DefaultStringParameterMapMapper.class,
+ boMappingPath="contact.customer.name")
+ @ReadWrite(ReadWritePolicy.READ)
+ private String customer;
+
+ @Mapping(
+ boMapping=ReferredStringPersistentObjectMapper.class,
+ rpcMapping=DefaultStringParameterMapMapper.class,
+ boMappingPath="contact.login")
+ @ReadWrite(ReadWritePolicy.READ)
+ private String contactLogin;
+
+ @Mapping(
+ boMapping=ReferredStringPersistentObjectMapper.class,
+ rpcMapping=DefaultStringParameterMapMapper.class,
+ boMappingPath="pac.name")
+ @ReadWrite(ReadWritePolicy.READ)
+ private String packetName;
+
+ public PacAdministrationVO() throws TechnicalException {
+ super();
+ }
+
+ public String getCustomer() {
+ return customer;
+ }
+
+ public void setCustomer(String customer) {
+ this.customer = customer;
+ }
+
+ public String getContactLogin() {
+ return contactLogin;
+ }
+
+ public void setContactLogin(String contactLogin) {
+ this.contactLogin = contactLogin;
+ }
+
+ public String getPacketName() {
+ return packetName;
+ }
+
+ public void setPacketName(String packetName) {
+ this.packetName = packetName;
+ }
+
+}