From: Márk Mérész <USER\mark.meresz>
Date: Fri, 13 Jul 2018 14:57:40 +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=64fa6a65d12872135ff1bbbf80b2c0b8a85127bb;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/pages/metadatadetails.zul b/server/user.jobengine.osgi.server/pages/metadatadetails.zul
index 02ce6db6..b40b6e81 100644
--- a/server/user.jobengine.osgi.server/pages/metadatadetails.zul
+++ b/server/user.jobengine.osgi.server/pages/metadatadetails.zul
@@ -1,31 +1,31 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<window id="window"  title="Metadatok szerkesztése" width="900px" height="660px" position="top_center" sizable="true" border="normal" apply="org.zkoss.bind.BindComposer"
+<window id="window"  title="" width="900px" height="660px" position="top_center" sizable="true" border="normal" apply="org.zkoss.bind.BindComposer"
 	viewModel="@id('vm') @init('user.jobengine.zk.model.MetadataDetailsModel')" forward="onCancel=closeButton.onClick">
 	<style>
 		.z-window-header{ background:#008ac8; color:white; font-size:16px; padding:10px; } .z-row:hover > .z-row-inner{ background:#7ad6ff40; }
 	</style>
 	<attribute name="onSize"><![CDATA[
-	        String height= String.valueOf((Integer.parseInt(self.getHeight().replace("px",""))-125)*0.059813084112149535);
+	        String height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.059813084112149535);
             item_houseid.setHeight(height+"px");
             Clients.resize(item_houseid);
             item_title.setHeight(height+"px");
             Clients.resize(item_title);
             item_type.setHeight(height+"px");
             Clients.resize(item_type);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px",""))-120)*0.21495327102803738);
+            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.21495327102803738);
             item_description.setHeight(height+"px");
             Clients.resize(item_description);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px",""))-120)*0.0599250936329588);
+            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.0599250936329588);
             media_houseid.setHeight(height+"px");
             Clients.resize(media_houseid);
             media_title.setHeight(height+"px");
             Clients.resize(media_title);
             media_type.setHeight(height+"px");
             Clients.resize(media_type);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px",""))-120)*0.41869158878504675);
+            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.41869158878504675);
             media_description.setHeight(height+"px");
             Clients.resize(media_description);
-            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px",""))-120)*0.41869158878504675*0.9);
+            height= String.valueOf((Integer.parseInt(self.getHeight().replace("px","")))*0.41869158878504675*0.9);
             media_description_content.setHeight(height+"px");
             Clients.resize(media_description_content);
         ]]></attribute>
@@ -62,7 +62,7 @@
 					</listitem>
 					<listitem id="media_type">
 						<listcell label="Média típusa:" />
-						<listcell><combobox constraint="no empty" id="mediatypes" width="300px"
+						<listcell><combobox id="mediatypes" width="300px"
 							selectedItem="@load(vm.archivedMedia.media.itemType)@save(vm.archivedMedia.media.itemType,before='save')" model="@load(vm.itemTypes)">
 							<template name="model">
 								<comboitem label="${each.name}" value="${each}"></comboitem>
@@ -79,7 +79,7 @@
 		</div>
 		<div vflex="min">
 		<hbox width="100%"  pack="center" align="center">
