From e283edfef12ad83e185906e6822fd6464928fb79 Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Mon, 13 Dec 2021 13:41:31 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C32571

---
 .../user.mediacube.gui/pages/searchitems.zul  |  4 +-
 .../pages/searchitems/gridresults.zul         | 77 +++++++++++++++
 .../pages/searchitems/listresults.zul         | 21 ++++
 .../pages/searchitems/results.zul             | 98 -------------------
 ...{SearchModel.java => ListSearchModel.java} |  4 +-
 5 files changed, 102 insertions(+), 102 deletions(-)
 create mode 100644 server/user.mediacube.gui/pages/searchitems/gridresults.zul
 create mode 100644 server/user.mediacube.gui/pages/searchitems/listresults.zul
 delete mode 100644 server/user.mediacube.gui/pages/searchitems/results.zul
 rename server/user.mediacube.gui/src/user/jobengine/zk/model/{SearchModel.java => ListSearchModel.java} (96%)

diff --git a/server/user.mediacube.gui/pages/searchitems.zul b/server/user.mediacube.gui/pages/searchitems.zul
index dca0bffe..f750cc68 100644
--- a/server/user.mediacube.gui/pages/searchitems.zul
+++ b/server/user.mediacube.gui/pages/searchitems.zul
@@ -4,7 +4,7 @@
 
 <!-- tag deklarációja -->
 <?component name="search-filters" inline="true" macroURI="searchitems/filters.zul"?>
-<?component name="search-results" inline="true" macroURI="searchitems/results.zul"?>
+<?component name="search-results" inline="true" macroURI="searchitems/listresults.zul"?>
 <?component name="item-details" inline="true" macroURI="searchitems/details.zul"?>
 
 <zk xmlns:h="xhtml" xmlns:n="native" xmlns:c="client">
@@ -37,7 +37,7 @@
 	<custom-attributes org.zkoss.zul.listbox.initRodSize="50" />
 	<custom-attributes org.zkoss.zul.listbox.preloadSize="50" />
 
-	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
+	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.ListSearchModel')">
 		<timer id="timer" delay="500" repeats="false" onTimer="@command('uiTick')" />
 		<div id="tagListener" onChange="@command('onTagChanged')" />
 
