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

Conflicts:
	src/main/java/info/bukova/isspst/AppInitListener.java
	src/main/resources/hibernate.cfg.xml

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?characterEncoding=latin2
+jdbc.databaseurl=jdbc:mysql://127.0.0.1:3306/isspst?characterEncoding=latin2&autoReconnect=true
 jdbc.username=isspst
 jdbc.password=xsacfgd

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

@@ -39,6 +39,8 @@ AgendaRights=Práva
 RightsFormTitle=Práva
 RightsGridRole=Role
 RightsGridModules=Práva modulů
+WorkgroupFunction=Funkce v komisích
+CentreFunction=Funkce ve střediscích
 
 AgendaSuppliers=Dodavatelé
 SuppliersFormTitle=Dodavatel
@@ -91,6 +93,15 @@ MaterialFormTitle=Materiál
 AgendaWorkgroups=Střediska / komise
 WorkgroupFormTitle=Pracvní skupina
 
+AgendaWorkflow=Procesy schválení
+RequirementType=Typ požadavku: 
+AvailableRoles=Dostupné role
+WorkgroupRoles=Role komisí
+CentreRoles=Role středisek
+Workflow=Proces schválení
+WorkgroupWorkflow=Schválení v komisi
+CentreWorkflow=Schválení ve středisku
+
 CentresForRequirements=Střediska, pro která lze vkládat požadavky
 WorkgroupMembership=Členství v komisích
 LogedInUser=Přihlášený uživatel:

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

@@ -136,6 +136,10 @@
     	<property name="sessionFactory" ref="sessionFactory"/>
     </bean>
     
+    <bean id="reqTypeDao" class="info.bukova.isspst.dao.jpa.RequirementTypeDaoJPA">
+    	<property name="sessionFactory" ref="sessionFactory"/>
+    </bean>
+    
     <!-- Business logic -->
     <bean id="validator" class="org.springframework.validation.beanvalidation.LocalValidatorFactoryBean"/>
     
@@ -197,6 +201,11 @@
 		<property name="dao" ref="commissionDao"/>
 		<property name="validator" ref="validator"/>
 	</bean>
+	
+	<bean id="reqTypeService" class="info.bukova.isspst.services.requirements.RequirementTypeServiceImpl">
+		<property name="dao" ref="reqTypeDao"/>
+		<property name="validator" ref="validator"/>
+	</bean>
 		
 	<bean id="requirementService" class="info.bukova.isspst.services.requirement.RequirementServiceImpl">
 		<property name="dao" ref="requirementDao" />

src/main/webapp/admin/permissions/permForm.zul

@@ -5,8 +5,8 @@
 	<caption zclass="form-caption" label="${labels.AgendaRights}" />
 	<label value="@load(vm.dataBean.description)" style="font-weight: bold;"/>
 	<hbox>
-			<checkbox label="Práva pracovních skupin" checked="@bind(vm.dataBean.workgroup)"/>
-			<checkbox label="Práva středisek" checked="@bind(vm.dataBean.centre)"/>
+			<checkbox label="${labels.WorkgroupFunction}" checked="@bind(vm.dataBean.workgroup)"/>
+			<checkbox label="${labels.CentreFunction}" checked="@bind(vm.dataBean.centre)"/>
 		</hbox>
 	
 	<vbox children="@load(vm.modules)" width="730px">

src/main/webapp/app/navigation.zul

@@ -37,6 +37,7 @@
 		</tabpanel>
 		<tabpanel>
 			<menubar orient="vertical">
+				<menuitem label="${labels.AgendaWorkflow}" href="/settings/workflow" disabled="${not sec:isAllGranted('PERM_EDIT_WORKFLOW')}"/>
 				<menuitem label="Limity částek"/>
 				<menuitem label="E-maily" />
 			</menubar>

src/main/webapp/settings/workflow/index.zul

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

src/main/webapp/settings/workflow/workflow.zul

@@ -0,0 +1,73 @@
+<?page title="${labels.AgendaWorkflow}" contentType="text/html;charset=UTF-8"?>
+<zk>
+<window border="normal" apply="org.zkoss.bind.BindComposer"
+	viewModel="@id('vm') @init('info.bukova.isspst.ui.requirements.RequirementTypesVM')">
+<caption zclass="form-caption" label="${labels.AgendaWorkflow}" />
+<vbox>
+	<hbox>
+		<label value="${labels.RequirementType}"/>
+		<combobox model="@load(vm.reqTypes)" readonly="true" width="300px" selectedItem="@bind(vm.selected)">
+			<template name="model">
+				<comboitem label="@load(each.description)"/>
+			</template>
+		</combobox>
+	</hbox>
+	<hbox>
+		<div hflex="1">
+		<groupbox mold="3d" hflex="1">
+		<caption label="${labels.AvailableRoles}"/>
+			<vbox>
+				<listbox id="allWgRoles" model="@load(vm.workgroupRoles)" droppable="workgroup" 
+				onDrop="@command('removeRoleWg', event=event)">
+					<listhead>
+						<listheader label="${labels.WorkgroupRoles}"/>
+					</listhead>
+					<template name="model">
+						<listitem label="@load(each.description)" draggable="workgroup" droppable="workgroup"
+						onDrop="@command('removeRoleCentre', event=event)"/>
+					</template>
+				</listbox>
+				<listbox id="allCentreRoles" model="@load(vm.centreRoles)" droppable="centre" 
+				onDrop="@command('removeRoleCentre', event=event)">
+					<listhead>
+						<listheader label="${labels.CentreRoles }"/>
+					</listhead>
+					<template name="model">
+						<listitem label="@load(each.description)" draggable="centre" droppable="centre"
+						onDrop="@command('removeRoleCentre', event=event)"/>
+					</template>
+				</listbox>
+			</vbox>
+		</groupbox>
+		</div>
+		<div hflex="1">
+		<groupbox mold="3d" visible="@load(not empty vm.selected)">
+		<caption label="${labels.Workflow}"/>
+			<vbox>
+				<listbox id="wgWorkflow" model="@load(vm.selected.workflow)" droppable="workgroup"
+				onDrop="@command('addRoleWg', event=event)">
+					<listhead>
+						<listheader label="${labels.WorkgroupWorkflow}"/>
+					</listhead>
+					<template name="model">
+						<listitem label="@load(each.role.description)" visible="@load(not each.centre)"
+						onDrop="@command('reorderWg', event=event)" draggable="workgroup" droppable="workgroup"/>
+					</template>
+				</listbox>
+				<listbox id="centreWorkflow" model="@load(vm.selected.workflow)" droppable="centre"
+				onDrop="@command('addRoleCentre', event=event)">
+					<listhead>
+						<listheader label="${labels.CentreWorkflow}"/>
+					</listhead>
+					<template name="model">
+						<listitem label="@load(each.role.description)" visible="@load(each.centre)"
+						onDrop="@command('reorderCentre', event=event)" draggable="centre" droppable="centre"/>
+					</template>
+				</listbox>
+			</vbox>
+		</groupbox>
+		</div>
+	</hbox>
+</vbox>
+</window>
+</zk>