From: Dénes Horváth <USER\denes.horvath>
Date: Fri, 9 Aug 2019 12:56:26 +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=490a9e4db503baf70e1d6318c4eda3bcce544775;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/img/baseline_arrow_back_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_arrow_back_black_18dp.png
new file mode 100644
index 00000000..4a04f650
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_arrow_back_black_18dp.png differ
diff --git a/server/user.jobengine.osgi.server/img/baseline_close_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_close_black_18dp.png
new file mode 100644
index 00000000..aa51b150
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_close_black_18dp.png differ
diff --git a/server/user.jobengine.osgi.server/img/baseline_folder_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_folder_black_18dp.png
new file mode 100644
index 00000000..88708284
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_folder_black_18dp.png differ
diff --git a/server/user.jobengine.osgi.server/img/baseline_insert_drive_file_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_insert_drive_file_black_18dp.png
new file mode 100644
index 00000000..3714c4f4
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_insert_drive_file_black_18dp.png differ
diff --git a/server/user.jobengine.osgi.server/img/baseline_refresh_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_refresh_black_18dp.png
new file mode 100644
index 00000000..b1321c33
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_refresh_black_18dp.png differ
diff --git a/server/user.jobengine.osgi.server/img/outline_insert_drive_file_black_18dp.png b/server/user.jobengine.osgi.server/img/outline_insert_drive_file_black_18dp.png
new file mode 100644
index 00000000..14446398
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/outline_insert_drive_file_black_18dp.png differ
diff --git a/server/user.jobengine.osgi.server/pages/directorylist.zul b/server/user.jobengine.osgi.server/pages/directorylist.zul
new file mode 100644
index 00000000..72614a7f
--- /dev/null
+++ b/server/user.jobengine.osgi.server/pages/directorylist.zul
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+<window id="zkwindow" border="true" width="100%" height="100%" contentStyle="padding:0;" 
+	apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.DirectoryListModel')">
+						<div id="kicsidiv" height="100%" width="100%">
+				    <!-- Keresés menü -->
+				    <hbox width="100%">
+						<button id="sback" onClick="@command('onSrcBack')" image="/img/baseline_arrow_back_black_18dp.png">
+							<attribute w:name="onClick"><![CDATA[
+								var ss = zk.Widget.$(jq('$sourceSearch')),
+								val = "";
+								ss.setValue(val);
+								ss.smartUpdate('value', val);
+							]]></attribute>
+						</button>
+						<textbox id="sourceSearch" value="@bind(vm.searchText)" onOK="@command('refresh')" />
+						
+	
+						<!-- button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" / -->
+						<button id="resetSSearch" image="/img/baseline_close_black_18dp.png" onClick="@command('clearSrcFilter')">
+							<attribute w:name="onClick"><![CDATA[
+								var ss = zk.Widget.$(jq('$sourceSearch')),
+								val = "";
+								ss.setValue(val);
+								ss.smartUpdate('value', val);
+							]]></attribute>
+						</button>
+						<button id="refreshS" image="/img/baseline_refresh_black_18dp.png" onClick="@command('refresh')"/>
+					</hbox>
+					<!-- Forrás file lista -->
+					<listbox id="srcbox" vflex="true" model="@load(vm.srcFiles)" multiple="false" checkmark="true" 
+					            oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" style="border: none; background: #e3e3e3 !important;"
+					             ctrlKeys="#bak" onCtrlKey="@command('onSrcBack')" onSelect="@command('selectedItemChanged')"
+					             onAfterRender="srcbox.focus()">
+						<listhead>
+							<listheader label="" sort="auto(isFolder)" width="8%" />
+							<listheader label="Név" sort="auto(name)" width="40%" />
+							<listheader label="Méret" sort="auto(size)" width="12%" />
+							<listheader label="Létrehozva" sort="auto(created)" width="20%" />
+							<listheader label="Módosítva" sort="auto(modify)" />
+						</listhead>
+
+						<template name="model">
+							<!-- listitem onDoubleClick="@command('onSourceDoubleClick',selectedItem=each)" -->
+							<listitem onDoubleClick="@command('onSourceDoubleClick')">
+								<attribute w:name="onDoubleClick"><![CDATA[
+									var ss = zk.Widget.$(jq('$sourceSearch')),
+									val = "";
+									ss.setValue(val);
+									ss.smartUpdate('value', val);
+								]]></attribute>
+								<listcell>
+									<image  style="margin-left:4px;margin-top:2px;vertical-align:top;">
+										<attribute name="src" if="${!each.isFolder}">/img/outline_insert_drive_file_black_18dp.png</attribute>
+										<attribute name="src" if="${each.isFolder}">/img/baseline_folder_black_18dp.png</attribute>
+									</image>
+								</listcell>
+								
+								<listcell>
+									<label value="@load(each.name)" visible="${!each.isFolder}" />
+									<a label="@load(each.name)" visible="${each.isFolder}" onClick="@command('onSourceClick',selectedItem=each)">
+										<attribute w:name="onClick"><![CDATA[
+											var ss = zk.Widget.$(jq('$sourceSearch')),
+											val = "";
+											ss.setValue(val);
+											ss.smartUpdate('value', val);
+										]]></attribute>
+									</a>
+								</listcell>
+								<listcell><label value="@load(each.size) @converter(vm.fileSizeConverter)" visible="${!each.isFolder}" /></listcell>
+								<listcell><label value="@load(each.created) @converter('formatedDate',format='yyyy.MM.dd hh:mm:ss')" /></listcell>
+								<listcell><label value="@load(each.modify) @converter('formatedDate',format='yyyy.MM.dd hh:mm:ss')" /></listcell>
+							</listitem>
+						</template>
+					</listbox> 
+				</div> 
+</window>
+</zk>
diff --git a/server/user.jobengine.osgi.server/pages/maestro.zul b/server/user.jobengine.osgi.server/pages/maestro.zul
index f822ee51..ccb9d801 100644
--- a/server/user.jobengine.osgi.server/pages/maestro.zul
+++ b/server/user.jobengine.osgi.server/pages/maestro.zul
@@ -1,51 +1,50 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<?init class="user.jobengine.zk.util.AuthInitiator"?>
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client">
-<window id="zkwindow" border="none" width="100%" height="100%" contentStyle="padding:0;" 
+<window id="zkwindow" border="true" width="100%" height="100%" contentStyle="padding:0;" 
 	apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.MaestroModel')">
 		<custom-attributes org.zkoss.zul.image.preload="true" />
