git-tfs-id: [http://tfs.userrendszerhaz.hu:8080/tfs/DefaultCollection]$/MediaCube...

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 700a807a64017dc26cc327e225c901e6ce3d8bb8..0e073c61dfcc5231511d29b8ee3e6d54bec59912 100644 (file)
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -95,6 +95,7 @@
                                                        <textbox hflex="1" focus="true" instant="true" value="@bind(vm.searchValue)"\r
                                                                tooltiptext="Gépelje be a keresendő kifejezést és nyomja meg az Enter-t." onOK="@command('doSearch')" />\r
                                                        <button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" style="width:40px" />\r
+                                                       <button hflex="min" label="x" onClick="@command('doTest')" style="width:40px" />\r
                                                </hbox>\r
                                        </groupbox>\r
                                        <popup id="sortOther">\r
@@ -105,8 +106,12 @@
                                                </vlayout>\r
                                        </popup>\r
                                        <groupbox vflex="true" closable="false">\r
+<!--                                                   onAfterRender="@command('onPaging')" -->\r
                                                <grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"\r
-                                                       model="@load(vm.searchResult)" emptyMessage="Nincs találat!" onAfterRender="@command('onPaging')" pageSize="50"\r
+                                                       model="@load(vm.searchResult)" emptyMessage="Nincs találat!" \r
+                                                       onAfterRender='Events.sendEvent("onAfterDataLoading", self, null);'\r
+                                               onAfterDataLoading="@command('afterDataLoading')"\r
+                                                       pageSize="50"\r
                                                        style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">\r
                                                        <columns>\r
                                                                <column hflex="min">\r

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 e7c3403e7d21a39073cc377e4bfdfb989714e6d3..b210ee849c85eac356983891a9cb91eb2441059c 100644 (file)
--- 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
@@ -151,9 +151,6 @@ public class SearchModel extends AsyncBaseModel {
                Selectors.wireComponents(view, this, false);\r
                Selectors.wireEventListeners(view, this);\r
                itemsGrid.getPagingChild().setAutohide(false);\r
-               itemsGrid.getPaginal().addEventListener("onPaging ", pe -> {\r
-                       logger.info("PAGING");\r
-               });\r
                for (Component child : itemsGrid.getColumns().getChildren()) {\r
                        Column column = (Column) child;\r
                        column.addEventListener("onSort", evt -> doSort(evt));\r
@@ -179,6 +176,16 @@ 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);\r
        }\r
 \r
+       @Command\r
+       public void afterDataLoading() {\r
+               List<Component> children = itemsGrid.getRows().getChildren();\r
+               if (children.size() > 0) {\r
+                       int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage();\r
+                       Component top = children.get(pos);\r
+                       Clients.scrollIntoView(top);\r
+               }\r
+       }\r
+\r
        @Command\r
        @NotifyChange({ "searchResult", "selectedObject", "hasLowresMediaFile", "lowresMediaFilePath" })\r
        public void doSearch() {\r
@@ -210,6 +217,14 @@ public class SearchModel extends AsyncBaseModel {
                evt.stopPropagation();\r
        }\r
 \r
+       @Command\r
+       public void doTest() {\r
+               List<Component> children = itemsGrid.getRows().getChildren();\r
+               int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage();\r
+               Component top = children.get(pos);\r
+               Clients.scrollIntoView(top);\r
+       }\r
+\r
        @Command\r
        public void downloadMedia() {\r
                if (!getHasTSMMediaFile())\r
@@ -387,16 +402,6 @@ public class SearchModel extends AsyncBaseModel {
                return rowsExpanded;\r
        }\r
 \r
-       @Command\r
-       public void onPaging() {\r
-               if (rows != null)\r
-                       Clients.scrollIntoView(rows.getFirstChild());\r
-               if (mediaID != null) {\r
-                       selectedObject = searchResult.getElementAt(0);\r
-                       NotifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");\r
-               }\r
-       }\r
-\r
        @Command\r
        public void openMetaDataDialog() {\r
                String template = "/pages/metadatadetails.zul";\r
@@ -421,6 +426,8 @@ public class SearchModel extends AsyncBaseModel {
                highlight(this.selectedObject, false);\r
                this.selectedObject = selectedObject;\r
                highlight(this.selectedObject, true);\r
+\r
+               logger.info(itemsGrid.getActivePage());\r
        }\r
 \r
        @NotifyChange("typeFilters")\r