git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul
index dca0bffeac242679be04609e56adfeb6d0208a37..f750cc68425646852c84e41f5ae5fd2e1a1dd1f4 100644 (file)
--- a/server/user.mediacube.gui/pages/searchitems.zul
+++ b/server/user.mediacube.gui/pages/searchitems.zul
@@ -4,7 +4,7 @@
 \r
 <!-- tag deklarációja -->\r
 <?component name="search-filters" inline="true" macroURI="searchitems/filters.zul"?>\r
-<?component name="search-results" inline="true" macroURI="searchitems/results.zul"?>\r
+<?component name="search-results" inline="true" macroURI="searchitems/listresults.zul"?>\r
 <?component name="item-details" inline="true" macroURI="searchitems/details.zul"?>\r
 \r
 <zk xmlns:h="xhtml" xmlns:n="native" xmlns:c="client">\r
@@ -37,7 +37,7 @@
        <custom-attributes org.zkoss.zul.listbox.initRodSize="50" />\r
        <custom-attributes org.zkoss.zul.listbox.preloadSize="50" />\r
 \r
-       <div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">\r
+       <div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.ListSearchModel')">\r
                <timer id="timer" delay="500" repeats="false" onTimer="@command('uiTick')" />\r
                <div id="tagListener" onChange="@command('onTagChanged')" />\r
 \r

diff --git a/server/user.mediacube.gui/pages/searchitems/gridresults.zul b/server/user.mediacube.gui/pages/searchitems/gridresults.zul
new file mode 100644 (file)
index 0000000..069a2e6
--- /dev/null
+++ b/server/user.mediacube.gui/pages/searchitems/gridresults.zul
@@ -0,0 +1,77 @@
+\r
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client" height="100%" width="100%">\r
+       <grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" \r
+               autopaging="false" model="@load(vm.searchResult)"\r
+               emptyMessage="Nincs találat!" pageSize="50" \r
+               onAfterRender="@command('onAfterRenderGrid')" \r
+               style="border: none; background: white !important;"\r
+               oddRowSclass="listbox-odd-style">\r
+               <attribute name="onAfterRender">\r
+                       Clients.evalJavaScript("clearSelection();");\r
+               </attribute>\r
+               <columns id="orderColumns">\r
+\r
+                       <column hflex="min">\r
+                               <checkbox checked="@bind(vm.rowsExpanded)" />\r
+                       </column>\r
+                       <column hflex="min">\r
+                               <checkbox checked="@bind(vm.allSelected)" />\r
+                       </column>\r
+                       \r
+                       <column label="ID" sort="auto" hflex="1" align="left" />\r
+                       <column label="Cím" sort="auto" hflex="2" align="left" />\r
+                       <column label="Fájlnév" sort="auto" hflex="5" align="left" />\r
+                       <column label="Archiválva" sort="auto" hflex="1" align="left" />\r
+                       <column label="Hossz" sort="auto" hflex="2" align="right" />\r
+               </columns>\r
+               <rows id="rows" style="cursor: pointer;">\r
+                       <template name="model">\r
+                               <row onClick="@command('select', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)"\r
+                                       onMouseOut="@Command('rowMouseOut', evt=event)" style="background: none;">\r
+                                       <detail open="@load(vm.rowsExpanded)">\r
+                                               <hlayout style="border-bottom: 1px solid #ebebeb; width: 100%;">\r
+                                                       <image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg"\r
+                                                               content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')"\r
+                                                               onClick="@command('select', selectedObject=each)" />\r
+                                                       <div sclass="details">\r
+                                                               <hlayout>\r
+                                                                       <div class="${c:cat(vm.typeFilters[each.media.itemType.name].color,' type-inlist')}">\r
+                                                                               <label style="font-size: 10px;" value="@load(each.media.itemType.name)" />\r
+                                                                       </div>\r
+                                                                       <label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />\r
+                                                               </hlayout>\r
+                                                               <html sclass="relevant">\r
+                                                                       <![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]>\r
+                                                               </html>\r
+                                                       </div>\r
+                                               </hlayout>\r
+                                       </detail>\r
+                                       <checkbox checked="@save(vm.itemSelected) @validator(vm.itemSelectedValidator, arg=each)" />\r
+                                       <label value="@load(each.media.houseId)" />\r
+                                       <label value="@load(each.media.title)" />\r
+                                       <label value="@load(each.media.mediaFileRealName)" />\r
+                                       <label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" />\r
+                                       <cell>\r
+                                               <vlayout>\r
+                                                       <hlayout>\r
+                                                               <label style="font-size:14px"\r
+                                                                       value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" />\r
+                                                               <image src="/img/ic_visibility_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">\r
+                                                                       <attribute name="visible" if="${each.media.mediaFilesCount lt 2}">false</attribute>\r
+                                                               </image>\r
+                                                               <image src="/img/ic_visibility_off_black_18dp.png"\r
+                                                                       style="margin-left:4px;margin-top:2px;vertical-align:top;">\r
+                                                                       <attribute name="visible" if="${each.media.mediaFilesCount gt 1}">false</attribute>\r
+                                                               </image>\r
+                                                               <image src="/img/baseline_arrow_back_black_18dp.png"\r
+                                                                       style="margin-left:4px;margin-top:2px;vertical-align:top;"\r
+                                                                       visible="@load(!each.media.created.equals(each.media.modified))">\r
+                                                               </image>\r
+                                                       </hlayout>\r
+                                               </vlayout>\r
+                                       </cell>\r
+                               </row>\r
+                       </template>\r
+               </rows>\r
+       </grid>\r
+</zk>
\ No newline at end of file

