From 56e360fc470aab2d4bcb2a81165052a47f8ccb6b Mon Sep 17 00:00:00 2001
From: "vasary.daniel" <TFS\vasary.daniel>
Date: Mon, 25 Apr 2022 09:41:05 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C33207

---
 .../user.mediacube.gui/pages/jobeditor2.zul   | 55 ++++++++--------
 .../jobengine/zk/model/JobEditorModel.java    | 66 +++++++++++--------
 .../zk/validator/ChangeValidator.java         | 14 ++++
 3 files changed, 78 insertions(+), 57 deletions(-)
 create mode 100644 server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java

diff --git a/server/user.mediacube.gui/pages/jobeditor2.zul b/server/user.mediacube.gui/pages/jobeditor2.zul
index e49b2333..4d6b703d 100644
--- a/server/user.mediacube.gui/pages/jobeditor2.zul
+++ b/server/user.mediacube.gui/pages/jobeditor2.zul
@@ -46,7 +46,7 @@
 							<tabpanel>
 								<borderlayout>
 									<north size="50%" splittable="true">
-										<grid visible="@bind(not empty jem.selectedJob)" sizedByContent="false" span="true" vflex="true"
+										<grid visible="@bind(not empty jem.editingJob)" 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.">
@@ -57,38 +57,37 @@
 											<rows>
 												<row>
 													<label value="Name"/>
-													<textbox id="nameTextbox" 
-														value="@bind(jem.selectedJob.name)" onChange="@command('onNameChanged')" onClick="@command('onNameTextboxClicked')"/>
-												</row>
-												<row>
-													<label value="Template"/>
-													<textbox id="templateNameTextbox" 
-														value="@bind(jem.selectedJob.template)" onChange="@command('onTemplateNameChanged')"/>
-												</row>
-												<row>
-													<label value="Active"/>
-													<checkbox id="activeCheckbox" 
-														value="@bind(empty jem.selectedJob.active ? false : jem.selectedJob.active)" onClick="@command('onActiveChanged')"/>
-												</row>
-												<row>
-													<label value="Execute immediate"/>
-													<checkbox id="executeImmediateCheckbox" 
-														value="@bind(empty jem.selectedJob.executeimmediate ? false : jem.selectedJob.executeimmediate)" onClick="@command('onExecuteImmediateChanged')"/>
-												</row>
-												<row>
-													<label value="Cron expression"/>
-													<textbox id="cronExpressionTextbox" 
-														value="@bind(jem.selectedJob.cronexpression)" onChange="@command('onCronExpressionChanged')"/>
-												</row>
-												<row>
-													<label value="Next execution"/>
-													<label value="@bind(jem.selectedJob.nextTime)"/>
+													<textbox value="@bind(jem.editingJob.name) @validator()" instant="true"/>
 												</row>
+<!-- 												<row> -->
+<!-- 													<label value="Template"/> -->
+<!-- 													<textbox id="templateNameTextbox"  -->
+<!-- 														value="@bind(jem.selectedJob.template)" onChange="@command('onTemplateNameChanged')"/> -->
+<!-- 												</row> -->
+<!-- 												<row> -->
+<!-- 													<label value="Active"/> -->
+<!-- 													<checkbox id="activeCheckbox"  -->
+<!-- 														value="@bind(empty jem.selectedJob.active ? false : jem.selectedJob.active)" onClick="@command('onActiveChanged')"/> -->
+<!-- 												</row> -->
+<!-- 												<row> -->
+<!-- 													<label value="Execute immediate"/> -->
+<!-- 													<checkbox id="executeImmediateCheckbox"  -->
+<!-- 														value="@bind(empty jem.selectedJob.executeimmediate ? false : jem.selectedJob.executeimmediate)" onClick="@command('onExecuteImmediateChanged')"/> -->
+<!-- 												</row> -->
+<!-- 												<row> -->
+<!-- 													<label value="Cron expression"/> -->
+<!-- 													<textbox id="cronExpressionTextbox"  -->
+<!-- 														value="@bind(jem.selectedJob.cronexpression)" onChange="@command('onCronExpressionChanged')"/> -->
+<!-- 												</row> -->
+<!-- 												<row> -->
+<!-- 													<label value="Next execution"/> -->
+<!-- 													<label value="@bind(jem.selectedJob.nextTime)"/> -->
+<!-- 												</row> -->
 											</rows>
 										</grid>
 									</north>
 									<center border="none" flex="true">
