WIP add fields and returnTemplateData parametera to office reads

mifosng-data/src/main/java/org/mifosng/data/OfficeData.java

@@ -1,8 +1,6 @@
 package org.mifosng.data;
 
 import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
 
 import javax.xml.bind.annotation.XmlRootElement;
 
@@ -20,8 +18,7 @@ public class OfficeData implements Serializable {
 	private String hierarchy;
 	private String parentName;
 	private Long parentId;
-	
-	private List<OfficeData> allowedParents = new ArrayList<OfficeData>();
+	private OfficeTemplateData officeTemplateData;
 
 	public OfficeData() {
 		//
@@ -87,14 +84,6 @@ public class OfficeData implements Serializable {
 		this.parentId = parentId;
 	}
 
-	public List<OfficeData> getAllowedParents() {
-		return allowedParents;
-	}
-
-	public void setAllowedParents(List<OfficeData> allowedParents) {
-		this.allowedParents = allowedParents;
-	}
-
 	public String getHierarchy() {
 		return hierarchy;
 	}
@@ -102,4 +91,12 @@ public class OfficeData implements Serializable {
 	public void setHierarchy(String hierarchy) {
 		this.hierarchy = hierarchy;
 	}
+
+	public OfficeTemplateData getOfficeTemplateData() {
+		return officeTemplateData;
+	}
+
+	public void setOfficeTemplateData(OfficeTemplateData officeTemplateData) {
+		this.officeTemplateData = officeTemplateData;
+	}
 }

mifosng-data/src/main/java/org/mifosng/data/OfficeLookup.java

@@ -0,0 +1,30 @@
+package org.mifosng.data;
+
+import java.io.Serializable;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement(name = "office lookup")
+public class OfficeLookup implements Serializable {
+
+	private Long id;
+	private String name;
+
+	public OfficeLookup() {
+		//
+	}
+
+	public OfficeLookup(final Long id, final String name) {
+		this.id = id;
+		this.name = name;
+	}
+
+	public Long getId() {
+		return this.id;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+}

mifosng-data/src/main/java/org/mifosng/data/OfficeTemplateData.java

@@ -0,0 +1,43 @@
+package org.mifosng.data;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlRootElement;
+
+import org.joda.time.LocalDate;
+
+@XmlRootElement(name = "office template")
+public class OfficeTemplateData implements Serializable {
+
+	private LocalDate defaultOpeningDate;
+	private List<OfficeLookup> allowedParents = new ArrayList<OfficeLookup>();
+
+	public OfficeTemplateData() {
+		//
+	}
+
+	public OfficeTemplateData(final LocalDate defaultOpeningDate,
+			final List<OfficeLookup> allowedParents) {
+		this.defaultOpeningDate = defaultOpeningDate;
+		this.allowedParents = allowedParents;
+	}
+
+	public LocalDate getDefaultOpeningDate() {
+		return defaultOpeningDate;
+	}
+
+	public void setDefaultOpeningDate(LocalDate defaultOpeningDate) {
+		this.defaultOpeningDate = defaultOpeningDate;
+	}
+
+	public List<OfficeLookup> getAllowedParents() {
+		return allowedParents;
+	}
+
+	public void setAllowedParents(List<OfficeLookup> allowedParents) {
+		this.allowedParents = allowedParents;
+	}
+
+}