diff --git a/server/user.mediacube.gui/pages/searchitems/listresults.zul b/server/user.mediacube.gui/pages/searchitems/listresults.zul
new file mode 100644 (file)
index 0000000..e02ace7
--- /dev/null
+++ b/server/user.mediacube.gui/pages/searchitems/listresults.zul
@@ -0,0 +1,21 @@
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client" height="100%" width="100%">\r
+       <listbox id="itemsListbox" mold="paging" emptyMessage="Nincs találat!"\r
+               model="@load(vm.searchResult)" vflex="true" hflex="true">\r
+               <listhead>\r
+                       <listheader label="ID" sort="auto" hflex="5" align="left" />\r
+                       <listheader label="Cím" sort="auto" hflex="5" align="left" />\r
+                       <listheader label="Fájlnév" sort="auto" hflex="5" align="left" />\r
+                       <listheader label="Archiválva" sort="auto" hflex="5" align="left" />\r
+                       <listheader label="Hossz" sort="auto" hflex="5" align="left" /> \r
+               </listhead>\r
+               <template name="model">\r
+                       <listitem>\r
+                               <listcell label="@load(each.item.id)" />\r
+                               <listcell label="@load(each.item.title)" />\r
+                               <listcell label="@load(each.media.mediaFileRealName)" />\r
+                               <listcell label="@load(each.media.archived)"/>\r
+                               <listcell label="@load(each.media.length)" />\r
+                       </listitem>\r
+               </template>\r
+       </listbox>\r
+</zk>\r

