From: Dénes Horváth <USER\denes.horvath>
Date: Tue, 3 Sep 2019 11:52:10 +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=7989f73d787726c29169d858083612e235aab59e;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/pages/directorylist.zul b/server/user.jobengine.osgi.server/pages/directorylist.zul
index c77a6241..58ab0ba3 100644
--- a/server/user.jobengine.osgi.server/pages/directorylist.zul
+++ b/server/user.jobengine.osgi.server/pages/directorylist.zul
@@ -2,50 +2,32 @@
 <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%">
+						<div height="100%" width="100%">
+<custom-attributes org.zkoss.zul.image.preload="true" />
 				    <!-- Keresés menü -->
 				    <hbox width="100%">
-						<button id="sback" onClick="@command('onBack')" 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>
+						<button onClick="@command('onBack')" image="/img/baseline_arrow_back_black_18dp.png" />
 						<textbox id="sourceSearch" value="@bind(vm.searchText)" onOK="@command('doSearch')" />
 						<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('clearFilter')">
-							<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')"/>
+						<button image="/img/baseline_close_black_18dp.png" onClick="@command('clearFilter')" />
+						<button image="/img/baseline_refresh_black_18dp.png" onClick="@command('refresh')"/>
 					</hbox>
 					<!-- Forrás file lista -->
-					<listbox id="srcbox" vflex="true" model="@load(vm.files)" multiple="false" checkmark="true" 
+					<listbox id="srcbox" vflex="true" sizedByContent="true" model="@load(vm.files)" multiple="false" checkmark="true" 
 					            oddRowSclass="listbox-odd-style" sclass="listbox-normal-style" style="border: none; background: #e3e3e3 !important;"
 					             ctrlKeys="#bak" onCtrlKey="@command('onBack')" onSelect="@command('selectedItemChanged')"
 					             onAfterRender="srcbox.focus()">
+					    <custom-attributes org.zkoss.zul.listbox.selectOnHighlight.disabled="true" />
 						<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)" />
+							<listheader label="" hflex="min" align="left" />
+							<listheader label="Név" hflex="min" align="left" />
+							<listheader label="Méret" hflex="min" align="left" />
+							<listheader label="Létrehozva" hflex="min" align="left" />
+							<listheader label="Módosítva" hflex="min" align="left" />
 						</listhead>
 
 						<template name="model">
 							<listitem onDoubleClick="@command('onDoubleClick',selectedItem=each)">
-								<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>
@@ -55,14 +37,7 @@
 								
 								<listcell>
 									<label value="@load(each.name)" visible="${!each.isFolder}" />
-									<a label="@load(each.name)" visible="${each.isFolder}" onClick="@command('onDoubleClick',selectedItem=each)">
-										<attribute w:name="onClick"><![CDATA[
-											var ss = zk.Widget.$(jq('$sourceSearch')),
-											val = "";
-											ss.setValue(val);
-											ss.smartUpdate('value', val);
-										]]></attribute>
-									</a>
+									<a label="@load(each.name)" visible="${each.isFolder}" onClick="@command('onDoubleClick',selectedItem=each)" />
 								</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>
diff --git a/server/user.jobengine.osgi.server/pages/maestro.zul b/server/user.jobengine.osgi.server/pages/maestro.zul
index 8807702c..2c19ec01 100644
--- a/server/user.jobengine.osgi.server/pages/maestro.zul
+++ b/server/user.jobengine.osgi.server/pages/maestro.zul
@@ -1,4 +1,5 @@
 <?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="true" width="100%" height="98%" contentStyle="padding:0;" 
 	apply="org.zkoss.bind.BindComposer" viewModel="@id('vm') @init('user.jobengine.zk.model.MaestroModel')">
diff --git a/server/user.jobengine.osgi.server/pages/maestrojoblist.zul b/server/user.jobengine.osgi.server/pages/maestrojoblist.zul
index b2c4acfd..d8672682 100644
--- a/server/user.jobengine.osgi.server/pages/maestrojoblist.zul
+++ b/server/user.jobengine.osgi.server/pages/maestrojoblist.zul
@@ -1,22 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:ca="client/attribute">
+	<style>
+		.z-progressmeter { height: 16px; border: 1px solid #cfcfcf; background: #fff 0 0 repeat-x; text-align: left; overflow: hidden; // background-image:
+		url(/zkau/web/1bf94a1d/zul/img/misc/prgmeter-anim.gif); }
+	</style>
 <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.MaestroJobListModel')">
