From cbe752f6315d1e2d48cdf4857deac8aaa0a64dfa Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?=
 <daniel.vasary@userrendszerhaz.hu>
Date: Wed, 11 Apr 2018 19:35:26 +0000
Subject: [PATCH] git-tfs-id:
 [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31020

---
 .../commons/log4j2/appender/SmtpManager.java  |  16 +++-
 .../server/steps/BatchRetrieveForkStep.java   |   1 +
 .../steps/CleanupMountedLocationStep.java     |  29 +++---
 .../user/jobengine/server/steps/FakeStep.java |   6 +-
 .../user/commons/MediaCubeFinishMarker.java   |   1 +
 .../src/user/jobengine/db/ItemDAOEx.java      |   8 +-
 .../WEB-INF/web.xml                           |   6 +-
 .../user.jobengine.osgi.server/WEB-INF/zk.xml |   1 +
 .../img/ic_visibility_black_18dp.png          | Bin 0 -> 257 bytes
 .../img/ic_visibility_off_black_18dp.png      | Bin 0 -> 292 bytes
 .../img/types/ic_bug_report_black_18dp.png    | Bin 0 -> 190 bytes
 .../img/types/ic_group_work_black_18dp.png    | Bin 0 -> 250 bytes
 .../img/types/ic_invert_colors_black_18dp.png | Bin 0 -> 223 bytes
 .../img/types/ic_language_black_18dp.png      | Bin 0 -> 305 bytes
 .../types/ic_perm_camera_mic_black_18dp.png   | Bin 0 -> 235 bytes
 .../ic_picture_in_picture_alt_black_18dp.png  | Bin 0 -> 145 bytes
 .../ic_picture_in_picture_black_18dp.png      | Bin 0 -> 150 bytes
 .../ic_settings_brightness_black_18dp.png     | Bin 0 -> 180 bytes
 .../img/types/ic_theaters_black_18dp.png      | Bin 0 -> 108 bytes
 .../img/types/ic_view_quilt_black_18dp.png    | Bin 0 -> 113 bytes
 .../pages/searchitems.zul                     |  71 +++++++++------
 .../resources/i3-label_hu.properties          |   2 +-
 .../user/jobengine/zk/model/SearchModel.java  |  84 +++++++++++-------
 .../user/jobengine/zk/model/TCConverter.java  |  27 ++++++
 24 files changed, 171 insertions(+), 81 deletions(-)
 create mode 100644 server/user.jobengine.osgi.server/img/ic_visibility_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/ic_visibility_off_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_bug_report_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_group_work_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_invert_colors_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_language_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_perm_camera_mic_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_alt_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_settings_brightness_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_theaters_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/img/types/ic_view_quilt_black_18dp.png
 create mode 100644 server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TCConverter.java

diff --git a/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java b/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
index 1b3a43df..77bbbb7f 100644
--- a/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
+++ b/server/user.commons.log4j2/src/user/commons/log4j2/appender/SmtpManager.java
@@ -30,6 +30,7 @@ import java.util.concurrent.ConcurrentHashMap;
 import javax.activation.DataSource;
 import javax.mail.Authenticator;
 import javax.mail.Message;
+import javax.mail.Message.RecipientType;
 import javax.mail.MessagingException;
 import javax.mail.PasswordAuthentication;
 import javax.mail.Session;
@@ -283,6 +284,7 @@ public class SmtpManager extends AbstractManager {
 	private void sendEmail(final String to, final String subject, byte[] content, String contentType) {
 		try {
 			message.setSubject(subject);
+			message.setRecipients(RecipientType.TO, to);
 			final String encoding = getEncoding(content, contentType);
 			final byte[] encodedBytes = encodeContentToBytes(content, encoding);
 			final InternetHeaders headers = getHeaders(contentType, encoding);
@@ -333,8 +335,9 @@ public class SmtpManager extends AbstractManager {
 	private void sendEvents(final String to, final String subject, final Layout<?> layout, final List<LogEvent> events) {
 		try {
 			final byte[] rawBytes = formatContentToBytes(events, layout);
-			final String contentType = layout.getContentType();
-			sendEmail(to, subject, rawBytes, contentType);
+			//final String contentType = layout.getContentType();
+
+			sendEmail(to, subject, rawBytes, "text/html; charset=utf-8");
 		} catch (Exception e) {
 			logError("Caught exception while sending e-mail notification.", e);
 			throw new LoggingException("Error occurred while sending email", e);
@@ -378,10 +381,19 @@ public class SmtpManager extends AbstractManager {
 	}
 
 	protected void writeBuffer(List<LogEvent> events, final Layout<?> layout, final OutputStream out) throws IOException {
+		out.write("<html>".getBytes());
+		out.write("<body>".getBytes());
+
+		out.write("<table>".getBytes());
 		for (final LogEvent priorEvent : events) {
+			out.write("<tr><td>".getBytes());
 			final byte[] bytes = layout.toByteArray(priorEvent);
 			out.write(bytes);
+			out.write("</td></tr>".getBytes());
 		}
+		out.write("</table>".getBytes());
+		out.write("</body>".getBytes());
+		out.write("</html>".getBytes());
 	}
 
 	private void writeContent(final List<LogEvent> events, final Layout<?> layout, final ByteArrayOutputStream out) throws IOException {
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java
index b743b704..a5bd517e 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/BatchRetrieveForkStep.java
@@ -46,6 +46,7 @@ public class BatchRetrieveForkStep extends JobStep {
 			parameters.put(HOUSEID, houseId);
 			parameters.put(RECIPIENT, recipient);
 			IJobRuntime child = jobEngine.submit(jobRuntime, null, CHILD_TEMPLATE, String.format("Visszatöltés %s részére", recipient), parameters);
+			((MediaCubeMarker) child.getMarker()).setTo(recipient);
 		} catch (Exception e) {
 			logger.catching(e);
 			logger.error(marker, "Hiba a kötegelt visszatöltésben. A rendszer üzenete: {}", e.getMessage());
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/CleanupMountedLocationStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/CleanupMountedLocationStep.java
index a0c63645..0921586c 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/CleanupMountedLocationStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/CleanupMountedLocationStep.java
@@ -21,6 +21,7 @@ import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
+import org.apache.logging.log4j.Marker;
 
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
@@ -55,6 +56,8 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 		return false;
 	}
 
+	private Marker marker;
+
 	final int[] allCount = { 0 };
 	final int[] currentCount = { 0 };
 
@@ -75,15 +78,16 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 
 	@StepEntry
 	public Object[] execute(String sourceFolder, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
+		marker = jobRuntime.getMarker();
 		sourcePath = Paths.get(sourceFolder);
 		DirectoryStream<Path> directoryStream = null;
 		if (StringUtils.isBlank(sourcePath.toString())) {
-			logger.error(getMarker(), "A folyamat 'sourcePath' bemeneti paramétere üres.");
+			logger.error(marker, "A folyamat 'sourcePath' bemeneti paramétere üres.");
 			throw new NullPointerException("System is not configured properly, 'sourceFolder' input parameter missing.");
 		}
 
 		if (!sourcePath.toFile().exists() || !sourcePath.toFile().isDirectory()) {
-			logger.error(getMarker(), "A {} mappa nem létezik.", sourceFolder);
+			logger.error(marker, "A {} mappa nem létezik.", sourceFolder);
 			throw new NullPointerException(String.format("Directory %s not exists.", sourceFolder));
 		}
 		try {
@@ -99,7 +103,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 			Files.walkFileTree(sourcePath, this);
 		} catch (Exception e) {
 			logger.catching(e);
-			logger.error(getMarker(), "Az '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", sourcePath, e.getMessage());
+			logger.error(marker, "Az '{}' mappa elérése sikertelen. A rendszer hibaüzenete: {}", sourcePath, e.getMessage());
 			throw e;
 		} finally {
 			if (directoryStream != null) {
@@ -126,12 +130,11 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 			try {
 				result = dateFormat.parse(strKillDate);
 			} catch (ParseException e) {
-				logger.error(getMarker(), "A {} fájl 'killdate' állománya hibás formátumú, a {} karaktersorozat nem konvertálható dátummá.", fileName,
-						strKillDate);
+				logger.error(marker, "A {} fájl 'killdate' állománya hibás formátumú, a {} karaktersorozat nem konvertálható dátummá.", fileName, strKillDate);
 				return null;
 			}
 		} else
-			logger.error(getMarker(), "A {} fájl 'killdate' állománya hibás formátumú, az dátum helyett ez áll: '{}'.", fileName, strKillDate);
+			logger.error(marker, "A {} fájl 'killdate' állománya hibás formátumú, az dátum helyett ez áll: '{}'.", fileName, strKillDate);
 		return result;
 	}
 
@@ -159,7 +162,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 			if (!removeExistingSpecialDirectory(dir, STATUSFOLDER))
 				return FileVisitResult.CONTINUE;
 			if (removeFile(dir))
-				logger.info(getMarker(), "A {} üres mappa törlése sikeres.", dir);
+				logger.info(marker, "A {} üres mappa törlése sikeres.", dir);
 
 		}
 		return FileVisitResult.CONTINUE;
@@ -184,17 +187,17 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 			return;
 
 		if (killDateFiles.size() != 1)
-			logger.warn(getMarker(), "A {} fájlhoz több 'killdate' állomány található, a legújabb dátum határozza meg a törlés időpontját.", filePath);
+			logger.warn(marker, "A {} fájlhoz több 'killdate' állomány található, a legújabb dátum határozza meg a törlés időpontját.", filePath);
 
 		Date killDate = checkExpiration(killDateFiles);
 		if (killDate == null)
 			return;
 
 		if (removeFiles(filePath, killDateFiles))
-			logger.info(getMarker(), "A {} fájl és kapcsolódó állományai a {} killdate bejegyzés alapján sikeresen törlődtek.", filePath.getFileName(),
+			logger.info(marker, "A {} fájl és kapcsolódó állományai a {} killdate bejegyzés alapján sikeresen törlődtek.", filePath.getFileName(),
 					dateFormat.format(killDate));
 		else
-			logger.warn(getMarker(), "A {} fájl és kapcsolódó állományai a {} killdate bejegyzés alapján csak részlegesen vagy egyáltalán nem törlődtek.",
+			logger.warn(marker, "A {} fájl és kapcsolódó állományai a {} killdate bejegyzés alapján csak részlegesen vagy egyáltalán nem törlődtek.",
 					filePath.getFileName(), dateFormat.format(killDate));
 	}
 
@@ -203,7 +206,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 		if (projectPath.exists() && projectPath.isDirectory()) {
 			FileUtils.deleteDirectory(projectPath);
 			if (projectPath.exists()) {
-				logger.warn(getMarker(), "A {} alatti {} mappa törlése nem sikerült.", dir, folderName);
+				logger.warn(marker, "A {} alatti {} mappa törlése nem sikerült.", dir, folderName);
 				return false;
 			}
 		}
@@ -218,7 +221,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 			if (file.exists())
 				result = file.delete();
 		} catch (Exception e) {
-			logger.error(getMarker(), "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", filePath, e.getMessage());
+			logger.error(marker, "A {} fájl nem törölhető. A rendszer hibaüzenete: {}", filePath, e.getMessage());
 		}
 		return result;
 	}
@@ -248,7 +251,7 @@ public class CleanupMountedLocationStep extends JobStep implements FileVisitor<P
 
 	@Override
 	public FileVisitResult visitFileFailed(Path file, IOException e) throws IOException {
-		logger.error(getMarker(), "A {} fájl nem érhető el. A rendszer hibaüzenete: {}", file.toString(), e.getMessage());
+		logger.error(marker, "A {} fájl nem érhető el. A rendszer hibaüzenete: {}", file.toString(), e.getMessage());
 		return FileVisitResult.CONTINUE;
 	}
 }
diff --git a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
index b14dcade..f93d3afc 100644
--- a/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
+++ b/server/user.jobengine.executors/src/user/jobengine/server/steps/FakeStep.java
@@ -3,6 +3,7 @@ package user.jobengine.server.steps;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import user.commons.MediaCubeMarker;
 import user.jobengine.server.IJobEngine;
 import user.jobengine.server.IJobRuntime;
 
@@ -15,7 +16,10 @@ public class FakeStep extends JobStep {
 	public Object[] execute(long itemID, IJobEngine jobEngine, IJobRuntime jobRuntime) throws Exception {
 		Object[] result = { itemID + 1 };
 
-		//logransger.info(jobRuntime.getMarker(), "Starting with {} #{}", itemID, jobRuntime.getId());
+		((MediaCubeMarker) jobRuntime.getMarker()).setTo("vasary@elgekko.net");
+
+		//logger.info(jobRuntime.getMarker(), "<a href='UNC://\\10.10.1.100\\BRAAVOS\\ARCHIVE' target='blank'>usefullink</a>");
+		logger.info(jobRuntime.getMarker(), "Starting with {} #{}", itemID, jobRuntime.getId());
 		//		Message message = logger.getMessageFactory().newMessage("Starting with {} #{}", itemID, jobRuntime.getId());
 		//logger.error(jobRuntime.getMarker(), message, new Exception("TESZT"));
 		try {
diff --git a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java
index accab8e9..afe5f677 100644
--- a/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java
+++ b/server/user.jobengine.osgi.commons/src/user/commons/MediaCubeFinishMarker.java
@@ -6,6 +6,7 @@ public class MediaCubeFinishMarker extends MediaCubeMarker {
 	public MediaCubeFinishMarker(MediaCubeMarker parent) {
 		setSessionID(parent.getSessionID());
 		setSessionName(parent.getSessionName());
+		setTo(parent.getTo());
 	}
 
 	public MediaCubeFinishMarker(MediaCubeMarker parent, String to) {
diff --git a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
index fe496d04..c94a4a82 100644
--- a/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
+++ b/server/user.jobengine.osgi.db/src/user/jobengine/db/ItemDAOEx.java
@@ -72,21 +72,21 @@ public class ItemDAOEx {
 
 		StringBuilder sql = new StringBuilder();
 		sql.append("SELECT * FROM ((");
-		sql.append("SELECT DISTINCT m.id, m.title FROM ITEM i, MEDIA m, MEDIAFILE mf");
+		sql.append("SELECT DISTINCT m.id, m.title,m.itemtypeid,m.archived FROM ITEM i, MEDIA m, MEDIAFILE mf");
 		sql.append(" WHERE ((CONTAINS(i.title, ?) >= 1) OR (CONTAINS(i.description, ?) >= 1)) AND m.itemid = i.id AND mf.mediaid = m.id");
 		if (typeIDs != null)
 			sql.append(" AND m.itemtypeid IN ").append(typeCriteria.toString());
 		sql.append(")UNION(");
-		sql.append("SELECT DISTINCT m2.id,m2.title FROM ITEM i2, MEDIA m2, MEDIAFILE mf2");
+		sql.append("SELECT DISTINCT m2.id,m2.title,m2.itemtypeid,m2.archived FROM ITEM i2, MEDIA m2, MEDIAFILE mf2");
 		sql.append(" WHERE ((CONTAINS(m2.title, ?) >= 1) OR (CONTAINS(m2.description, ?) >= 1)) AND m2.itemid = i2.id AND mf2.mediaid = m2.id");
 		if (typeIDs != null)
 			sql.append(" AND m2.itemtypeid IN ").append(typeCriteria.toString());
 		sql.append(")UNION(");
-		sql.append("SELECT DISTINCT m3.id,m3.title FROM ITEM i3, MEDIA m3, MEDIAFILE mf3");
+		sql.append("SELECT DISTINCT m3.id,m3.title,m3.itemtypeid,m3.archived FROM ITEM i3, MEDIA m3, MEDIAFILE mf3");
 		sql.append(" WHERE (CONTAINS(mf3.houseId, ?) >= 1) AND m3.itemid = i3.id AND mf3.mediaid = m3.id");
 		if (typeIDs != null)
 			sql.append(" AND m3.itemtypeid IN ").append(typeCriteria.toString());
-		sql.append(")) ORDER BY title");
+		sql.append(")) ORDER BY itemtypeid,archived desc");
 
 		String query = sql.toString();
 		PreparedStatement st = connection.prepareStatement(query, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.CONCUR_UPDATABLE);
diff --git a/server/user.jobengine.osgi.server/WEB-INF/web.xml b/server/user.jobengine.osgi.server/WEB-INF/web.xml
index 5fbfe23e..2aa75113 100644
--- a/server/user.jobengine.osgi.server/WEB-INF/web.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/web.xml
@@ -47,9 +47,9 @@
 	    <url-pattern>/test</url-pattern>
 	</servlet-mapping>
 
-	<session-config>
-		<session-timeout>120</session-timeout>
-	</session-config>
+<!-- 	<session-config> -->
+<!-- 		<session-timeout>120</session-timeout> -->
+<!-- 	</session-config> -->
 	<welcome-file-list>
 		<welcome-file>index.html</welcome-file>
 		<welcome-file>index.htm</welcome-file>
diff --git a/server/user.jobengine.osgi.server/WEB-INF/zk.xml b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
index 1986e0e1..e5ac6a4d 100644
--- a/server/user.jobengine.osgi.server/WEB-INF/zk.xml
+++ b/server/user.jobengine.osgi.server/WEB-INF/zk.xml
@@ -10,6 +10,7 @@
 	    <timeout-message>Lejárt a munkamenet, kérem töltse be újra az alkalmazást.</timeout-message>
 	    <!-- timeout-uri>/timeout.zul</timeout-uri -->
 	    <automatic-timeout/>
+	    <session-timeout>900</session-timeout>
 	</session-config>
 
 	<system-config>
diff --git a/server/user.jobengine.osgi.server/img/ic_visibility_black_18dp.png b/server/user.jobengine.osgi.server/img/ic_visibility_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..0f72bfaccd50450154b10e9563966bf74a8d68ab
GIT binary patch
literal 257
zcmV+c0sj7pP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002UNkl<Zcmc)E
zKS~2p6ov6$<~9DQ%rcVfK@;tg*@B3;1rdqpA~FONAuhloprE)JMR%Z9u^5Np77w(~
z_ciC-Iq=5%NcLU1X}mO&{GsE-hdT4!v5t&w5ABDQN@;9n)%K-LLGlul5&8xg#_UM~
zrtv_9yEZLQ#q|ujzN41<>ab@L=}R{sjSaF<8R^pwoJXBu(WYC><9Z4t&++3!^cp$v
z)7~Bxf-TFKRVGUFnB3ct(Q)KWo%!m}KNR*{xNe-<Rah6lTe4}Rb=}jg00000NkvXX
Hu0mjf(*1S^

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/ic_visibility_off_black_18dp.png b/server/user.jobengine.osgi.server/img/ic_visibility_off_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ad7e703ccac95afb2a7078f244ab47c1a47c26ac
GIT binary patch
literal 292
zcmV+<0o(qGP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002%Nkl<Zcmb`=
zJxT*n6oAp=B!U`2$ufeS*3q#{LhQscpyCE>#Gfo8X^ce{;17Zbf)+OJLzf^vn-qy~
zi$S!Ah2JZN`#5u-e{E4$*_2j&xD2+b>%zd9T*;5>Qm}nv6LGxh@V$x`lVB|kO+BN4
zH|7D#p2Xj-lx1qj1#>S0P6hEO1=}@5U)(x`s!uU$*b&?8scDH@@0O@aV$`$}-|Kj^
zU7%$+5~Ci51=})KJV(hxj3YT}wxwVP#_nVQ3vLC|*V6VJ+h#S*p=d_OYrx_J`&DMc
qiE{(T>T)UAl-4C(Q(IH<*S-MD1!<<5j6Na&0000<MNUMnLSTZWgncpq

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_bug_report_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_bug_report_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..b3d2e3e51089d77d5e0d7b15140d9cd9d8c6681d
GIT binary patch
literal 190
zcmV;v073tWP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0001mNkl<ZcmZRe
z36Nqag|o{UB(W<hWBAX|$6&!=&M*PUD#5OZiQytp5&};%Fk)BK2b4s>PD};=aX=K%
zz_14_cmT+10Fof~E+7jHG=L=<kl6KPT6X}$x&xTj)nHgxNuG5;cppXj4p<BW=rKHl
sD|y18g)52$f$rGKumu>s0<=j(0Nkc#M4@cXQUCw|07*qoM6N<$f=8G{hyVZp

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_group_work_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_group_work_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..c06e23117982e661202c7e315b2eef11bc5fce28
GIT binary patch
literal 250
zcmV<W00sYvP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002NNkl<Zcmb8r
zK}v!_7=YntRR?f>Jws*d^bkP{#havFMMQ+4(<B{2ZBwh3zl*PbA;U08;QMag558fB
zaXpQhW#>$Ck%6s~INRFjt9bM!DvyQ=26^Sf$dlc9I%s6J`Sb{k^1KFUoT{a9@wNoa
zM0RJ~`6;qfU@87_Q7(OZHTR?Ld3oJ4cv1HRNLt|zJP2jCdH@^Y&5c{{LfI>szN7Hl
z89H<CB?UtVQMq@oqOsN%pSY4-B$-;6o9MZgKkKZHztdk4<^TWy07*qoM6N<$g46$P
Aw*UYD

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_invert_colors_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_invert_colors_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..67fb49226b3cefedb53a058b767ec93a43866ff3
GIT binary patch
literal 223
zcmV<503iQ~P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0001{Nkl<ZcmbWt
zu?j(97>DtP&c<Lc$s&{4;6@BGnB0g`Hj`1g2U(N>=MLD;1t>`=k~-=24QKiHeTe5-
zfBaX`{guRQg#}59Iac^g+8D;hV?w}iv-Vk@Wk$fV7vvQ6F!~_K=qQTWfrnO#?u-NI
zqUgymfF6nx<^i-<G$N(pp@E_@M-pm+4wTSnapuN^ZbnWt2~=g~m;+pyQsHe8b$7(?
Zy#UVdR!G*!<re?|002ovPDHLkV1iFLU#|cF

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_language_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_language_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..4c4a2e48c29043e83face284e3c33a7469578774
GIT binary patch
literal 305
zcmV-10nYx3P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0002^Nkl<Zcmb8r
z%gR!56b10#C}^6Onnw|uN$+A7QO}{LN#_xwMv6&D<uE7+A_#hgnmEl%K7x9@>~G@W
z58s*iThj$=vt6$4nM|gus?;45dvQ+Ty&9z2);2y0UwjoNww9U_x2^rtlsmeo;pCN;
zg=ISX!A1i!Kfo`4(XurHsM(A1C{%%`!W+4%Fp$fQgimsBg(pBJ+`voWF1Rl|$4#M6
zT6$4h>Rq23O6T4Q9iXZZ=bRiIoRY&U0Am|X%=`qu{XyH-5P-Usg-2dHdf=gudF;Qr
zibTuG&Q$p3yYN|It^ujKaq`rifr?T!U41<rw_NH9oc4TO7N<KT00000NkvXXu0mjf
D_ymZ2

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_perm_camera_mic_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_perm_camera_mic_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ead6835eed134b0d4d43ee5cfd90fb822f1b339e
GIT binary patch
literal 235
zcmV<H02Kd;P)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz00028Nkl<ZcmcJ}
zzexm97)9|PySbt*Yy(Edq74Y<hJxX$h+wc&z-l1IVh37);OoObj9>wqPB1)QAj5}`
ziPU?t!wIf`+KKedT(y~<!nqtcQ=A#Vo?afIw+k$STsbVPf>{7fP)l$XOcSH1nqNh&
z6eCGnM>qKNWMb;s2X5==#l*4f)tl_d)VunV3mka#U>}!b$Coz1rt6=_PvwEmcA*Pq
l4y?PE2DS=m;Le&q+!p`_mV_w8&0GKg002ovPDHLkV1l!wW7Gfu

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_alt_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_alt_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f19e38cd7e88d08c460dac7d630c5e0fbc99fe67
GIT binary patch
literal 145
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3SgM0mP5hEy;nFVM<Jx^cdM
z!J6fiNz;@W27l5mj&5LPw_%-PnwC(&5X5Kkrr{Ldjzydvb;bvlzF?TZ-^^zc+VWCu
vQcXI~61@jKySW`AohQ7i+9Md_eRc~AL$YjUNl$<W$Z`fxS3j3^P6<r_21G9f

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..695352538d934ef7366d58a08183d55c558aec5a
GIT binary patch
literal 150
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3Sg#Cp0ohEy;nFVM<JxpBUL
z!J6fiNy8Kg<3H&Zr#G;(+i*`YO-d+W2;#GN({L(DYgR+bOh!Fd_J$gXk_B6p4&@zU
zVP3=`q$^%<>@MqqHHsdkyod8*3fZTuT$C2Y#E_DgnGwr8JAi?Kfx*+&&t;ucLK6Ue
C7B02`

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_settings_brightness_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_settings_brightness_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..3ee86f8881e02e6518440ca21221af802afdec42
GIT binary patch
literal 180
zcmV;l089UgP)<h;3K|Lk000e1NJLTq000sI000sQ1ONa4{KrPz0001cNkl<Zcmb`^
z;R(Vp5J2IN+eo`WM-iMu)I~Ch&@NCYNar~z6pLUAV&8-NlLrYGyK>j*D|T+sNP|bk
zK|0b(t(6c~mebED6h&-BY4$nKS`<sfNs4b#DDQ|#5x+#0>&{YaKYW_!pDU;?vyn!9
i#ZfxIb@PKScH{*bcyGd4Pg%480000<MNUMnLSTZN;zV`;

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_theaters_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_theaters_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ff0794b39be85304b6d280ba63df2afbf68a78fe
GIT binary patch
literal 108
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3Sg7<;-nhEy;nFR-#WFo8iy
zP~e0&!z7Id_J^6+*cCb(_#7tw&*<9Ve93pwon3*iIou7VGBT{r>lO@|-dM}Pz`)??
L>gTe~DWM4fvgRMF

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/img/types/ic_view_quilt_black_18dp.png b/server/user.jobengine.osgi.server/img/types/ic_view_quilt_black_18dp.png
new file mode 100644
index 0000000000000000000000000000000000000000..ba38be23b9f2221729c4d61a5b4476ef93fbea7a
GIT binary patch
literal 113
zcmeAS@N?(olHy`uVBq!ia0y~yU=RXf4i*LmhCj#M?l3SgSa`ZPhEy;nOGrFmXk+8y
zN|0jYogn&`{V+2RZ-NvfKhGYeOET{mge4tZc@t(ZOljF5@<6Fsgn{9*d$!Wgr|eT1
Q7#J8lUHx3vIVCg!0A)`cc>n+a

literal 0
HcmV?d00001

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 6d4ea9c0..e563a8c5 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -55,31 +55,35 @@ div.z-row-content span {
 			<west border="none" size="60%" splittable="true" minsize="500">
 				<div height="100%" width="100%">
 					<groupbox vflex="min" closable="false">
-						<hbox hflex="1" pack="center" align="center">
-							<button hflex="min" label="Típusok" popup="filter"/>
-							<textbox focus="true" width="300px" instant="true" value="@bind(vm.searchValue)"  tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" />
-							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
-							<popup id="filter">
-								<vlayout vflex="min">
-									<checkbox label="Összes típus" checked="@bind(vm.allChecked)" />
-									<separator/>
-									<forEach items="@load(vm.typeFilterNames)" >
-										<checkbox label="@load(each)" checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" />
-									</forEach>							
-								</vlayout>						    
-						    </popup>							
+						<vlayout>
+							<hbox pack="left" align="top">
+								<checkbox checked="@bind(vm.allChecked)" style="font-size:10px" />
+								<vlayout>
+									<toolbar style="padding:1px;background:none;border:0px;">
+										<forEach items="@load(vm.topTypeFilterNames)">
+											<toolbarbutton image="@load(c:cat('/img/types/', vm.typeIcons[each]))" style="font-size:9px;padding:0px;margin:0px;background:none;" label="@load(each)" mode="toggle"
+												checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" />
+										</forEach>
+									</toolbar>
+									<toolbar style="padding:1px;background:none;border:0px;">
+										<forEach items="@load(vm.bottomTypeFilterNames)">
+											<toolbarbutton image="@load(c:cat('/img/types/', vm.typeIcons[each]))" style="font-size:9px;padding:0px;margin:0px;background:none;" label="@load(each)" mode="toggle"
+												checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" />
+										</forEach>
+									</toolbar>
+								</vlayout>
+							</hbox>
+						</vlayout>
+						<hbox width="100%" pack="center" align="center">
+							<textbox hflex="1" focus="true" instant="true" value="@bind(vm.searchValue)"
+								tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" />
+							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" style="width:40px" />
 						</hbox>
-<!-- 						<toolbar style="font-size:8px"> -->
-<!-- 							<checkbox checked="@bind(vm.allChecked)" /> -->
-<!-- 							<forEach items="@load(vm.typeFilterNames)" > -->
-<!-- 								<toolbarbutton label="@load(each)" mode="toggle" checked="@bind(vm.typeFilters[each]) @validator(vm.allFilterCheckedValidator)" /> -->
-<!-- 							</forEach>							 -->
-<!-- 						</toolbar> -->
 					</groupbox>
 					<groupbox vflex="true" closable="false">
 						<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
 							model="@load(vm.searchResult)" activePage="@bind(vm.activePage)" emptyMessage="Nincs találat!"
-							onAfterRender="@command('onPaging')"
+							onAfterRender="@command('onPaging')" pageSize="50"
 							style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">
 							<columns>
 								<column hflex="min">
@@ -91,7 +95,7 @@ div.z-row-content span {
 								<column label="ID" hflex="min" align="left" />
 								<column label="Cím" align="left" />
 								<column label="Fájlnév" hflex="min" align="left" />
-								<column label="Megtekinthető" hflex="min" align="right" />
+								<column label="Hossz" hflex="min" align="right" />
 							</columns>
 							<rows id="rows" style="cursor: pointer;" >
 								<template name="model">
@@ -103,11 +107,12 @@ div.z-row-content span {
 												sclass="myimg" content="@load(each.media.poster) @converter('user.jobengine.zk.model.ByToImageConverter')" 
 												onClick="@command('selectMediaArchive', selectedObject=each)" />
 												<div sclass="details">
-													<div>
-														<label style="font: 20px Century Gothic; color: #008AC8;" value="@load(each.item.title)" />
-														<label style="" value="@load(each.media.length)" />
-														<label style="border-left: 1px solid #008AC8; border-bottom: 1px solid #008AC8; padding: 4px;" value="@load(each.media.itemType.name)" />
-													</div>
+													<hlayout>
+														<div style="width:80px; border-left:1px solid #008AC8; border-bottom:1px solid #008AC8; padding:4px;">
+															<label style="font-size: 10px;" value="@load(each.media.itemType.name)" />
+														</div>
+														<label style="font:20px Century Gothic; color:#008AC8;" value="@load(each.item.title)" />
+													</hlayout>
 													<html sclass="relevant">
 													<![CDATA[
 													    <div style='width: 90%'>${each.relevant}</div>
@@ -120,7 +125,19 @@ div.z-row-content span {
 										<label value="@load(each.media.houseId)" />
 										<label value="@load(each.media.title)" />
 										<label value="@load(each.media.mediaFilesName)" />
-										<checkbox checked="@load(each.media.mediaFilesCount > 1)" w:onCheck="this.setChecked(!this.isChecked())" />
+										<cell>
+											<label style="font-size:14px" value="@load(each.media.length) @converter('user.jobengine.zk.model.TCConverter')" />
+											<image src="/img/ic_visibility_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">
+												<attribute name="visible" if="${each.media.mediaFilesCount lt 2}">
+													false
+												</attribute>						
+											</image>
+											<image src="/img/ic_visibility_off_black_18dp.png" style="margin-left:4px;margin-top:2px;vertical-align:top;">
+												<attribute name="visible" if="${each.media.mediaFilesCount gt 1}">
+													false
+												</attribute>						
+											</image>
+										</cell>
 									</row>
 								</template>
 							</rows>
diff --git a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
index 893d9e3c..f796582f 100644
--- a/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
+++ b/server/user.jobengine.osgi.server/resources/i3-label_hu.properties
@@ -1,4 +1,4 @@
-version=2.3.4
+version=2.3.5
 footer=2016 © Copyright User Rendszerház Kft.
 
 login_info=Információ
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
index 9782e025..9bb6d9ea 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/SearchModel.java
@@ -40,17 +40,28 @@ import user.jobengine.db.Store;
 import user.jobengine.zk.util.SessionUtil;
 
 public class SearchModel extends AsyncBaseModel {
+	private static final String ARG = "arg";
+	private static final String GENERIC = "Egyéb";
+	private static final String RECORDING = "Visszarögzített";
+	private static final String RAW_AD = "Reklám nyers";
+	private static final String AD = "Reklám";
+	private static final String RAW_PROMO = "Promo nyers";
+	private static final String PROMO = "Promo";
+	private static final String RAW_MATERIAL = "Műsor nyers";
+	private static final String MATERIAL = "Műsor";
+	private static final String RAW_NEWS_MATERIAL = "Hír nyers";
+	private static final String NEWS_MATERIAL = "Hír bejátszó";
 	private static final Logger logger = LogManager.getLogger();
-	private static final String MEDIACUBEMEDIA = "mediaCubeMedia";
-	private static final String PAGES_RETRIEVESELECTOR_ZUL = "/pages/retrieveselector.zul";
 	private static final String PAGES_MEDIAPLAYER = "/pages/mediaplayer.jsp?mediaurl=";
-	private List<String> typeFilterNames;
+	private String[] topTypeFilterNames;
+	private String[] bottomTypeFilterNames;
 	private String searchValue = null;
 	private CachedListModel searchResult = null;
 	private ArchivedMedia selectedObject = null;
 	private Validator allFilterCheckedValidator;
 	private Validator itemSelectedValidator;
-	private Map<String, Object> typeFilters;
+	private Map<String, Boolean> typeFilters;
+	private Map<String, String> typeIcons;
 	private boolean allChecked = true;
 	private int activePage;
 	private boolean rowsExpanded = true;
@@ -64,17 +75,30 @@ public class SearchModel extends AsyncBaseModel {
 
 	public SearchModel() {
 		typeFilters = new LinkedHashMap<>();
-		typeFilters.put("Hír bejátszó", true);
-		typeFilters.put("Hír nyersanyag", true);
-		typeFilters.put("Műsor", true);
-		typeFilters.put("Műsor nyersanyag", true);
-		typeFilters.put("Promo", true);
-		typeFilters.put("Promo nyersanyag", true);
-		typeFilters.put("Reklám", true);
-		typeFilters.put("Reklám nyersanyag", true);
-		typeFilters.put("Visszarögzített", true);
-		typeFilters.put("Egyéb", true);
-		typeFilterNames = new ArrayList<>(typeFilters.keySet());
+		typeFilters.put(NEWS_MATERIAL, true);
+		typeFilters.put(RAW_NEWS_MATERIAL, true);
+		typeFilters.put(MATERIAL, true);
+		typeFilters.put(RAW_MATERIAL, true);
+		typeFilters.put(PROMO, true);
+		typeFilters.put(RAW_PROMO, true);
+		typeFilters.put(AD, true);
+		typeFilters.put(RAW_AD, true);
+		typeFilters.put(RECORDING, true);
+		typeFilters.put(GENERIC, true);
+		topTypeFilterNames = new String[] { NEWS_MATERIAL, RAW_NEWS_MATERIAL, RECORDING, GENERIC };
+		bottomTypeFilterNames = new String[] { MATERIAL, RAW_MATERIAL, PROMO, RAW_PROMO, AD, RAW_AD };
+
+		typeIcons = new LinkedHashMap<>();
+		typeIcons.put(NEWS_MATERIAL, "ic_language_black_18dp.png");
+		typeIcons.put(RAW_NEWS_MATERIAL, "ic_perm_camera_mic_black_18dp.png");
+		typeIcons.put(MATERIAL, "ic_theaters_black_18dp.png");
+		typeIcons.put(RAW_MATERIAL, "ic_invert_colors_black_18dp.png");
+		typeIcons.put(PROMO, "ic_picture_in_picture_black_18dp.png");
+		typeIcons.put(RAW_PROMO, "ic_bug_report_black_18dp.png");
+		typeIcons.put(AD, "ic_picture_in_picture_alt_black_18dp.png");
+		typeIcons.put(RAW_AD, "ic_settings_brightness_black_18dp.png");
+		typeIcons.put(RECORDING, "ic_group_work_black_18dp.png");
+		typeIcons.put(GENERIC, "ic_view_quilt_black_18dp.png");
 
 		allFilterCheckedValidator = new Validator() {
 			@Override
@@ -97,7 +121,7 @@ public class SearchModel extends AsyncBaseModel {
 			public void validate(ValidationContext ctx) {
 				try {
 
-					ArchivedMedia item = (ArchivedMedia) ctx.getValidatorArg("arg");
+					ArchivedMedia item = (ArchivedMedia) ctx.getValidatorArg(ARG);
 					boolean select = (boolean) ctx.getProperty().getValue();
 					MenuModel model = (MenuModel) SessionUtil.getAttribute(SessionUtil.MENUMODEL);
 					model.selectArchivedMedia(item, select);
@@ -152,6 +176,10 @@ public class SearchModel extends AsyncBaseModel {
 		return allFilterCheckedValidator;
 	}
 
+	public String[] getBottomTypeFilterNames() {
+		return bottomTypeFilterNames;
+	}
+
 	public boolean getHasLowresMediaFile() {
 		boolean ret = false;
 		Media media = getMedia();
@@ -220,7 +248,7 @@ public class SearchModel extends AsyncBaseModel {
 		List<String> result = null;
 		if (!allChecked) {
 			for (String label : typeFilters.keySet()) {
-				boolean isChecked = (boolean) typeFilters.get(label);
+				boolean isChecked = typeFilters.get(label);
 				if (!isChecked)
 					continue;
 				if (result == null)
@@ -235,6 +263,10 @@ public class SearchModel extends AsyncBaseModel {
 		return selectedObject;
 	}
 
+	public String[] getTopTypeFilterNames() {
+		return topTypeFilterNames;
+	}
+
 	public String getTSMMediaFilePath() throws Exception {
 		String ret = "";
 		Media media = getMedia();
@@ -249,12 +281,12 @@ public class SearchModel extends AsyncBaseModel {
 		return ret;
 	}
 
-	public List<String> getTypeFilterNames() {
-		return typeFilterNames;
+	public Map<String, Boolean> getTypeFilters() {
+		return typeFilters;
 	}
 
-	public Map<String, Object> getTypeFilters() {
-		return typeFilters;
+	public Map<String, String> getTypeIcons() {
+		return typeIcons;
 	}
 
 	private void highlight(ArchivedMedia am, boolean highlight) {
@@ -325,7 +357,7 @@ public class SearchModel extends AsyncBaseModel {
 		this.activePage = activePage;
 	}
 
-	@NotifyChange("*")
+	@NotifyChange("typeFilters")
 	public void setAllChecked(boolean allChecked) {
 		this.allChecked = allChecked;
 		for (String key : typeFilters.keySet())
@@ -377,14 +409,6 @@ public class SearchModel extends AsyncBaseModel {
 		this.selectedObject = selectedObject;
 	}
 
-	public void setTypeFilterNames(List<String> typeFilterNames) {
-		this.typeFilterNames = typeFilterNames;
-	}
-
-	public void setTypeFilters(Map<String, Object> typeFilters) {
-		this.typeFilters = typeFilters;
-	}
-
 	public void updateAllChecked() {
 		final boolean[] check = { true };
 		for (String key : typeFilters.keySet()) {
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TCConverter.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TCConverter.java
new file mode 100644
index 00000000..afe7f62f
--- /dev/null
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/TCConverter.java
@@ -0,0 +1,27 @@
+package user.jobengine.zk.model;
+
+import org.zkoss.bind.BindContext;
+import org.zkoss.bind.Converter;
+import org.zkoss.zul.Label;
+
+public class TCConverter implements Converter<String, Long, Label> {
+
+	@Override
+	public Long coerceToBean(String text, Label label, BindContext context) {
+		return null;
+	}
+
+	@Override
+	public String coerceToUi(Long frames, Label label, BindContext context) {
+		double reminder = frames;
+		int hour = (int) Math.floor(reminder / (60 * 60 * 25));
+		reminder = reminder % (60 * 60 * 25);
+		int minute = (int) Math.floor(reminder / (60 * 25));
+		reminder = reminder % (60 * 25);
+		int sec = (int) Math.floor(reminder / 25);
+		reminder = reminder % 25;
+		int frame = (int) Math.floor(reminder);
+		return String.format("%02d:%02d:%02d:%02d", hour, minute, sec, frame);
+	}
+
+}
-- 
2.54.0