diff --git a/server/user.mediacube.gui/pages/searchitems/results.zul b/server/user.mediacube.gui/pages/searchitems/results.zul
deleted file mode 100644 (file)
index e0713f9..0000000
--- a/server/user.mediacube.gui/pages/searchitems/results.zul
+++ /dev/null
@@ -1,98 +0,0 @@
-<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client" height="100%" width="100%">\r
-       <listbox id="itemsListbox" mold="paging" emptyMessage="Nincs találat!"\r
-               model="@load(vm.searchResult)" vflex="true" hflex="true">\r
-               <listhead>\r
-                       <listheader label="ID" sort="auto" hflex="5" align="left" />\r
-                       <listheader label="Cím" sort="auto" hflex="5" align="left" />\r
-                       <listheader label="Fájlnév" sort="auto" hflex="5" align="left" />\r
-                       <listheader label="Archiválva" sort="auto" hflex="5" align="left" />\r
-                       <listheader label="Hossz" sort="auto" hflex="5" align="left" /> \r
-               </listhead>\r
-               <template name="model">\r
-                       <listitem>\r
-                               <listcell label="@load(each.item.id)" />\r
-                               <listcell label="@load(each.item.title)" />\r
-                               <listcell label="@load(each.media.mediaFileRealName)" />\r
-                               <listcell label="@load(each.media.archived)"/>\r
-                               <listcell label="@load(each.media.length)" />\r
-                       </listitem>\r
-               </template>\r
-       </listbox>\r
-</zk>\r
-\r
-<!-- <zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client" height="100%" width="100%"> -->\r
-<!--   <grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging"  -->\r
-<!--           autopaging="false" model="@load(vm.searchResult)" -->\r
-<!--           emptyMessage="Nincs találat!" pageSize="50"  -->\r
-<!--           onAfterRender="@command('onAfterRenderGrid')"  -->\r
-<!--           style="border: none; background: white !important;" -->\r
-<!--           oddRowSclass="listbox-odd-style"> -->\r
-<!--           <attribute name="onAfterRender"> -->\r
-<!--                   Clients.evalJavaScript("clearSelection();"); -->\r
-<!--           </attribute> -->\r
-<!--           <columns id="orderColumns"> -->\r
-\r
-<!--                   <column hflex="min"> -->\r
-<!--                           <checkbox checked="@bind(vm.rowsExpanded)" /> -->\r
-<!--                   </column> -->\r
-<!--                   <column hflex="min"> -->\r
-<!--                           <checkbox checked="@bind(vm.allSelected)" /> -->\r
-<!--                   </column> -->\r
-                       \r
-<!--                   <column label="ID" sort="auto" hflex="1" align="left" /> -->\r
-<!--                   <column label="Cím" sort="auto" hflex="2" align="left" /> -->\r
-<!--                   <column label="Fájlnév" sort="auto" hflex="5" align="left" /> -->\r
-<!--                   <column label="Archiválva" sort="auto" hflex="1" align="left" /> -->\r
-<!--                   <column label="Hossz" sort="auto" hflex="2" align="right" /> -->\r
-<!--           </columns> -->\r
-<!--           <rows id="rows" style="cursor: pointer;"> -->\r
-<!--                   <template name="model"> -->\r
-<!--                           <row onClick="@command('select', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)" -->\r
-<!--                                   onMouseOut="@Command('rowMouseOut', evt=event)" style="background: none;"> -->\r
-<!--                                   <detail open="@load(vm.rowsExpanded)"> -->\r
-<!--                                           <hlayout style="border-bottom: 1px solid #ebebeb; width: 100%;"> -->\r
-<!--                                                   <image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg" -->\r
-<!--                                                           content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')" -->\r
-<!--                                                           onClick="@command('select', selectedObject=each)" /> -->\r
-<!--                                                   <div sclass="details"> -->\r
-<!--                                                           <hlayout> -->\r
-<!--                                                                   <div class="${c:cat(vm.typeFilters[each.media.itemType.name].color,' type-inlist')}"> -->\r
-<!--                                                                           <label style="font-size: 10px;" value="@load(each.media.itemType.name)" /> -->\r
-<!--                                                                   </div> -->\r
-<!--                                                                   <label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" /> -->\r
-<!--                                                           </hlayout> -->\r
-<!--                                                           <html sclass="relevant"> -->\r
-<!--                                                                   <![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]> -->\r
-<!--                                                           </html> -->\r
-<!--                                                   </div> -->\r
-<!--                                           </hlayout> -->\r
-<!--                                   </detail> -->\r
-<!--                                   <checkbox checked="@save(vm.itemSelected) @validator(vm.itemSelectedValidator, arg=each)" /> -->\r
-<!--                                   <label value="@load(each.media.houseId)" /> -->\r
-<!--                                   <label value="@load(each.media.title)" /> -->\r
-<!--                                   <label value="@load(each.media.mediaFileRealName)" /> -->\r
-<!--                                   <label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" /> -->\r
-<!--                                   <cell> -->\r
-<!--                                           <vlayout> -->\r
-<!--                                                   <hlayout> -->\r
-<!--                                                           <label style="font-size:14px" -->\r
-<!--                                                                   value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" /> -->\r
-<!--                                                           <image src="/img/ic_visibility_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;"> -->\r
-<!--                                                                   <attribute name="visible" if="${each.media.mediaFilesCount lt 2}">false</attribute> -->\r
-<!--                                                           </image> -->\r
-<!--                                                           <image src="/img/ic_visibility_off_black_18dp.png" -->\r
-<!--                                                                   style="margin-left:4px;margin-top:2px;vertical-align:top;"> -->\r
-<!--                                                                   <attribute name="visible" if="${each.media.mediaFilesCount gt 1}">false</attribute> -->\r
-<!--                                                           </image> -->\r
-<!--                                                           <image src="/img/baseline_arrow_back_black_18dp.png" -->\r
-<!--                                                                   style="margin-left:4px;margin-top:2px;vertical-align:top;" -->\r
-<!--                                                                   visible="@load(!each.media.created.equals(each.media.modified))"> -->\r
-<!--                                                           </image> -->\r
-<!--                                                   </hlayout> -->\r
-<!--                                           </vlayout> -->\r
-<!--                                   </cell> -->\r
-<!--                           </row> -->\r
-<!--                   </template> -->\r
-<!--           </rows> -->\r
-<!--   </grid> -->\r
-<!-- </zk> -->
\ No newline at end of file

diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
similarity index 96%
rename from server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java
rename to server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
index 79e61ff7b8bc6ef29792f47e1b5ba5446b9b6956..7254bc217ef1bb449cb1341965426a2074b140e6 100644 (file)
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/ListSearchModel.java
@@ -79,7 +79,7 @@ import user.jobengine.server.JobEngineException;
 import user.jobengine.server.scheduler.ScheduledJob;\r
 import user.jobengine.zk.util.SessionUtil;\r
 \r
-public class SearchModel extends AsyncBaseModel {\r
+public class ListSearchModel extends AsyncBaseModel {\r
        private static final String TAGTYPE_REMOVE = "remove";\r
        private static final String TAGTYPE_ADD = "add";\r
        private static final String TAGEVT_TAGTEXT = "tagtext";\r
@@ -151,7 +151,7 @@ public class SearchModel extends AsyncBaseModel {
        private int selectedDateOption;\r
        private Window metaWindow;\r
 \r
-       public SearchModel() {\r
+       public ListSearchModel() {\r
                this.itemManager = ItemManager.getInstance();\r
 \r
                typeFilters = new LinkedHashMap<>();\r