-	<!-- borderlayout width="${myWidth}" height="${myHeight}" -->
-	<!-- borderlayout width="100px" height="100px" -->
-		<borderlayout height="100%">
-			<west border="10">
-				<!-- hbox height="100%" width="100%" align="center" pack="center" style="background: #008AC8;" -->
-					<listbox id="box" height="400px" multiple="false" model="@load(vm.sourceFileList)" selectedItem="@bind(vm.sourceFileList)">
-						<auxhead>
-							<auxheader label="Forrás fájlok" colspan="1" align="center" />
-						</auxhead>
-						<listhead>
-							<listheader label="Név" width="200px" />
-							<!-- listheader label="Név" sort="auto(fileName)" width="200px" / -->
-							<!-- listheader label="Hossz" sort="auto(length)" width="80px" / -->
-							<!-- listheader label="Típus" sort="auto(type)" width="80px" / -->
-						</listhead>
-
-						<template name="model" >
-							<listitem>
-								<listcell><label value="@load(each)" /></listcell>
-								<!-- listcell><label value="@load(each.fileName)" /></listcell -->
-								<!-- listcell><label value="@load(each.length)" /></listcell -->
-								<!-- listcell><label value="@load(each.type)" /></listcell -->
-							</listitem>
-						</template>
-					</listbox> 
-				<!-- /hbox -->
+		<borderlayout width="100%" height="100%">
+			<west width="40%" splittable="true">
+			<panel width="100%" height="100%" border="normal" title="Source">
+            	<panelchildren style="padding:5px;">
+					<include src="/pages/directorylist.zul" />
+				</panelchildren>
+            </panel>
 			</west>
-			<center border="0">
-				<hbox height="100%" width="100%" align="bottom" pack="start" style="background: #008AC8;">
-				    <image src="/img/mediacube_logo_v2_50x50.png" />
-					<label style="color:#e3e3e3;font-size:26px;font-weight:bold" value="MediaCube" />
-					</hbox>
+			<center border="true">
+				<panel width="100%" border="normal" title="Traffic" vflex="true">
+           		<panelchildren style="padding:5px;">
+					<include src="/pages/planner.zul" />
+				</panelchildren>
+            	</panel>
 			</center>
-			<east border="0">
-				<hbox height="100%" width="100%" align="bottom" pack="center" style="background: #008AC8;">
-					<image src="/img/mediacube_logo_v2_50x50.png" />
-					<label style="color:#e3e3e3;font-size:26px;font-weight:bold" value="MediaCube" />
-					</hbox>
+			<east border="true" width="25%" splittable="true">
+				<panel width="100%" border="normal" title="Targets" vflex="true">
+           			<panelchildren style="padding:5px;">
+						<include src="/pages/targets.zul" />
+					</panelchildren>
+            	</panel>
 			</east>
-			<south border="0">
-				
-				</south>
+			<south border="true" height="40%" hflex="true" splittable="true">
+				<panel width="100%" border="normal" title="Jobs">
+				<panelchildren style="padding:5px;">
+				<listbox id="jobs" height="400px" model="@load(vm.jobs)" multiple="false" checkmark="false"
+					oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">
+					<auxhead sclass="category-center">
+						<auxheader label="Jobok" colspan="6"/>
+					</auxhead>
+					<listhead>
+						<listheader label="" sort="auto(isFolder)" width="8%" />
+					</listhead>
+					<template name="model" >
+						<listitem>
+							<listcell><label value="@load(each)" /></listcell>
+							</listitem>
+					</template>
+				</listbox>
+				</panelchildren>
+            	</panel>
+			</south>
 		</borderlayout>
 		<!-- include src="/pages/menu.zul" / -->
 	<!-- /borderlayout -->
diff --git a/server/user.jobengine.osgi.server/pages/planner.zul b/server/user.jobengine.osgi.server/pages/planner.zul
new file mode 100644
index 00000000..cfdd4ff9
--- /dev/null
+++ b/server/user.jobengine.osgi.server/pages/planner.zul
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+<window id="zkwindow" border="true" width="100%" height="100%" contentStyle="padding:0;" 
+	apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.PlannerListModel')">
+		<custom-attributes org.zkoss.zul.image.preload="true" />
+				    <!-- Keresés menü -->
+				    <hbox>
+						<button id="back" image="/img/baseline_arrow_back_black_18dp.png">
+							<attribute w:name="onClick"><![CDATA[
+								var ts = zk.Widget.$(jq('$search')),
+								val = "";
+								ts.setValue(val);
+								ts.smartUpdate('value', val);
+							]]></attribute>
+						</button>
+						<textbox id="search" />
+						<button id="resetSearch" image="/img/baseline_close_black_18dp.png">
+							<attribute w:name="onClick"><![CDATA[
+								var ts = zk.Widget.$(jq('$search')),
+								val = "";
+								ts.setValue(val);
+								ts.smartUpdate('value', val);
+							]]></attribute>
+						</button>
+						<button id="refresh" image="/img/baseline_refresh_black_18dp.png">
+						</button>
+					</hbox>
+					<!-- Gombok -->
+					<hbox pack="left" align="top" id="searchFiltersMenu">
+						<vlayout>
+							<toolbar class="toolbar">
+								<forEach items="@load(vm.topTypeFilterNames)">
+									<toolbarbutton label="@load(each)" mode="toggle" 
+													checked="@bind(vm.typeFilters[each].checked) @validator(vm.allFilterCheckedValidator)" />
+								</forEach>
+							</toolbar>
+						</vlayout>
+					</hbox>
+					<!-- Cél file lista -->
+					<listbox id="lbox" vflex="true"  
+					            oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" style="border: none; background: #e3e3e3 !important;"
+					             onAfterRender="lbox.focus()">
+						<listhead>
+							<listheader label="Tételek" />
+						</listhead>
+
+						<template name="model" hflex="max">
+							<listitem >
+								<listcell> label="Tételek" /></listcell>
+							</listitem>
+						</template>
+					</listbox> 
+
+</window>
+</zk>
diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index e2be4653..ed34b545 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -2,7 +2,7 @@
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
 
-<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:h="xhtml">
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:h="xhtml" xmlns:n="native" xmlns:c="client">
 	<style src="/css/video-js.css" />
 	<h:script src="/js/videojs-ie8.min.js"  />
 	<h:script src="/js/video.js"  />
@@ -32,14 +32,24 @@
 		
 		function setSource(src) {
 			console.log("setSource", player, src);
-			player.src({type: 'video/mp4', src: src});
+			if (src != null) {
+				player.src({type: 'video/mp4', src: src});
+			}else{
+				player.src({type: 'image/png', src: "/img/mediacube_logo_v2_50x50.png"});
+			}
 		}	
 		
 		function pushTcIn() {
 			var current = player.currentTime();
 			console.log("pushTcIn", current);
-			zk.Widget.$('$videoListener').fire('onTcIn', current, {toServer:true});
-		}	
+			zk.Widget.$('$videoListener').fire('onTcIn', {meta: current}, {toServer:true});
+		}
+		
+		function pushTcOut() {
+			var current = player.currentTime();
+			console.log("pushTcOut", current);
+			zk.Widget.$('$videoListener').fire('onTcOut', {meta: current}, {toServer:true});
+		}
 	</h:script>
 
 	<!-- csak igy jo a list sebessege -->
