IS_Trebic/isspst
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
František Přibyl
2014-06-17 06:28:13 +02:00
parent 142b82a8de 53d5d262b1
commit d371cab545
16 changed files with 231 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/WEB-INF/locales/columns.properties
+5 -1
View File
@@ -35,4 +35,8 @@ fullName=Plné jméno
lastName=Příjmení
notify=Posílat oznámení
personalNumber=Osobní číslo
username=Uživatelské jméno
username=Uživatelské jméno
#Skupiny
centre=Středisko
members=Členové
src/main/webapp/WEB-INF/locales/zk-label.properties
+4 -1
View File
@@ -87,7 +87,7 @@ UsersGridColumnSureName=Příjmení
AgendaMaterial=Materiál
MaterialFormTitle=Materiál
AgendaWorkgroups=Pracovní skupiny
AgendaWorkgroups=Střediska / komise
WorkgroupFormTitle=Pracvní skupina
ButtonStorno=Storno
@@ -120,4 +120,7 @@ DbForKey= pro klíč
DbCannotDelete=Chyba při mazání záznamu: Záznam nelze smazat protože na něj odkazuje jiný záznam
DbSaveError=Chyba při ukládání záznamu
DbValidationError=Chyba validace
true=Ano
false=Ne
src/main/webapp/admin/workgroups/index.zul
+1 -1
View File
@@ -1,4 +1,4 @@
<?page title="${labels.AgendaCommissions}" contentType="text/html;charset=UTF-8"?>
<?page title="${labels.AgendaWorkgroups}" contentType="text/html;charset=UTF-8"?>
<zk>
<zscript>
src/main/webapp/admin/workgroups/workgroupForm.zul
+35 -5
View File
@@ -24,26 +24,56 @@
</row>
<row>
<cell>
<checkbox label="Středisko" checked="@bind(vm.centre)"/>
<checkbox label="Středisko" checked="@bind(vm.centre)" disabled="@load(not empty vm.dataBean.created)"/>
</cell>
</row>
</rows>
</grid>
<label value="Přetáhněte myší:"/>
<hlayout>
<listbox id="users" model="@bind(vm.users)" height="280px" width="200px" multiple="true"
<listbox id="users" model="@bind(vm.users)" height="380px" width="300px" multiple="true"
droppable="true" onDrop="@command('addMember', event=event)">
<listhead>
<listheader label="Uživatelé" sort="czech(fullName)"/>
</listhead>
<template name="model">
<listitem image="@load(each.hasJob ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.fullName)" draggable="user" droppable="user"
<listitem image="@load(each.person ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.fullName)" draggable="user" droppable="user"
onDrop="@command('addMember', event=event)" attributes.item="@load(each)"/>
</template>
</listbox>
<tabbox mold="accordion" width="300px">
<tabs children="@load(vm.workgroupRoles)">
<template name="children">
<tab label="@load(each.description)" />
</template>
</tabs>
<tabpanels children="@load(vm.workgroupRoles)">
<template name="children">
<tabpanel>
<listbox id="@load(each.authority)"
model="@bind(vm.dataBean.members)" height="200px" width="290px"
multiple="true" droppable="true"
onDrop="@command('addMember', event=event)">
<!-- <listhead>
<listheader label="@load(each.description)" sort="czech(fullName)"/>
</listhead> -->
<template name="model" var="member">
<listitem
image="@load(member.member.person ? '/img/user-small.png' : '/img/commission-small.png')"
label="@load(member.member.fullName)" draggable="user"
droppable="user" onDrop="@command('addMember', event=event)"
attributes.item="@load(member)"
visible="@load(member.role.authority eq each.authority)" />
</template>
</listbox>
</tabpanel>
</template>
</tabpanels>
</tabbox>
<!--
<vlayout children="@load(vm.workgroupRoles)">
<template name="children">
<listbox id="@load(each.authority)" model="@bind(vm.dataBean.members)" height="120px" width="200px" multiple="true"
@@ -52,14 +82,14 @@
<listheader label="@load(each.description)" sort="czech(fullName)"/>
</listhead>
<template name="model" var="member">
<listitem image="@load(member.member.hasJob ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(member.member.fullName)" draggable="user" droppable="user"
<listitem image="@load(member.member.person ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(member.member.fullName)" draggable="user" droppable="user"
onDrop="@command('addMember', event=event)" attributes.item="@load(member)" visible="@load(member.role.authority eq each.authority)"/>
</template>
</listbox>
</template>
</vlayout>
-->
</hlayout>
<include src="/app/formButtons.zul" />
</vlayout>
src/main/webapp/admin/workgroups/workgroups.zul
+7 -39
View File
@@ -12,8 +12,9 @@
<listhead menupopup="auto">
<listheader label="${labels.code}" sort="czech(code)" width="10%" />
<listheader label="${labels.name}" sort="czech(name)" width="30%" />
<listheader label="${labels.centre}" width="8%"/>
</listhead>
<!--
<auxhead sclass="category-center" visible="@load(vm.filter)">
<auxheader>
<div sclass="find-grid-cell">
@@ -38,7 +39,7 @@
<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" />
<checkbox label="${labels.centre}" checked="@bind(vm.filterTemplate.centre)" onClick="@command('doFilter')"/>
</div>
<div sclass="find-grid-img">
<image src="/img/funnel.png" />
@@ -46,16 +47,17 @@
</div>
</auxheader>
</auxhead>
-->
<template name="model">
<listitem>
<listcell label="@load(each.code)" />
<listcell label="@load(each.name)" />
<listcell label="@load(each.centre) @converter(vm.boolConverter)"/>
</listitem>
</template>
</listbox>
<groupbox>
<groupbox mold="3d" closable="false">
<caption label="členové"/>
<tree hflex="1" model="@load(vm.workgroupTreeModel)">
<treecols>
@@ -64,47 +66,13 @@
<template name="model">
<treeitem>
<treerow>
<treecell image="@load(each.data.hasJob ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.data.fullName)"/>
<treecell image="@load(each.data.person ? '/img/user-small.png' : '/img/commission-small.png')" label="@load(each.data.fullName)"/>
</treerow>
</treeitem>
</template>
</tree>
</groupbox>
<!-- <panel hflex="1" width="70%" height="480px">
<panelchildren>
<grid model="@load(vm.dataBean.approvers)" height="90px">
<columns>
<column label="Vedoucí" sort="auto(fullName)"/>
</columns>
<rows>
<template name="model">
<row>
<cell>
<image src="/img/user-small-red.png"/><label value="@load(each.fullName)"/>
</cell>
</row>
</template>
</rows>
</grid>
<grid model="@load(vm.dataBean.members)" height="290px">
<columns>
<column label="Členové" sort="auto(fullName)"/>
</columns>
<rows>
<template name="model">
<row>
<cell>
<image src="/img/user-small.png"/><label value="@load(each.fullName)"/>
</cell>
</row>
</template>
</rows>
</grid>
</panelchildren>
</panel> -->
</hbox>
</window>
</zk>