Vložen bázový kód pro agendu Požadavky / Aktivní.

refs #100

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

@@ -8,8 +8,9 @@ MenuSettings=Nastavení
 MenuAdministration=Administrace
 MenuUser=Uživatel
 
-AgendaMyRequirements=Aktuální
-AgendaRequirementsHistory=Ukončené
+AgendaActRequirements=Aktuální požadavky
+AgendaRequirementsHistory=Ukončené požadavky
+RequirementsFormTitle="Požadavek"
 
 AgendaMyOrders=Aktuální
 AgendaOrdersHistory=Ukončené

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

@@ -127,6 +127,14 @@
     <bean id="commissionDao" class="info.bukova.isspst.dao.jpa.WorkgroupDaoJPA">
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
+
+    <bean id="requirementDao" class="info.bukova.isspst.dao.jpa.RequirementDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+
+    <bean id="numericSeriesDao" class="info.bukova.isspst.dao.jpa.NumberSeriesDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
     
     <!-- Business logic -->
     <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
@@ -190,4 +198,13 @@
 		<property name="validator" ref="validator"/>
 	</bean>
 		
+	<bean id="requirementService" class="info.bukova.isspst.services.requirement.RequirementServiceImpl">
+		<property name="dao" ref="requirementDao" />
+		<property name="validator" ref="validator" />
+	</bean>
+
+	<bean id="numericSeriesService" class="info.bukova.isspst.services.numberseries.NumberSeriesServiceImpl">
+		<property name="dao" ref="numericSeriesDao" />
+		<property name="validator" ref="validator" />
+	</bean>
 </beans>

src/main/webapp/app/navigation.zul

@@ -16,7 +16,7 @@
 	<tabpanels hflex="1">
 		<tabpanel>
 			<menubar orient="vertical">
-				<menuitem label="${labels.AgendaMyRequirements}" href="/requirements/actual" />
+				<menuitem label="${labels.AgendaActRequirements}" href="/requirements/actual" />
 				<menuitem label="${labels.AgendaRequirementsHistory}" href="/requirements/history" />
 			</menubar>
 		</tabpanel>

src/main/webapp/requirements/actual/index.zul

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

src/main/webapp/requirements/actual/requirements.zul

@@ -0,0 +1,58 @@
+<?page title="${labels.AgendaActRequirements}" 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.requirement.RequirementList')">
+		<caption zclass="form-caption" label="${labels.AgendaActRequirements}" />
+		<include src="/app/toolbar.zul" />
+
+		<listbox model="@load(vm.dataList)" selectedItem="@bind(vm.dataBean)">
+			<listhead menupopup="auto">
+				<listheader label="${labels.BuildingsGridColumnCode}" sort="czech(numser)" width="10%" />
+				<listheader label="${labels.BuildingsGridColumnName}" sort="auto(reqDate)" width="30%" />
+				<listheader label="${labels.BuildingsGridColumnDescription}" 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.numser)" 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">
+							<datebox value="@bind(vm.filterTemplate.reqDate)" 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.numser)" />
+					<listcell label="@load(each.reqDate)" />
+					<listcell label="@load(each.description)" />
+				</listitem>
+			</template>
+		</listbox>
+
+	</window>
+</zk>

src/main/webapp/requirements/actual/requirementsForm.zul

@@ -0,0 +1,35 @@
+<?page title="${labels.RequirementsFormTitle}" 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.requirement.RequirementForm')">
+		<caption src="/img/reqact.png" zclass="form-caption" label="RequirementsFormTitle" />
+		<vlayout>
+			<grid hflex="min">
+				<columns>
+					<column align="right" hflex="min" />
+					<column />
+				</columns>
+				<rows>
+					<row>
+						<cell sclass="row-title">${labels.BuildingsFormCode} :</cell>
+						<cell>
+							<textbox id="code" constraint="@load(vm.constriant)" width="200px" value="@bind(vm.dataBean.numser)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.BuildingsFormName} :</cell>
+						<cell>
+							<datebox id="name" width="200px" value="@bind(vm.dataBean.reqDate)" />
+						</cell>
+					</row>
+					<row>
+						<cell sclass="row-title">${labels.BuildingsFormDescription} :</cell>
+						<cell>
+							<textbox id="description" width="300px" value="@bind(vm.dataBean.description)" />
+						</cell>
+					</row>
+				</rows>
+			</grid>
+			<include src="/app/formButtons.zul" />
+		</vlayout>
+	</window>
+</zk>