-			<button id="saveButton" label="Mentés" onClick="@command('save')" />
+			<button id="saveButton" label="Mentés" onClick="@command('save')"/>
 			<button id="closeButton" label="Mégse" onClick="@command('close')" />
 		</hbox>
 		</div>
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index e3a88aa8..700a807a 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -56,8 +56,10 @@
 
 		.type-inlist { width:80px; border-left:1px solid #008AC8; border-bottom:1px solid #008AC8; padding:4px; }
 
-		.buttonMetadata{ float: right; margin: 5px; width: 200px; }
-
+		.buttonBold{ font-weight:bold; width:200px;}
+		.menuButtons{ display: flex; justify-content: space-between; padding:5px 10px 5px 10px; }
+		.menuButtons >button{ width:200px; }
+		.z-messagebox-window{ top:40% !important; width:30% !important; }
 	</style>
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.SearchModel')">
 		<timer id="timer" delay="100" repeats="true" onTimer="@command('uiTick')" />
@@ -136,9 +138,15 @@
 														<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>
@@ -186,14 +194,16 @@
 					<center border="none">
 
 						<groupbox closable="false" mold="3d" width="100%" height="100%">
-							<div width="100%">
+							<div width="100%" sclass="menuButtons">
 								<button label="Kosárba" onClick="@command('downloadMedia')" autodisable="self" disabled="@load(not vm.hasTSMMediaFile)"
-									sclass="buttonboldfont" />
-								<button id="metadataButton" sclass="buttonMetadata" label="Szerkesztés" onClick="@command('openMetaDataDialog')" 
-									autodisable="self" disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" />
+									sclass="buttonBold" />
+								<button id="copyMediaIdButton" label="MédiaId vágólapra másolás" onClick="@command('copyMediaIdToClipboard')" autodisable="self"
+									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" />
+								<button id="metadataButton" label="Szerkesztés" onClick="@command('openMetaDataDialog')" autodisable="self"
+									disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" />
 							</div>
 
-							<div width="100%" height="100%" style="padding: 4px; overflow:auto; background-color: white">
+							<div width="100%" height="90%" style="padding: 4px; overflow:auto; background-color: white">
 								<div>
 									<label style="font-size:8pt; color: gray" value="Anyag azonosító" />
 									<div style="margin: 4px">
@@ -242,6 +252,5 @@
 
 			</center>
 		</borderlayout>
-
 	</div>
 </zk>
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
index 4ed74109..3b997751 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
@@ -1,7 +1,6 @@
 package user.jobengine.zk.model;
 
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 
@@ -18,7 +17,6 @@ import user.jobengine.db.ArchivedMedia;
 import user.jobengine.db.IItemManager;
 import user.jobengine.db.Item;
 import user.jobengine.db.ItemManager;
-import user.jobengine.db.Media;
 import user.jobengine.db.SearchResult;
 
 /**
@@ -37,7 +35,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 	private int cacheEnd;
 
 	private ArrayList<EventListener> eventListenerList = new ArrayList<EventListener>();
-	private IItemManager itemManager = null;
+	protected IItemManager itemManager = null;
 	private List<String> searchFilters;
 	private String orderBy;
 	private boolean orderAscending;
@@ -51,7 +49,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		reinit();
 	}
 
-	//load cache event
+	// load cache event
 	public void addEventListener(EventListener listener) {
 		eventListenerList.add(listener);
 	}
@@ -75,19 +73,6 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		return sr;
 	}
 
-	//TODO szarmaztatott osztalyba
-	protected SearchResult<ArchivedMedia> createSearchResult1(int startPos, int endPos) {
-		long mediaID = 0;
-		Media media = itemManager.getMedia(mediaID);
-		SearchResult<ArchivedMedia> sr = new SearchResult<>();
-		sr.setItemCount(1);
-		ArchivedMedia archivedMedia = new ArchivedMedia();
-		archivedMedia.setMedia(media);
-		archivedMedia.setItem(itemManager.getItem(media.getItemId()));
-		sr.setItems(Arrays.asList(archivedMedia));
-		return sr;
-	}
-
 	public void fireListEvent() {
 		clearCache();
 		fireEvent(ListDataEvent.STRUCTURE_CHANGED, -1, -1);
@@ -119,7 +104,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		return cacheEnd;
 	}
 
-	//zul felulet hasznalja kiirashoz
+	// zul felulet hasznalja kiirashoz
 	public int getCacheStart() {
 		return cacheStart;
 	}
@@ -130,7 +115,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 
 	@Override
 	public ArchivedMedia getElementAt(int index) {
-		//logger.debug("CachedListMode.getElementAt(): " + index);
+		// logger.debug("CachedListMode.getElementAt(): " + index);
 		ArchivedMedia ret = cache.get(index);
 		if (ret == null) {
 			loadCache(index);
@@ -146,13 +131,13 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		return itemManager;
 	}
 
-	//ListModelList method felulirva
-	//after 1. search ++++++++++
+	// ListModelList method felulirva
+	// after 1. search ++++++++++
 	@Override
 	public int getSize() {
 		if (this.resultSetSize < 0) {
 			loadCache(0);
-			//logger.debug("CachedListMode.getSize(): " + this.resultSetSize);
+			// logger.debug("CachedListMode.getSize(): " + this.resultSetSize);
 		}
 		return this.resultSetSize;
 	}
@@ -164,9 +149,9 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		try {
 			clearCache();
 			int halfSize = this.cacheSize / 2;
-			int rowLimit = this.cacheSize; //200
+			int rowLimit = this.cacheSize; // 200
 			int startPos = 0;
-			if ((forIndex - halfSize) > 0) { //forIndex=60	startPos=0 cache=0-200,		forIndex=150 startPos=50 cache=50-250
+			if ((forIndex - halfSize) > 0) { // forIndex=60 startPos=0 cache=0-200, forIndex=150 startPos=50 cache=50-250
 				startPos = (forIndex - halfSize);
 			}
 
@@ -185,10 +170,10 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 					for (int c = 0; c < resList.size(); c++) {
 						cache.put(startPos + c, resList.get(c));
 						cache.put(startPos + c, resList.get(c));
-						//logger.debug("CachedListMode.cached idx: " + (startPos + c));
+						// logger.debug("CachedListMode.cached idx: " + (startPos + c));
 					}
 				}
-				//logger.debug("CachedListMode.cacheSize: " + cache.size());
+				// logger.debug("CachedListMode.cacheSize: " + cache.size());
 
 				cacheStart = startPos + 1;
 				cacheEnd = cacheStart + (cache.size() == 0 ? 0 : (cache.size() - 1));
@@ -201,7 +186,7 @@ public class CachedListModel extends ListModelList<ArchivedMedia> {
 		}
 	}
 
-	//kintrol is hivhatjak
+	// kintrol is hivhatjak
 	public void reinit() {
 		this.resultSetSize = -1;
 		this.cacheStart = 0;
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/InitializedCachedListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/InitializedCachedListModel.java
new file mode 100644
index 00000000..d6ab4f0e
--- /dev/null
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/InitializedCachedListModel.java
@@ -0,0 +1,32 @@
+package user.jobengine.zk.model;
+
+import java.util.Arrays;
+import java.util.List;
+
+import user.jobengine.db.ArchivedMedia;
+import user.jobengine.db.Media;
+import user.jobengine.db.SearchResult;
+
+public class InitializedCachedListModel extends CachedListModel {
+
+	private long mediaID;
+
+	public InitializedCachedListModel(String mediaID, String searchValue, List<String> searchFilters, String orderBy, boolean orderAscending) {
+		super(searchValue, searchFilters, orderBy, orderAscending);
+		this.mediaID = Long.parseLong(mediaID);
+
+	}
+
+	@Override
+	protected SearchResult<ArchivedMedia> createSearchResult(int startPos, int endPos) {
+		Media media = itemManager.getMedia(mediaID);
+		SearchResult<ArchivedMedia> sr = new SearchResult<>();
+		sr.setItemCount(1);
+		ArchivedMedia archivedMedia = new ArchivedMedia();
+		archivedMedia.setMedia(media);
+		archivedMedia.setItem(itemManager.getItem(media.getItemId()));
+		sr.setItems(Arrays.asList(archivedMedia));
+		return sr;
+	}
+
+}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java
index 1f8eadf8..32ab33f0 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MetadataDetailsModel.java
@@ -12,8 +12,12 @@ import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.WrongValueException;
 import org.zkoss.zk.ui.select.Selectors;
+import org.zkoss.zk.ui.select.annotation.Listen;
 import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zul.Button;
+import org.zkoss.zul.Combobox;
 import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Window;
 
@@ -30,6 +34,12 @@ public class MetadataDetailsModel extends BaseModel {
 	private List<ItemType> itemTypes;
 	private ItemManager manager;
 
+	@Wire
+	private Combobox mediatypes;
+
+	@Wire
+	private Button saveButton;
+
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
@@ -62,18 +72,35 @@ public class MetadataDetailsModel extends BaseModel {
 		return itemTypes;
 	}
 
-	// @Listen("onAfterRender = #mediatypes")
-	// public void onAfterRender(Event event) {
-	// mediatypesCombobox.setSelectedIndex(getItemTypes().indexOf(archivedMedia.getMedia().getItemType()));
-	// }
-
 	@Init
 	public void init() {
 	}
 
+	@Listen("onAfterRender  = #mediatypes")
+	public void onAfterRenderMediaTypes() {
+		if (mediatypes.getSelectedItem() != null) {
+			saveButton.setDisabled(false);
+
+		} else {
+			saveButton.setDisabled(true);
+			throw new WrongValueException(mediatypes, "Kérem válasszon a listából");
+		}
+	}
+
+	@Listen("onSelect = #mediatypes")
+	public void onChangesMediaTypes() {
+		if (mediatypes.getSelectedItem() != null) {
+			saveButton.setDisabled(false);
+		} else {
+			saveButton.setDisabled(true);
+			throw new WrongValueException(mediatypes, "Kérem válasszon a listából");
+		}
+	}
+
 	@Command
 	public void save() {
 		manager.modify(archivedMedia.getMedia());
+		logger.info("Metadat of media was updated by user, id of media: {}", archivedMedia.getMedia().getHouseId());
 		wnd.detach();
 	}
 
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 be621395..29c85f75 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
@@ -1,5 +1,8 @@
 package user.jobengine.zk.model;
 
+import java.awt.Toolkit;
+import java.awt.datatransfer.Clipboard;
+import java.awt.datatransfer.StringSelection;
 import java.net.URL;
 import java.nio.file.Paths;
 import java.util.ArrayList;
@@ -48,6 +51,7 @@ import user.jobengine.zk.util.SessionUtil;
 
 public class SearchModel extends AsyncBaseModel {
 	private static final String ARG = "arg";
+	private static final String MEDIA_ID = "showMediaID";
 	private static final String GENERIC = "Egyéb";
 	private static final String RECORDING = "Visszarögzített";
 	private static final String RAW_AD = "Reklám nyers";
@@ -72,7 +76,7 @@ public class SearchModel extends AsyncBaseModel {
 	private boolean allChecked = true;
 	private boolean rowsExpanded = true;
 	private boolean allSelected;
-
+	private String baseURL;
 	private boolean itemSelected;
 	@Wire
 	Rows rows;
@@ -82,6 +86,8 @@ public class SearchModel extends AsyncBaseModel {
 	private boolean orderAscending;
 
 	private Map<String, String> topColorClasses;
+	private String[] parameters;
+	private String mediaID;
 
 	public SearchModel() {
 		typeFilters = new LinkedHashMap<>();
@@ -152,17 +158,23 @@ public class SearchModel extends AsyncBaseModel {
 			Column column = (Column) child;
 			column.addEventListener("onSort", evt -> doSort(evt));
 		}
+		String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort());
+		baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port + Executions.getCurrent().getContextPath();
+		setParameters();
+		mediaID = getValueByParameterName(MEDIA_ID);
+		if (mediaID != null) {
+			searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy, orderAscending);
+		}
+	}
 
-		Object x = Executions.getCurrent().getNativeRequest();
-
-		//TODO
-		String mediaID = Executions.getCurrent().getParameter("showMediaID");
-		// doSearchByMedia(mediaID)
-		// selectMediaArchive()
-
-		//TODO ??? kellhet
-		//NotifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");
-
+	@Command
+	public void copyMediaIdToClipboard() {
+		String url = String.format("%s/?%s=%d", baseURL, MEDIA_ID, selectedObject.getMedia().getId());
+		Toolkit toolkit = Toolkit.getDefaultToolkit();
+		Clipboard clipboard = toolkit.getSystemClipboard();
+		StringSelection strSel = new StringSelection(url);
+		clipboard.setContents(strSel, null);
+		Messagebox.show("A médiához szükséges URL a vágólapra másolva, az URL a következő:\n" + url, "", Messagebox.OK, Messagebox.NONE);
 	}
 
 	@Command
@@ -174,10 +186,9 @@ public class SearchModel extends AsyncBaseModel {
 				throw new Exception("Legalább 3 karakter megadása kötelező!");
 
 			List<String> searchFilters = getSelectedFilters();
-
 			searchResult = new CachedListModel(searchValue, searchFilters, orderBy, orderAscending);
 		} catch (Exception e) {
-			Messagebox.show(e.getMessage());
+			Messagebox.show(e.getMessage(), "Hiba", Messagebox.OK, Messagebox.ERROR);
 			logger.catching(e);
 		}
 	}
@@ -327,6 +338,14 @@ public class SearchModel extends AsyncBaseModel {
 		return typeFilters;
 	}
 
+	private String getValueByParameterName(String name) {
+		for (String result : parameters) {
+			if (result.contains(name))
+				return result.substring(result.indexOf('=') + 1);
+		}
+		return null;
+	}
+
 	private void highlight(ArchivedMedia am, boolean highlight) {
 		if (am == null)
 			return;
@@ -370,6 +389,10 @@ public class SearchModel extends AsyncBaseModel {
 	public void onPaging() {
 		if (rows != null)
 			Clients.scrollIntoView(rows);
+		if (mediaID != null) {
+			selectedObject = searchResult.getElementAt(0);
+			NotifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");
+		}
 	}
 
 	@Command
@@ -437,6 +460,10 @@ public class SearchModel extends AsyncBaseModel {
 		this.itemSelectedValidator = itemSelectedValidator;
 	}
 
+	private void setParameters() {
+		parameters = SessionUtil.getQueryString().split("&");
+	}
+
 	public void setRowsExpanded(boolean rowsExpanded) {
 		this.rowsExpanded = rowsExpanded;
 	}