From b79653271dc80c4c4a4ebc489b19b338487c57ec Mon Sep 17 00:00:00 2001
From: Mailis Toompuu <maiilu@hotmail.com>
Date: Sun, 18 Dec 2011 18:08:33 +0200
Subject: [PATCH 1/2] =?UTF-8?q?Lisatud=20Admin=C3=BCksuse=20liigiredaktori?=
 =?UTF-8?q?=20vaate=20disain.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Selleks on lisatud
kontroller AdminyksuseLiigiRedaktor,
kodeeritud selle kontrolleri view.jspx ja
lisatud uus tagLibrary createLiik.tagx.
---
 bin                                           |   1 -
 .../team09/web/AdminYksuseLiigiRedaktor.java  | 111 ++++++
 .../WEB-INF/i18n/application.properties       |   6 +-
 .../webapp/WEB-INF/tags/form/createLiik.tagx  | 106 ++++++
 .../views/adminyksuseliigiredaktor/index.jspx | 325 ++++++++++++++++++
 .../views/adminyksuseliigiredaktor/views.xml  |   7 +
 src/main/webapp/WEB-INF/views/menu.jspx       |   1 +
 7 files changed, 554 insertions(+), 3 deletions(-)
 delete mode 160000 bin
 create mode 100644 src/main/java/itcollege/team09/web/AdminYksuseLiigiRedaktor.java
 create mode 100644 src/main/webapp/WEB-INF/tags/form/createLiik.tagx
 create mode 100644 src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/index.jspx
 create mode 100644 src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/views.xml

