Lisatud adminüksuse liigiredaktori vaate disain.

src/main/java/itcollege/team09/entities/AdminYksuseLiik.java

@@ -5,7 +5,9 @@
 import java.util.List;
 
 import javax.persistence.Entity;
+import javax.persistence.EntityManager;
 import javax.persistence.OneToMany;
+import javax.persistence.PersistenceContext;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 
@@ -36,7 +38,7 @@ public class AdminYksuseLiik extends Piirivalve implements Serializable  {
 
     @NotNull
     @DateTimeFormat(style="M-")
-    private Date alates;
+    private Date alates = new Date();
 
     @NotNull
     @DateTimeFormat(style="M-")

src/main/java/itcollege/team09/entities/Piirivalve.java

@@ -32,7 +32,7 @@ public abstract class Piirivalve {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;    	
 	@Size(max=500)
-	@NotNull
+	//@NotNull
     private String kommentaar;    
     @Size(max=32)
     protected String avaja;    
@@ -48,6 +48,9 @@ public abstract class Piirivalve {
     protected Date suletud;
 
 
+	public void setSuletud(Date suletud) {
+		this.suletud = suletud;
+	}
 	public Long getId() {
 		return id;
 	}

src/main/java/itcollege/team09/web/AdminYksuseLiigiRedaktor.java

@@ -0,0 +1,111 @@
+package itcollege.team09.web;
+
+import itcollege.team09.entities.AdminYksuseLiik;
+import itcollege.team09.entities.VoimalikAlluvus;
+
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.joda.time.format.DateTimeFormat;
+import org.springframework.context.i18n.LocaleContextHolder;
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.ui.ModelMap;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.util.UriUtils;
+import org.springframework.web.util.WebUtils;
+
+@RequestMapping("/adminyksuseliigiredaktor/**")
+@Controller
+public class AdminYksuseLiigiRedaktor {
+
+	//kui pealehel ollaks esimest korda
+    @RequestMapping
+    public String index(@RequestParam(required = false) Long liigiID,Model uiModel) {
+    	//kui siia formi tullakse esimest korda
+       createForm(liigiID,uiModel);
+        return "adminyksuseliigiredaktor/index";
+    } 
+    @RequestMapping(params = "form", method = RequestMethod.GET)
+    public String createForm(@ModelAttribute("liigiID") Long liigiID, Model uiModel) {
+    	                                    //"liigiID" saadab siia 
+    	                                    //Voimalik_alluvusController
+    	                                    //meetodist 'public String create(..)'
+
+
+    	if(liigiID != null){//kui siia formi tullakse alluvaid loomast
+    		//na:ita samu andmeid uuesti
+
+    		AdminYksuseLiik alluvategaLiik = AdminYksuseLiik.findAdminYksuseLiik(liigiID);
+    		AdminYksuseLiik u = new AdminYksuseLiik();
+     		u = alluvategaLiik; //see ta:idab textboxid endiste andmetega
+
+    		uiModel.addAttribute("tagasiLiik", u);
+    		uiModel.addAttribute("alluvategaLiik", alluvategaLiik);
+
+    		//seda ion vaja <c:out..>va:a:rtuseks, et kuvada olemasolevaid alluvusi
+    		AdminYksuseLiik valitudLiik = AdminYksuseLiik.findAdminYksuseLiik(liigiID);
+    		uiModel.addAttribute("valitudLiik", valitudLiik);
+    		//uiModel.addAttribute("voimalikudAlluvad", annaV6imalikualluvuseList(valitudLiik));
+
+    	}
+        uiModel.addAttribute("riigi_admin_yksuse_liik", new AdminYksuseLiik());
+        addDateTimeFormatPatterns(uiModel);
+        return "adminyksuseliigiredaktor/index";
+    }
+
+
+    void addDateTimeFormatPatterns(Model uiModel) {
+        uiModel.addAttribute("riigi_admin_yksuse_liik_avatud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
+        uiModel.addAttribute("riigi_admin_yksuse_liik_muudetud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
+        uiModel.addAttribute("riigi_admin_yksuse_liik_suletud_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
+        uiModel.addAttribute("riigi_admin_yksuse_liik_alates_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
+        uiModel.addAttribute("riigi_admin_yksuse_liik_kuni_date_format", DateTimeFormat.patternForStyle("M-", LocaleContextHolder.getLocale()));
+    }
+
+    String encodeUrlPathSegment(String pathSegment, HttpServletRequest httpServletRequest) {
+        String enc = httpServletRequest.getCharacterEncoding();
+        if (enc == null) {
+            enc = WebUtils.DEFAULT_CHARACTER_ENCODING;
+        }
+        try {
+            pathSegment = UriUtils.encodePathSegment(pathSegment, enc);
+        }
+        catch (UnsupportedEncodingException uee) {}
+        return pathSegment;
+    }
+
+    //seda kasutatakse Allub: va:lja dropboxi jaoks
+    @ModelAttribute("riigi_admin_yksuse_liiks_piiks")
+    public Collection<AdminYksuseLiik> populateRiigi_admin_yksuse_liiks() {
+        return AdminYksuseLiik.findAllAdminYksuseLiiks();
+    }
+
+    public List<VoimalikAlluvus> annaV6imalikualluvuseList(AdminYksuseLiik ylemLiik){
+    	VoimalikAlluvus v6i = null;
+    	List<VoimalikAlluvus> vaList = new ArrayList<VoimalikAlluvus>();
+		for(VoimalikAlluvus va : VoimalikAlluvus.findAllVoimalikAlluvuses()){
+    		if(va.getYksuseliik()== ylemLiik){
+    			v6i = va;
+    			vaList.add(v6i);
+    		}
+    	}
+		return vaList;
+    }
+/*  //admin.liigi olemasolevad alluvad
+    //@ModelAttribute("JubaOlemasOlevadAlluvad")
+    List<AdminYksuseLiik> annaOlOlAlluvad(AdminYksuseLiik valitudLiik ){
+    	OlemasOlevadAlluvad ooaall = OlemasOlevadAlluvad.findAlluvadForAdminLiik(valitudLiik);
+    	List<AdminYksuseLiik> ololAlluvad = ooaall.getLiikItems();
+    	return ololAlluvad;
+    }*/
+}

src/main/webapp/WEB-INF/i18n/application.properties

@@ -1,6 +1,7 @@
-#Updated at Sun Dec 18 12:59:18 EET 2011
-#Sun Dec 18 12:59:18 EET 2011
+#Updated at Sun Dec 18 17:36:27 EET 2011
+#Sun Dec 18 17:36:27 EET 2011
 application_name=BorderGuard
+label_adminyksuseliigiredaktor_index=Admin Yksuse Liigi Redaktor View
 label_itcollege_team09_entities_adminalluvus=Admin Alluvus
 label_itcollege_team09_entities_adminalluvus_adminyksus=Adminyksus
 label_itcollege_team09_entities_adminalluvus_alamadminyksus=Alamadminyksus
@@ -89,6 +90,7 @@ menu_item_adminyksus_list_label=Admin Yksuses
 menu_item_adminyksus_new_label=Admin Yksus
 menu_item_adminyksuseliik_list_label=Admin Yksuse Liiks
 menu_item_adminyksuseliik_new_label=Admin Yksuse Liik
+menu_item_controller__adminyksuseliigiredaktorindex_id_label=Admin Yksuse Liigi Redaktor View
 menu_item_controller__popupindex_id_label=Pop Up Controller View
 menu_item_controller__testdataindex_id_label=Test Data Controller View
 menu_item_vaeosa_list_label=Vaeosas

src/main/webapp/WEB-INF/tags/form/createLiik.tagx

@@ -0,0 +1,106 @@
+<jsp:root xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	xmlns:util="urn:jsptagdir:/WEB-INF/tags/util"
+	xmlns:form="http://www.springframework.org/tags/form"
+	xmlns:jsp="http://java.sun.com/JSP/Page"
+	xmlns:spring="http://www.springframework.org/tags" version="2.0">
+	<jsp:output omit-xml-declaration="yes" />
+
+	<jsp:directive.attribute name="id" 
+	type="java.lang.String"
+		required="true" rtexprvalue="true"
+		description="The identifier for this tag (do not change!)" />
+
+	<jsp:directive.attribute name="modelAttribute" 
+	type="java.lang.String"
+		required="true" rtexprvalue="true"
+		description="The name of the model attribute for form binding" />
+
+	<jsp:directive.attribute name="path" 
+	type="java.lang.String"
+		required="true" rtexprvalue="true"
+		description="Specify the relative URL path (wit leading /)" />
+
+	<jsp:directive.attribute name="compositePkField"
+		type="java.lang.String" required="false" rtexprvalue="true"
+		description="The field name of the composite primary key 
+		             (only used if a composite PK is present in the 
+		              form backing object)" />
+
+	<jsp:directive.attribute name="multipart" 
+	type="java.lang.Boolean"
+		required="false" rtexprvalue="true"
+		description="Indicate if this is a multipart form (default: false)" />
+
+	<jsp:directive.attribute name="label" 
+	type="java.lang.String"
+		required="false" rtexprvalue="true"
+		description="The label used for this object, will default 
+		             to a message bundle if not supplied" />
+
+	<jsp:directive.attribute name="render" 
+	type="java.lang.Boolean"
+		required="false" rtexprvalue="true"
+		description="Indicate if the contents of this tag and 
+		             all enclosed tags should be rendered (default 'true')" />
+
+	<jsp:directive.attribute name="openPane" 
+	type="java.lang.Boolean"
+		required="false" rtexprvalue="true"
+		description="Control if the title pane is opened or closed 
+		                                by default (default: true)" />
+
+	<jsp:directive.attribute name="z" 
+	type="java.lang.String"
+		required="false"
+		description="Used for checking if element has been modified 
+		              (to recalculate simply provide empty string value)" />
+
+	<c:if test="${empty render or render}">
+		<c:if test="${empty label}">
+			<spring:message
+				code="label_${fn:toLowerCase(fn:substringAfter(id,'_'))}"
+				var="label" htmlEscape="false" />
+		</c:if>
+		<c:set var="enctype" value="application/x-www-form-urlencoded" />
+		<c:if test="${multipart}">
+			<c:set var="enctype" value="multipart/form-data" />
+		</c:if>
+		<spring:message arguments="${label}" code="entity_create"
+			var="title_msg" htmlEscape="false" />
+		<util:panel id="${id}" title="${title_msg}" openPane="${openPane}">
+		<spring:url value="${path}" var="form_url" />
+
+
+			<form:form action="${fn:escapeXml(form_url)}" method="POST"
+				modelAttribute="${modelAttribute}" enctype="${enctype}"
+				onsubmit="encodePk()">
+				<form:errors cssClass="errors" delimiter="&lt;p/&gt;" />
+				<c:if test="${not empty compositePkField}">
+					<form:hidden id="_${fn:escapeXml(compositePkField)}_id"
+						path="${fn:escapeXml(compositePkField)}" />
+		<script type="text/javascript">
+          <![CDATA[
+            dojo.require("dojox.encoding.base64");
+            function encodePk() {
+              var obj = new Object();
+              dojo.query("input[name^=\"${compositePkField}.\"]").forEach(function(node, index, nodelist){
+                obj[node.name.substring('${compositePkField}'.length + 1)] = node.value;
+              });
+              var json = dojo.toJson(obj);
+              var tokArr = [];
+              for (var i = 0; i < json.length; i++) {
+                tokArr.push(json.charCodeAt(i));
+              }
+              var encoded = dojox.encoding.base64.encode(tokArr);
+              dojo.byId('_${fn:escapeXml(compositePkField)}_id').value = encoded;
+            }
+          ]]>
+          </script>
+				</c:if>
+				<jsp:doBody />
+
+			</form:form>
+		</util:panel>
+	</c:if>
+</jsp:root>