From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 12 Mar 2018 16:05:25 +0000 (+0000)
Subject: git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube... 
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=80b3708a3be3e38a6a464665d4e408a0865523d8;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/img/ic_play_big.png b/server/user.jobengine.osgi.server/img/ic_play_big.png
new file mode 100644
index 00000000..a9e0143b
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/ic_play_big.png differ
diff --git a/server/user.jobengine.osgi.server/img/redcliff_rens.png b/server/user.jobengine.osgi.server/img/redcliff_rens.png
new file mode 100644
index 00000000..265bbede
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/redcliff_rens.png differ
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index ff929273..bcc66e25 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -3,93 +3,101 @@
 <?script type="text/javascript" src="/js/videojs-ie8.min.js"?>
 <?script type="text/javascript" src="/js/video.js"?>
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
+
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client">
 	<!-- csak igy jo a list sebessege -->
 	<custom-attributes org.zkoss.zul.listbox.rod="true" />
 	<custom-attributes org.zkoss.zul.listbox.initRodSize="50" />
 	<custom-attributes org.zkoss.zul.listbox.preloadSize="50" />
+	<style>
+.myimg {
+	margin: 5px; border: 1px solid #CFCFCF;
+	cursor: pointer;
+}
+div.z-row-content span {
+	font-family: Tahoma,Arial,serif;
+}
+.z-row .z-detail-outer {
+    padding: 3px 6px;
+}
+.heavy {
+	font-weight:bold;
+}
+div.z-row-content .rating {
+	font-weight:bold;
+	color: #0093f9;
+}
 
+.details {
+    padding: 5px;
+    line-height: 1.5em;
+}
+	</style>
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
-
-
 		<borderlayout>
-			<west border="none" size="50%" splittable="true" minsize="250">
+			<west border="none" size="60%" splittable="true" minsize="250">
 				<div height="100%" width="100%">
 					<groupbox vflex="min" closable="false">
-
 						<textbox style="border:none" instant="true" value="@bind(vm.searchValue)" width="100%"
 							tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" />
-						<toolbar>
-							<checkbox checked="@bind(vm.allFeedChecked)" />
+						<toolbar vflex="min" style="font-size:8px">
+							<checkbox checked="@bind(vm.allChecked)" />
 							<toolbarbutton label="Hír bejátszó" mode="toggle" checked="@bind(vm.newsFeedChecked)" />
 							<toolbarbutton label="Hír nyersanyag" mode="toggle" checked="@bind(vm.newsRawChecked)" />
 							<toolbarbutton label="Műsor" mode="toggle" checked="@bind(vm.materialChecked)" />
+							<toolbarbutton label="Műsor nyersanyag" mode="toggle" checked="@bind(vm.materialRawChecked)" />
 							<toolbarbutton label="Promo" mode="toggle" checked="@bind(vm.promoChecked)" />
+							<toolbarbutton label="Promo nyersanyag" mode="toggle" checked="@bind(vm.promoRawChecked)" />
 							<toolbarbutton label="Reklám" mode="toggle" checked="@bind(vm.adChecked)" />
-							<toolbarbutton label="Visszarögzített" mode="toggle" checked="@bind(vm.recordingChecked) "/>
+							<toolbarbutton label="Reklám nyersanyag" mode="toggle" checked="@bind(vm.adRawChecked)" />
+							<toolbarbutton label="Visszarögzített" mode="toggle" checked="@bind(vm.recordingChecked) " />
 							<toolbarbutton label="Egyéb" mode="toggle" checked="@bind(vm.otherChecked)" />
 						</toolbar>
 					</groupbox>
