Validace Budov.

src/main/java/info/bukova/isspst/data/Building.java

@@ -3,6 +3,10 @@ package info.bukova.isspst.data;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.Table;
+import javax.validation.constraints.NotNull;
+
+import org.hibernate.validator.constraints.NotBlank;
+import org.hibernate.validator.constraints.NotEmpty;
 
 @Entity
 @Table(name="BUILDING")
@@ -22,6 +26,9 @@ public class Building extends BaseData implements DataModel {
 	/**
 	 * @return the code
 	 */
+	@NotBlank(message = "${labels.BuildingsFormCodeConstr}")
+	@NotNull(message = "${labels.BuildingsFormCodeConstr}")
+	@NotEmpty(message = "${labels.BuildingsFormCodeConstr}")
 	public String getCode() {
 		return code;
 	}

src/main/java/info/bukova/isspst/services/buildings/BuildingService.java

@@ -1,6 +1,7 @@
-package info.bukova.isspst.services;
+package info.bukova.isspst.services.buildings;
 
 import info.bukova.isspst.data.Building;
+import info.bukova.isspst.services.Service;
 
 public interface BuildingService  extends Service<Building> {
 

src/main/java/info/bukova/isspst/services/buildings/BuildingServiceImpl.java

@@ -1,6 +1,7 @@
-package info.bukova.isspst.services;
+package info.bukova.isspst.services.buildings;
 
 import info.bukova.isspst.data.Building;
+import info.bukova.isspst.services.AbstractService;
 
 public class BuildingServiceImpl  extends AbstractService<Building> implements BuildingService{
 

src/main/java/info/bukova/isspst/ui/BuildingList.java

@@ -1,7 +1,7 @@
 package info.bukova.isspst.ui;
 
 import info.bukova.isspst.data.Building;
-import info.bukova.isspst.services.BuildingService;
+import info.bukova.isspst.services.buildings.BuildingService;
 
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.select.annotation.WireVariable;

src/main/java/info/bukova/isspst/ui/ListViewModel.java

@@ -98,7 +98,6 @@ public class ListViewModel<T extends DataModel> {
 		this.editBean = edit;
 	}
 
-	
 	@Command
 	@NotifyChange({ "filter", "dataList", "dataBean" })
 	public void filter() {
@@ -159,8 +158,9 @@ public class ListViewModel<T extends DataModel> {
 	@Command
 	@NotifyChange({ "dataList", "dataBean" })
 	public void delete() {
-		Messagebox.show("Opravdu smazat?", "Smazat záznam", Messagebox.YES|Messagebox.NO,
+		Messagebox.show("Opravdu smazat?", "Smazat záznam", Messagebox.YES
-			    Messagebox.QUESTION, new EventListener<Event>() {
+				| Messagebox.NO, Messagebox.QUESTION,
+				new EventListener<Event>() {
 
 					@Override
 					public void onEvent(Event evt) throws Exception {
@@ -169,10 +169,14 @@ public class ListViewModel<T extends DataModel> {
 								service.delete(dataBean);
 								dataList.remove(dataBean);
 								dataBean = null;
-								BindUtils.postNotifyChange(null, null, ListViewModel.this, "dataList");
+								BindUtils.postNotifyChange(null, null,
-								BindUtils.postNotifyChange(null, null, ListViewModel.this, "dataBean");
+										ListViewModel.this, "dataList");
+								BindUtils.postNotifyChange(null, null,
+										ListViewModel.this, "dataBean");
 							} catch (DataIntegrityViolationException e) {
-								Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK, Messagebox.ERROR);
+								Messagebox.show("Chyba při mazání záznamu",
+										"Chyba", Messagebox.OK,
+										Messagebox.ERROR);
 							}
 						}
 					}
@@ -188,16 +192,17 @@ public class ListViewModel<T extends DataModel> {
 			dataList.remove(dataBean);
 			dataBean = null;
 		} catch (DataIntegrityViolationException e) {
-			Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK, Messagebox.ERROR);
+			Messagebox.show("Chyba při mazání záznamu", "Chyba", Messagebox.OK,
+					Messagebox.ERROR);
 		}
 	}
 
 	@GlobalCommand
 	@NotifyChange({ "dataList", "dataBean" })
 	public void refresh() {
-		/*if (editBean != null && !editBean.isValid()) {
+		if (editBean != null && !editBean.isValid()) {
 			return;
-		}*/
+		}
 		if (editBean.getCreated() == null) {
 			return;
 		}

src/main/webapp/WEB-INF/jdbc.properties

@@ -1,5 +1,5 @@
 jdbc.driverClassName=com.mysql.jdbc.Driver
 jdbc.dialect=org.hibernate.dialect.MySQLDialect
-jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst
+jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst?characterEncoding=UTF-8
 jdbc.username=root
 jdbc.password=xsacfgd

src/main/webapp/WEB-INF/spring/root-context.xml

@@ -1,11 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
+<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p" xmlns:tx="http://www.springframework.org/schema/tx" xmlns:aop="http://www.springframework.org/schema/aop" xmlns:security="http://www.springframework.org/schema/security" xmlns:context="http://www.springframework.org/schema/context"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns:p="http://www.springframework.org/schema/p"
-	xmlns:tx="http://www.springframework.org/schema/tx"
-	xmlns:aop="http://www.springframework.org/schema/aop"
-	xmlns:security="http://www.springframework.org/schema/security"
-	xmlns:context="http://www.springframework.org/schema/context"
 	xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
 		http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx.xsd
 		http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd
@@ -17,19 +11,12 @@
 	<context:annotation-config />
 	<context:component-scan base-package="info.bukova.isspst,org.zkoss.spring.beans.zkcomponents"></context:component-scan>
 
-	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" 
+	<bean class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" id="propertyConfigurer" p:location="/WEB-INF/jdbc.properties" />
-		id="propertyConfigurer" 
-		p:location="/WEB-INF/jdbc.properties"/>
 
 	<!-- Database -->
-	<bean id="dataSource"
+	<bean id="dataSource" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close" p:driverClassName="${jdbc.driverClassName}" p:url="${jdbc.databaseurl}" p:username="${jdbc.username}" p:password="${jdbc.password}"></bean>
-        class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"
+
-        p:driverClassName="${jdbc.driverClassName}"
+	<bean id="sessionFactory" class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
-        p:url="${jdbc.databaseurl}" p:username="${jdbc.username}"
-        p:password="${jdbc.password}"></bean>
-        
-	<bean id="sessionFactory"
-        class="org.springframework.orm.hibernate4.LocalSessionFactoryBean">
 		<property name="dataSource" ref="dataSource"></property>
 		<property name="configLocation">
 			<value>classpath:hibernate.cfg.xml</value>
@@ -44,8 +31,7 @@
 	</bean>
 
 	<tx:annotation-driven transaction-manager="transactionManager" />
-    <bean id="transactionManager"
+	<bean id="transactionManager" class="org.springframework.orm.hibernate4.HibernateTransactionManager">
-        class="org.springframework.orm.hibernate4.HibernateTransactionManager">
 		<property name="sessionFactory" ref="sessionFactory"></property>
 	</bean>
 
@@ -55,8 +41,7 @@
 	<security:http auto-config="true">
 		<security:intercept-url pattern="/app/**" access="ROLE_USER, ROLE_ADMIN" />
 		<security:intercept-url pattern="/admin/**" access="ROLE_ADMIN" />
-		<security:form-login login-page="/login.zhtml"
+		<security:form-login login-page="/login.zhtml" authentication-failure-handler-ref="loginFail" />
-			authentication-failure-handler-ref="loginFail"/>
 		<security:http-basic />
 		<security:logout invalidate-session="true" />
 	</security:http>
@@ -108,8 +93,9 @@
 		<property name="dao" ref="roleDao" />
 	</bean>
 
-	<bean id="buildingService" class="info.bukova.isspst.services.BuildingServiceImpl">
+	<bean id="buildingService" class="info.bukova.isspst.services.buildings.BuildingServiceImpl">
 		<property name="dao" ref="buildingDao" />
+		<property name="validator" ref="validator" />
 	</bean>
 
 	<bean id="adbService" class="info.bukova.isspst.services.addressbook.AdbServiceImpl">

src/main/webapp/app/formButtons.zul

@@ -1,4 +1,9 @@
 <?page title="buttons" contentType="text/html;charset=UTF-8"?>
 <zk>
-<button image="/img/save.png" label="Uložit" onClick="@command('save', window=editWin) @global-command('refresh')" sclass="nicebutton" /><button image="~./zul/img/misc/drag-disallow.png" label="Zrušit" onClick="editWin.detach()" sclass="nicebutton"/>
+	<vlayout>
+		<div hflex="max" align="right">
+			<button image="~./zul/img/misc/drag-disallow.png" label="${labels.ButtonStorno}" onClick="editWin.detach()" sclass="nicebutton" />
+			<button image="/img/save.png" label="${labels.ButtonSave}" onClick="@command('save', window=editWin) @global-command('refresh')" sclass="nicebutton" />
+		</div>
+	</vlayout>
 </zk>

src/main/webapp/buildings/buildingForm.zul

@@ -8,12 +8,16 @@
 				<columns>
 					<column align="right" hflex="min" />
 					<column />
+					<column />
 				</columns>
 				<rows>
 					<row>
 						<cell sclass="row-title">${labels.BuildingsFormCode} :</cell>
 						<cell>
-							<textbox constraint="no empty: ${labels.BuildingsFormCodeConstr}" width="200px" value="@bind(vm.dataBean.code)" />
+							<textbox width="200px" value="@bind(vm.dataBean.code)" />
+						</cell>
+						<cell>
+							<label visible="true" value="@load(vm.errMessages['code'])" style="color:red" />
 						</cell>
 					</row>
 					<row>