From: Omar Sweidan <omar.sweidan@userrendszerhaz.hu>
Date: Wed, 18 May 2022 13:11:32 +0000 (+0200)
Subject: feladat megoldva
X-Git-Url: http://git.useribm.hu/?a=commitdiff_plain;h=cb4f1c01d94c2845927bfb3819a218ccc1b4b8b8;p=mediacube.git

feladat megoldva
---

diff --git a/server/user.mediacube.gui/index.zul b/server/user.mediacube.gui/index.zul
index 4c1a9132..821c540d 100644
--- a/server/user.mediacube.gui/index.zul
+++ b/server/user.mediacube.gui/index.zul
@@ -1,26 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <?init class="user.jobengine.zk.util.AuthInitiator"?>
+
+<?component name="sidewindow" inline="true" macroURI="pages/sidewindow.zul"?>
+
+<!DOCTYPE xml>
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client">
 	<style src="/css/archivum.css" />
-	<zscript><![CDATA[
-	// Chrome F5 bug workaround (miscalculates 100% width on second refresh)
-	void onClientInfo(ClientInfoEvent evt) {
-    	int myHeight = evt.getScreenHeight();
-        int myWidth = evt.getScreenWidth();
-    }
-	
-	void resizeComp(org.zkoss.zk.ui.Component toResize){
-		org.zkoss.zk.ui.util.Clients.resize(toResize);
-	}
-	
-	public void clearErrorMsg(Component comp){
-		if(comp != null && comp.getErrorMessage() != null){
-        	//comp.setErrorMessage(comp.getErrorMessage().replaceAll("aaaa.nn.jj","éééé.hh.nn"));
-        	comp.setErrorMessage("Hibás érték! (ÉÉÉÉ.HH.NN)");
+	<zscript>
+		<![CDATA[
+		// Chrome F5 bug workaround (miscalculates 100% width on second refresh)
+ 		void onClientInfo(ClientInfoEvent evt) {
+ 	    	int myHeight = evt.getScreenHeight();
+	        int myWidth = evt.getScreenWidth();
+ 	    } 
+		
+		void resizeComp(org.zkoss.zk.ui.Component toResize){
+			org.zkoss.zk.ui.util.Clients.resize(toResize);
 		}
- 	}
-	]]></zscript>
+		
+		public void clearErrorMsg(Component comp){
+			if(comp != null && comp.getErrorMessage() != null){
+	        	//comp.setErrorMessage(comp.getErrorMessage().replaceAll("aaaa.nn.jj","éééé.hh.nn"));
+	        	comp.setErrorMessage("Hibás érték! (ÉÉÉÉ.HH.NN)");
+			}
+	 	}
+		]]>
+	</zscript>
 	<!-- ZKOSS chrome listbox scroll bug workaround: http://tracker.zkoss.org/browse/ZK-3263 -->
 	<script>
 		window.onpopstate = function(event) {
@@ -63,8 +69,9 @@
 	
 <!-- 	onClientInfo="onClientInfo(event)" -->
 
-	<window id="zkwindow" viewModel="@id('vm') @init('user.jobengine.zk.model.IndexModel')" border="none" width="100%" height="100%" contentStyle="padding:0;">
- 		<custom-attributes org.zkoss.zul.image.preload="true" />
+	<window id="zkwindow" viewModel="@id('im') @init('user.jobengine.zk.model.IndexModel')" border="none" 
+		width="100%" height="100%" contentStyle="padding:0;" onClientInfo="@command('onClientInfo', evt=event)">
+ 		<custom-attributes org.zkoss.zul.image.preload="true"/>
 <!-- 		<borderlayout width="${myWidth}" height="${myHeight}"> -->
 		<borderlayout>
 			<north border="0">
@@ -99,8 +106,11 @@
 				</div>
 			</north>
 			<center border="0">
-				<include style="background: #e3e3e3;" id="includeContent" src="@load(vm.page)" />
+				<include style="background: #e3e3e3;" id="includeContent" src="@load(im.page)" />
 			</center>
+<!-- 			<east> -->
+<!-- 				<sidewindow /> -->
+<!-- 			</east> -->
 		</borderlayout>
 	</window>
 </zk>
diff --git a/server/user.mediacube.gui/pages/index.zul b/server/user.mediacube.gui/pages/index.zul2
similarity index 100%
rename from server/user.mediacube.gui/pages/index.zul
rename to server/user.mediacube.gui/pages/index.zul2
diff --git a/server/user.mediacube.gui/pages/sidewindow.zul b/server/user.mediacube.gui/pages/sidewindow.zul
new file mode 100644
index 00000000..ea551443
--- /dev/null
+++ b/server/user.mediacube.gui/pages/sidewindow.zul
@@ -0,0 +1,25 @@
+<!DOCTYPE xml>
+
+<zk>	
+	<div width="50px" vflex="1">
+		<window mode="overlapped" viewModel="@id('sm') @init('user.jobengine.zk.model.SidewindowModel')" 
+		width="@bind(sm.width)" left="@bind(sm.left)" top="@bind(sm.top)" height="@bind(sm.height)"
+			onClose="@command('onClose')" visible="@bind(sm.visible)">
+			<tabbox id="pagesTab" vflex="true" orient="left" 
+				onSelect="@command('onSelectTab', evt=event)" visible="@bind(sm.visible)">
+				<tabs>
+					<tab id="tab0" iconSclass="z-icon-envelope-o" selected="true"/>
+					<tab id="tab1" iconSclass="z-icon-glass"/>
+				</tabs>
+				<tabpanels visible="@bind(sm.opened)">
+					<tabpanel>
+						teszt1
+					</tabpanel>
+					<tabpanel>
+						teszt2
+					</tabpanel>
+				</tabpanels>
+			</tabbox>
+		</window>
+	</div>
+</zk>
\ No newline at end of file
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/GlobalConstants.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/GlobalConstants.java
new file mode 100644
index 00000000..98f7b530
--- /dev/null
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/GlobalConstants.java
@@ -0,0 +1,5 @@
+package user.jobengine.zk.model;
+
+public interface GlobalConstants {
+	public static final String EVENTQUEUE_NAME= "OnClientInfoEvents";
+}
\ No newline at end of file
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 21d1e57a..05b413fc 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
@@ -12,6 +12,7 @@ import org.zkoss.bind.annotation.ContextParam;
 import org.zkoss.bind.annotation.ContextType;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.Executions;
+import org.zkoss.zk.ui.event.ClientInfoEvent;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.select.Selectors;
 import org.zkoss.zk.ui.util.Clients;
@@ -26,12 +27,14 @@ public class IndexModel extends BaseModel {
 	private String page;
 	private Map<String, Object> pathMap = ListUtils.asMap("/", "searchitems", "jobs", "jobs", "missingmaterials", "missingmaterials", "newshistory",
 			"newshistory", "edithistory", "edithistory", "statistics", "statistics", "maestro", "maestro", "pwdgen", "pwdgen");
+	
 
 	@AfterCompose
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
-		route(Executions.getCurrent().getParameter("action"), SessionUtil.getQueryString(Arrays.asList("action")), false);
+		route(Executions.getCurrent().getParameter("action"), 
+				SessionUtil.getQueryString(Arrays.asList("action")), false);
 		SessionUtil.setAttribute(IndexModel.class.getCanonicalName(), this);
 	}
 
@@ -47,6 +50,17 @@ public class IndexModel extends BaseModel {
 		logger.info("Popped to client: {}", h);
 		route(h.getString("action"), h.getString("query"), true);
 	}
+	
+	@Command
+	public void onClientInfo(@ContextParam(ContextType.TRIGGER_EVENT) ClientInfoEvent event) {
+		logger.info("onClientInfo()");
+		SessionUtil.publish(event);
+	}
+	
+	public void onVisibilityChanged(@ContextParam(ContextType.TRIGGER_EVENT) Event event) {
+		logger.info("onVisibilityChanged");
+		SessionUtil.publish(event);		
+	}
 
 	public void pushClientHistory(String action, String query) {
 		String realAction = action.equals("/") ? action : "/actions/" + action;
@@ -72,5 +86,4 @@ public class IndexModel extends BaseModel {
 		BindUtils.postNotifyChange(null, null, this, "page");
 		logger.info("Page set to {}", getPage());
 	}
-
 }
\ No newline at end of file
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java b/server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java
new file mode 100644
index 00000000..6eaf9a12
--- /dev/null
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/model/SidewindowModel.java
@@ -0,0 +1,139 @@
+package user.jobengine.zk.model;
+
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
+import org.zkoss.bind.annotation.AfterCompose;
+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.zk.ui.Component;
+import org.zkoss.zk.ui.event.ClientInfoEvent;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.SelectEvent;
+import org.zkoss.zk.ui.event.VisibilityChangeEvent;
+import org.zkoss.zk.ui.select.Selectors;
+import org.zkoss.zul.Tab;
+
+import user.jobengine.zk.util.SessionUtil;
+
+public class SidewindowModel extends BaseModel {
+	private static final Logger logger = LogManager.getLogger();
+	private boolean opened= false;
+	private String top= "70px";	
+	private String width="50px";
+	private String left= "1482px";
+	private String height="680px";
+	private int screenWidth;
+	private int screenHeight;
+	private boolean visible= true;
+
+	private EventListener<Event> eventListener = new EventListener<Event>() {
+		public void onEvent(Event evt) {
+			if(evt instanceof ClientInfoEvent) {
+				ClientInfoEvent evt2 = (ClientInfoEvent) evt;
+				setScreenWidth(evt2.getScreenWidth());
+				setScreenHeight(evt2.getScreenWidth());
+				setHeight((evt2.getScreenHeight()-70)+"px");
+				return;
+			}
+
+			if(evt instanceof VisibilityChangeEvent) {
+				setVisible(!isVisible());
+				return;
+			}
+		}
+	};
+
+	@AfterCompose
+	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
+		Selectors.wireComponents(view, this, false);
+		Selectors.wireEventListeners(view, this);	
+		SessionUtil.setAttribute(SidewindowModel.class.getCanonicalName(), this);
+		SessionUtil.subscribe(eventListener);
+	}
+
+	@Command
+	public void onAfterResize() {
+		logger.info("onAfterResize()");
+	}
+	
+	@Command
+	@NotifyChange({"left", "width", "opened"})
+	public void onSelectTab(@ContextParam(ContextType.TRIGGER_EVENT) SelectEvent<Tab, Event> event) {
+		logger.info("onSelectTab()");
+		setOpened(true);
+		setWidth("200px");
+		setLeft((getScreenWidth()-200)+"px");
+	}
+	
+	@Command
+	public void onClose() {
+		SessionUtil.unsubscribe(eventListener);
+	}
+	
+	public boolean isOpened() {
+		return opened;
+	}
+
+	public void setOpened(boolean opened) {
+		this.opened = opened;
+	}
+	
+	public String getTop() {
+		return top;
+	}
+	
+	public void setTop(String top) {
+		this.top = top;
+	}
+	
+	public String getWidth() {
+		return width;
+	}
+
+	public void setWidth(String width) {
+		this.width = width;
+	}
+
+	public String getLeft() {
+		return left;
+	}
+
+	public void setLeft(String left) {
+		this.left = left;
+	}
+	
+	public int getScreenHeight() {
+		return screenHeight;
+	}
+
+	public void setScreenHeight(int screenHeight) {
+		this.screenHeight = screenHeight;
+	}
+	
+	public int getScreenWidth() {
+		return screenWidth;
+	}
+
+	public void setScreenWidth(int screenWidth) {
+		this.screenWidth = screenWidth;
+	}
+	
+	public String getHeight() {
+		return height;
+	}
+
+	public void setHeight(String height) {
+		this.height = height;
+	}
+	
+	public boolean isVisible() {
+		return visible;
+	}
+
+	public void setVisible(boolean visible) {
+		this.visible = visible;
+	}
+}
\ No newline at end of file
diff --git a/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java b/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java
index 5c693e19..b0828a0c 100644
--- a/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java
+++ b/server/user.mediacube.gui/src/user/jobengine/zk/util/SessionUtil.java
@@ -17,6 +17,9 @@ import org.apache.logging.log4j.Logger;
 import org.zkoss.zk.ui.Executions;
 import org.zkoss.zk.ui.Session;
 import org.zkoss.zk.ui.Sessions;
+import org.zkoss.zk.ui.event.Event;
+import org.zkoss.zk.ui.event.EventListener;
+import org.zkoss.zk.ui.event.EventQueues;
 
 import com.ibm.nosql.json.api.BasicDBList;
 import com.ibm.nosql.json.api.BasicDBObject;
@@ -28,11 +31,12 @@ import user.jobengine.gui.ComponentBinder;
 import user.jobengine.server.IJobChangedListener;
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.JobEngineConfiguration;
+import user.jobengine.zk.model.GlobalConstants;
 import user.jobengine.zk.model.IndexModel;
 import user.jobengine.zk.model.MaestroConfig;
 import user.jobengine.zk.model.MediaCubeConfig;
 
-public class SessionUtil {
+public class SessionUtil implements GlobalConstants{
 	private static Logger logger = LogManager.getLogger();
 	private static final String MEDIACUBE_CONFIG = "mediaCubeConfig";
 	private static final String MAESTRO_CONFIG = "maestroConfig";
@@ -51,6 +55,7 @@ public class SessionUtil {
 	public static final String GUI_STAT_DISABLE = "gui.statistics.disable";
 	public static final String GUI_HELP_DISABLE = "gui.help.disable";
 	public static final String GUI_EDITOR_DISABLE = "gui.editor.disable";
+	
 	//	private static MediaCubeConfig mediaCubeConfig;
 	//
 	//	static {
@@ -398,4 +403,16 @@ public class SessionUtil {
 		if (session != null)
 			session.setAttribute(name, obj);
 	}
+	
+	public static void publish(Event event) {
+		EventQueues.lookup(EVENTQUEUE_NAME, EventQueues.SESSION, true).publish(event);
+	}
+
+	public static void subscribe(EventListener<Event> eventListener) {
+		EventQueues.lookup(EVENTQUEUE_NAME, EventQueues.SESSION, true).subscribe(eventListener);		
+	}
+
+	public static void unsubscribe(EventListener<Event> eventListener) {
+		EventQueues.lookup(EVENTQUEUE_NAME, EventQueues.APPLICATION, false).unsubscribe(eventListener);
+	}
 }
\ No newline at end of file