From: Vásáry Dániel Date: Wed, 11 Apr 2018 19:35:26 +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=cbe752f6315d1e2d48cdf4857deac8aaa0a64dfa;p=mediacube.git git-tfs-id: [tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31020 --- 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 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 events, final Layout layout, final OutputStream out) throws IOException { + out.write("".getBytes()); + out.write("".getBytes()); + + out.write("".getBytes()); for (final LogEvent priorEvent : events) { + out.write("".getBytes()); } + out.write("
".getBytes()); final byte[] bytes = layout.toByteArray(priorEvent); out.write(bytes); + out.write("
".getBytes()); + out.write("".getBytes()); + out.write("".getBytes()); } private void writeContent(final List 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

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

usefullink"); + 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 @@ /test - - 120 - + + + index.html index.htm 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 @@ Lejárt a munkamenet, kérem töltse be újra az alkalmazást. + 900 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 00000000..0f72bfac Binary files /dev/null and b/server/user.jobengine.osgi.server/img/ic_visibility_black_18dp.png differ 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 00000000..ad7e703c Binary files /dev/null and b/server/user.jobengine.osgi.server/img/ic_visibility_off_black_18dp.png differ 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 00000000..b3d2e3e5 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_bug_report_black_18dp.png differ 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 00000000..c06e2311 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_group_work_black_18dp.png differ 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 00000000..67fb4922 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_invert_colors_black_18dp.png differ 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 00000000..4c4a2e48 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_language_black_18dp.png differ 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 00000000..ead6835e Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_perm_camera_mic_black_18dp.png differ 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 00000000..f19e38cd Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_alt_black_18dp.png differ 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 00000000..69535253 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_picture_in_picture_black_18dp.png differ 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 00000000..3ee86f88 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_settings_brightness_black_18dp.png differ 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 00000000..ff0794b3 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_theaters_black_18dp.png differ 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 00000000..ba38be23 Binary files /dev/null and b/server/user.jobengine.osgi.server/img/types/ic_view_quilt_black_18dp.png differ 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 {

- -