Formulář v agendě uživatelů byl rozšířen o tab pro zadání adresy

uživatele. Na sestavy žádosti o služební cestu a vyúčtování služební
cesty byla přidána adresa. 
closes #128
This commit is contained in:
2014-09-10 22:19:40 +02:00
parent 74586f9820
commit 3a8954a909
8 changed files with 218 additions and 82 deletions
+119 -81
View File
@@ -11,87 +11,125 @@
<caption
zclass="form-caption"
label="${labels.UsersFormTitle}" />
<grid
width="440px"
form="@id('fx') @load(vm.dataBean) @save(vm.dataBean, before='save') @validator(vm.userFormValidator)">
<columns>
<column hflex="min"></column>
<column></column>
<column></column>
</columns>
<rows>
<row>
<label value="${labels.UsersFormLogin}" />
<textbox
value="@bind(vm.dataBean.username)"
instant="true"
disabled="@load(vm.editRec)"
onChange="@command('checkLogin')" />
<label
value="Login je obsazený"
sclass="error"
visible="@load(not vm.loginFree)" />
</row>
<row>
<label value="${labels.UsersFormFirstName}" />
<textbox value="@bind(vm.dataBean.firstName)" />
</row>
<row>
<label value="${labels.UsersFormSureName}" />
<textbox value="@bind(vm.dataBean.lastName)" />
</row>
<row>
<label value="${labels.UsersFormPersonalID}" />
<textbox
value="@bind(vm.dataBean.personalNumber)"
width="90px" />
</row>
<row>
<label value="${labels.UsersFormEmail}" />
<textbox value="@bind(vm.dataBean.email)" />
</row>
<row>
<label value="" />
<checkbox
label="${labels.UsersFormSendNotify}"
checked="@bind(vm.dataBean.notify)" />
</row>
<row>
<label value="${labels.UsersFormPassword}" />
<textbox
id="idUserPasswordOriginal"
value="@save(vm.password, before='save')"
type="password"
instant="true" />
</row>
<row>
<label value="${labels.UsersFormRepeatPassword}" />
<textbox
id="idUserPasswordDuplicate"
value="@save(vm.retPasswd, before='save')"
type="password"
instant="true" />
</row>
<row>
<label value="" />
<checkbox
label="${labels.UsersFormActive}"
checked="@bind(vm.dataBean.enabled)"
disabled="@load(vm.dataBean.username eq 'admin')" />
</row>
</rows>
</grid>
<groupbox mold="3d">
<caption label="Role" />
<vbox children="@load(vm.userRoles.roleChecks)">
<template name="children">
<checkbox
label="@load(each.role.description)"
checked="@bind(each.checked)"
disabled="@load(vm.dataBean.username eq 'admin')" />
</template>
</vbox>
</groupbox>
<tabbox>
<tabs>
<tab label="Základní"/>
<tab label="Adresa"/>
</tabs>
<tabpanels>
<tabpanel>
<grid
width="440px"
form="@id('fx') @load(vm.dataBean) @save(vm.dataBean, before='save') @validator(vm.userFormValidator)">
<columns>
<column hflex="min"></column>
<column></column>
<column></column>
</columns>
<rows>
<row>
<label value="${labels.UsersFormLogin}" />
<textbox
value="@bind(vm.dataBean.username)"
instant="true"
disabled="@load(vm.editRec)"
onChange="@command('checkLogin')" />
<label
value="Login je obsazený"
sclass="error"
visible="@load(not vm.loginFree)" />
</row>
<row>
<label value="${labels.UsersFormFirstName}" />
<textbox value="@bind(vm.dataBean.firstName)" />
</row>
<row>
<label value="${labels.UsersFormSureName}" />
<textbox value="@bind(vm.dataBean.lastName)" />
</row>
<row>
<label value="${labels.UsersFormPersonalID}" />
<textbox
value="@bind(vm.dataBean.personalNumber)"
width="90px" />
</row>
<row>
<label value="${labels.UsersFormEmail}" />
<textbox value="@bind(vm.dataBean.email)" />
</row>
<row>
<label value="" />
<checkbox
label="${labels.UsersFormSendNotify}"
checked="@bind(vm.dataBean.notify)" />
</row>
<row>
<label value="${labels.UsersFormPassword}" />
<textbox
id="idUserPasswordOriginal"
value="@save(vm.password, before='save')"
type="password"
instant="true" />
</row>
<row>
<label value="${labels.UsersFormRepeatPassword}" />
<textbox
id="idUserPasswordDuplicate"
value="@save(vm.retPasswd, before='save')"
type="password"
instant="true" />
</row>
<row>
<label value="" />
<checkbox
label="${labels.UsersFormActive}"
checked="@bind(vm.dataBean.enabled)"
disabled="@load(vm.dataBean.username eq 'admin')" />
</row>
</rows>
</grid>
<groupbox mold="3d">
<caption label="Role" />
<vbox children="@load(vm.userRoles.roleChecks)">
<template name="children">
<checkbox
label="@load(each.role.description)"
checked="@bind(each.checked)"
disabled="@load(vm.dataBean.username eq 'admin')" />
</template>
</vbox>
</groupbox>
</tabpanel>
<tabpanel>
<grid>
<columns>
<column/>
<column/>
</columns>
<rows>
<row>
<label value="${labels.SuppliersFormStreet}"/>
<textbox value="@bind(vm.dataBean.address.street)"/>
</row>
<row>
<label value="${labels.SuppliersFormNo}"/>
<textbox value="@bind(vm.dataBean.address.houseNumber)"/>
</row>
<row>
<label value="${labels.SuppliersFormZIP}"/>
<textbox value="@bind(vm.dataBean.address.zipCode)"/>
</row>
<row>
<label value="${labels.SuppliersFormCity}"/>
<textbox value="@bind(vm.dataBean.address.city)"/>
</row>
</rows>
</grid>
</tabpanel>
</tabpanels>
</tabbox>
<include src="/app/formButtons.zul" />
</window>
</zk>