-										<grid model="@load(jem.selectedJob.parameters)" style="border: none; background: #e3e3e3 !important;"
+										<grid model="@load(jem.editingJob.parameters)" style="border: none; background: #e3e3e3 !important;"
 											oddRowSclass="listbox-odd-style" sclass="listbox-normal-style">
 											<columns sizable="true">
 												<column label="Name" hflex="1"/>
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java
index 3fd52809..ea4312ef 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/JobEditorModel.java
@@ -58,8 +58,8 @@ public class JobEditorModel extends BaseModel {
 	private Window resultWin;
 	@Wire("#SaveButton")
 	private Button saveButton;
-	@Wire("#nameTextbox")
-	private Textbox nameTextbox;
+//	@Wire("#nameTextbox")
+//	private Textbox nameTextbox;
 	@Wire("#templateNameTextbox")
 	private Textbox templateNameTextbox;
 	@Wire("#activeCheckbox")
@@ -120,8 +120,8 @@ public class JobEditorModel extends BaseModel {
 	}
 
 	private void saveData() {
-		selectedJob.remove("name");
-		selectedJob.append("name", nameTextbox.getValue());
+//		selectedJob.remove("name");
+//		selectedJob.append("name", nameTextbox.getValue());
 		selectedJob.remove("template");
 		selectedJob.append("template", templateNameTextbox.getValue());
 		selectedJob.remove("active");
@@ -132,19 +132,19 @@ public class JobEditorModel extends BaseModel {
 		selectedJob.append("cronexpression", cronExpressionTextbox.getValue());
 	}
 
-	@Command
-	public void onNameChanged() {
-		setProcessDataChanged(true);
-		selectedJob.remove("name");
-		selectedJob.append("name", nameTextbox.getValue());
-		saveButton.setDisabled(false);
-		logger.info("onNameChanged()");
-	}
+//	@Command
+//	public void onNameChanged() {
+//		setProcessDataChanged(true);
+//		selectedJob.remove("name");
+//		selectedJob.append("name", nameTextbox.getValue());
+//		saveButton.setDisabled(false);
+//		logger.info("onNameChanged()");
+//	}
 
-	@Command
-	public void onNameTextboxClicked() {
-		oldSelectedJob = selectedJob.get("name").toString();
-	}
+//	@Command
+//	public void onNameTextboxClicked() {
+//		oldSelectedJob = selectedJob.get("name").toString();
+//	}
 
 	@Command
 	public void onTemplateNameChanged() {
@@ -286,20 +286,28 @@ public class JobEditorModel extends BaseModel {
 	public void setSelectedJob(BasicDBObject selectedJob) {
 		this.selectedJob = selectedJob;
 
-		if (selectedJob == null)
-			return;
-
-		String cronExpression = selectedJob.getString(CRONEXPRESSION);
-		if (StringUtils.isBlank(cronExpression))
-			return;
+		if (selectedJob == null) {
+			// reset cron next time display
+			// reset editing job
+		} else {
+			String cronExpression = selectedJob.getString(CRONEXPRESSION);
+			if (StringUtils.isBlank(cronExpression))
+				return;
+
+			try {
+				CronExpression ce = new CronExpression(cronExpression);
+				Date nextTime = ce.getNextValidTimeAfter(new Date());
+				selectedJob.put(NEXT_TIME, nextTime);
+			} catch (ParseException e) {
+				logger.catching(e);
+			}
+
+			// update editingJob, create deep copy from selectedJob: a megoldas a
+			// NoSQLUtils-ba keruljon
+			// notify editingJob changed
 
-		try {
-			CronExpression ce = new CronExpression(cronExpression);
-			Date nextTime = ce.getNextValidTimeAfter(new Date());
-			selectedJob.put(NEXT_TIME, nextTime);
-		} catch (ParseException e) {
-			logger.catching(e);
 		}
+
 	}
 
 	public void setSelectedJobs(ListModelList<BasicDBObject> selectedJobs) {
@@ -354,7 +362,7 @@ public class JobEditorModel extends BaseModel {
 	private JobTemplate collectProcessTemplateSettings() {
 		JobTemplate jobTemplate = new JobTemplate();
 
-		jobTemplate.setName(nameTextbox.getValue());
+//		jobTemplate.setName(nameTextbox.getValue());
 		jobTemplate.setFileName(templateNameTextbox.getValue());
 
 		return jobTemplate;
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java
new file mode 100644
index 00000000..74ebd979
--- /dev/null
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/validator/ChangeValidator.java
@@ -0,0 +1,14 @@
+package user.jobengine.zk.validator;
+
+import org.zkoss.bind.ValidationContext;
+import org.zkoss.bind.validator.AbstractValidator;
+
+public class ChangeValidator extends AbstractValidator {
+
+	@Override
+	public void validate(ValidationContext context) {
+		// context.getBindContext().
+
+	}
+
+}
-- 
2.54.0