diff --git a/server/user.mediacube.gui/pages/searchitems/gridresults.zul b/server/user.mediacube.gui/pages/searchitems/gridresults.zul
new file mode 100644
index 00000000..069a2e6a
--- /dev/null
+++ b/server/user.mediacube.gui/pages/searchitems/gridresults.zul
@@ -0,0 +1,77 @@
+
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client" height="100%" width="100%">
+	<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" 
+		autopaging="false" model="@load(vm.searchResult)"
+		emptyMessage="Nincs találat!" pageSize="50" 
+		onAfterRender="@command('onAfterRenderGrid')" 
+		style="border: none; background: white !important;"
+		oddRowSclass="listbox-odd-style">
+		<attribute name="onAfterRender">
+			Clients.evalJavaScript("clearSelection();");
+		</attribute>
+		<columns id="orderColumns">
+
+			<column hflex="min">
+				<checkbox checked="@bind(vm.rowsExpanded)" />
+			</column>
+			<column hflex="min">
+				<checkbox checked="@bind(vm.allSelected)" />
+			</column>
+			
+			<column label="ID" sort="auto" hflex="1" align="left" />
+			<column label="Cím" sort="auto" hflex="2" align="left" />
+			<column label="Fájlnév" sort="auto" hflex="5" align="left" />
+			<column label="Archiválva" sort="auto" hflex="1" align="left" />
+			<column label="Hossz" sort="auto" hflex="2" align="right" />
+		</columns>
+		<rows id="rows" style="cursor: pointer;">
+			<template name="model">
+				<row onClick="@command('select', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)"
+					onMouseOut="@Command('rowMouseOut', evt=event)" style="background: none;">
+					<detail open="@load(vm.rowsExpanded)">
+						<hlayout style="border-bottom: 1px solid #ebebeb; width: 100%;">
+							<image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg"
+								content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')"
+								onClick="@command('select', selectedObject=each)" />
+							<div sclass="details">
+								<hlayout>
+									<div class="${c:cat(vm.typeFilters[each.media.itemType.name].color,' type-inlist')}">
+										<label style="font-size: 10px;" value="@load(each.media.itemType.name)" />
+									</div>
+									<label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />
+								</hlayout>
+								<html sclass="relevant">
+									<![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]>
+								</html>
+							</div>
+						</hlayout>
+					</detail>
+					<checkbox checked="@save(vm.itemSelected) @validator(vm.itemSelectedValidator, arg=each)" />
+					<label value="@load(each.media.houseId)" />
+					<label value="@load(each.media.title)" />
+ 					<label value="@load(each.media.mediaFileRealName)" />
+					<label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" />
+					<cell>
+						<vlayout>
+							<hlayout>
+								<label style="font-size:14px"
+									value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" />
+								<image src="/img/ic_visibility_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">
+									<attribute name="visible" if="${each.media.mediaFilesCount lt 2}">false</attribute>
+								</image>
+								<image src="/img/ic_visibility_off_black_18dp.png"
+									style="margin-left:4px;margin-top:2px;vertical-align:top;">
+									<attribute name="visible" if="${each.media.mediaFilesCount gt 1}">false</attribute>
+								</image>
+								<image src="/img/baseline_arrow_back_black_18dp.png"
+									style="margin-left:4px;margin-top:2px;vertical-align:top;"
+									visible="@load(!each.media.created.equals(each.media.modified))">
+								</image>
+							</hlayout>
+						</vlayout>
+					</cell>
+				</row>
+			</template>
+		</rows>
+	</grid>
+</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
index 00000000..e02ace7c
--- /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%">
+	<listbox id="itemsListbox" mold="paging" emptyMessage="Nincs találat!"
+		model="@load(vm.searchResult)" vflex="true" hflex="true">
+		<listhead>
+			<listheader label="ID" sort="auto" hflex="5" align="left" />
+			<listheader label="Cím" sort="auto" hflex="5" align="left" />
+			<listheader label="Fájlnév" sort="auto" hflex="5" align="left" />
+			<listheader label="Archiválva" sort="auto" hflex="5" align="left" />
+			<listheader label="Hossz" sort="auto" hflex="5" align="left" />	
+		</listhead>
+		<template name="model">
+			<listitem>
+				<listcell label="@load(each.item.id)" />
+				<listcell label="@load(each.item.title)" />
+				<listcell label="@load(each.media.mediaFileRealName)" />
+				<listcell label="@load(each.media.archived)"/>
+				<listcell label="@load(each.media.length)" />
+			</listitem>
+		</template>
+	</listbox>
+</zk>
diff --git a/server/user.mediacube.gui/pages/searchitems/results.zul b/server/user.mediacube.gui/pages/searchitems/results.zul
deleted file mode 100644
index e0713f92..00000000
--- 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%">
-	<listbox id="itemsListbox" mold="paging" emptyMessage="Nincs találat!"
-		model="@load(vm.searchResult)" vflex="true" hflex="true">
-		<listhead>
-			<listheader label="ID" sort="auto" hflex="5" align="left" />
-			<listheader label="Cím" sort="auto" hflex="5" align="left" />
-			<listheader label="Fájlnév" sort="auto" hflex="5" align="left" />
-			<listheader label="Archiválva" sort="auto" hflex="5" align="left" />
-			<listheader label="Hossz" sort="auto" hflex="5" align="left" />	
-		</listhead>
-		<template name="model">
-			<listitem>
-				<listcell label="@load(each.item.id)" />
-				<listcell label="@load(each.item.title)" />
-				<listcell label="@load(each.media.mediaFileRealName)" />
-				<listcell label="@load(each.media.archived)"/>
-				<listcell label="@load(each.media.length)" />
-			</listitem>
-		</template>
-	</listbox>
-</zk>
-
-<!-- <zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:c="client" height="100%" width="100%"> -->
-<!-- 	<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging"  -->
-<!-- 		autopaging="false" model="@load(vm.searchResult)" -->
-<!-- 		emptyMessage="Nincs találat!" pageSize="50"  -->
-<!-- 		onAfterRender="@command('onAfterRenderGrid')"  -->
-<!-- 		style="border: none; background: white !important;" -->
-<!-- 		oddRowSclass="listbox-odd-style"> -->
-<!-- 		<attribute name="onAfterRender"> -->
-<!-- 			Clients.evalJavaScript("clearSelection();"); -->
-<!-- 		</attribute> -->
-<!-- 		<columns id="orderColumns"> -->
-
-<!-- 			<column hflex="min"> -->
-<!-- 				<checkbox checked="@bind(vm.rowsExpanded)" /> -->
-<!-- 			</column> -->
-<!-- 			<column hflex="min"> -->
-<!-- 				<checkbox checked="@bind(vm.allSelected)" /> -->
-<!-- 			</column> -->
-			
-<!-- 			<column label="ID" sort="auto" hflex="1" align="left" /> -->
-<!-- 			<column label="Cím" sort="auto" hflex="2" align="left" /> -->
-<!-- 			<column label="Fájlnév" sort="auto" hflex="5" align="left" /> -->
-<!-- 			<column label="Archiválva" sort="auto" hflex="1" align="left" /> -->
-<!-- 			<column label="Hossz" sort="auto" hflex="2" align="right" /> -->
-<!-- 		</columns> -->
-<!-- 		<rows id="rows" style="cursor: pointer;"> -->
-<!-- 			<template name="model"> -->
-<!-- 				<row onClick="@command('select', selectedObject=each)" onMouseOver="@Command('rowMouseOver', evt=event)" -->
-<!-- 					onMouseOut="@Command('rowMouseOut', evt=event)" style="background: none;"> -->
-<!-- 					<detail open="@load(vm.rowsExpanded)"> -->
-<!-- 						<hlayout style="border-bottom: 1px solid #ebebeb; width: 100%;"> -->
-<!-- 							<image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg" -->
-<!-- 								content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')" -->
-<!-- 								onClick="@command('select', selectedObject=each)" /> -->
-<!-- 							<div sclass="details"> -->
-<!-- 								<hlayout> -->
-<!-- 									<div class="${c:cat(vm.typeFilters[each.media.itemType.name].color,' type-inlist')}"> -->
-<!-- 										<label style="font-size: 10px;" value="@load(each.media.itemType.name)" /> -->
-<!-- 									</div> -->
-<!-- 									<label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" /> -->
-<!-- 								</hlayout> -->
-<!-- 								<html sclass="relevant"> -->
-<!-- 									<![CDATA[ <div style='width: 90%'>${each.relevant}</div> ]]> -->
-<!-- 								</html> -->
-<!-- 							</div> -->
-<!-- 						</hlayout> -->
-<!-- 					</detail> -->
-<!-- 					<checkbox checked="@save(vm.itemSelected) @validator(vm.itemSelectedValidator, arg=each)" /> -->
-<!-- 					<label value="@load(each.media.houseId)" /> -->
-<!-- 					<label value="@load(each.media.title)" /> -->
-<!--  					<label value="@load(each.media.mediaFileRealName)" /> -->
-<!-- 					<label style="font-size: 10px;" value="@load(each.media.archived) @converter('user.jobengine.zk.model.ShortDateConverter')" /> -->
-<!-- 					<cell> -->
-<!-- 						<vlayout> -->
-<!-- 							<hlayout> -->
-<!-- 								<label style="font-size:14px" -->
-<!-- 									value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" /> -->
-<!-- 								<image src="/img/ic_visibility_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;"> -->
-<!-- 									<attribute name="visible" if="${each.media.mediaFilesCount lt 2}">false</attribute> -->
-<!-- 								</image> -->
-<!-- 								<image src="/img/ic_visibility_off_black_18dp.png" -->
-<!-- 									style="margin-left:4px;margin-top:2px;vertical-align:top;"> -->
-<!-- 									<attribute name="visible" if="${each.media.mediaFilesCount gt 1}">false</attribute> -->
-<!-- 								</image> -->
-<!-- 								<image src="/img/baseline_arrow_back_black_18dp.png" -->
-<!-- 									style="margin-left:4px;margin-top:2px;vertical-align:top;" -->
-<!-- 									visible="@load(!each.media.created.equals(each.media.modified))"> -->
-<!-- 								</image> -->
-<!-- 							</hlayout> -->
-<!-- 						</vlayout> -->
-<!-- 					</cell> -->
-<!-- 				</row> -->
-<!-- 			</template> -->
-<!-- 		</rows> -->
-<!-- 	</grid> -->
-<!-- </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 79e61ff7..7254bc21 100644
--- 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;
 import user.jobengine.zk.util.SessionUtil;
 
-public class SearchModel extends AsyncBaseModel {
+public class ListSearchModel extends AsyncBaseModel {
 	private static final String TAGTYPE_REMOVE = "remove";
 	private static final String TAGTYPE_ADD = "add";
 	private static final String TAGEVT_TAGTEXT = "tagtext";
@@ -151,7 +151,7 @@ public class SearchModel extends AsyncBaseModel {
 	private int selectedDateOption;
 	private Window metaWindow;
 
-	public SearchModel() {
+	public ListSearchModel() {
 		this.itemManager = ItemManager.getInstance();
 
 		typeFilters = new LinkedHashMap<>();
-- 
2.54.0