@@ -124,7 +134,7 @@
 	<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="1" repeats="false" onTimer="@command('uiTick')" />
 		<borderlayout width="100%" height="100%">
-			<west border="none" size="60%" splittable="true" minsize="500" onSize="@command('onWestResize', west=self)">
+			<west border="none" flex="true" size="60%" splittable="true" minsize="500" onSize="@command('onWestResize', west=self)">
 				<div height="100%" width="100%">
 					<groupbox vflex="min" closable="false">
 						<vlayout>
@@ -280,29 +290,30 @@
 				<borderlayout height="100%" width="100%">
 					<north border="none" size="60%" splittable="true" minsize="250" collapsible="true">
 						<div align="center" height="100%" width="100%">
-							<h:video id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered" poster="/img/mediacube_logo_v2_50x50.png">
+							<h:video id="myVideoDiv" class="video-js vjs-default-skin vjs-big-play-centered">
 							</h:video>
-							<div id="videoListener" onTcIn="@command('onTcIn')" />
-							
-							
+							<div id="videoListener" onTcOut="@command('onTcOut')" onTcIn="@command('onTcIn')" />
+
 <!-- 							<iframe id="mediaPlayer" height="100%" width="100%" autohide="false" src="@load(vm.lowresMediaFilePath)"></iframe> -->
 						</div>
 					</north>
 					<center border="none">
 						<div height="100%">
 							<toolbar width="100%" style="min-height:40px; font-size:8px">
-							<div style="max-width:450px; margin:auto;" >
-								<div sclass="menuButtons">
-									<toolbarbutton image="/img/ic_compare_arrows_black_18dp.png" autodisable="self" onClick="@command('showInResults')"
-										disabled="@load(vm.selectedObject eq null)" label="Szinkronizálás" />
-									<toolbarbutton sclass="col-xs-12" image="/img/ic_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('downloadMedia')"
-										disabled="@load(not vm.hasTSMMediaFile)" label="Kosárba" />
-									<toolbarbutton image="/img/baseline_share_black_18dp.png" autodisable="self" onClick="@command('copyMediaIdToClipboard')" 
-										disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Megosztás" />
-									<toolbarbutton image="/img/baseline_edit_black_18dp.png" autodisable="self" onClick="@command('openMetaDataDialog')"
-										disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Szerkesztés" />
-									<toolbarbutton autodisable="self" onClick="pushTcIn()" label="IN" />
-								</div>
+								<div style="max-width:450px; margin:auto;" >
+									<div sclass="menuButtons">
+										<toolbarbutton image="/img/ic_compare_arrows_black_18dp.png" autodisable="self" onClick="@command('showInResults')"
+											disabled="@load(vm.selectedObject eq null)" label="Szinkronizálás" />
+										<toolbarbutton sclass="col-xs-12" image="/img/ic_shopping_cart_black_18dp.png" autodisable="self" onClick="@command('downloadMedia')"
+											disabled="@load(not vm.hasTSMMediaFile)" label="Kosárba" />
+										<toolbarbutton image="/img/baseline_share_black_18dp.png" autodisable="self" onClick="@command('copyMediaIdToClipboard')" 
+											disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Megosztás" />
+										<toolbarbutton image="/img/baseline_edit_black_18dp.png" autodisable="self" onClick="@command('openMetaDataDialog')"
+											disabled="@load(not sessionScope.userPrincipal.editor or sessionScope.userPrincipal.anonymous or vm.selectedObject eq null)" label="Szerkesztés" />
+										<separator />
+										<toolbarbutton autodisable="self" c:onClick="pushTcIn('${arg.field}')" label="IN" />
+										<toolbarbutton autodisable="self" c:onClick="pushTcOut('${arg.field}')" label="OUT" />
+									</div>
 								</div>
 							</toolbar>
 							<div id="mediaDetails" width="100%" vflex="true" style="padding: 4px; overflow:auto; background-color: white">
