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

Implementováno a sjednoceno řazení záznamů podle českých znaků.

Browse Source 
Změnit v databázi collation z ut8_czech_ci na latin2_czech_cs!!!
Sjednocen vzhled gridů ve všech agendách.

closes #83
This commit is contained in:
franta
2014-05-28 21:06:54 +02:00
parent 0f9d1baf94
commit 1c19625ffb
23 changed files with 590 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/webapp/admin/addressbook/address.zul
+82 -69
View File
@@ -1,71 +1,84 @@
<?page title="Adresa" contentType="text/html;charset=UTF-8"?>
<?page title="${labels.SuppliersFormTitle}" contentType="text/html;charset=UTF-8"?>
<zk>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window id="editWin" title="Adresa" border="normal" apply="org.zkoss.bind.BindComposer"
viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressForm')"
closable="true" width="600px">
<grid width="580px">
<columns>
<column label="" hflex="min"/>
<column label="" hflex="min"/>
<column label=""/>
</columns>
<rows>
<row>
<label value="Firma" /> <textbox id="company" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.company)" instant="true" width="320px"/>
<button image="/img/search.png" label="Hledat v ARESu" onClick="@command('searchAres')" sclass="nicebutton" disabled="@load((vm.dataBean.ic == 0) &amp;&amp; (empty vm.dataBean.company))" />
</row>
<row>
<label value="IČ" /> <textbox value="@bind(vm.dataBean.ic)"/>
</row>
<row>
<label value="DIČ" /> <textbox value="@bind(vm.dataBean.dic)"/>
</row>
<row>
<label value="Oddělení" /> <textbox value="@bind(vm.dataBean.department)"/>
</row>
<row>
<label value="Kontaktní osoba" /> <textbox value="@bind(vm.dataBean.contactName)"/>
</row>
<row>
<label value="Ulice" /> <textbox value="@bind(vm.dataBean.street)" width="320px"/>
</row>
<row>
<label value="Číslo domu" /> <textbox value="@bind(vm.dataBean.houseNumber)" width="80px"/>
</row>
<row>
<label value="Město" /> <textbox id="city" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.city)" width="320px"/>
</row>
<row>
<label value="PSČ" /> <textbox value="@bind(vm.dataBean.zipCode)"/>
</row>
<row>
<label value="Telefon" /> <textbox value="@bind(vm.dataBean.phone)"/>
</row>
<row>
<label value="E-mail" /> <textbox id="email" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.email)" width="320px"/>
</row>
<row>
<label value="Web" /> <textbox id="web" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.web)" width="320px"/>
</row>
</rows>
</grid>
<hlayout>
<panel>
<panelchildren>
<vlayout>
<panel>
<panelchildren><label value="Poznámka"/> </panelchildren>
</panel>
<panel>
<panelchildren><ckeditor height="65px" width="330px" toolbar="Basic" value="@bind(vm.dataBean.description)"/>
</panelchildren>
</panel>
</vlayout>
</panelchildren>
</panel>
</hlayout>
<include src="/app/formButtons.zul"/>
</window>
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
<window id="editWin" border="normal" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('info.bukova.isspst.ui.addressbook.AddressForm')" closable="true" width="600px">
<caption zclass="form-caption" label="${labels.SuppliersFormTitle}" />
<grid width="580px">
<columns>
<column label="" hflex="min" />
<column label="" hflex="min" />
<column label="" />
</columns>
<rows>
<row>
<label value="${labels.SuppliersFormCompany}" />
<textbox id="company" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.company)" instant="true" width="320px" />
<button image="/img/search.png" label="${labels.SuppliersFormFindInARES}" onClick="@command('searchAres')" sclass="nicebutton" disabled="@load((vm.dataBean.ic == 0) &amp;&amp; (empty vm.dataBean.company))" />
</row>
<row>
<label value="${labels.SuppliersFormIC}" />
<textbox value="@bind(vm.dataBean.ic)" />
</row>
<row>
<label value="${labels.SuppliersFormDIC}" />
<textbox value="@bind(vm.dataBean.dic)" />
</row>
<row>
<label value="${labels.SuppliersFormDepartment}" />
<textbox value="@bind(vm.dataBean.department)" />
</row>
<row>
<label value="${labels.SuppliersFormContact}" />
<textbox value="@bind(vm.dataBean.contactName)" />
</row>
<row>
<label value="${labels.SuppliersFormStreet}" />
<textbox value="@bind(vm.dataBean.street)" width="320px" />
</row>
<row>
<label value="${labels.SuppliersFormNo}" />
<textbox value="@bind(vm.dataBean.houseNumber)" width="80px" />
</row>
<row>
<label value="${labels.SuppliersFormCity}" />
<textbox id="city" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.city)" width="320px" />
</row>
<row>
<label value="${labels.SuppliersFormZIP}" />
<textbox value="@bind(vm.dataBean.zipCode)" />
</row>
<row>
<label value="${labels.SuppliersFormPhone}" />
<textbox value="@bind(vm.dataBean.phone)" />
</row>
<row>
<label value="${labels.SuppliersFormEmail}" />
<textbox id="email" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.email)" width="320px" />
</row>
<row>
<label value="${labels.SuppliersFormWWW}" />
<textbox id="web" constraint="@load(vm.constriant)" value="@bind(vm.dataBean.web)" width="320px" />
</row>
</rows>
</grid>
<hlayout>
<panel>
<panelchildren>
<vlayout>
<panel>
<panelchildren>
<label value="${labels.SuppliersFormNote}" />
</panelchildren>
</panel>
<panel>
<panelchildren>
<ckeditor height="65px" width="100%" toolbar="Basic" value="@bind(vm.dataBean.description)" />
</panelchildren>
</panel>
</vlayout>
</panelchildren>
</panel>
</hlayout>
<include src="/app/formButtons.zul" />
</window>
</zk>