Merge branch 'master' of https://git.bukova.info/repos/git/isspst

src/main/webapp/WEB-INF/locales/zk-label.properties

@@ -69,6 +69,9 @@ UsersGridColumnPersonalID=Osobní číslo
 UsersGridColumnFirstName=Jméno
 UsersGridColumnSureName=Příjmení
 
+AgendaMaterial=Materiál
+MaterialFormTitle=Materiál
+
 ButtonStorno=Storno
 ButtonSave=Uložit
 

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

@@ -120,6 +120,10 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
     
+    <bean id="materialDao" class="info.bukova.isspst.dao.jpa.MaterialDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
     <!-- Business logic -->
     <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
     
@@ -171,5 +175,10 @@
 	<bean id="permissionService" class="info.bukova.isspst.services.users.PermissionServiceImpl">
 		<property name="dao" ref="permissionDao"/>
 	</bean>
+	
+	<bean id="materialService" class="info.bukova.isspst.services.material.MaterialServiceImpl">
+		<property name="dao" ref="materialDao"/>
+		<property name="validator" ref="validator"/>
+	</bean>
 		
 </beans>

src/main/webapp/app/navigation.zul

@@ -33,6 +33,7 @@
 				<menuitem label="Střediska" href="/admin/users" disabled="${not sec:isAllGranted('ROLE_ADMIN')}"/>
 				<menuitem label="${labels.AgendaBuildings}" href="/buildings" disabled="${not sec:isAllGranted('PERM_READ_BUILDINGS')}" />
 				<menuitem label="Místnosti" href="/admin/users"/>
+				<menuitem label="${labels.AgendaMaterial}" href="/material" disabled="${not sec:isAllGranted('PERM_READ_MATERIAL')}"/>
 				<menuitem label="Dodavatelé" href="/admin/addressbook" disabled="${not sec:isAllGranted('PERM_READ_ADDRESSBOOK')}"/>
 			</menubar>
 		</tabpanel>

src/main/webapp/material/index.zul

@@ -0,0 +1,10 @@
+<?page title="${labels.AgendaMaterial}" contentType="text/html;charset=UTF-8"?>
+<zk>
+
+<zscript>
+	String gridZul = "material.zul";
+</zscript>
+
+<include src="/app/template.zhtml"/>
+
+</zk>

src/main/webapp/material/material.zul

@@ -0,0 +1,58 @@
+<?page title="${labels.AgendaMaterial}" contentType="text/html;charset=UTF-8"?>
+<zk>
+	<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
+	<window border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.material.MaterialList')">
+		<caption zclass="form-caption" label="${labels.AgendaMaterial}" />
+		<include src="/app/toolbar.zul" />
+
+		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)" height="500px">
+			<listhead menupopup="auto">
+				<listheader label="${labels.code}" sort="czech(code)" width="10%" />
+				<listheader label="${labels.name}" sort="czech(name)" width="30%" />
+				<listheader label="${labels.description}" sort="czech(description)" width="60%" />
+			</listhead>
+			
+			<auxhead sclass="category-center" visible="@load(vm.filter)">
+				 <auxheader>
+					<div sclass="find-grid-cell">
+						<div sclass="find-grid-divtextbox">
+							<textbox value="@bind(vm.filterTemplate.code)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+						</div>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+				<auxheader>
+					<div sclass="find-grid-cell">
+						<div sclass="find-grid-divtextbox">
+							<textbox value="@bind(vm.filterTemplate.name)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+						</div>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+				<auxheader>
+					<div sclass="find-grid-cell">
+						<div sclass="find-grid-divtextbox">
+							<textbox value="@bind(vm.filterTemplate.description)" instant="true" onChange="@command('doFilter')" sclass="find-grid-textbox" />
+						</div>
+						<div sclass="find-grid-img">
+							<image src="/img/funnel.png" />
+						</div>
+					</div>
+				</auxheader>
+			</auxhead> 
+			
+			<template name="model">
+				<listitem>
+					<listcell label="@load(each.code)" />
+					<listcell label="@load(each.name)" />
+					<listcell label="@load(each.description)" />
+				</listitem>
+			</template>
+		</listbox>
+
+	</window>
+</zk>

src/main/webapp/material/materialForm.zul

@@ -0,0 +1,36 @@
+<?page title="${labels.MaterialFormTitle}" contentType="text/html;charset=UTF-8"?>
+<zk>
+	<window id="editWin" closable="true" border="normal" position="center" apply="org.zkoss.bind.BindComposer" 
+		viewModel="@id('vm') @init('info.bukova.isspst.ui.material.MaterialForm')">
+		<caption src="/img/material.png" zclass="form-caption" label="${labels.MaterialFormTitle}" />
+		<vlayout>
+			<grid hflex="min">
+				<columns>
+					<column align="right" hflex="min" />
+					<column />
+				</columns>
+				<rows>
+					<row>
+						<cell sclass="row-title">${labels.code} :</cell>
+						<cell>
+							<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.code)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.name} :</cell>
+						<cell>
+							<textbox id="name" width="200px" value="@bind(vm.dataBean.name)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.description} :</cell>
+						<cell>
+							<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
+						</cell>
+					</row>
+				</rows>
+			</grid>
+			<include src="/app/formButtons.zul" />
+		</vlayout>
+	</window>
+</zk>