-		<custom-attributes org.zkoss.zul.image.preload="true" />
+	apply="org.zkoss.bind.BindComposer"  viewModel="@id('vm') @init('user.jobengine.zk.model.MaestroJobListModel')">
+	<timer delay="500" repeats="true" onTimer="@command('uiTick')" />
+	<custom-attributes org.zkoss.zul.image.preload="true" />
 
-		<listbox id="jobs" height="400px" model="@load(vm.jobList)" multiple="false" checkmark="false"
+	<!-- div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer" -->
+		<listbox height="400px" model="@load(vm.jobList)" 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%" />
+				<!-- listheader label="" sort="auto(isFolder)" width="8%" / -->
+				<listheader label="Id" hflex="min" align="left" sort="auto" />
+						<listheader label="Indítás" hflex="min" align="left" sort="auto" />
+						<listheader label="Kész" hflex="min" align="left" sort="auto" />
+						<listheader label="Név" hflex="min" align="left" sort="auto" />
+						<listheader label="Prioritás" hflex="min" align="left" sort="auto" />
+						<listheader label="Állapot" hflex="min" align="left" sort="auto" />
+						<listheader label="Készültség" width="100px" align="left" sort="auto" />
+						<listheader label="Üzenet" hflex="max" align="left" sort="auto" />
+						<listheader label="Paraméterek" hflex="min" align="left" sort="auto" />
 			</listhead>
 			<template name="model" >
 				<listitem>
-					<listcell><label value="@load(each)" /></listcell>
+					<listcell label="@load(each.id)" />
+					<listcell label="@load(each.submitted)" />
+					<listcell label="@load(each.finished)" />
+					<listcell label="@load(each.name)" />
+					<listcell label="@load(each.priority)" />
+					<listcell label="@load(each.status)" />
+					<listcell>
+						<progressmeter ca:data-animationspeed="-1" value="@load(each.progress)" width="100%" />
+					</listcell>
+					<listcell label="@load(each.description)" />
+					<listcell>
+						<a href="javascript:void(0);" label="Paraméterek" onClick="@command('showParameters', item=each)" />
+					</listcell>
 				</listitem>
 			</template>
 		</listbox>
+	<!-- /div -->
 </window>
 </zk>
\ No newline at end of file
diff --git a/server/user.jobengine.osgi.server/pages/targets.zul b/server/user.jobengine.osgi.server/pages/targets.zul
index 9f3a8e4b..85b96a76 100644
--- a/server/user.jobengine.osgi.server/pages/targets.zul
+++ b/server/user.jobengine.osgi.server/pages/targets.zul
@@ -3,19 +3,16 @@
 <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', targetName=self.label, isChecked=self.checked)" forEach="${vm.targets}" />
