Merge branch 'master' of https://git.bukova.info/repos/git/isspst
Conflicts: src/main/webapp/app/mainMenu.zul
This commit is contained in:
@@ -29,6 +29,7 @@
|
||||
<value>/WEB-INF/mail.properties</value>
|
||||
<value>/WEB-INF/gmail.properties</value>
|
||||
<value>/WEB-INF/ad.properties</value>
|
||||
<value>/WEB-INF/storage.properties</value>
|
||||
</list>
|
||||
</property>
|
||||
</bean>
|
||||
@@ -52,10 +53,10 @@
|
||||
<property name="hibernateProperties">
|
||||
<props>
|
||||
<prop key="hibernate.dialect">${jdbc.dialect}</prop>
|
||||
<prop key="hibernate.show_sql">true</prop>
|
||||
<prop key="hibernate.show_sql">false</prop>
|
||||
<prop key="hibernate.hbm2ddl.auto">update</prop>
|
||||
<prop key="hibernate.search.default.directory_provider">filesystem</prop>
|
||||
<prop key="hibernate.search.default.indexBase">./</prop>
|
||||
<prop key="hibernate.search.default.indexBase">${storage.fulltextIndex}</prop>
|
||||
<prop key="hibernate.search.analyzer">org.apache.lucene.analysis.cz.CzechAnalyzer</prop>
|
||||
<!-- <prop key="hibernate.enable_lazy_load_no_trans">true</prop> -->
|
||||
</props>
|
||||
@@ -176,6 +177,10 @@
|
||||
<property name="context" ref="servletContext"/>
|
||||
<property name="rootPath" value="/WEB-INF/upload"/>
|
||||
</bean>
|
||||
|
||||
<bean id="documentStorage" class="info.bukova.isspst.storage.DocumentFileStorageImpl">
|
||||
<property name="rootPath" value="${storage.root}"/>
|
||||
</bean>
|
||||
|
||||
<!-- Session data -->
|
||||
<bean id="sessionData" class="info.bukova.isspst.SessionData" scope="session">
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
storage.root=/home/pepa/tmp/isspst
|
||||
storage.fulltextIndex=/home/pepa/tmp/isspst
|
||||
@@ -135,7 +135,6 @@
|
||||
href="/j_spring_security_logout" />
|
||||
</menupopup>
|
||||
</menu>
|
||||
<menuitem label="${labels.Help}" target="blank"
|
||||
href="https://drive.google.com/folderview?id=0B2inqAvr2t-TODg4ZWZoSThYbGM&usp=sharing_eid"
|
||||
tooltiptext="${labels.GoogleDriveUrl}" />
|
||||
<menuseparator />
|
||||
|
||||
@@ -1,57 +1,62 @@
|
||||
<?page title="${labels.AgendaSearch}" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
|
||||
<zk xmlns="http://www.zkoss.org/2005/zul"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
|
||||
|
||||
<window border="normal" closable="false"
|
||||
apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.search.SearchForm')"
|
||||
vflex="1">
|
||||
<caption src="/img/search-032.png" zclass="form-caption" label="${labels.AgendaSearch}" />
|
||||
<?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
|
||||
|
||||
<vbox width="100%"
|
||||
vflex="1">
|
||||
<hbox hflex="1" align="center">
|
||||
<div align="center" hflex="1">
|
||||
<vbox>
|
||||
<image src="/img/lucene_logo.png"/>
|
||||
<hbox>
|
||||
<textbox value="@bind(vm.keyWord)" instant="true" width="250px" onOK="@command('doSearch')"/>
|
||||
<button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton" image="/img/search.png" />
|
||||
</hbox>
|
||||
</vbox>
|
||||
</div>
|
||||
</hbox>
|
||||
<panel hflex="1" vflex="1">
|
||||
<panelchildren style="overflow:auto;">
|
||||
<vbox children="@load(vm.results)" width="100%">
|
||||
<template name="children">
|
||||
<vbox width="100%">
|
||||
<separator bar="true" width="100%"/>
|
||||
<label value="@load(each.recordName)" style="font-weight: bold; font-size:14px;"/>
|
||||
<label value="@load(each.description)"/>
|
||||
<hbox>
|
||||
<label value="${labels.created}: "/>
|
||||
<label value="@load(each.created)"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<label value="${labels.ownedBy}: "/>
|
||||
<label value="@load(each.ownedBy)"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<label value="${labels.modified}: "/>
|
||||
<label value="@load(each.modified)"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<label value="${labels.modifiedBy}: "/>
|
||||
<label value="@load(each.modifiedBy)"/>
|
||||
</hbox>
|
||||
<a href="@load(each.url)" label="@load(each.url)"/>
|
||||
</vbox>
|
||||
</template>
|
||||
</vbox>
|
||||
</panelchildren>
|
||||
</panel>
|
||||
</vbox>
|
||||
<window border="normal" closable="false"
|
||||
apply="org.zkoss.bind.BindComposer"
|
||||
viewModel="@id('vm') @init('info.bukova.isspst.ui.search.SearchForm')"
|
||||
vflex="1">
|
||||
<caption src="/img/search-032.png" zclass="form-caption" label="${labels.AgendaSearch}"/>
|
||||
|
||||
</window>
|
||||
<vbox width="100%"
|
||||
vflex="1">
|
||||
<hbox hflex="1" align="center">
|
||||
<div align="center" hflex="1">
|
||||
<vbox>
|
||||
<image src="/img/lucene_logo.png"/>
|
||||
<hbox>
|
||||
<textbox value="@bind(vm.keyWord)" instant="true" width="250px"
|
||||
onOK="@command('doSearch')"/>
|
||||
<button label="${labels.Search}" onClick="@command('doSearch')" sclass="nicebutton"
|
||||
image="/img/search.png"/>
|
||||
</hbox>
|
||||
</vbox>
|
||||
</div>
|
||||
</hbox>
|
||||
<panel hflex="1" vflex="1">
|
||||
<panelchildren style="overflow:auto;">
|
||||
<vbox children="@load(vm.results)" width="100%">
|
||||
<template name="children">
|
||||
<vbox width="100%">
|
||||
<separator bar="true" width="100%"/>
|
||||
<label value="@load(each.recordName)" style="font-weight: bold; font-size:14px;"/>
|
||||
<label value="@load(each.description)"/>
|
||||
<hbox>
|
||||
<label value="${labels.created}: "/>
|
||||
<label value="@load(each.created)"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<label value="${labels.ownedBy}: "/>
|
||||
<label value="@load(each.ownedBy)"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<label value="${labels.modified}: "/>
|
||||
<label value="@load(each.modified)"/>
|
||||
</hbox>
|
||||
<hbox>
|
||||
<label value="${labels.modifiedBy}: "/>
|
||||
<label value="@load(each.modifiedBy)"/>
|
||||
</hbox>
|
||||
<a href="@load(each.url)" label="@load(each.url)"/>
|
||||
</vbox>
|
||||
</template>
|
||||
</vbox>
|
||||
</panelchildren>
|
||||
</panel>
|
||||
</vbox>
|
||||
|
||||
</window>
|
||||
</zk>
|
||||
@@ -1,5 +1,8 @@
|
||||
<?page title="${labels.RequirementsFormTitle}" contentType="text/html;charset=UTF-8"?>
|
||||
<zk>
|
||||
<zk xmlns="http://www.zkoss.org/2005/zul"
|
||||
xmlns:h="http://www.w3.org/1999/xhtml"
|
||||
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
|
||||
xsi:schemaLocation="http://www.zkoss.org/2005/zul http://www.zkoss.org/2005/zul/zul.xsd">
|
||||
<window
|
||||
id="editWin"
|
||||
closable="true"
|
||||
@@ -12,118 +15,144 @@
|
||||
zclass="form-caption"
|
||||
label="${labels.RequirementsFormTitle}" />
|
||||
<vlayout form="@id('fx') @load(vm.dataBean) @save(vm.dataBean, before='save') @validator(vm.validator)">
|
||||
<grid hflex="min">
|
||||
<columns>
|
||||
<column
|
||||
align="right"
|
||||
hflex="min" />
|
||||
<column />
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormNumberSerie} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="numser"
|
||||
width="200px"
|
||||
value="@bind(fx.numser)"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
readonly="true" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormReqDate} :</cell>
|
||||
<cell>
|
||||
<datebox
|
||||
id="reqDate"
|
||||
width="200px"
|
||||
value="@bind(fx.reqDate)"
|
||||
format="${labels.DateFormat}" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormCenter} :</cell>
|
||||
<cell>
|
||||
<combobox
|
||||
model="@load(vm.centres)"
|
||||
readonly="true"
|
||||
selectedItem="@bind(fx.centre)">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.fullName)" />
|
||||
</template>
|
||||
</combobox>
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormFrom} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="from"
|
||||
width="300px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.from)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormStartDateTime} :</cell>
|
||||
<cell>
|
||||
<hbox>
|
||||
<datebox
|
||||
id="tripDate"
|
||||
width="200px"
|
||||
format="medium"
|
||||
value="@bind(fx.tripDate)" />
|
||||
<timebox
|
||||
id="tripTime"
|
||||
width="90px"
|
||||
format="short"
|
||||
value="@bind(fx.tripDate)" />
|
||||
|
||||
</hbox>
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormTo} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="to"
|
||||
width="300px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.to)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormPurpose} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="description"
|
||||
width="300px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.description)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormEndTravel} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="end"
|
||||
width="200px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.end)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormEndDate} :</cell>
|
||||
<cell>
|
||||
<datebox
|
||||
id="endDate"
|
||||
width="300px"
|
||||
format="medium"
|
||||
value="@bind(fx.endDate)" />
|
||||
</cell>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<hbox>
|
||||
<grid hflex="min">
|
||||
<columns>
|
||||
<column
|
||||
align="right"
|
||||
hflex="min" />
|
||||
<column />
|
||||
</columns>
|
||||
<rows>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormNumberSerie} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="numser"
|
||||
width="200px"
|
||||
value="@bind(fx.numser)"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
readonly="true" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormReqDate} :</cell>
|
||||
<cell>
|
||||
<datebox
|
||||
id="reqDate"
|
||||
width="200px"
|
||||
value="@bind(fx.reqDate)"
|
||||
format="${labels.DateFormat}" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormCenter} :</cell>
|
||||
<cell>
|
||||
<combobox
|
||||
model="@load(vm.centres)"
|
||||
readonly="true"
|
||||
selectedItem="@bind(fx.centre)">
|
||||
<template name="model">
|
||||
<comboitem label="@load(each.fullName)" />
|
||||
</template>
|
||||
</combobox>
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormFrom} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="from"
|
||||
width="300px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.from)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormStartDateTime} :</cell>
|
||||
<cell>
|
||||
<hbox>
|
||||
<datebox
|
||||
id="tripDate"
|
||||
width="200px"
|
||||
format="medium"
|
||||
value="@bind(fx.tripDate)" />
|
||||
<timebox
|
||||
id="tripTime"
|
||||
width="90px"
|
||||
format="short"
|
||||
value="@bind(fx.tripDate)" />
|
||||
|
||||
</hbox>
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormTo} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="to"
|
||||
width="300px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.to)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormPurpose} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="description"
|
||||
width="300px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.description)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormEndTravel} :</cell>
|
||||
<cell>
|
||||
<textbox
|
||||
id="end"
|
||||
width="200px"
|
||||
maxlength="@load(vm.lengthText)"
|
||||
value="@bind(fx.end)" />
|
||||
</cell>
|
||||
</row>
|
||||
<row>
|
||||
<cell sclass="row-title">${labels.RequirementsFormEndDate} :</cell>
|
||||
<cell>
|
||||
<datebox
|
||||
id="endDate"
|
||||
width="300px"
|
||||
format="medium"
|
||||
value="@bind(fx.endDate)" />
|
||||
</cell>
|
||||
</row>
|
||||
</rows>
|
||||
</grid>
|
||||
<vbox>
|
||||
<button label="Připojit"
|
||||
upload="true"
|
||||
onUpload="@command('uploadAttachment')"
|
||||
sclass="nicebutton" />
|
||||
<grid model="@load(vm.attachments)">
|
||||
<columns>
|
||||
<column/>
|
||||
</columns>
|
||||
<rows>
|
||||
<template name="model">
|
||||
<row>
|
||||
<a href="@load('/api/dl/'.concat(each.pathInFilesystem).concat('/').concat(each.fileName))"
|
||||
label="@load(each.fileName)"
|
||||
target="blank"/>
|
||||
<hbox>
|
||||
<button label="Odebrat" onClick="@command('deleteAttachment', attachment=each)"/>
|
||||
<button label="Stáhnout" onClick="@command('downloadAttachment', attachment=each)"/>
|
||||
</hbox>
|
||||
</row>
|
||||
</template>
|
||||
</rows>
|
||||
</grid>
|
||||
</vbox>
|
||||
</hbox>
|
||||
<vbox>
|
||||
<label value="${labels.RequirementsFormPassengers}"/>
|
||||
<hbox>
|
||||
@@ -147,7 +176,7 @@
|
||||
<rows>
|
||||
<template name="model">
|
||||
<row>
|
||||
<label value="@load(each)"/>
|
||||
<label value="@load(each)" />
|
||||
<button label="${labels.RemoveItem}"
|
||||
onClick="@command('removePassanger', user=each)"
|
||||
sclass="nicebutton"/>
|
||||
|
||||
Reference in New Issue
Block a user