From fd4b981826eb8dcb9501cb01c82756f35e564c69 Mon Sep 17 00:00:00 2001 From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= Date: Mon, 16 Jul 2018 11:39:05 +0000 Subject: [PATCH] git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube;C31170 --- .../user.jobengine.osgi.server/WEB-INF/zk.xml | 3 + .../pages/searchitems.zul | 13 +++-- .../user/jobengine/zk/model/SearchModel.java | 58 +++++++------------ .../zk/util/LogEventInterceptor.java | 34 +++++++++++ 4 files changed, 66 insertions(+), 42 deletions(-) create mode 100644 server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java diff --git a/server/user.jobengine.osgi.server/WEB-INF/zk.xml b/server/user.jobengine.osgi.server/WEB-INF/zk.xml index 8afaaab8..39a19736 100644 --- a/server/user.jobengine.osgi.server/WEB-INF/zk.xml +++ b/server/user.jobengine.osgi.server/WEB-INF/zk.xml @@ -19,6 +19,9 @@ + + + Monitor the statistic org.zkoss.zk.ui.util.Statistic diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul index 0e073c61..b9b484fe 100644 --- a/server/user.jobengine.osgi.server/pages/searchitems.zul +++ b/server/user.jobengine.osgi.server/pages/searchitems.zul @@ -62,14 +62,14 @@ .z-messagebox-window{ top:40% !important; width:30% !important; }
- +
- + @@ -106,12 +106,15 @@ - - + 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 b210ee84..dcf7fd59 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 @@ -76,7 +76,6 @@ public class SearchModel extends AsyncBaseModel { private boolean allChecked = true; private boolean rowsExpanded = true; private boolean allSelected; - private String baseURL; private boolean itemSelected; @Wire Rows rows; @@ -86,8 +85,6 @@ public class SearchModel extends AsyncBaseModel { private boolean orderAscending; private Map topColorClasses; - private String[] parameters; - private String mediaID; public SearchModel() { typeFilters = new LinkedHashMap<>(); @@ -151,23 +148,22 @@ public class SearchModel extends AsyncBaseModel { Selectors.wireComponents(view, this, false); Selectors.wireEventListeners(view, this); itemsGrid.getPagingChild().setAutohide(false); + for (Component child : itemsGrid.getColumns().getChildren()) { Column column = (Column) child; column.addEventListener("onSort", evt -> doSort(evt)); } - String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort()); - baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port + Executions.getCurrent().getContextPath(); - setParameters(); - mediaID = getValueByParameterName(MEDIA_ID); - if (mediaID != null) { + + String mediaID = SessionUtil.getQueryParameter(MEDIA_ID); + if (mediaID != null) searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList(), orderBy, orderAscending); - } - if (rows != null) - Clients.scrollIntoView(rows.getFirstChild()); } @Command public void copyMediaIdToClipboard() { + String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort()); + String baseURL = Executions.getCurrent().getScheme() + "://" + Executions.getCurrent().getServerName() + port + + Executions.getCurrent().getContextPath(); String url = String.format("%s/?%s=%d", baseURL, MEDIA_ID, selectedObject.getMedia().getId()); Toolkit toolkit = Toolkit.getDefaultToolkit(); Clipboard clipboard = toolkit.getSystemClipboard(); @@ -176,16 +172,6 @@ public class SearchModel extends AsyncBaseModel { Messagebox.show("A médiához szükséges URL a vágólapra másolva, az URL a következő:\n" + url, "", Messagebox.OK, Messagebox.NONE); } - @Command - public void afterDataLoading() { - List children = itemsGrid.getRows().getChildren(); - if (children.size() > 0) { - int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage(); - Component top = children.get(pos); - Clients.scrollIntoView(top); - } - } - @Command @NotifyChange({ "searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath" }) public void doSearch() { @@ -219,10 +205,7 @@ public class SearchModel extends AsyncBaseModel { @Command public void doTest() { - List children = itemsGrid.getRows().getChildren(); - int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage(); - Component top = children.get(pos); - Clients.scrollIntoView(top); + onAfterRenderGrid(); } @Command @@ -355,14 +338,6 @@ public class SearchModel extends AsyncBaseModel { return typeFilters; } - private String getValueByParameterName(String name) { - for (String result : parameters) { - if (result.contains(name)) - return result.substring(result.indexOf('=') + 1); - } - return null; - } - private void highlight(ArchivedMedia am, boolean highlight) { if (am == null) return; @@ -402,6 +377,19 @@ public class SearchModel extends AsyncBaseModel { return rowsExpanded; } + @Command + public void onAfterRenderGrid() { + registerTask(() -> { + logger.info("onAfterRenderGrid"); + List children = rows.getChildren(); + if (children.size() > 0) { + int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage(); + Component top = children.get(pos); + Clients.scrollIntoView(top); + } + }); + } + @Command public void openMetaDataDialog() { String template = "/pages/metadatadetails.zul"; @@ -469,10 +457,6 @@ public class SearchModel extends AsyncBaseModel { this.itemSelectedValidator = itemSelectedValidator; } - private void setParameters() { - parameters = SessionUtil.getQueryString().split("&"); - } - public void setRowsExpanded(boolean rowsExpanded) { this.rowsExpanded = rowsExpanded; } diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java new file mode 100644 index 00000000..91fd3c83 --- /dev/null +++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/util/LogEventInterceptor.java @@ -0,0 +1,34 @@ +package user.jobengine.zk.util; + +import org.apache.logging.log4j.LogManager; +import org.apache.logging.log4j.Logger; +import org.zkoss.zk.ui.event.Event; +import org.zkoss.zk.ui.util.EventInterceptor; + +public class LogEventInterceptor implements EventInterceptor { + private static final Logger logger = LogManager.getLogger(); + + @Override + public void afterProcessEvent(Event event) { + logger.info("afterProcessEvent {}", event.getName()); + + } + + @Override + public Event beforePostEvent(Event event) { + // logger.info("beforePostEvent {}", event.getName()); + return event; + } + + @Override + public Event beforeProcessEvent(Event event) { + // logger.info("beforeProcessEvent {}", event.getName()); + return event; + } + + @Override + public Event beforeSendEvent(Event event) { + // logger.info("beforeSendEvent {}", event.getName()); + return event; + } +} \ No newline at end of file -- 2.54.0