-					<!-- 					<grid> -->
-					<!-- 						<columns> -->
-					<!-- 							<column width="40px" /> -->
-					<!-- 							<column hflex="1" label="Name" sort="auto" /> -->
-					<!-- 							<column width="150px" label="Price" sort="auto" align="center" /> -->
-					<!-- 							<column width="150px" label="Rating" sort="auto" align="center" /> -->
-					<!-- 						</columns> -->
-					<!-- 						<rows> -->
-					<!-- 							<template name="model"> -->
-					<!-- 								<row> -->
-					<!-- 									<detail open="true"> -->
-					<!-- 										<hlayout> -->
-					<!-- 											<image sclass="myimg" width="140px" height="90px" src="/widgets/grid/master_detail/img/${img}" /> -->
-					<!-- 											<div sclass="details"> -->
-					<!-- 												<div> -->
-					<!-- 													<label value="Facilities:" /> -->
-					<!-- 													<label value="${facilities}" sclass="heavy" /> -->
-					<!-- 												</div> -->
-					<!-- 												<div> -->
-					<!-- 													<label value="Room Type:" /> -->
-					<!-- 													<label value="${roomType}" sclass="heavy" /> -->
-					<!-- 												</div> -->
-					<!-- 												<div> -->
-					<!-- 													<label value="Included:" /> -->
-					<!-- 													<label value="${included}" sclass="heavy" /> -->
-					<!-- 												</div> -->
-					<!-- 												<div> -->
-					<!-- 													<label value="Nearby:" /> -->
-					<!-- 													<label value="${nearby}" sclass="heavy" /> -->
-					<!-- 												</div> -->
-					<!-- 												<div> -->
-					<!-- 													<label value="PaymentOptions:" /> -->
-					<!-- 													<label value="${paymentOptions}" sclass="heavy" /> -->
-					<!-- 												</div> -->
-					<!-- 											</div> -->
-					<!-- 										</hlayout> -->
-					<!-- 									</detail> -->
-					<!-- 									<label value="${name}" /> -->
-					<!-- 									<label value="${price}" sclass="price" /> -->
-					<!-- 									<label value="${rating}" sclass="rating" /> -->
-					<!-- 								</row> -->
-					<!-- 							</template> -->
-					<!-- 						</rows> -->
-					<!-- 					</grid> -->
-
 					<groupbox vflex="true" closable="false">
-						<listbox id="itemResults" sizedByContent="false" span="true" model="@load(vm.searchResult)" activePage="@bind(vm.activePage)" mold="paging" multiple="false" autopaging="true"
-							vflex="true" selectedItem="@bind(vm.selectedItem)" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"
-							sclass="listbox-normal-style">
-							<listhead sizable="true">
-								<listheader label="ID" hflex="1" align="left" />
-								<listheader label="Cím" hflex="6" align="left" />
-							</listhead>
-							<template name="model">
-								<listitem>
-									<listcell label="@load(each.media.houseId)" />
-									<listcell label="@load(each.media.title)" />
-								</listitem>
-							</template>
-						</listbox>
+						<grid id="itemResults" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
+							model="@load(vm.searchResult)" activePage="@bind(vm.activePage)" selectedItem="@bind(vm.selectedObject)"
+							style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" emptyMessage="Nincs találat!">
+							<columns>
+								<column hflex="min">
+									<checkbox checked="@bind(vm.rowsExpanded)"/>
+								</column>
+								<column label="ID" hflex="min" align="left" />
+								<column label="Cím" align="left" />
+								<column label="Fájlnév" hflex="min" align="left" />
+								<column label="Megtekinthető" hflex="min" align="right" />
+							</columns>
+							<rows>
+								<template name="model">
+									<row>
+										<detail open="@load(vm.rowsExpanded)">
+											<hlayout>
+												<image tooltiptext="Kattints a lejátszáshoz!" width="140px" height="90px" sclass="myimg" content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')" />
+												<div sclass="details">
+													<div>
+														<label value="Típus:" sclass="heavy" />
+														<label value="@load(each.media.itemType.name)" />
+													</div>
+													<div>
+														<label value="Gyűjtő:" sclass="heavy" />
+														<label value="@load(each.item.title)" />
+													</div>
+													<div>
+														<label value="@load(each.media.description)" maxlength="200" />
+													</div>
+												</div>
+											</hlayout>
+ 										</detail>
+										<label value="@load(each.media.houseId)" />
+										<label value="@load(each.media.title)" />
+										<label value="@load(each.media.houseId)" />
+										<checkbox checked="@load(each.media.mediaFilesCount > 1)" w:onCheck="this.setChecked(!this.isChecked())" />
+									</row>
+								</template>
+							</rows>
+						</grid>
+
+
 					</groupbox>
 				</div>
 			</west>
