From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Mon, 16 Jul 2018 08:01:40 +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=1c66e283145c69b253e8d065b46a15e106da74a0;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/pages/searchitems.zul b/server/user.jobengine.osgi.server/pages/searchitems.zul
index 700a807a..0e073c61 100644
--- 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)"
 								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" />
+							<button hflex="min" label="x" onClick="@command('doTest')" style="width:40px" />
 						</hbox>
 					</groupbox>
 					<popup id="sortOther">
@@ -105,8 +106,12 @@
 						</vlayout>
 					</popup>
 					<groupbox vflex="true" closable="false">
+<!-- 							onAfterRender="@command('onPaging')" -->
 						<grid id="itemsGrid" sizedByContent="false" span="true" vflex="true" hflex="true" mold="paging" autopaging="false"
-							model="@load(vm.searchResult)" emptyMessage="Nincs találat!" onAfterRender="@command('onPaging')" pageSize="50"
+							model="@load(vm.searchResult)" emptyMessage="Nincs találat!" 
+							onAfterRender='Events.sendEvent("onAfterDataLoading", self, null);'
+					    	onAfterDataLoading="@command('afterDataLoading')"
+							pageSize="50"
 							style="border: none; background: white !important;" oddRowSclass="listbox-odd-style">
 							<columns>
 								<column hflex="min">
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 e7c3403e..b210ee84 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
@@ -151,9 +151,6 @@ public class SearchModel extends AsyncBaseModel {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
 		itemsGrid.getPagingChild().setAutohide(false);
-		itemsGrid.getPaginal().addEventListener("onPaging ", pe -> {
-			logger.info("PAGING");
-		});
 		for (Component child : itemsGrid.getColumns().getChildren()) {
 			Column column = (Column) child;
 			column.addEventListener("onSort", evt -> doSort(evt));
@@ -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);
 	}
 
+	@Command
+	public void afterDataLoading() {
+		List<Component> 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() {
@@ -210,6 +217,14 @@ public class SearchModel extends AsyncBaseModel {
 		evt.stopPropagation();
 	}
 
+	@Command
+	public void doTest() {
+		List<Component> children = itemsGrid.getRows().getChildren();
+		int pos = itemsGrid.getPageSize() * itemsGrid.getActivePage();
+		Component top = children.get(pos);
+		Clients.scrollIntoView(top);
+	}
+
 	@Command
 	public void downloadMedia() {
 		if (!getHasTSMMediaFile())
@@ -387,16 +402,6 @@ public class SearchModel extends AsyncBaseModel {
 		return rowsExpanded;
 	}
 
-	@Command
-	public void onPaging() {
-		if (rows != null)
-			Clients.scrollIntoView(rows.getFirstChild());
-		if (mediaID != null) {
-			selectedObject = searchResult.getElementAt(0);
-			NotifyChange("selectedObject", "hasLowresMediaFile", "hasTSMMediaFile", "lowresMediaFilePath");
-		}
-	}
-
 	@Command
 	public void openMetaDataDialog() {
 		String template = "/pages/metadatadetails.zul";
@@ -421,6 +426,8 @@ public class SearchModel extends AsyncBaseModel {
 		highlight(this.selectedObject, false);
 		this.selectedObject = selectedObject;
 		highlight(this.selectedObject, true);
+
+		logger.info(itemsGrid.getActivePage());
 	}
 
 	@NotifyChange("typeFilters")