From 2461d6ac1c5ecc9785728f60fceec834433f147e Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Wed, 13 Apr 2022 21:57:16 +0000
Subject: [PATCH] job view redesign

git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33158
---
 server/user.mediacube.gui/css/toast.css       |  73 +++++++++++
 server/user.mediacube.gui/js/toast.js         | 113 +++++++++++++++++
 server/user.mediacube.gui/js/toast.min.js     |   1 +
 server/user.mediacube.gui/pages/index.zul     |   5 +-
 server/user.mediacube.gui/pages/jobeditor.zul | 116 ++++++++++++++++++
 server/user.mediacube.gui/pages/joblist.zul   |   9 +-
 server/user.mediacube.gui/pages/jobs.zul      |  20 +++
 .../user.mediacube.gui/pages/jobselector.zul  | 107 +---------------
 .../user/jobengine/zk/model/IndexModel.java   |   2 +-
 ...SelectorModel.java => JobEditorModel.java} |  23 ++--
 .../zk/model/MaestroJobListModel.java         |   9 +-
 11 files changed, 353 insertions(+), 125 deletions(-)
 create mode 100644 server/user.mediacube.gui/css/toast.css
 create mode 100644 server/user.mediacube.gui/js/toast.js
 create mode 100644 server/user.mediacube.gui/js/toast.min.js
 create mode 100644 server/user.mediacube.gui/pages/jobeditor.zul
 create mode 100644 server/user.mediacube.gui/pages/jobs.zul
 rename server/user.mediacube.gui/src/user/jobengine/zk/model/{JobSelectorModel.java => JobEditorModel.java} (83%)