@@ -100,15 +108,6 @@
 
 					<north border="none" size="60%" splittable="true" minsize="250" collapsible="true">
 						<div align="center" height="100%" width="100%">
-							<!-- 							<html> -->
-							<!-- 								<![CDATA[  -->
-							<!-- 								<link href="/css/video-js.css" rel="stylesheet"> -->
-							<!-- 								<video id="myVideoDiv" width="100%" height="100%" class="video-js" controls preload="auto" data-setup="{}">  -->
-							<!-- 									<source src="@load(vm.lowresMediaFilePath)" type='video/mp4'> -->
-							<!-- 								</video>  -->
-							<!-- 								<script> var player = videojs('myVideoDiv'); </script>  -->
-							<!-- 								]]> -->
-							<!-- 							</html> -->
 							<iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(vm.lowresMediaFilePath)"></iframe>
 						</div>
 					</north>
@@ -119,46 +118,47 @@
 								<button label="Visszatöltés" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)"
 									sclass="buttonboldfont" />
 							</caption>
+
 							<div width="100%" height="100%" style="padding: 4px; overflow:auto; background-color: white">
 								<div>
 									<label style="font-size:8pt; color: gray" value="Anyag azonosító" />
 									<div style="margin: 4px">
-										<label value="@load(vm.selectedItem.item)" />
+										<label value="@load(vm.selectedObject.item.houseId)" />
 									</div>
 									<space bar="false" />
 								</div>
 								<div>
 									<label style="font-size:8pt; color: gray" value="Anyag címe" />
 									<div style="margin: 4px">
-										<label value="@load(vm.selectedItem.item.title)" />
+										<label value="@load(vm.selectedObject.item.title)" />
 									</div>
 									<space bar="false" />
 								</div>
 								<div>
 									<label style="font-size:8pt; color: gray" value="Anyag leírása" />
 									<div style="margin: 4px">
-										<label value="@load(vm.selectedItem.item.description)" />
+										<label value="@load(vm.selectedObject.item.description)" />
 									</div>
 									<space bar="false" />
 								</div>
 								<div>
 									<label style="font-size:8pt; color: gray" value="Média azonosító" />
 									<div style="margin: 4px">
-										<label value="@load(vm.selectedItem.media.houseId)" />
+										<label value="@load(vm.selectedObject.media.houseId)" />
 									</div>
 									<space bar="false" />
 								</div>
 								<div>
 									<label style="font-size:8pt; color: gray" value="Média címe" />
 									<div style="margin: 4px">
-										<label value="@load(vm.selectedItem.media.title)" />
+										<label value="@load(vm.selectedObject.media.title)" />
 									</div>
 									<space bar="false" />
 								</div>
 								<div>
 									<label style="font-size:8pt; color: gray" value="Média leírása" />
 									<div style="margin: 4px">
-										<label multiline="true" value="@load(vm.selectedItem.getMedia().description)" />
+										<label multiline="true" value="@load(vm.selectedObject.media.description)" />
 									</div>
 								</div>
 							</div>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/ByToImageConverter.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/ByToImageConverter.java
