From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Fri, 9 Feb 2018 10:23:36 +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=21dafb37df6f31a4cfd9df2097536b9ca10d629e;p=mediacube.git

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

diff --git a/client/Maestro/Program.cs b/client/Maestro/Program.cs
index 2d74206d..05efed34 100644
--- a/client/Maestro/Program.cs
+++ b/client/Maestro/Program.cs
@@ -200,10 +200,13 @@ namespace Maestro {
                     using (PrincipalContext pc = new PrincipalContext(ContextType.Domain, domainName)) {
                         while (true) {
                             logger.Debug("Trying authenticate user {0}", UserName);
-                            bool isValid = pc.ValidateCredentials(UserName, password);
-                            if (isValid) {
-                                logger.Debug("Authenticated: {0}", UserName);
-                                break;
+
+                            if (!String.IsNullOrEmpty(password)) {
+                                bool isValid = pc.ValidateCredentials(UserName, password);
+                                if (isValid) {
+                                    logger.Debug("Authenticated: {0}", UserName);
+                                    break;
+                                }
                             }
 
                             if (loginForm == null)
diff --git a/server/user.jobengine.osgi.server/pages/missingmaterials.zul b/server/user.jobengine.osgi.server/pages/missingmaterials.zul
index bfc56a34..d31fdd25 100644
--- a/server/user.jobengine.osgi.server/pages/missingmaterials.zul
+++ b/server/user.jobengine.osgi.server/pages/missingmaterials.zul
@@ -7,13 +7,14 @@
 	<custom-attributes org.zkoss.zul.listbox.preloadSize="50" />
 	<div id="scdiv" width="100%" height="100%" apply="org.zkoss.bind.BindComposer"
 		viewModel="@id('jlm') @init('user.jobengine.zk.model.MissingMaterialsModel')">
-		<timer id="timer" delay="500" repeats="true" onTimer="@command('uiTick')" />
+		<timer id="timer" delay="100" repeats="true" onTimer="@command('uiTick')" />
 
 		<space bar="false" />
 
 		<div align="left" width="100%">
 			<space bar="false" />
 			<button label="Importálás" onClick="@command('executeImportJob')" autodisable="self" disabled="@load(jlm.importDisabled)" />
+			<button label="Visszaállítás" onClick="@command('executeRestoreJobs')" autodisable="self" disabled="false" />
 		</div>
 
 		<div height="100%" width="100%" style="background: #e3e3e3" align="left">
@@ -21,12 +22,12 @@
 				<caption sclass="boldfont" label="Hiányzó adásanyagok" />
 				<listbox id="lbJobList" sizedByContent="false" model="@load(jlm.jobList)" multiple="true" pagingPosition="top" mold="paging" autopaging="true"
 					vflex="true" checkmark="true" onSelect="@command('selectJob')" style="border: none; background: #e3e3e3 !important;" oddRowSclass="listbox-odd-style"
-					sclass="listbox-normal-style" emptyMessage="Nincs hiányzó anyag.">
+					sclass="listbox-normal-style" emptyMessage="Nincs hiányzó anyag." selectedItems="@bind(jlm.selectedJobs)">
 					<listhead sizable="true">
 						<listheader label="Adásbakerülés" hflex="min" align="left" sort="auto" />
 						<listheader label="Adásanyag" hflex="min" align="left" sort="auto" />
 						<listheader label="Importálva" hflex="min" align="left" sort="auto" />
-						<listheader label="Elérhetőség" hflex="min" align="left" sort="auto" />
+						<listheader label="Elérhetőség" hflex="100%" align="left" sort="auto" />
 					</listhead>
 
 					<template name="model">
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
index 25fe604f..b8c0d18b 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/MissingMaterialsModel.java
@@ -3,9 +3,11 @@ package user.jobengine.zk.model;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
+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.Command;
 import org.zkoss.bind.annotation.Init;
 import org.zkoss.zul.ListModelList;
@@ -34,6 +36,7 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 	private static final String COLLECTION_NAME = "missing_materials";
 	private ListModelList<BasicDBObject> jobList = new ListModelList<BasicDBObject>();
 	private BasicDBObject selectedJob = null;
+	private Set<BasicDBObject> selectedJobs;
 	private IJobEngine jobEngine = null;
 	private boolean importDisabled;
 
@@ -51,7 +54,8 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 					break;
 				}
 			}
-
+			if (importJob == null)
+				throw new NullPointerException("Nem található az import sablon.");
 			ScheduledJob scheduledJob = scheduler.createScheduledJob(importJob);
 			scheduledJob.setJobEngine(jobEngine);
 			scheduledJob.doJob();
@@ -61,6 +65,20 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 		}
 	}
 
+	@Command
+	public void executeRestoreJobs() {
+		logger.info(selectedJobs.size());
+		registerTask(() -> {
+
+			for (BasicDBObject job : selectedJobs) {
+				job.put("Status", "???");
+				BindUtils.postNotifyChange(null, null, job, "*");
+			}
+			//BasicDBObject dbObject = jobList.get(0);
+		});
+
+	}
+
 	public ListModelList<BasicDBObject> getJobList() {
 		return jobList;
 	}
@@ -69,6 +87,10 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 		return this.selectedJob;
 	}
 
+	public Set<BasicDBObject> getSelectedJobs() {
+		return selectedJobs;
+	}
+
 	@Init
 	public void init() {
 		try {
@@ -76,7 +98,7 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 			SessionUtil.addJobChangedListener(this);
 			this.jobEngine = JobEngine.getInstance();
 			if (jobEngine == null)
-				throw new Exception("Internal error! JobEngine instance unavailable.");
+				throw new Exception("Belső hiba! A JobEngine szolgáltatás elérhetetlen.");
 			List<IJobRuntime> jobRuntimes = new ArrayList<>(jobEngine.getJobs().values());
 			Optional<IJobRuntime> findFirst = jobRuntimes.stream().filter(j -> isImportJob(j.getTemplate())).findFirst();
 			if (findFirst.isPresent())
@@ -90,8 +112,9 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 	private void initializeList() {
 		DB db = NoSQLUtils.getNoSQLDB();
 		DBCollection collection = db.getCollection(COLLECTION_NAME);
-		DBCursor cursor = collection.find().sort(new BasicDBObject("TimeToAir", -1)).limit(1000);
-
+		DBCursor cursor = collection.find().sort(new BasicDBObject("TimetoAir", -1)).limit(1000);
+		if (selectedJobs != null)
+			selectedJobs.clear();
 		jobList.clear();
 		while (cursor.hasNext())
 			jobList.add((BasicDBObject) cursor.next());
@@ -138,4 +161,8 @@ public class MissingMaterialsModel extends AsyncBaseModel implements IJobChanged
 		this.selectedJob = selectedJob;
 	}
 
+	public void setSelectedJobs(Set<BasicDBObject> selectedJobs) {
+		this.selectedJobs = selectedJobs;
+	}
+
 }