diff --git a/server/user.mediacube.gui/css/toast.css b/server/user.mediacube.gui/css/toast.css
new file mode 100644
index 00000000..79d65808
--- /dev/null
+++ b/server/user.mediacube.gui/css/toast.css
@@ -0,0 +1,73 @@
+.toastjs-container {
+	position: absolute; /* Fallback */
+	position: fixed;
+	top: 200px;
+	left: 30px;
+	width: calc(100% - 60px);
+	max-width: 400px;
+
+	transform: translateX(-150%);
+	transition: transform 0.3s;
+
+	z-index: 100; /* */
+}
+
+.toastjs-container[aria-hidden="false"] {
+	transform: translateX(0%);
+}
+
+.toastjs {
+	background: #fff;
+	padding: 10px 15px 0; /* No bottom padding because the buttons have a margin-bottom */
+	border-left-style: solid;
+	border-left-width: 5px;
+	border-radius: 4px;
+	box-shadow: 0 2px 5px 0 rgba(0,0,0,0.2);
+}
+
+.toastjs.default {
+	border-left-color: #AAAAAA;
+}
+
+.toastjs.success {
+	border-left-color: #2ECC40;
+}
+.toastjs.warning {
+	border-left-color: #FF851B;
+}
+.toastjs.danger {
+	border-left-color: #FF4136;
+}
+
+
+.toastjs-btn {
+	background: rgb(240,240,240);
+	padding: 5px 10px;
+	border: 0;
+	border-radius: 4px;
+
+	font-family: 'Source Sans Pro', sans-serif;
+	font-size: 14px;
+
+	display: inline-block;
+	margin-right: 10px;
+	margin-bottom: 10px;
+	cursor: pointer;
+}
+
+.toastjs-btn--custom {
+	background: rgb(50,50,50);
+	color: #fff;
+}
+
+
+.toastjs-btn:hover,
+.toastjs-btn:focus {
+	outline: none;
+	box-shadow: 0 2px 5px 0 rgba(0,0,0,0.2);
+}
+
+
+
+
+
diff --git a/server/user.mediacube.gui/js/toast.js b/server/user.mediacube.gui/js/toast.js
new file mode 100644
index 00000000..3b54a6b2
--- /dev/null
+++ b/server/user.mediacube.gui/js/toast.js
@@ -0,0 +1,113 @@
+'use strict';
+
+function Toast(options) {
+
+    if (!options.message) {
+        throw new Error('Toast.js - You need to set a message to display');
+        return;
+    }
+
+    this.options = options;
+    this.options.type = options.type || 'default';
+
+    this.toastContainerEl = document.querySelector('.toastjs-container');
+    this.toastEl = document.querySelector('.toastjs');
+
+    this._init();
+}
+
+Toast.prototype._createElements = function () {
+    var _this = this;
+
+    return new Promise(function (resolve, reject) {
+
+        _this.toastContainerEl = document.createElement('div');
+        _this.toastContainerEl.classList.add('toastjs-container');
+        _this.toastContainerEl.setAttribute('role', 'alert');
+        _this.toastContainerEl.setAttribute('aria-hidden', true);
+
+        _this.toastEl = document.createElement('div');
+        _this.toastEl.classList.add('toastjs');
+
+        _this.toastContainerEl.appendChild(_this.toastEl);
+        document.body.appendChild(_this.toastContainerEl);
+
+        setTimeout(function () {
+            return resolve();
+        }, 500);
+    });
+};
+
+Toast.prototype._addEventListeners = function () {
+    var _this2 = this;
+
+    document.querySelector('.toastjs-btn--close').addEventListener('click', function () {
+        _this2._close();
+    });
+
+    if (this.options.customButtons) {
+        var customButtonsElArray = Array.prototype.slice.call(document.querySelectorAll('.toastjs-btn--custom'));
+        customButtonsElArray.map(function (el, index) {
+            el.addEventListener('click', function (event) {
+                return _this2.options.customButtons[index].onClick(event);
+            });
+        });
+    }
+};
+
+Toast.prototype._close = function () {
+    var _this3 = this;
+
+    return new Promise(function (resolve, reject) {
+        _this3.toastContainerEl.setAttribute('aria-hidden', true);
+        setTimeout(function () {
+
+            _this3.toastEl.innerHTML = '';
+            _this3.toastEl.classList.remove('default', 'success', 'warning', 'danger');
+
+            if (_this3.focusedElBeforeOpen) {
+                _this3.focusedElBeforeOpen.focus();
+            }
+
+            resolve();
+        }, 1000);
+    });
+};
+
+Toast.prototype._open = function () {
+
+    this.toastEl.classList.add(this.options.type);
+    this.toastContainerEl.setAttribute('aria-hidden', false);
+
+    var customButtons = '';
+    if (this.options.customButtons) {
+        customButtons = this.options.customButtons.map(function (customButton, index) {
+            return '<button type="button" class="toastjs-btn toastjs-btn--custom">' + customButton.text + '</button>';
+        });
+        customButtons = customButtons.join('');
+    }
+
+    this.toastEl.innerHTML = '\n        <p>' + this.options.message + '</p>\n        <button type="button" class="toastjs-btn toastjs-btn--close">Close</button>\n        ' + customButtons + '\n    ';
+
+    this.focusedElBeforeOpen = document.activeElement;
+    document.querySelector('.toastjs-btn--close').focus();
+};
+
+Toast.prototype._init = function () {
+    var _this4 = this;
+
+    Promise.resolve().then(function () {
+        if (_this4.toastContainerEl) {
+            return Promise.resolve();
+        }
+        return _this4._createElements();
+    }).then(function () {
+        if (_this4.toastContainerEl.getAttribute('aria-hidden') == 'false') {
+            return _this4._close();
+        }
+        return Promise.resolve();
+    }).then(function () {
+        _this4._open();
+        _this4._addEventListeners();
+    });
+};
\ No newline at end of file
diff --git a/server/user.mediacube.gui/js/toast.min.js b/server/user.mediacube.gui/js/toast.min.js
new file mode 100644
index 00000000..1a0413ca
--- /dev/null
+++ b/server/user.mediacube.gui/js/toast.min.js
@@ -0,0 +1 @@
+"use strict";function Toast(t){if(!t.message)throw new Error("Toast.js - You need to set a message to display");this.options=t,this.options.type=t.type||"default",this.toastContainerEl=document.querySelector(".toastjs-container"),this.toastEl=document.querySelector(".toastjs"),this._init()}Toast.prototype._createElements=function(){var t=this;return new Promise(function(e,o){t.toastContainerEl=document.createElement("div"),t.toastContainerEl.classList.add("toastjs-container"),t.toastContainerEl.setAttribute("role","alert"),t.toastContainerEl.setAttribute("aria-hidden",!0),t.toastEl=document.createElement("div"),t.toastEl.classList.add("toastjs"),t.toastContainerEl.appendChild(t.toastEl),document.body.appendChild(t.toastContainerEl),setTimeout(function(){return e()},500)})},Toast.prototype._addEventListeners=function(){var t=this;if(document.querySelector(".toastjs-btn--close").addEventListener("click",function(){t._close()}),this.options.customButtons){var e=Array.prototype.slice.call(document.querySelectorAll(".toastjs-btn--custom"));e.map(function(e,o){e.addEventListener("click",function(e){return t.options.customButtons[o].onClick(e)})})}},Toast.prototype._close=function(){var t=this;return new Promise(function(e,o){t.toastContainerEl.setAttribute("aria-hidden",!0),setTimeout(function(){t.toastEl.innerHTML="",t.toastEl.classList.remove("default","success","warning","danger"),t.focusedElBeforeOpen&&t.focusedElBeforeOpen.focus(),e()},1e3)})},Toast.prototype._open=function(){this.toastEl.classList.add(this.options.type),this.toastContainerEl.setAttribute("aria-hidden",!1);var t="";this.options.customButtons&&(t=this.options.customButtons.map(function(t,e){return'<button type="button" class="toastjs-btn toastjs-btn--custom">'+t.text+"</button>"}),t=t.join("")),this.toastEl.innerHTML="\n        <p>"+this.options.message+'</p>\n        <button type="button" class="toastjs-btn toastjs-btn--close">Close</button>\n        '+t+"\n    ",this.focusedElBeforeOpen=document.activeElement,document.querySelector(".toastjs-btn--close").focus()},Toast.prototype._init=function(){var t=this;Promise.resolve().then(function(){return t.toastContainerEl?Promise.resolve():t._createElements()}).then(function(){return"false"==t.toastContainerEl.getAttribute("aria-hidden")?t._close():Promise.resolve()}).then(function(){t._open(),t._addEventListeners()})};
\ No newline at end of file
diff --git a/server/user.mediacube.gui/pages/index.zul b/server/user.mediacube.gui/pages/index.zul
index 3b74039d..1df319a4 100644
--- a/server/user.mediacube.gui/pages/index.zul
+++ b/server/user.mediacube.gui/pages/index.zul
@@ -1,8 +1,5 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
-<!DOCTYPE xml>
-<zk xmlns:w="http://www.zkoss.org/2005/zk/client">
+<zk>
 	<style src="/css/archivum.css" />
 	<zscript><![CDATA[
 	// Chrome F5 bug workaround (miscalculates 100% width on second refresh)
diff --git a/server/user.mediacube.gui/pages/jobeditor.zul b/server/user.mediacube.gui/pages/jobeditor.zul
new file mode 100644
index 00000000..33849db8
--- /dev/null
+++ b/server/user.mediacube.gui/pages/jobeditor.zul
@@ -0,0 +1,116 @@
+<zk xmlns:ca="client/attribute">
+	<style src="/css/toast.css" />
+	<script src="/js/toast.min.js" />
+	<script>
+		function showToast(m) {
+			var toast = new Toast({message: m, type: 'danger' });
+			setTimeout(function(){ toast._close(); }, 3000);
+		}
+	</script>
+	<vlayout height="100%" viewModel="@id('jlm') @init('user.jobengine.zk.model.JobEditorModel')">
+		<toolbar>
+			<toolbarbutton label="Futtatás" iconSclass="z-icon-play" onClick="@command('execute')" disabled="${not sessionScope.userPrincipal.admin}" autodisable="self" />
+		</toolbar>
+		<borderlayout vflex="true">
+			<center border="none" vflex="true">
+				<listbox vflex="true" model="@load(jlm.jobs)" selectedItem="@bind(jlm.selectedJob)">
+					<listhead>
+						<listheader hflex="1" label="Név" align="left" />
+					</listhead>
+
+					<template name="model">
+						<!--  Ez nagyon veszelyes, furan kezeli a zkoss, problemakat okozhat !!! -->
+						<!-- <listitem onDoubleClick="@command('execute')"> -->
+						<listitem>
+							<listcell label="@load(empty each.name ? each.template : each.name)" />
+						</listitem>
+					</template>
+				</listbox>
+			</center>
+			<east size="60%" flex="true" splittable="true" collapsible="true">
+				<tabbox id="pagesTab" vflex="true" hflex="true" orient="top">
+					<tabs visible="true">
+						<tab id="tab0" label="Paraméterek" selected="true" />
+						<tab id="tab1" label="Részletek" />
+						<tab id="tab2" label="Ábra" />
+					</tabs>
+					<tabpanels>
+						<tabpanel>
+							<borderlayout>
+								<north size="50%" splittable="true">
+									<grid visible="@bind(not empty jlm.selectedJob)" sizedByContent="false" span="true" vflex="true"
+										style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" 
+										sclass="listbox-normal-style"
+										emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot.">
+										<columns>
+											<column hflex="min"/>
+											<column hflex="true"/>
+										</columns>
+										<rows>
+											<row>
+												<label value="Name"/>
+												<label value="@bind(jlm.selectedJob.name)"/>
+											</row>
+											<row>
+												<label value="Template"/>
+												<label value="@bind(jlm.selectedJob.template)"/>
+											</row>
+											<row>
+												<label value="Active"/>
+												<label value="@bind(empty jlm.selectedJob.active ? false : jlm.selectedJob.active)"/>
+											</row>
+											<row>
+												<label value="Execute immediate"/>
+												<label value="@bind(empty jlm.selectedJob.executeimmediate ? false : jlm.selectedJob.executeimmediate)"/>
+											</row>
+											<row>
+												<label value="Cron expression"/>
+												<label value="@bind(jlm.selectedJob.cronexpression)"/>
+											</row>
+											<row>
+												<label value="Next execution"/>
+												<label value="@bind(jlm.selectedJob.nextTime)"/>
+											</row>
+										</rows>
+									</grid>
+
+								</north>
+								<center border="none" flex="true">
+									<grid model="@load(jlm.selectedJob.parameters)" style="border: none; background: #e3e3e3 !important;"
+										oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">
+										<columns sizable="true">
+											<column label="Name" hflex="1"/>
+											<column label="Value" hflex="3"/>
+											<column label="Type" hflex="1"/>
+										</columns>
+										<rows>
+											<template name="model">
+												<row>
+													<label value="@load(each.name)"/>
+													<label value="@load(each.value)"/>
+													<label value="@load(each.type)"/>
+												</row>
+											</template>
+										</rows>
+									</grid>
+								</center>
+							</borderlayout>
+						</tabpanel>
+						<tabpanel>
+							<label height="100%" ca:data-syntax-highlight="true" multiline="true" pre="true" 
+								value="@bind(jlm.selectedJob['xml'])" />
+						</tabpanel>
+						<tabpanel>
+							<include src="pages/processVisualizer.zul" />
+						</tabpanel>
+					</tabpanels>
+				</tabbox>
+			</east>
+		</borderlayout>
+<!-- 		<div hflex="true" vflex="min" align="center"> -->
+<!-- 			<button id="reloadButton" label="Frissítés" onClick="@command('reload')" /> -->
+<!-- 			<button id="closeButton" label="Mégsem" onClick="@command('close')" /> -->
+<!-- 			<button id="executeButton" label="Futtatás" onClick="@command('execute')" /> -->
+<!-- 		</div> -->
+	</vlayout>
+</zk>
diff --git a/server/user.mediacube.gui/pages/joblist.zul b/server/user.mediacube.gui/pages/joblist.zul
index 04f60a3f..648ad922 100644
--- a/server/user.mediacube.gui/pages/joblist.zul
+++ b/server/user.mediacube.gui/pages/joblist.zul
@@ -1,11 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c" ?>
 <?init class="user.jobengine.zk.util.AdminAuthInitiator"?>
-<?page id="joblist"?>
-<!DOCTYPE xml>
-
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:ca="client/attribute" xmlns:x="xhtml">
-	<style src="css/joblist.css" />
+	<style src="/css/joblist.css" />
 
 	<!-- csak igy jo a list sebessege -->
 	<custom-attributes org.zkoss.zul.listbox.rod="true" />
@@ -24,8 +21,8 @@
 			<toolbarbutton label="Feladat leállítása" iconSclass="z-icon-times-circle" onClick="@command('cancelSelectedJobs')" 
 				disabled="@load(jlm.updatePriorityDisabled)" autodisable="self"/>
 			<separator orient="vertical"/>
-			<toolbarbutton label="Futtatás" iconSclass="z-icon-play" onClick="@command('executeJob')" 
-				disabled="${not sessionScope.userPrincipal.admin}" autodisable="self" />
+<!-- 			<toolbarbutton label="Futtatás" iconSclass="z-icon-play" onClick="@command('executeJob')"  -->
+<!-- 				disabled="${not sessionScope.userPrincipal.admin}" autodisable="self" /> -->
 			<toolbarbutton label="Összes megszakítása" iconSclass="z-icon-stop" onClick="@command('cancelAllJobs')" 
 				disabled="${not sessionScope.userPrincipal.admin}" autodisable="self" />
 			  
diff --git a/server/user.mediacube.gui/pages/jobs.zul b/server/user.mediacube.gui/pages/jobs.zul
new file mode 100644
index 00000000..30f4c513
--- /dev/null
+++ b/server/user.mediacube.gui/pages/jobs.zul
@@ -0,0 +1,20 @@
+<?page id="jobs"?>
+<zk xmlns:w="http://www.zkoss.org/2005/zk/client" xmlns:ca="client/attribute" xmlns:x="xhtml">
+	<style src="css/joblist.css" />
+
+	<tabbox id="pagesTab" vflex="true" hflex="true" orient="top">
+		<tabs visible="true">
+			<tab id="tab0" label="Futó folyamatok" selected="true" />
+			<tab id="tab1" label="Folyamat szerkesztő" />
+		</tabs>
+		<tabpanels>
+			<tabpanel>
+				<include src="/pages/joblist.zul" />
+			</tabpanel>
+			<tabpanel>
+				<include src="/pages/jobeditor.zul" />
+			</tabpanel>
+		</tabpanels>
+	</tabbox>
+
+</zk>
\ No newline at end of file
diff --git a/server/user.mediacube.gui/pages/jobselector.zul b/server/user.mediacube.gui/pages/jobselector.zul
index 31b800c3..6080525a 100644
--- a/server/user.mediacube.gui/pages/jobselector.zul
+++ b/server/user.mediacube.gui/pages/jobselector.zul
@@ -2,110 +2,7 @@
 <!DOCTYPE xml>
 
 <zk xmlns:ca="client/attribute">
-	<window id="resultWin" title="Folyamat futtatása" sizable="true" width="70%" height="70%" border="normal"
-		viewModel="@id('jlm') @init('user.jobengine.zk.model.JobSelectorModel')" forward="onCancel=closeButton.onClick">
-		<vlayout height="100%">
-			<borderlayout vflex="true">
-				<center border="none" vflex="true">
-					<listbox vflex="true" model="@load(jlm.jobs)" selectedItem="@bind(jlm.selectedJob)">
-						<listhead>
-							<listheader hflex="1" label="Név" align="left" />
-						</listhead>
-
-						<template name="model">
-<!--  Ez nagyon veszelyes, furan kezeli a zkoss, problemakat okozhat !!! -->
-<!--  						<listitem onDoubleClick="@command('execute')"> -->
-							<listitem>
-								<listcell label="@load(empty each.name ? each.template : each.name)" />
-							</listitem>
-						</template>
-					</listbox>
-				</center>
-				<east size="60%" flex="true" splittable="true" collapsible="true">
-					<tabbox id="pagesTab" vflex="true" hflex="true" orient="top">
-						<tabs visible="true">
-							<tab id="tab0" label="Paraméterek" selected="true" />
-							<tab id="tab1" label="Részletek" />
-							<tab id="tab2" label="Ábra" />
-						</tabs>
-						<tabpanels>
-							<tabpanel>
-								<borderlayout>
-									<north size="50%" splittable="true">
-										<grid visible="@bind(not empty jlm.selectedJob)" sizedByContent="false" span="true" vflex="true"
-											style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style" 
-											sclass="listbox-normal-style"
-											emptyMessage="A részletek megtekintéséhez jelöljön ki egy folyamatot.">
-											<columns>
-												<column hflex="min"/>
-												<column hflex="true"/>
-											</columns>
-											<rows>
-												<row>
-													<label value="Name"/>
-													<label value="@bind(jlm.selectedJob.name)"/>
-												</row>
-												<row>
-													<label value="Template"/>
-													<label value="@bind(jlm.selectedJob.template)"/>
-												</row>
-												<row>
-													<label value="Active"/>
-													<label value="@bind(empty jlm.selectedJob.active ? false : jlm.selectedJob.active)"/>
-												</row>
-												<row>
-													<label value="Execute immediate"/>
-													<label value="@bind(empty jlm.selectedJob.executeimmediate ? false : jlm.selectedJob.executeimmediate)"/>
-												</row>
-												<row>
-													<label value="Cron expression"/>
-													<label value="@bind(jlm.selectedJob.cronexpression)"/>
-												</row>
-												<row>
-													<label value="Next execution"/>
-													<label value="@bind(jlm.selectedJob.nextTime)"/>
-												</row>
-											</rows>
-										</grid>
-
-									</north>
-									<center border="none" flex="true">
-										<grid model="@load(jlm.selectedJob.parameters)" style="border: none; background: #e3e3e3 !important;"
-											oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">
-											<columns sizable="true">
-												<column label="Name" hflex="1"/>
-												<column label="Value" hflex="3"/>
-												<column label="Type" hflex="1"/>
-											</columns>
-											<rows>
-												<template name="model">
-													<row>
-														<label value="@load(each.name)"/>
-														<label value="@load(each.value)"/>
-														<label value="@load(each.type)"/>
-													</row>
-												</template>
-											</rows>
-										</grid>
-									</center>
-								</borderlayout>
-							</tabpanel>
-							<tabpanel>
-								<label height="100%" ca:data-syntax-highlight="true" multiline="true" pre="true" 
-									value="@bind(jlm.selectedJob['xml'])" />
-							</tabpanel>
-							<tabpanel>
-								<include src="pages/processVisualizer.zul" />
-							</tabpanel>
-						</tabpanels>
-					</tabbox>
-				</east>
-			</borderlayout>
-			<div hflex="true" vflex="min" align="center">
-				<!-- <button id="reloadButton" label="Frissítés" onClick="@command('reload')" /> -->
-				<button id="closeButton" label="Mégsem" onClick="@command('close')" />
-				<button id="executeButton" label="Futtatás" onClick="@command('execute')" />
-			</div>
-		</vlayout>
+	<window id="resultWin" title="Folyamat futtatása" sizable="true" width="70%" height="70%" border="normal" forward="onCancel=closeButton.onClick">
+		<include src="/pages/jobeditor.zul" />
 	</window>
 </zk>
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java
index fd678321..cb01bdc8 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/IndexModel.java
@@ -24,7 +24,7 @@ import user.jobengine.zk.util.SessionUtil;
 public class IndexModel extends BaseModel {
 	private static final Logger logger = LogManager.getLogger();
 	private String page;
-	private Map<String, Object> pathMap = ListUtils.asMap("/", "searchitems", "jobs", "joblist", "missingmaterials",
+	private Map<String, Object> pathMap = ListUtils.asMap("/", "searchitems", "jobs", "jobs", "missingmaterials",
 			"missingmaterials", "newshistory", "newshistory", "edithistory", "edithistory", "statistics", "statistics",
 			"maestro", "maestro", "pwdgen", "pwdgen");
 
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobSelectorModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java
similarity index 83%
rename from server/user.mediacube.gui/src/user/jobengine/zk/model/JobSelectorModel.java
rename to server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java
index 931ec81f..91011250 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobSelectorModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java
@@ -20,17 +20,20 @@ import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.select.Selectors;
 import org.zkoss.zk.ui.select.annotation.Wire;
+import org.zkoss.zk.ui.util.Clients;
 import org.zkoss.zul.ListModelList;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Window;
 
 import com.ibm.nosql.json.api.BasicDBObject;
 
+import user.jobengine.gui.ComponentBinder;
 import user.jobengine.server.IJobEngine;
+import user.jobengine.server.IJobRuntime;
 import user.jobengine.server.scheduler.ScheduledJob;
 import user.jobengine.server.scheduler.SchedulerService;
 
-public class JobSelectorModel extends BaseModel {
+public class JobEditorModel extends BaseModel {
 	private static final String XML = "xml";
 	private static final String NEXT_TIME = "nextTime";
 	private static final String TEMPLATE = "template";
@@ -50,7 +53,8 @@ public class JobSelectorModel extends BaseModel {
 
 	@Command
 	public void close() {
-		resultWin.detach();
+		if (resultWin != null)
+			resultWin.detach();
 	}
 
 	@Command
@@ -61,17 +65,20 @@ public class JobSelectorModel extends BaseModel {
 
 		ScheduledJob scheduledJob = jobEngine.getScheduledJob(template);
 
-		// ScheduledJob scheduledJob =
-		// jobEngine.getJobEngineConfiguration().createScheduledJob(selectedJob,
-		// jobEngine);
 		try {
-			scheduledJob.doManualJob();
+			IJobRuntime runtime = scheduledJob.doManualJob();
+			toast(runtime);
 		} catch (Exception e) {
 			Messagebox.show(e.getMessage());
 		}
 		close();
 	}
 
+	private void toast(IJobRuntime runtime) {
+		Clients.evalJavaScript(
+				String.format("showToast('<b>%s</b> elindítva.</br>ID %d')", runtime.getName(), runtime.getId()));
+	}
+
 	public ListModelList<BasicDBObject> getJobs() {
 		return jobs;
 	}
@@ -86,7 +93,9 @@ public class JobSelectorModel extends BaseModel {
 
 	@Init
 	public void init() {
-		this.jobEngine = (IJobEngine) Executions.getCurrent().getArg().get("jobEngine");
+		jobEngine = (IJobEngine) Executions.getCurrent().getArg().get("jobEngine");
+		if (jobEngine == null)
+			jobEngine = ComponentBinder.getJobEngine();
 
 		initJobList();
 	}
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java
index 9ce5c9c6..12036f40 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/MaestroJobListModel.java
@@ -102,8 +102,13 @@ public class MaestroJobListModel extends AsyncBaseModel implements IJobChangedLi
 		jobList.clear();
 		Map<Long, IJobRuntime> jobMap = jobEngine.getJobs();
 		for (int i = 0; i < jobMap.size(); i++) {
-			if (currentUser.equals(jobMap.get(i).getOwner())) {
-				jobList.add(i, jobMap.get(i));
+			IJobRuntime runtime = jobMap.get(i);
+
+			if (runtime == null)
+				continue;
+
+			if (currentUser.equals(runtime.getOwner())) {
+				jobList.add(i, runtime);
 			}
 		}
 	}
-- 
2.54.0