Implementováno fulltextové vyhledávání přes všechny záznamy. Nutno

dořešit konfiguraci adresáře pro ukládání fulltextového indexu.

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

@@ -101,6 +101,7 @@ SuppliersGridColumnPhone=Telefon
 SuppliersGridColumnEmail=E-mail
 SuppliersGridColumnWWW=Web
 SuppliersGridColumnNote=Poznámka
+Supplier=dodavatel
 
 AgendaUsers=Uživatelé
 UsersFormTitle=Uživatel
@@ -220,6 +221,8 @@ TripBillTo=Tam
 TripBillBack=Zpět
 TripBillTotal=Celkem
 
+TripRequirement=Požadavek na služební cestu
+
 CentresForRequirements=Střediska, pro která lze vkládat požadavky
 WorkgroupMembership=Členství v komisích
 LogedInUser=Přihlášený uživatel:
@@ -361,3 +364,6 @@ Help=Příručka
 GoogleDriveUrl=Odkaz na Google Drive
 
 ModuleNotActive=Modul není aktivovaný
+
+AgendaSearch=Vyhledávání
+Search=Hledat

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

@@ -55,7 +55,7 @@
                 <prop key="hibernate.show_sql">true</prop>
                 <prop key="hibernate.hbm2ddl.auto">update</prop>
                 <prop key="hibernate.search.default.directory_provider">filesystem</prop>
-                <prop key="hibernate.search.default.indexBase">/home/pepa/Dokumenty/dev/lucene</prop>
+                <prop key="hibernate.search.default.indexBase">./</prop>
                 <prop key="hibernate.search.analyzer">org.apache.lucene.analysis.cz.CzechAnalyzer</prop>
                 <!-- <prop key="hibernate.enable_lazy_load_no_trans">true</prop> -->
             </props>
@@ -106,6 +106,7 @@
 				<entry key="#{T(info.bukova.isspst.data.Requirement)}" value-ref="reqEditEval"/>
 				<entry key="#{T(info.bukova.isspst.data.TripRequirement)}" value-ref="tripReqEditEval"/>
 				<entry key="#{T(info.bukova.isspst.data.User)}" value-ref="userEvaluator"/>
+				<entry key="#{T(info.bukova.isspst.services.FullTextService)}" value-ref="serviceEval"/>
 			</map>
 		</property>
 		<property name="specialEvaluators">

src/main/webapp/app/mainMenu.zul

@@ -135,5 +135,12 @@
 					href="/j_spring_security_logout" />
 			</menupopup>
 		</menu>
+		<menuseparator />
+		<menuitem 
+		  image="/img/search.png"
+		  label="${labels.AgendaSearch}"
+		  href="/app/search"
+		  visible="${module:isActive('SEARCH') }"
+		  disabled="${not sec:isAllGranted('PERM_SEARCH_SEARCH')}" />
 	</menubar>
 </zk>

src/main/webapp/app/search/index.zul

@@ -1,4 +1,4 @@
-<?page title="${labels.AgendaWorkflow}" contentType="text/html;charset=UTF-8"?>
+<?page title="${labels.AgendaSearch}" contentType="text/html;charset=UTF-8"?>
 <zk>
 
 <zscript>

src/main/webapp/app/search/searchForm.zul

@@ -1,17 +1,25 @@
-<?page title="Search" contentType="text/html;charset=UTF-8"?>
+<?page title="${labels.AgendaSearch}" contentType="text/html;charset=UTF-8"?>
 <zk>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 
-	<window title="Search" border="normal" closable="true"
+	<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}" />
 
     <vbox width="100%"
       vflex="1">
-			<hbox>
-				<textbox value="@bind(vm.keyWord)" />
-				<button label="Hledat" onClick="@command('doSearch')" />
+		  <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;">
@@ -22,19 +30,19 @@
 		            <label value="@load(each.recordName)" style="font-weight: bold; font-size:14px;"/>
 		            <label value="@load(each.description)"/>
 		            <hbox>
-		              <label value="Vytvořeno: "/>
+		              <label value="${labels.created}: "/>
 		              <label value="@load(each.created)"/>
 		            </hbox>
 		            <hbox>
-                  <label value="Vytvořil: "/>
+                  <label value="${labels.ownedBy}: "/>
                   <label value="@load(each.ownedBy)"/>
                 </hbox>
                 <hbox>
-                  <label value="Změněno: "/>
+                  <label value="${labels.modified}: "/>
                   <label value="@load(each.modified)"/>
                 </hbox>
                 <hbox>
-                  <label value="Změnil: "/>
+                  <label value="${labels.modifiedBy}: "/>
                   <label value="@load(each.modifiedBy)"/>
                 </hbox>
 		            <a href="@load(each.url)" label="@load(each.url)"/>

src/main/webapp/main/orders/created/grid.zul

@@ -24,6 +24,7 @@
 						itemRenderer="@load(vm.orderCreatedItemRenderer)"
 						vflex="1"
 						onSelect="@command('onChangeSelectOrder', ctrl=self)"
+						onAfterRender="@command('afterRender')"
 						selectedItem="@bind(vm.dataBean)"
 						model="@load(vm.dataList)">
 						<listhead menupopup="auto">