diff --git a/bin b/bin
deleted file mode 160000
index b2dde2e..0000000
--- a/bin
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b2dde2ed03a1519e54cfa045d2ca1cf02983b66e
diff --git a/src/main/java/itcollege/team09/web/AdminYksuseLiigiRedaktor.java b/src/main/java/itcollege/team09/web/AdminYksuseLiigiRedaktor.java
new file mode 100644
index 0000000..d0db1ac
--- /dev/null
+++ b/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;
+    }*/
+}
diff --git a/src/main/webapp/WEB-INF/i18n/application.properties b/src/main/webapp/WEB-INF/i18n/application.properties
index 4ce177c..b44b767 100644
--- a/src/main/webapp/WEB-INF/i18n/application.properties
+++ b/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
diff --git a/src/main/webapp/WEB-INF/tags/form/createLiik.tagx b/src/main/webapp/WEB-INF/tags/form/createLiik.tagx
new file mode 100644
index 0000000..49963ea
--- /dev/null
+++ b/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>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/index.jspx b/src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/index.jspx
new file mode 100644
index 0000000..3ca050d
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/index.jspx
@@ -0,0 +1,325 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<div xmlns:page="urn:jsptagdir:/WEB-INF/tags/form"
+    xmlns:springform="http://www.springframework.org/tags/form"
+    xmlns:c="http://java.sun.com/jsp/jstl/core"
+	xmlns:fn="http://java.sun.com/jsp/jstl/functions"
+	xmlns:field="urn:jsptagdir:/WEB-INF/tags/form/fields"
+	xmlns:form="urn:jsptagdir:/WEB-INF/tags/form"
+	xmlns:liikForm="urn:jsptagdir:/WEB-INF/tags/form"
+	xmlns:jsp="http://java.sun.com/JSP/Page"
+	xmlns:spring="http://www.springframework.org/tags"
+	xmlns:util="urn:jsptagdir:/WEB-INF/tags/util"
+	xmlns:table="urn:jsptagdir:/WEB-INF/tags/form/fields" version="2.0">
+	<jsp:directive.page contentType="text/html;charset=UTF-8" />
+	<jsp:output omit-xml-declaration="yes" />
+	<!-- <spring:message code="label_adminyksuseliigiredaktor_index"
+		htmlEscape="false" var="title" /> -->
+
+
+
+
+	<div style="float: left; width: 600px;">
+
+		<!-- Allja:rgnevas on ta:pselt yhesugused create-vormikuvamised, ainult 
+     modelAttribute on erinev. Teist korda alluvate loomise juurest naastes kuvatakse
+     ta:idetud va:ljad. ModelAttribute' i saadab siia createform klassist AdminYksuseLiigiRedaktorController
+     ja sellele oma korda saadab selle v6imalike alluvuste controlleri POST-meetod-->
+		<c:choose>
+			<!-- kui lehele tullakse mitmendat korda -->
+			<c:when test="${!empty tagasiLiik}">
+
+				<form:createLiik id="fc_itcollege_team09_entities_AdminYksuseLiik"
+					modelAttribute="tagasiLiik" path="/adminyksuseliiks"
+					render="${empty dependencies}" z="D+W8anT89lpLZmyNMTBWSKkT1jA=">
+					<field:input field="kood"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_kood" max="10"
+						required="true" z="K0NTDrpSSAuzXwxUteU/fLkz6bM=" />
+					<field:input field="nimetus"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_nimetus"
+						required="true" z="LkMyISBKCacxuQLlw55RWttfSq4=" />
+
+
+
+					<field:textarea field="kommentaar"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_kommentaar"
+						z="Xa2bTIbRGi+k8YXM1RVGOVnvlYg=" />
+
+					<field:select label="Allub" field="ylemyksused"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_ylemyksused"
+						items="${riigi_admin_yksuse_liiks_piiks}" itemLabel="nimetus"
+						itemValue="id" path="/riigi_admin_yksuse_liiks" />
+
+
+
+					<field:datetime
+						dateTimePattern="${adminYksuseLiik_alates_date_format}"
+						field="alates"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_alates"
+						required="true" z="2EDRw/3tB460zLfWV1WQT1tdbcI=" />
+					<field:datetime
+						dateTimePattern="${adminYksuseLiik_kuni_date_format}" field="kuni"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_kuni"
+						required="true" z="CDxFM3o6bbcXwapsOb6z3zU4JuE=" />
+
+
+
+
+
+					<!-- na:itab olemasolevaid alluvusi -->
+					<div
+						style="float: right; margin-right: 15px; margin-left: 25px; margin-top: -285px;">
+
+						<table style="bgcolor: #D7D7D7; width: 200px;">
+							<th colspan="2" style="height: 30px;"><c:out
+									value="Alluvad:" /></th>
+							<c:choose>
+								<c:when test="${!empty voimalikudAlluvad}">
+									<c:forEach items="${voimalikudAlluvad}" var="alluvad">
+										<tr style="padding: 5px; height: 30px;">
+											<td style="width: 50%;"><c:out
+													value="${alluvad.voimalik_alluv_liik.nimetus}" /></td>
+											<td style="width: 50%;">
+												<!-- 		EEMALDA_NUPP			 --> <spring:message code="button_add"
+													var="save_button" htmlEscape="false" /> <input
+												id="proceed" type="submit" name="eemalda${alluvad.id}"
+												value="Eemalda" />
+
+
+
+
+											</td>
+										</tr>
+									</c:forEach>
+									<tr colspan="2" style="padding: 5px; height: 30px;">
+										<td>...</td>
+									</tr>
+								</c:when>
+								<c:otherwise>
+									<tr colspan="2" style="padding: 5px; height: 30px;">
+										<td>...</td>
+									</tr>
+								</c:otherwise>
+							</c:choose>
+						</table>
+
+
+
+
+
+
+
+						<div style="clear: both;" />
+
+
+
+						<!-- NUPP -->
+						<!-- deployd resourcers > webapp > styles-->
+						<!-- styleSheet=resources/styles/alt.css -->
+						<!-- tegin selle vormi jaoks uue form-tagi createLiik, kust on nupp a:rra koritatud ja siia toodud, 
+                             et seda saak paigutada kuhuvaja -->
+						<div class="submit" id="${fn:escapeXml(id)}_submit">
+
+							<spring:message code="button_add" var="save_button"
+								htmlEscape="false" />
+
+							<input id="proceed" type="submit" name="lisa" value="Lisa" />
+
+						</div>
+
+					</div>
+					<!-- endof olemasolevad alluvad -->
+
+					<div style="clear: both;" />
+
+
+
+
+
+
+
+					<!-- alumised nupud -->
+
+					<div id="containerf"
+						style="position: absolute; margin-top: 20px; margin-bottom: 20px;">
+						<!-- SALVESTA -->
+
+						<div class="submit" id="${fn:escapeXml(id)}_submit">
+							<spring:message code="button_add" var="save_button"
+								htmlEscape="false" />
+							<input id="proceed" type="submit" name="salvesta2"
+								value="Salvesta2" />
+						</div>
+
+						<!-- LOOBU -->
+						<div class="submit"
+							style="margin-top: 122px; margin-left: -125px;">
+							<!-- deployd resourcers > webapp > styles-->
+							<form action="http://localhost:8080/Piirivalve">
+								<div id="${fn:escapeXml(id)}_submit">
+									<spring:message code="button_cancel" var="cancel_button"
+										htmlEscape="false" />
+									<input id="proceed" type="submit"
+										value="${fn:escapeXml(cancel_button)}" />
+								</div>
+							</form>
+						</div>
+					</div>
+					<!-- end of containerf -->
+
+
+					</form:createLiik>
+			</c:when>
+ 
+			<!-- kui lehele tullakse esimest korda -->
+			<c:otherwise>
+				
+
+					<form:createLiik id="fc_itcollege_team09_entities_AdminYksuseLiik"
+					modelAttribute="riigi_admin_yksuse_liik" path="/adminyksuseliiks"
+					render="${empty dependencies}" z="D+W8anT89lpLZmyNMTBWSKkT1jA=">
+					<field:input field="kood"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_kood"
+						max="10" required="true" z="K0NTDrpSSAuzXwxUteU/fLkz6bM=" />
+					<field:input field="nimetus"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_nimetus"
+						required="true" z="LkMyISBKCacxuQLlw55RWttfSq4=" />
+
+
+
+					<field:textarea field="kommentaar"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_kommentaar"
+						z="Xa2bTIbRGi+k8YXM1RVGOVnvlYg=" />
+
+					<field:select label="Allub" 
+					    field="ylemyksused" 
+					    id="c_itcollege_team09_entities_AdminYksuseLiik_ylemyksused"
+						items="${riigi_admin_yksuse_liiks_piiks}" itemLabel="nimetus"
+						itemValue="id" path="/riigi_admin_yksuse_liiks" />
+
+
+
+					<field:datetime
+						dateTimePattern="${adminYksuseLiik_alates_date_format}"
+						field="alates"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_alates"
+						required="true" z="2EDRw/3tB460zLfWV1WQT1tdbcI=" />
+					<field:datetime
+						dateTimePattern="${adminYksuseLiik_kuni_date_format}"
+						field="kuni"
+						id="c_itcollege_team09_entities_AdminYksuseLiik_kuni"
+						required="true" z="CDxFM3o6bbcXwapsOb6z3zU4JuE=" />
+
+
+
+
+
+					<!-- na:itab olemasolevaid alluvusi -->
+					<div
+						style="float: right; margin-right: 15px; margin-left: 25px; margin-top: -285px;">
+
+						<table style="bgcolor: #D7D7D7; width: 200px;">
+							<th colspan="2" style="height: 30px;"><c:out
+									value="Alluvad:" /></th>
+							<c:choose>
+								<c:when test="${!empty voimalikudAlluvad}">
+									<c:forEach items="${voimalikudAlluvad}" var="alluvad">
+										<tr style="padding: 5px; height: 30px;">
+											<td style="width: 50%;"><c:out
+													value="${alluvad.voimalik_alluv_liik.nimetus}" /></td>
+											<td style="width: 50%;">
+												<!-- 		EEMALDA_NUPP			 --> <spring:message code="button_add"
+													var="save_button" htmlEscape="false" /> <input
+												id="proceed" type="submit" name="eemalda${alluvad.id}" value="Eemalda" />
+
+
+
+
+											</td>
+										</tr>
+									</c:forEach>
+									<tr colspan="2" style="padding: 5px; height: 30px;">
+										<td>...</td>
+									</tr>
+								</c:when>
+								<c:otherwise>
+									<tr colspan="2" style="padding: 5px; height: 30px;">
+										<td>...</td>
+									</tr>
+								</c:otherwise>
+							</c:choose>
+						</table>
+
+
+
+
+
+
+
+						<div style="clear: both;" />
+
+
+
+						<!-- NUPP -->
+						<!-- deployd resourcers > webapp > styles-->
+						<!-- styleSheet=resources/styles/alt.css -->
+						<!-- tegin selle vormi jaoks uue form-tagi createLiik, kust on nupp a:rra koritatud ja siia toodud, 
+                             et seda saak paigutada kuhuvaja -->
+						<div class="submit" id="${fn:escapeXml(id)}_submit">
+
+							<spring:message code="button_add" var="save_button"
+								htmlEscape="false" />
+
+							<input id="proceed" type="submit" name="lisa" value="Lisa" />
+
+						</div>
+
+					</div>
+					<!-- endof olemasolevad alluvad -->
+
+					<div style="clear: both;" />
+
+
+
+
+
+<!-- alumised nupud -->
+<div id = "containerf" style="position: absolute; margin-top: 20px; margin-bottom: 20px;">
+<!-- SALVESTA -->
+
+					
+					<div class="submit" id="${fn:escapeXml(id)}_submit">
+
+							<spring:message code="button_add" var="save_button"
+								htmlEscape="false" />
+
+							<input id="proceed" type="submit" name="salvesta" value="Salvesta" />
+
+						</div>
+					
+                    
+<!-- LOOBU -->
+	    <div class="submit" style="margin-top: 92px; margin-left: -125px;">
+						<!-- deployd resourcers > webapp > styles-->
+						<form action="http://localhost:8080/Piirivalve">
+							<div class="submit" id="${fn:escapeXml(id)}_submit">
+								<spring:message code="button_cancel" var="cancel_button"
+									htmlEscape="false" />
+								<input id="proceed" type="submit" 
+									value="${fn:escapeXml(cancel_button)}" />
+							</div>
+						</form>
+					</div>
+</div>  <!-- end of containerf -->                 
+				</form:createLiik>
+			</c:otherwise>
+		</c:choose>
+
+	</div>
+
+	<div style="clear: both;" />
+	
+	
+	
+		
+		<div style="clear: both;" />
+</div>
diff --git a/src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/views.xml b/src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/views.xml
new file mode 100644
index 0000000..4a6ac8f
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/adminyksuseliigiredaktor/views.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!DOCTYPE tiles-definitions PUBLIC "-//Apache Software Foundation//DTD Tiles Configuration 2.1//EN" "http://tiles.apache.org/dtds/tiles-config_2_1.dtd">
+<tiles-definitions>
+    <definition extends="default" name="adminyksuseliigiredaktor/index">
+        <put-attribute name="body" value="/WEB-INF/views/adminyksuseliigiredaktor/index.jspx"/>
+    </definition>
+</tiles-definitions>
diff --git a/src/main/webapp/WEB-INF/views/menu.jspx b/src/main/webapp/WEB-INF/views/menu.jspx
index 42d7878..d7e7afd 100644
--- a/src/main/webapp/WEB-INF/views/menu.jspx
+++ b/src/main/webapp/WEB-INF/views/menu.jspx
@@ -29,6 +29,7 @@
         </menu:category>
         <menu:category id="c_controller" z="nj8Dm3hojIyIEyPkwE1UMDIs+K8=">
             <menu:item id="i_controller__testdataindex_id" messageCode="global_generic" url="/testdata/index" z="aH4xZ2ulNlW18J2jbWZwp6xiuQw="/>