diff --git a/server/user.jobengine.osgi.server/pages/targets.zul b/server/user.jobengine.osgi.server/pages/targets.zul
new file mode 100644
index 00000000..ba9f21c5
--- /dev/null
+++ b/server/user.jobengine.osgi.server/pages/targets.zul
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+<window id="zkwindow" border="true" width="100%" height="100%" contentStyle="padding:0;" 
+	apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.TargetsListModel')">
+	<vbox vflex="true" width="100%">
+					<vbox vflex="max" width="100%" pack="start">
+							<checkbox label="${each.name}" onCheck="@command('onCheck', data=each)" forEach="${vm.targets}" />
+					</vbox>
+
+					<vbox vflex="min" pack="end" align="end" width="100%" class="bottomright">
+					<div align="" >
+						<div class="bottomright">
+							<button id="vegrehajt" label="Végrehajt" width="150px" height="80px" />
+						</div>
+					</div>
+					</vbox>
+				</vbox>
+</window>
+</zk>
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
new file mode 100644
index 00000000..d1b9f334
--- /dev/null
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/DirectoryListModel.java
@@ -0,0 +1,163 @@
+package user.jobengine.zk.model;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.zkoss.bind.annotation.BindingParam;
+import org.zkoss.bind.annotation.Command;
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zul.ListModelList;
+
+import user.commons.RemoteFile;
+import user.commons.StoreUri;
+import user.commons.config.JSONConfig;
+import user.jobengine.db.Store;
+
+public class DirectoryListModel {
+	private static final Logger logger = LogManager.getLogger();
+	private Store store = new Store();
+	private ListModelList<RemoteFile> files;
+	private List<RemoteFile> filesCopy;
+	private StoreUri uri;
+	private MaestroConfig config = null;
+	private FileSizeConverter fileSizeConverter = new FileSizeConverter();
+	private String searchText;
+
+	public void setSourceList() throws Exception {
+		filesCopy = new ArrayList<>(files);
+		files = new ListModelList<>(filesCopy);
+	}
+
+	public void changeSrcDirectory(RemoteFile selectedFolder) throws Exception {
+		if (uri.getCurrentPath() == null){
+			uri.setCurrentPath(selectedFolder.getName());
+		}else{
+			uri.setCurrentPath(uri.getCurrentPath() + "/" + selectedFolder.getName());
+		}
+
+		setSourceList();
+	}
+	
+	@Command
+	public void selectedItemChanged (){
+		Set<RemoteFile> selection = files.getSelection();
+		logger.info("Selected: {}", selection.size());
+	}
+
+	@Init
+	public void init() {
+		try {
+			String key = "jobengine.maestro.config";
+			config = JSONConfig.read(key, MaestroConfig.class);
+			uri = config.getSourceStoreUri();
+
+			files = new ListModelList<>(uri.getRemoteFiles()); 
+			setSourceList();
+		} catch (Exception e) {
+			logger.error("A forrás file -ok nem elérhetőek: {}", e.getMessage());
+		}
+	}
+
+	@Command
+	@NotifyChange("srcFiles")
+	public void onSourceDoubleClick() {
+//		if (selectedSource.getIsFolder()){
+//			try {
+//				
+//				changeSrcDirectory(selectedSource);
+//			} catch (Exception e) {
+//				logger.error("A forrás file -ok nem elérhetőek: {}", e);
+//			}
+//		}
+	}
+	
+	@Command
+	@NotifyChange("srcFiles")
+	public void onSourceClick(@BindingParam("selectedItem") RemoteFile selectedItem) {
+		//selectedSource = selectedItem;
+		onSourceDoubleClick();
+	}
+
+	@Command
+    @NotifyChange("srcFiles")
+    public void refresh() throws Exception {
+		if (searchText == null || searchText == ""){
+			setSourceList();
+		}else{		
+			files.clear();
+			for (int i=0;i<uri.getRemoteFiles().size();i++){
+				if (uri.getRemoteFiles().get(i).getName().contains(searchText)){
+					files.add(uri.getRemoteFiles().get(i));
+				}
+			}
+		}
+	}
+
+	@Command
+    @NotifyChange("srcFiles")
+    public void clearSrcFilter() throws Exception {
+		files = new ListModelList<>(filesCopy);
+    }
+	
+	public StoreUri getSourceUri() {
+		return uri;
+	}
+
+	public void setSourceUri(StoreUri sourceUri) {
+		this.uri = sourceUri;
+	}
+
+	public List<RemoteFile> getSrcFiles() {
+		return files;
+	}
+
+	public Store getSourceStore() {
+		return store;
+	}
+
+	public void setSourceStore(Store sourceStore) {
+		this.store = sourceStore;
+	}
+
+	@Command
+	@NotifyChange("srcFiles")
+	public void onSrcBack() throws Exception{
+		if (uri.getCurrentPath() != null){
+			if (uri.getCurrentPath().contains("/")){
+				uri.setCurrentPath(uri.getCurrentPath().substring(0, uri.getCurrentPath().lastIndexOf("/")));
+			}else{
+				uri.setCurrentPath(null);
+			}
+			setSourceList();
+		}
+	}
+
+	public FileSizeConverter getFileSizeConverter() {
+		return fileSizeConverter;
+	}
+	
+	public void setFileSizeConverter(FileSizeConverter fileSizeConverter) {
+		this.fileSizeConverter = fileSizeConverter;
+	}
+
+
+	public List<RemoteFile> getsrcFilesCopy() {
+		return filesCopy;
+	}
+
+	public void setsrcFilesCopy(List<RemoteFile> srcFilesCopy) {
+		this.filesCopy = srcFilesCopy;
+	}
+
+	public String getSearchText() {
+		return searchText;
+	}
+
+	public void setSearchText(String searchText) {
+		this.searchText = searchText;
+	}
+}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/FileSizeConverter.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/FileSizeConverter.java
new file mode 100644
index 00000000..09183ca2
--- /dev/null
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/FileSizeConverter.java
@@ -0,0 +1,20 @@
+package user.jobengine.zk.model;
+
+import org.apache.commons.io.FileUtils;
+import org.zkoss.bind.BindContext;
+import org.zkoss.bind.Converter;
+import org.zkoss.zul.Label;
+
+public class FileSizeConverter implements Converter<String, Long, Label> {
+
+	@Override
+	public String coerceToUi(Long fileSize, Label paramC, BindContext context) {
+		return  FileUtils.byteCountToDisplaySize(fileSize);
+	}
+
+	@Override
+	public Long coerceToBean(String paramU, Label paramC, BindContext paramBindContext) {
+		// TODO Auto-generated method stub
+		return null;
+	}
+}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroModel.java
index 5d93d91c..748b8534 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroModel.java
@@ -1,42 +1,392 @@
 package user.jobengine.zk.model;
 