-					</vbox>
+		<vbox vflex="max" width="100%" pack="start">
+			<checkbox label="${each.name}" onCheck="@command('onCheck', targetName=self.label, isChecked=self.checked)" 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"
-							 disabled="@command('notChecked') @global-command('notSelected')"
-							 onClick="@command('submitJob') @global-command('executeJob')" />
-						</div>
-					</div>
-					</vbox>
-				</vbox>
+		<vbox vflex="1" pack="end" align="end" width="97%" class="bottomright">
+			<button label="Végrehajt" width="150px" height="80px"
+			 disabled="@load(!vm.executeEnabled)"
+			 onClick="@command('createJob')" />
+			 <separator />
+		</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
index e35f0a30..08fe2076 100644
--- 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
@@ -30,6 +30,7 @@ public class DirectoryListModel {
 	private FileSizeConverter fileSizeConverter = new FileSizeConverter();
 	private String searchText;
 
+	@NotifyChange("searchText")
 	public void changeDirectory(RemoteFile selectedFolder) throws Exception {
 		setSearchText(null);
 		if (uri.getCurrentPath() == null) {
@@ -42,12 +43,13 @@ public class DirectoryListModel {
 	}
 
 	@Command
-	@NotifyChange("files")
+	@NotifyChange({ "files", "searchText" })
 	public void clearFilter() throws Exception {
-		//files = new ListModelList<>(filesCopy);
+		// files = new ListModelList<>(filesCopy);
 		setSearchText(null);
 		files.clear();
 		files.addAll(filesCopy);
+		selectedItemChanged();
 	}
 
 	@Command
@@ -120,21 +122,23 @@ public class DirectoryListModel {
 			} else {
 				uri.setCurrentPath(null);
 			}
-			setSourceList();
 		}
+		setSourceList();
+		selectedItemChanged();
 	}
 
 	@Command
-	@NotifyChange({ "files", "searchText" })
+	@NotifyChange("searchText")
 	public void onDoubleClick(@BindingParam("selectedItem") RemoteFile selectedItem) {
 		if (selectedItem.getIsFolder()) {
 			try {
-
 				changeDirectory(selectedItem);
 			} catch (Exception e) {
 				logger.error("A forrás file -ok nem elérhetőek: {}", e);
 			}
 		}
+
+		selectedItemChanged();
 	}
 
 	@Command
@@ -145,7 +149,7 @@ public class DirectoryListModel {
 			files.addAll(uri.getRemoteFiles());
 		} else {
 			files.clear();
-			//List<RemoteFile> currList = new ArrayList<>;
+			// List<RemoteFile> currList = new ArrayList<>;
 			List<RemoteFile> currList = uri.getRemoteFiles();
 			for (int i = 0; i < currList.size(); i++) {
 				if (currList.get(i).getName().contains(searchText)) {
@@ -158,9 +162,10 @@ public class DirectoryListModel {
 	}
 
 	@Command
+	@NotifyChange("executeEnabled")
 	public void selectedItemChanged() {
 		Set<RemoteFile> selection = files.getSelection();
-		logger.info("Selected: {}", selection.size());
+		// logger.info("Selected: {}", selection.size());
 
 		Map<String, Object> args = new HashMap<>();
 		args.put("sourcedata", selection);
@@ -180,8 +185,8 @@ public class DirectoryListModel {
 	}
 
 	public void setSourceList() throws Exception {
-		//files = new ListModelList<>(filesCopy);
-		//files = new ListModelList<>(uri.getRemoteFiles());
+		// files = new ListModelList<>(filesCopy);
+		// files = new ListModelList<>(uri.getRemoteFiles());
 		files.clear();
 		files.addAll(uri.getRemoteFiles());
 		filesCopy = new ArrayList<>(files);
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java
index cd77d228..bebeeea6 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroJobListModel.java
@@ -7,6 +7,7 @@ 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.GlobalCommand;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.bind.annotation.NotifyChange;
 import org.zkoss.zk.ui.Executions;
@@ -22,6 +23,7 @@ import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.JobChangedEvent;
 import user.jobengine.server.JobEngine;
+import user.jobengine.server.JobEngineException;
 import user.jobengine.zk.util.SessionUtil;
 
 public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedListener {
@@ -71,8 +73,8 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi
 	private void initializeList() {
 		jobList.clear();
 		Map<Long, IJobRuntime> jobMap = jobEngine.getJobs();
-		for (int i=0;i<jobMap.size();i++){
-			if (jobMap.get(i).getOwner() == currentUser){
+		for (int i = 0; i < jobMap.size(); i++) {
+			if (jobMap.get(i).getOwner() == currentUser) {
 				jobList.add(i, jobMap.get(i));
 			}
 		}
@@ -114,7 +116,6 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi
 		this.jobList = jobList;
 	}
 
-
 	public void setNewPriority(int newPriority) {
 		this.newPriority = newPriority;
 	}
@@ -130,4 +131,23 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi
 		Window window = (Window) Executions.createComponents(template, null, ListUtils.asMap("jobRuntime", jobRuntime));
 		window.doModal();
 	}
+
+	@GlobalCommand
+	@NotifyChange({ "jobList" })
+	public void submitJob() {
+		// public void submitJob(@BindingParam("targets") MaestroTarget targets)
+		// {
+		IJobRuntime job;
+		String template = "fake.xml";
+		// Map<String, Object> args = new HashMap<>();
+		// args.put("targets", targets);
+		try {
+			// jobEngine.submit(template, "fakeJob", null, currentUser);
+			job = jobEngine.submit(template, "fakeJob", ListUtils.asMap("itemID", 0), currentUser);
+			// jobList.add(job);
+		} catch (JobEngineException e) {
+			logger.info("Hiba a job indításakor", e);
+		}
+	}
+
 }
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroTarget.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroTarget.java
index f1e59997..8b4786d7 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroTarget.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MaestroTarget.java
@@ -5,6 +5,7 @@ import user.commons.StoreUri;
 public class MaestroTarget {
 	private String name;
 	private StoreUri storeUri;
+	private Boolean selected;
 
 	public String getName() {
 		return name;
@@ -14,10 +15,22 @@ public class MaestroTarget {
 		return storeUri;
 	}
 
+	public Boolean isSelected() {
+		if (selected == null) {
+			return false;
+		} else {
+			return selected;
+		}
+	}
+
 	public void setName(String name) {
 		this.name = name;
 	}
 
+	public void setSelected(Boolean selected) {
+		this.selected = selected;
+	}
+
 	public void setStoreUri(StoreUri storeUri) {
 		this.storeUri = storeUri;
 	}
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
index edc47d39..25e7cf86 100644
--- 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
@@ -4,6 +4,7 @@ import java.util.Set;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.zkoss.bind.BindUtils;
 import org.zkoss.bind.annotation.BindingParam;
 import org.zkoss.bind.annotation.Command;
 import org.zkoss.bind.annotation.GlobalCommand;
@@ -20,6 +21,45 @@ public class TargetsListModel {
 	private MaestroConfig config = null;
 	private ListModelList<MaestroTarget> targets;
 	private boolean executeEnabled;
+	Set<RemoteFile> sourceData;
+	Set<IMetadata> metaData;
+
+	public boolean conditionsOk() {
+		boolean srcMetaOk = false;
+		boolean ret = false;
+		if (sourceData != null && metaData != null) {
+			if (!sourceData.isEmpty() && !metaData.isEmpty()) {
+				srcMetaOk = true;
+			}
+		}
+
+		// Végén törölni !!! ////////////////////////////////////////
+		if (sourceData != null) {
+			if (!sourceData.isEmpty()) {
+				srcMetaOk = true;
+			}
+		}
+		// Végén törölni !!! ////////////////////////////////////////
+
+		if (srcMetaOk) {
+			for (int i = 0; i < targets.size(); i++) {
+				if (targets.get(i).isSelected().booleanValue()) {
+					ret = true;
+					break;
+				}
+			}
+		}
+		return ret;
+	}
+
+	@Command
+	public void createJob() {
+		Set<MaestroTarget> selection = targets.getSelection();
+
+		// Map<String, Object> args = new HashMap<>();
+		// args.put("targets", selection);
+		BindUtils.postGlobalCommand(null, null, "submitJob", null);
+	}
 
 	public ListModelList<MaestroTarget> getTargets() {
 		return targets;
@@ -34,28 +74,42 @@ public class TargetsListModel {
 		} catch (Exception e) {
 			logger.error("Hiba a config file beállításánál {}", e.getMessage());
 		}
+		setExecuteEnabled(false);
 	}
 
+	@Command
 	public boolean isExecuteEnabled() {
 		return executeEnabled;
 	}
 
 	@Command
-	public void onCheck(@BindingParam("data") MaestroTarget data) {
-		//@ContextParam(ContextType.TRIGGER_EVENT) CheckEvent event,
-
+	@NotifyChange("executeEnabled")
+	public void onCheck(@BindingParam("targetName") String targetName, @BindingParam("isChecked") Boolean isChecked) {
+		// public void onCheck(@BindingParam("sourcedata") Set<RemoteFile>
+		// sourceData, @BindingParam("metadata") Set<IMetadata> metaData) {
+		// @ContextParam(ContextType.TRIGGER_EVENT) CheckEvent event,
+		for (int i = 0; i < targets.size(); i++) {
+			if (targets.get(i).getName() == targetName) {
+				targets.get(i).setSelected(isChecked.booleanValue());
+			}
+		}
+		setExecuteEnabled(conditionsOk());
 	}
 
+	@Command
+	@NotifyChange("executeEnabled")
 	public void setExecuteEnabled(boolean executeEnabled) {
 		this.executeEnabled = executeEnabled;
 	}
 
-	@NotifyChange("executeEnabled")
 	@GlobalCommand
+	@NotifyChange("executeEnabled")
 	public void updateExecuteState(@BindingParam("sourcedata") Set<RemoteFile> sourceData, @BindingParam("metadata") Set<IMetadata> metaData) {
-		logger.info("{}", sourceData);
-		logger.info("{}", metaData);
-
+		this.sourceData = sourceData;
+		this.metaData = metaData;
+		setExecuteEnabled(conditionsOk());
+		// logger.info("{}", sourceData);
+		// logger.info("{}", metaData);
 	}
 
 }