+            <menu:item id="i_controller__adminyksuseliigiredaktorindex_id" messageCode="global_generic" url="/adminyksuseliigiredaktor/index" z="WVKyxX9PTTpUZ9nrJXy4zZdfUHw="/>
         </menu:category>
     </menu:menu>
 </div>

From 33816bdb279997f8e0e7441b1626830ed3e5d091 Mon Sep 17 00:00:00 2001
From: Mailis Toompuu <maiilu@hotmail.com>
Date: Sun, 18 Dec 2011 22:15:42 +0200
Subject: [PATCH 2/2] =?UTF-8?q?Parandused:=201.=20baseEntity-s=20Piirivalv?=
 =?UTF-8?q?e.java:=20kommentaar=20ei=20tohtinud=20baasidisaini=20j=C3=A4rg?=
 =?UTF-8?q?i=20olla=20@NotNull=20=20=20=20=20//@NotNull=20=20=20=20=20priv?=
 =?UTF-8?q?ate=20String=20kommentaar;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

2.
Alates kuupäeva kirjutasin beani AdminYksuseLiik sisse, et
seda ei peaks käsitis täitma:

    @NotNull
    @DateTimeFormat(style="M-")
    private Date alates = new Date();
---
 src/main/java/itcollege/team09/entities/AdminYksuseLiik.java | 4 +++-
 src/main/java/itcollege/team09/entities/Piirivalve.java      | 5 ++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java b/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java
index 98f6f5f..fa3f3aa 100644
--- a/src/main/java/itcollege/team09/entities/AdminYksuseLiik.java
+++ b/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-")
diff --git a/src/main/java/itcollege/team09/entities/Piirivalve.java b/src/main/java/itcollege/team09/entities/Piirivalve.java
index 0df5c03..c324085 100644
--- a/src/main/java/itcollege/team09/entities/Piirivalve.java
+++ b/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;
 	}