new file mode 100644
index 00000000..040f661a
--- /dev/null
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/ByToImageConverter.java
@@ -0,0 +1,52 @@
+package user.jobengine.zk.model;
+
+import java.io.IOException;
+
+import org.zkoss.bind.BindContext;
+import org.zkoss.bind.Converter;
+import org.zkoss.image.AImage;
+import org.zkoss.io.Files;
+import org.zkoss.zul.Image;
+
+public class ByToImageConverter implements Converter<AImage, byte[], Image> {
+
+	private byte[] noImg = null;
+
+	public ByToImageConverter() {
+		try {
+			noImg = Files.readAll(getClass().getResourceAsStream("/img/ic_play_big.png"));
+		} catch (IOException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public byte[] coerceToBean(AImage compAttr, Image component, BindContext ctx) {
+		return compAttr.getByteData();
+	}
+
+	@Override
+	public AImage coerceToUi(byte[] beanProp, Image component, BindContext ctx) {
+		try {
+			if (beanProp != null && beanProp.length > 0) {
+				AImage im = new AImage("", beanProp);
+				component.setContent(im);
+				component.setWidth(im.getWidth() + "px");
+				component.setHeight(im.getHeight() + "px");
+				return im;
+			}
+			if (noImg != null && noImg.length > 0) {
+				AImage im = new AImage("", noImg);
+				component.setContent(im);
+				component.setWidth(im.getWidth() + "px");
+				component.setHeight(im.getHeight() + "px");
+				return im;
+			}
+			return null;
+		} catch (IOException e) {
+			return null;
+		}
+	}
+
+}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index c7351870..be3fc7e1 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -31,22 +31,26 @@ public class SearchModel extends BaseModel {
 
 	private String searchValue = null;
 	private CachedListModel searchResult = null;
-	private ArchivedMedia selectedItem = null;
-	private boolean newsFeedChecked;
-	private boolean allFeedChecked;
-	private boolean newsRawChecked;
-	private boolean materialChecked;
-	private boolean promoChecked;
-	private boolean adChecked;
-	private boolean recordingChecked;
-	private boolean otherChecked;
+	private ArchivedMedia selectedObject = null;
+	private boolean newsFeedChecked = true;
+	private boolean allChecked = true;
+	private boolean newsRawChecked = true;
+	private boolean materialChecked = true;
+	private boolean materialRawChecked = true;
+	private boolean promoChecked = true;
+	private boolean promoRawChecked = true;
+	private boolean adChecked = true;
+	private boolean adRawChecked = true;
+	private boolean recordingChecked = true;
+	private boolean otherChecked = true;
 	private int activePage;
+	private boolean rowsExpanded = true;
 
 	@Command
-	@NotifyChange({ "activePage", "searchResult", "selectedItem", "hasLowresMediaFile" })
+	@NotifyChange({ "activePage", "searchResult", "selectedObject", "hasLowresMediaFile" })
 	public void doSearch() {
 		try {
-			this.selectedItem = null;
+			this.selectedObject = null;
 			if (StringUtils.isBlank(searchValue) || searchValue.length() < 3)
 				throw new Exception("Legalább 3 karakter megadása kötelező!");
 			searchResult = new CachedListModel(searchValue);
@@ -61,7 +65,7 @@ public class SearchModel extends BaseModel {
 		if (!getHasTSMMediaFile())
 			return;
 		Map<String, Object> arguments = new HashMap<String, Object>();
-		arguments.put(MEDIACUBEMEDIA, this.selectedItem.getMedia());
+		arguments.put(MEDIACUBEMEDIA, this.selectedObject.getMedia());
 		Window window = (Window) Executions.createComponents(PAGES_RETRIEVESELECTOR_ZUL, null, arguments);
 		window.doModal();
 	}
@@ -87,7 +91,7 @@ public class SearchModel extends BaseModel {
 	}
 
 	public boolean getHasTSMMediaFile() {
-		return selectedItem != null;
+		return selectedObject != null;
 	}
 
 	public String getLowresMediaFilePath() throws Exception {
@@ -115,9 +119,9 @@ public class SearchModel extends BaseModel {
 
 	private Media getMedia() {
 		Media result = null;
-		if (searchResult != null && selectedItem != null) {
+		if (searchResult != null && selectedObject != null) {
 			IItemManager manager = searchResult.getItemManager();
-			result = manager.getMedia(selectedItem.getMedia().getId());
+			result = manager.getMedia(selectedObject.getMedia().getId());
 		}
 		return result;
 	}
@@ -130,8 +134,8 @@ public class SearchModel extends BaseModel {
 		return searchValue;
 	}
 
-	public ArchivedMedia getSelectedItem() {
-		return selectedItem;
+	public ArchivedMedia getSelectedObject() {
+		return selectedObject;
 	}
 
 	public String getTSMMediaFilePath() throws Exception {
@@ -152,14 +156,22 @@ public class SearchModel extends BaseModel {
 		return adChecked;
 	}
 
-	public boolean isAllFeedChecked() {
-		return allFeedChecked;
+	public boolean isAdRawChecked() {
+		return adRawChecked;
+	}
+
+	public boolean isAllChecked() {
+		return allChecked;
 	}
 
 	public boolean isMaterialChecked() {
 		return materialChecked;
 	}
 
+	public boolean isMaterialRawChecked() {
+		return materialRawChecked;
+	}
+
 	public boolean isNewsFeedChecked() {
 		return newsFeedChecked;
 	}
@@ -176,10 +188,18 @@ public class SearchModel extends BaseModel {
 		return promoChecked;
 	}
 
+	public boolean isPromoRawChecked() {
+		return promoRawChecked;
+	}
+
 	public boolean isRecordingChecked() {
 		return recordingChecked;
 	}
 
+	public boolean isRowsExpanded() {
+		return rowsExpanded;
+	}
+
 	public void setActivePage(int activePage) {
 		this.activePage = activePage;
 	}
@@ -188,14 +208,34 @@ public class SearchModel extends BaseModel {
 		this.adChecked = adChecked;
 	}
 
-	public void setAllFeedChecked(boolean allFeedChecked) {
-		this.allFeedChecked = allFeedChecked;
+	public void setAdRawChecked(boolean adRawChecked) {
+		this.adRawChecked = adRawChecked;
+	}
+
+	@NotifyChange({ "newsFeedChecked", "newsRawChecked", "materialChecked", "materialRawChecked", "promoChecked", "promoRawChecked", "adChecked",
+			"adRawChecked", "recordingChecked", "otherChecked" })
+	public void setAllChecked(boolean allFeedChecked) {
+		this.allChecked = allFeedChecked;
+		newsFeedChecked = allChecked;
+		newsRawChecked = allChecked;
+		materialChecked = allChecked;
+		materialRawChecked = allChecked;
+		promoChecked = allChecked;
+		promoRawChecked = allChecked;
+		adChecked = allChecked;
+		adRawChecked = allChecked;
+		recordingChecked = allChecked;
+		otherChecked = allChecked;
 	}
 
 	public void setMaterialChecked(boolean materialChecked) {
 		this.materialChecked = materialChecked;
 	}
 
+	public void setMaterialRawChecked(boolean materialRawChecked) {
+		this.materialRawChecked = materialRawChecked;
+	}
+
 	public void setNewsFeedChecked(boolean newsFeedChecked) {
 		this.newsFeedChecked = newsFeedChecked;
 	}
@@ -212,17 +252,25 @@ public class SearchModel extends BaseModel {
 		this.promoChecked = promoChecked;
 	}
 
+	public void setPromoRawChecked(boolean promoRawChecked) {
+		this.promoRawChecked = promoRawChecked;
+	}
+
 	public void setRecordingChecked(boolean recordingChecked) {
 		this.recordingChecked = recordingChecked;
 	}
 
+	public void setRowsExpanded(boolean rowsExpanded) {
+		this.rowsExpanded = rowsExpanded;
+	}
+
 	public void setSearchValue(String searchValue) {
 		this.searchValue = searchValue;
 	}
 
-	@NotifyChange({ "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath", "selectedItem.item" })
-	public void setSelectedItem(ArchivedMedia selectedItem) {
-		this.selectedItem = selectedItem;
+	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
+	public void setSelectedObject(ArchivedMedia selectedObject) {
+		this.selectedObject = selectedObject;
 	}
 
 }