-import java.io.File;
+import java.util.ArrayList;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.zkoss.bind.annotation.BindingParam;
+import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.Init;
+import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.zul.ListModelList;
+
+import user.commons.RemoteFile;
+import user.commons.StoreUri;
+import user.commons.config.JSONConfig;
+import user.jobengine.db.Store;
+import user.jobengine.server.IJobEngine;
 
 public class MaestroModel {
-	//private ListModelList<Role> roleList = new ListModelList<Role>();
+	private static final Logger logger = LogManager.getLogger();
+	private Store sourceStore = new Store();
+	private Store targetStore = new Store();
+	private ListModelList<RemoteFile> srcFiles;
+	private List<RemoteFile> srcFilesCopy;
+	private List<RemoteFile> trgFiles;
+	private RemoteFile selectedTarget;
+	private StoreUri sourceUri;
+	private StoreUri targetUri0;
+	private StoreUri targetUri1;
+	private MaestroConfig sourceConfig = null;
+	//private MaestroConfig targetConfig = null;
+	private List<MaestroTarget> targetList = null;
+	private static final String PROGRAM = "Műsor";
+	private static final String PROMO = "Promó";
+	private static final String AD = "Reklám";
+	private String[] topTypeFilterNames;
+	private Map<String, TypeFilter> typeFilters;
+	private IJobEngine jobEngine;
+	private FileSizeConverter fileSizeConverter = new FileSizeConverter();
+	private String[] jobs = new String[] { "Job1", "Job2", "Job3" };
+	private String searchText;
+
+	public void setSourceList() throws Exception {
+		srcFilesCopy = new ArrayList<>(srcFiles);
+		srcFiles = new ListModelList<>(srcFilesCopy);
+	}
+
+	public void changeSrcDirectory(RemoteFile selectedFolder) throws Exception {
+		if (sourceUri.getCurrentPath() == null){
+			sourceUri.setCurrentPath(selectedFolder.getName());
+		}else{
+			sourceUri.setCurrentPath(sourceUri.getCurrentPath() + "/" + selectedFolder.getName());
+		}
+
+		setSourceList();
+		//srcFiles.clear();
+		//srcFiles.addAll(sourceUri.getRemoteFiles());
+	}
 	
-	//List<String> sourceFileList = new List<String>();
-	File folder = new File("c:/temp/");
-	private File[] sourceFileList = folder.listFiles();
-	//private ArrayList<String> sourceFileList;
+	public void changeTrgDirectory(RemoteFile selectedFolder) throws Exception {
+	/*	if (targetUri.getCurrentPath() == null){
+			targetUri.setCurrentPath(selectedFolder.getName());
+		}else{
+			targetUri.setCurrentPath(targetUri.getCurrentPath() + "/" + selectedFolder.getName());
+		}
 
+		trgFiles.clear();
+		getTargetList();
+	*/
+	}
+	
+	public void loadTargets(RemoteFile selectedFolder) throws Exception {
+	/*	targetUri.setCurrentPath(targetUri.getUri() + "/" + selectedFolder.getName());
+		trgFiles = targetUri.getRemoteFiles();
+	*/
+	}
 	
+	public void getTargetList()  throws Exception {
+		/*trgFiles.clear();
+		targetList = sourceConfig.getTargets();
+		for(MaestroTarget mt : targetList){
+			targetUri = mt.getStoreUri();
+			trgFiles.addAll(targetUri.getRemoteFiles());
+		}
+		Collections.sort(trgFiles, new Comparator<RemoteFile>() {
+			  @Override
+			  public int compare(RemoteFile r1, RemoteFile r2) {
+			    return ((r1.getIsFolder() ? "0" : "1")+ r1.getName()).compareTo(((r2.getIsFolder() ? "0" : "1")+ r2.getName()));
+			  }
+			});
+		*/
+	}
+	
+	@Command
+	public void selectedItemChanged (){
+		Set<RemoteFile> selection = srcFiles.getSelection();
+		logger.info("Selected: {}", selection.size());
+	}
+
 	@Init
 	public void init() {
-		//File folder = new File("/Users/you/folder/");
-		//File[] listOfFiles = folder.listFiles();
+		typeFilters = new LinkedHashMap<>();
+		addTypeFilter(TypeFilter.as(PROGRAM, "RED200", "ic_language_black_18dp.png"));
+		addTypeFilter(TypeFilter.as(PROMO, "RED100", "ic_perm_camera_mic_black_18dp.png"));
+		addTypeFilter(TypeFilter.as(AD, "TEAL200", "ic_theaters_black_18dp.png"));
+		setTopTypeFilterNames(new String[] { PROGRAM, PROMO, AD });
+
+		String message = "A forrás file -ok nem elérhetőek: {}";
+		try {
+			String key = "jobengine.maestro.config";
+			sourceConfig = JSONConfig.read(key, MaestroConfig.class);
+			sourceUri = sourceConfig.getSourceStoreUri();
+			//sourceConfig.getTargets().get(0).getStoreUri()
+			srcFiles = new ListModelList<>(sourceUri.getRemoteFiles()); 
+			setSourceList();
+			targetUri0 = sourceConfig.getTargets().get(0).getStoreUri();
+			targetUri1 = sourceConfig.getTargets().get(1).getStoreUri();
+
+			//target files
+			//message = "A cél file -ok nem elérhetőek: {}";
+			//trgFiles = new ArrayList<RemoteFile>();
+			//getTargetList();
+		} catch (Exception e) {
+			logger.error(message, e.getMessage());
+		}
+	}
+
+	@Command
+	@NotifyChange("srcFiles")
+	public void onSourceDoubleClick() {
+//		if (selectedSource.getIsFolder()){
+//			try {
+//				
+//				changeSrcDirectory(selectedSource);
+//			} catch (Exception e) {
+//				logger.error("A forrás file -ok nem elérhetőek: {}", e);
+//			}
+//		}
+	}
+	
+	/*@Command
+	@NotifyChange("trgFiles")
+	public void onTargetDoubleClick() {
+		if (selectedTarget.getIsFolder()){
+			try {
+				
+				changeTrgDirectory(selectedTarget);
+			} catch (Exception e) {
+				logger.error("A cél file -ok nem elérhetőek: {}", e);
+			}
+		}
+	}*/
+	
+	@Command
+	@NotifyChange("srcFiles")
+	public void onSourceClick(@BindingParam("selectedItem") RemoteFile selectedItem) {
+		//selectedSource = selectedItem;
+		onSourceDoubleClick();
+	}
+	
+	/*@Command
+	@NotifyChange("trgFiles")
+	public void onTargetClick(@BindingParam("selectedItem") RemoteFile selectedItem) {
+		selectedTarget = selectedItem;
+		onTargetDoubleClick();
+	}*/
 
-		for (File file : getSourceFileList()) {
-		    if (file.isFile()) {
-		        System.out.println(file.getAbsoluteFile());
-		        System.out.println(file.getParent());
-		    }
+	@Command
+    @NotifyChange("srcFiles")
+    public void refresh() throws Exception {
+		if (searchText == null || searchText == ""){
+			setSourceList();
+		}else{		
+			srcFiles.clear();
+			for (int i=0;i<sourceUri.getRemoteFiles().size();i++){
+				if (sourceUri.getRemoteFiles().get(i).getName().contains(searchText)){
+					srcFiles.add(sourceUri.getRemoteFiles().get(i));
+				}
+			}
 		}
-		/*sourceFileList = new ArrayList<String>(); 
-		sourceFileList.add("Alma");
-		sourceFileList.add("Körte");
-		sourceFileList.add("Narancs");*/
 	}
 
+	@Command
+    @NotifyChange("trgFiles")
+    public void changeTrgFilter(@BindingParam("ttext") String ttext) throws Exception {
+	/*	trgFiles.clear();
+		for (int i=0;i<targetUri.getRemoteFiles().size();i++){
+			if (targetUri.getRemoteFiles().get(i).getName().contains(ttext)){
+				trgFiles.add(targetUri.getRemoteFiles().get(i));
+				//getTargetList();
+			}
+		}
+	*/
+    }
 
-	public File[] getSourceFileList() {
-		return sourceFileList;
+	@Command
+    @NotifyChange("srcFiles")
+    public void clearSrcFilter() throws Exception {
+		srcFiles = new ListModelList<>(srcFilesCopy);
+    }
+	
+	@Command
+    @NotifyChange("trgFiles")
+    public void clearTrgFilter() throws Exception {
+	/*	trgFiles.clear();
+		trgFiles.addAll(targetUri.getRemoteFiles());
+	*/
+    }
+	
+	@Command
+	@NotifyChange({ "trgFiles"})
+	public void trg1(@BindingParam("state") boolean state ) {
+		if (state) {
+			//sourceConfig.getTargets().get(0).getStoreUri().setUri("c:/temp1");
+			sourceConfig.getTargets().get(0).setStoreUri(getTargetUri1());
+		}else {
+			//sourceConfig.getTargets().get(0).getStoreUri().setUri("");
+			sourceConfig.getTargets().get(0).setStoreUri(null);
+		}
+	}
+	
+	@Command
+	@NotifyChange({ "trgFiles"})
+	public void trg2(@BindingParam("state") boolean state ) {
+		if (state) {
+			//sourceConfig.getTargets().get(1).getStoreUri().setUri("c:/temp2");
+			sourceConfig.getTargets().get(1).setStoreUri(getTargetUri1());
+		}else {
+			//sourceConfig.getTargets().get(1).getStoreUri().setUri("");
+			sourceConfig.getTargets().get(1).setStoreUri(null);
+		}
+	}
+
+	
+	public StoreUri getSourceUri() {
+		return sourceUri;
 	}
 
-	public void setSourceFileList(File[] sourceFileList) {
-		this.sourceFileList = sourceFileList;
+	public void setSourceUri(StoreUri sourceUri) {
+		this.sourceUri = sourceUri;
 	}
 	
+	public StoreUri getTargetUri0() {
+		return targetUri0;
+	}
+
+	public void setTargetUri0(StoreUri targetUri) {
+		this.targetUri0 = targetUri;
+	}
+	
+	public StoreUri getTargetUri1() {
+		return targetUri1;
+	}
+
+	public void setTargetUri1(StoreUri targetUri) {
+		this.targetUri1 = targetUri;
+	}
+	
+	/*public String getTargetUri() {
+		return sourceConfig.getSourceStoreUri().getUri();
+	}
+	
+	public void setTargetUri(String targetUri) {
+		sourceConfig.getSourceStoreUri().setUri(targetUri);
+	}*/
+
+	public List<RemoteFile> getSrcFiles() {
+		return srcFiles;
+	}
+
+	public Store getSourceStore() {
+		return sourceStore;
+	}
+
+	public void setSourceStore(Store sourceStore) {
+		this.sourceStore = sourceStore;
+	}
+
+	public List<RemoteFile> gettrgFiles() {
+		return trgFiles;
+	}
+
+	public void settrgFiles(List<RemoteFile> trgFiles) {
+		this.trgFiles = trgFiles;
+	}
+	
+	public String[] getJobs() {
+		return jobs;
+	}
+	
+	public void setJobs(String[] jobs) {
+		this.jobs = jobs;
+	}
+
+	private void addTypeFilter(TypeFilter typeFilter) {
+		typeFilters.put(typeFilter.getName(), typeFilter);
+	}
+	
+	public String[] getTopTypeFilterNames() {
+		return topTypeFilterNames;
+	}
+
+	public void setTopTypeFilterNames(String[] topTypeFilterNames) {
+		this.topTypeFilterNames = topTypeFilterNames;
+	}
+	
+	public Map<String, TypeFilter> getTypeFilters() {
+		return typeFilters;
+	}
+	
+
+	public Store getTargetStore() {
+		return targetStore;
+	}
+
+	public void setTargetStore(Store targetStore) {
+		this.targetStore = targetStore;
+	}
+
+
+	public IJobEngine getJobEngine() {
+		return jobEngine;
+	}
+
+	public void setJobEngine(IJobEngine jobEngine) {
+		this.jobEngine = jobEngine;
+	}
+	
+	@Command
+	@NotifyChange("srcFiles")
+	public void onSrcBack() throws Exception{
+		if (sourceUri.getCurrentPath() != null){
+			if (sourceUri.getCurrentPath().contains("/")){
+				sourceUri.setCurrentPath(sourceUri.getCurrentPath().substring(0, sourceUri.getCurrentPath().lastIndexOf("/")));
+			}else{
+				sourceUri.setCurrentPath(null);
+			}
+			setSourceList();
+		}
+	}
+	
+	@Command
+	@NotifyChange("trgFiles")
+	public void onTrgBack() throws Exception{
+		/*if (targetUri.getCurrentPath() != null){
+			if (targetUri.getCurrentPath().contains("/")){
+				targetUri.setCurrentPath(targetUri.getCurrentPath().substring(0, targetUri.getCurrentPath().lastIndexOf("/")));
+			}else{
+				targetUri.setCurrentPath(null);
+			}
+			trgFiles.clear();
+			trgFiles.addAll(targetUri.getRemoteFiles());
+			clearTrgFilter();
+		}*/
+	}
+
+	public FileSizeConverter getFileSizeConverter() {
+		return fileSizeConverter;
+	}
+	
+	public void setFileSizeConverter(FileSizeConverter fileSizeConverter) {
+		this.fileSizeConverter = fileSizeConverter;
+	}
+
+	public RemoteFile getSelectedTarget() {
+		return selectedTarget;
+	}
+
+	public void setSelectedTarget(RemoteFile selectedTarget) {
+		this.selectedTarget = selectedTarget;
+	}
+
+	public List<RemoteFile> getsrcFilesCopy() {
+		return srcFilesCopy;
+	}
+
+	public void setsrcFilesCopy(List<RemoteFile> srcFilesCopy) {
+		this.srcFilesCopy = srcFilesCopy;
+	}
+
+	public String getSearchText() {
+		return searchText;
+	}
+
+	public void setSearchText(String searchText) {
+		this.searchText = searchText;
+	}
 }
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
index 3070e648..6804b3c0 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MenuModel.java
@@ -28,7 +28,7 @@ public class MenuModel extends BaseModel {
 	private static final Logger logger = LogManager.getLogger();
 	private static final String PAGES_RETRIEVEBATCHSELECTOR_ZUL = "/pages/retrievebatchselector.zul";
 	private String basketMenuLabel = "(0)";
-	private List<ArchivedMedia> basketItems;
+	private List<ArchivedMedia> basketItems = new ArrayList<>();
 
 	@Wire
 	Menuitem basketIMenuItem;
@@ -81,8 +81,7 @@ public class MenuModel extends BaseModel {
 			logger.warn("Item to select is null");
 			return;
 		}
-		if (basketItems == null)
-			basketItems = new ArrayList<>();
+			
 		if (select) {
 			if (!basketItems.contains(item)) {
 				basketItems.add(item);
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/PlannerListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/PlannerListModel.java
new file mode 100644
index 00000000..50dfabb0
--- /dev/null
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/PlannerListModel.java
@@ -0,0 +1,53 @@
+package user.jobengine.zk.model;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.zkoss.bind.annotation.Init;
+
+import user.commons.config.JSONConfig;
+
+public class PlannerListModel {
+	private MaestroConfig config = null;
+	private static final Logger logger = LogManager.getLogger();
+	private static final String PROGRAM = "Műsor";
+	private static final String PROMO = "Promó";
+	private static final String AD = "Reklám";
+	private String[] topTypeFilterNames;
+	private Map<String, TypeFilter> typeFilters;
+	
+	@Init
+	public void init() {
+		typeFilters = new LinkedHashMap<>();
+		addTypeFilter(TypeFilter.as(PROGRAM, "RED200", "ic_language_black_18dp.png"));
+		addTypeFilter(TypeFilter.as(PROMO, "RED100", "ic_perm_camera_mic_black_18dp.png"));
+		addTypeFilter(TypeFilter.as(AD, "TEAL200", "ic_theaters_black_18dp.png"));
+		setTopTypeFilterNames(new String[] { PROGRAM, PROMO, AD });
+		
+		String key = "jobengine.maestro.config";
+		try {
+			config = JSONConfig.read(key, MaestroConfig.class);
+		} catch (Exception e) {
+			logger.error("Hiba a config file beállításánál {}", e.getMessage());
+		}
+	}
+	
+	private void addTypeFilter(TypeFilter typeFilter) {
+		typeFilters.put(typeFilter.getName(), typeFilter);
+	}
+	
+	public String[] getTopTypeFilterNames() {
+		return topTypeFilterNames;
+	}
+
+	public void setTopTypeFilterNames(String[] topTypeFilterNames) {
+		this.topTypeFilterNames = topTypeFilterNames;
+	}
+	
+	public Map<String, TypeFilter> getTypeFilters() {
+		return typeFilters;
+	}
+
+}
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
index 9b5fdca4..8eb5e257 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/RetrieveBatchSelectorModel.java
@@ -1,8 +1,8 @@
 package user.jobengine.zk.model;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
@@ -107,9 +107,32 @@ public class RetrieveBatchSelectorModel extends BaseModel {
 
 	public List<ArchivedMedia> getBasketItems() {
 		setDisabled(menuModel.getBasketItems() == null || menuModel.getBasketItems().size() == 0);
-		return menuModel.getBasketItems();
-	}
-
+		List<ArchivedMedia> basketItems = menuModel.getBasketItems();
+		
+		//////////TEST CODE KESOBB TOROLNI ++++++++++++++++
+		if(basketItems == null) basketItems = new ArrayList<ArchivedMedia>();
+		if(basketItems.size() == 0){
+			for(int c=0; c<20; c++){
+				basketItems.add(createFakeArchivedMedia(c));
+			}
+		}
+		
+		
+		return basketItems;
+	}
+
+	//////////TEST CODE KESOBB TOROLNI ++++++++++++++++
+	private ArchivedMedia createFakeArchivedMedia(int c){
+		ArchivedMedia ret = new ArchivedMedia();
+		Media media = new Media();
+		media.setId(c);
+		media.setTitle("title_" + c);
+		media.setMediaFilesName("mediaFilesName_" + c);
+		ret.setMedia(media);
+		return ret;
+	}
+	
+	
 	public String getEmail() {
 		return email;
 	}
@@ -118,12 +141,12 @@ public class RetrieveBatchSelectorModel extends BaseModel {
 		return houseId;
 	}
 
-	private List<Media> getMedias() {
+	private List<ArchivedMedia> getMedias() {
 		List<ArchivedMedia> basket = getBasketItems();
-		List<Media> result = basket.stream().map(i -> {
-			return i.getMedia();
-		}).collect(Collectors.toList());
-		return result;
+//		List<Media> result = basket.stream().map(i -> {
+//		return i.getMedia();
+//	}).collect(Collectors.toList());
+		return basket;
 	}
 
 	public ListModel<String> getReloadTypes() {
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 94bba688..f0206211 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
@@ -20,6 +20,7 @@ import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.bind.annotation.NotifyChange;
+import org.zkoss.json.JSONObject;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.event.Event;
@@ -139,7 +140,8 @@ public class SearchModel extends AsyncBaseModel {
 		addTypeFilter(TypeFilter.as(GENERIC, "YELLOW200", "ic_view_quilt_black_18dp.png"));
 		addTypeFilter(TypeFilter.as(GENERIC_ORIGINAL, "YELLOW200", "ic_view_quilt_black_18dp.png"));
 		topTypeFilterNames = new String[] { NEWS_MATERIAL, RAW_NEWS_MATERIAL, ECHO_RECORDING, RECORDING, GENERIC };
-		bottomTypeFilterNames = new String[] { ECHO_MATERIAL, MATERIAL, RAW_MATERIAL, ECHO_PROMO, PROMO, RAW_PROMO, ECHO_AD, AD, RAW_AD };
+		bottomTypeFilterNames = new String[] { ECHO_MATERIAL, MATERIAL, RAW_MATERIAL, ECHO_PROMO, PROMO, RAW_PROMO,
+				ECHO_AD, AD, RAW_AD };
 
 		columnHeaders = new LinkedHashMap<>();
 		columnHeaders.put("ID", "mediahouseid");
@@ -199,7 +201,9 @@ public class SearchModel extends AsyncBaseModel {
 			itemsGrid.setPageSize(SessionUtil.getUserPageSize());
 		setSettingsPageSize(itemsGrid.getPageSize());
 		if (!allChecked)
-			Clients.showNotification(String.format("Figyelem!<br><br><span style='white-space:nowrap'> A keresési paraméterek megváltoztak! </span>"),
+			Clients.showNotification(
+					String.format(
+							"Figyelem!<br><br><span style='white-space:nowrap'> A keresési paraméterek megváltoztak! </span>"),
 					"warning", searchFiltersMenu, "end_center", 3000);
 	}
 
@@ -231,16 +235,19 @@ public class SearchModel extends AsyncBaseModel {
 
 	@Command
 	public void copyMediaIdToClipboard() {
-		String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort());
+		String port = (Executions.getCurrent().getServerPort() == 80) ? ""
+				: (":" + Executions.getCurrent().getServerPort());
 		String baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port
 				+ Executions.getCurrent().getContextPath();
 		String url = String.format("%s/?%s=%d", baseURL, MEDIA_ID, selectedObject.getMedia().getId());
-		String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s", selectedObject.getMedia().getTitle(), url);
+		String email = String.format("mailto:?subject=Média címe: %s &body=A média itt tekinthető meg: %s",
+				selectedObject.getMedia().getTitle(), url);
 		// 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" + email, "", Messagebox.OK, Messagebox.NONE);
+		// Messagebox.show("A médiához szükséges URL a vágólapra másolva, az URL
+		// a következő:\n" + email, "", Messagebox.OK, Messagebox.NONE);
 		Executions.getCurrent().sendRedirect(email);
 	}
 
@@ -302,7 +309,9 @@ public class SearchModel extends AsyncBaseModel {
 			return;
 		// Map<String, Object> arguments = new HashMap<String, Object>();
 		// arguments.put(MEDIACUBEMEDIA, this.selectedObject.getMedia());
-		// Window window = (Window) Executions.createComponents(PAGES_RETRIEVESELECTOR_ZUL, null, arguments);
+		// Window window = (Window)
+		// Executions.createComponents(PAGES_RETRIEVESELECTOR_ZUL, null,
+		// arguments);
 		// window.doModal();
 
 		MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);
@@ -504,8 +513,47 @@ public class SearchModel extends AsyncBaseModel {
 	}
 
 	@Command
-	public void onTcIn(@ContextParam(ContextType.TRIGGER_EVENT) Event event) {
-		//event.getData() a tcin
+	public void onTcIn(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception
+	{
+		////////////Végén törölni innen!!!
+		if (selectedObject == null) { 
+			selectedObject = new ArchivedMedia();
+		}
+		////////////Végén törölni eddig!!!
+		
+		JSONObject jsObject =  (JSONObject)event.getData();
+		Double doubleVar = 0.0; 
+		if (!jsObject.get("meta").equals(0)){		
+			doubleVar = (Double)jsObject.get("meta");
+		}
+		
+		if (doubleVar.floatValue() >= ((selectedObject.getTcOut() == null)?9999999999999999999999.9:selectedObject.getTcOut())){
+			throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!");
+		}else{
+			selectedObject.setTcIn(new Float(doubleVar.floatValue()));
+		}
+	}
+	
+	@Command
+	public void onTcOut(@ContextParam(ContextType.TRIGGER_EVENT) Event event) throws Exception
+	{
+		////////////Végén törölni innen!!!
+		if (selectedObject == null) { 
+			selectedObject = new ArchivedMedia();
+		}
+		////////////Végén törölni eddig!!!
+		
+		JSONObject jsObject =  (JSONObject)event.getData();
+		Double doubleVar = 0.0; 
+		if (!jsObject.get("meta").equals(0)){		
+			doubleVar = (Double)jsObject.get("meta");
+		}
+		
+		if (doubleVar.floatValue() <= ((selectedObject.getTcIn() == null)?0.0:selectedObject.getTcIn())){
+			throw new Exception("A kilépés időpontjának későbbinek kell lennie mint a belépés időpontja!");
+		}else{
+			selectedObject.setTcOut(new Float(doubleVar.floatValue()));
+		}
 	}
 
 	@Command
@@ -516,7 +564,8 @@ public class SearchModel extends AsyncBaseModel {
 	@Command
 	public void openMetaDataDialog() {
 		String template = "/pages/metadatadetails.zul";
-		Window window = (Window) Executions.createComponents(template, null, ListUtils.asMap("selectedObject", selectedObject));
+		Window window = (Window) Executions.createComponents(template, null,
+				ListUtils.asMap("selectedObject", selectedObject));
 		window.doModal();
 	}
 
@@ -525,7 +574,8 @@ public class SearchModel extends AsyncBaseModel {
 		logger.info(event);
 	}
 
-	// public void rowSelected(@BindingParam("item") Object media, @BindingParam("isChecked") boolean isChecked) {
+	// public void rowSelected(@BindingParam("item") Object media,
+	// @BindingParam("isChecked") boolean isChecked) {
 	@Command
 	public void rowMouseOver(@BindingParam("evt") MouseEvent event) {
 		logger.info(event);
@@ -533,10 +583,11 @@ public class SearchModel extends AsyncBaseModel {
 
 	@Command
 	@NotifyChange({ "selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath" })
-	public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject, @ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {
+	public void select(@BindingParam("selectedObject") ArchivedMedia selectedObject,
+			@ContextParam(ContextType.BIND_CONTEXT) BindContext ctx) {
 		Event event = ctx.getTriggerEvent();
-		//Nem mindig a row a target, ha a kepre kattintunk akkor az image
-		//selectedRowIndex = ((Row) event.getTarget()).getIndex();
+		// Nem mindig a row a target, ha a kepre kattintunk akkor az image
+		// selectedRowIndex = ((Row) event.getTarget()).getIndex();
 		highlight(this.selectedObject, false);
 		setSelectedObject(selectedObject);
 		highlight(this.selectedObject, true);
@@ -546,6 +597,14 @@ public class SearchModel extends AsyncBaseModel {
 
 	@NotifyChange("typeFilters")
 	public void setAllChecked(boolean allChecked) {
+		////////////Végén törölni innen!!!
+		if (allChecked) {
+			Clients.evalJavaScript("setSource('/img/Mediacube_todo2.mp4')");
+		} else {
+			// Clients.evalJavaScript("setSource('/img/mediacube_logo_v2_50x50.png')");
+			Clients.evalJavaScript("setSource()");
+		}
+		////////////Végén törölni eddig!!!
 		this.allChecked = allChecked;
 		for (String key : typeFilters.keySet())
 			typeFilters.get(key).setChecked(allChecked);
@@ -619,9 +678,13 @@ public class SearchModel extends AsyncBaseModel {
 
 			try {
 				String video = getLowresMediaFilePath();
-				Clients.evalJavaScript("setSource('" + video + "')");
+				if (video.contentEquals(null)) {
+					Clients.evalJavaScript("setSource('/img/mediacube_logo_v2_50x50.png')");
+				} else {
+					Clients.evalJavaScript("setSource('" + video + "')");
+				}
 
-				//ret += "&poster=/img/mediacube_logo_v2_50x50.png";
+				// Clients.evalJavaScript("setSource('/img/Mediacube_todo2.mp4')");
 
 			} catch (Exception e) {
 				logger.error(e);
@@ -663,7 +726,8 @@ public class SearchModel extends AsyncBaseModel {
 	private void showExternalMediaID() {
 		String mediaID = SessionUtil.getQueryParameter(MEDIA_ID);
 		if (mediaID != null)
-			searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy, orderAscending);
+			searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy,
+					orderAscending);
 	}
 
 	@Command
@@ -676,7 +740,9 @@ public class SearchModel extends AsyncBaseModel {
 		// preventAfterRender = true;
 		if (activePageIndex != itemsGrid.getActivePage()) {
 			itemsGrid.setActivePage(activePageIndex);
-			logger.info("Selected media is shown in the results, which can be found on {} page and also it will be highlighted.", activePageIndex + 1);
+			logger.info(
+					"Selected media is shown in the results, which can be found on {} page and also it will be highlighted.",
+					activePageIndex + 1);
 		} else {
 			onAfterRenderGrid();
 			logger.info("Selected media is shown in the results, which can be found on opened page.");
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TargetsListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TargetsListModel.java
new file mode 100644
index 00000000..7ca70651
--- /dev/null
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TargetsListModel.java
@@ -0,0 +1,37 @@
+package user.jobengine.zk.model;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.zkoss.bind.annotation.BindingParam;
+import org.zkoss.bind.annotation.Command;
+import org.zkoss.bind.annotation.Init;
+import org.zkoss.zul.ListModelList;
+
+import user.commons.config.JSONConfig;
+
+public class TargetsListModel {
+	private static final Logger logger = LogManager.getLogger();
+	private MaestroConfig config = null;
+	private ListModelList<MaestroTarget> targets;
+
+	@Init
+	public void init() {
+		String key = "jobengine.maestro.config";
+		try {
+			config = JSONConfig.read(key, MaestroConfig.class);
+			targets = new ListModelList<>(config.getTargets());
+		} catch (Exception e) {
+			logger.error("Hiba a config file beállításánál {}", e.getMessage());
+		}
+	}
+
+	public ListModelList<MaestroTarget> getTargets() {
+		return targets;
+	}
+	
+	@Command
+	public void onCheck(@BindingParam("data") MaestroTarget data){
+		//@ContextParam(ContextType.TRIGGER_EVENT) CheckEvent event,
+		
+	}
+}