From: Vásáry Dániel <daniel.vasary@userrendszerhaz.hu>
Date: Tue, 17 Jul 2018 14:09:42 +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=f153d9cff5992f5fbabbcca9a8e919d8aad78e0f;p=mediacube.git

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

diff --git a/server/user.jobengine.osgi.server/img/baseline_expand_more_black_18dp.png b/server/user.jobengine.osgi.server/img/baseline_expand_more_black_18dp.png
new file mode 100644
index 00000000..65354301
Binary files /dev/null and b/server/user.jobengine.osgi.server/img/baseline_expand_more_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 f36c53f5..3e1bd3b2 100644
--- a/server/user.jobengine.osgi.server/pages/searchitems.zul
+++ b/server/user.jobengine.osgi.server/pages/searchitems.zul
@@ -7,8 +7,8 @@
 <zk xmlns:w="http://www.zkoss.org/2005/zk/client">
 	<!-- csak igy jo a list sebessege -->
 	<custom-attributes org.zkoss.zul.listbox.rod="true" />
-	<custom-attributes org.zkoss.zul.listbox.initRodSize="50" />
-	<custom-attributes org.zkoss.zul.listbox.preloadSize="50" />
+<!-- 	<custom-attributes org.zkoss.zul.listbox.initRodSize="50" /> -->
+<!-- 	<custom-attributes org.zkoss.zul.listbox.preloadSize="50" /> -->
 	<style>
 		.myimg { margin: 5px; border: 1px solid #CFCFCF; } div.z-row-content span { font-family: Tahoma,Arial,serif; } .z-row .z-detail-outer { padding: 3px
 		6px; } .heavy { font-weight: bold; font-family: Tahoma,Arial,serif; } .ir { font-weight: bold; font-family: Tahoma,Arial,serif; text-color: green; }
@@ -97,8 +97,18 @@
 								</template>
 							</combobox>
 							<button hflex="min" image="/img/ic_search_black_18dp.png" onClick="@command('doSearch')" />
-<!-- 							<spinner inplace="true" value="50" width="50px"/> -->
-							<a onClick="@command('clearHistory')" style="font-size: 9px;">előzmények törlése</a>
+							<button dir="reverse" image="/img/baseline_expand_more_black_18dp.png"
+								popup="searchSettings, after_start" iconSclass="caret">
+							</button>
+							<menupopup id="searchSettings">
+								<menuitem label="10 találat oldalanként" value="10" checked="true" onClick="@command('setPageSize', source=self)" />
+								<menuitem label="25 találat oldalanként" value="25" checked="true" onClick="@command('setPageSize', source=self)" />
+								<menuitem label="50 találat oldalanként" value="50" checked="true" onClick="@command('setPageSize', source=self)" />
+								<menuitem label="100 találat oldalanként" value="100" checked="true" onClick="@command('setPageSize', source=self)" />
+								<menuitem label="200 találat oldalanként" value="200" checked="true" onClick="@command('setPageSize', source=self)" />
+								<menuseparator />
+								<menuitem label="Előzmények törlése" onClick="@command('clearHistory')" />
+							</menupopup>
 						</hbox>
 					</groupbox>
 					<popup id="sortOther">
diff --git a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
index 3b997751..4bee3596 100644
--- a/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
+++ b/server/user.jobengine.osgi.server/src/user/jobengine/zk/model/CachedListModel.java
@@ -24,7 +24,7 @@ import user.jobengine.db.SearchResult;
  */
 public class CachedListModel extends ListModelList<ArchivedMedia> {
 	private static final Logger logger = LogManager.getLogger();
-	private int cacheSize = 100;
+	private int cacheSize = 200;
 	private HashMap<Integer, ArchivedMedia> cache = new HashMap<Integer, ArchivedMedia>();
 
 	private String searchValue = null;
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 c5581765..9f96b578 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
@@ -38,6 +38,8 @@ import org.zkoss.zul.Detail;
 import org.zkoss.zul.Grid;
 import org.zkoss.zul.Hlayout;
 import org.zkoss.zul.ListModelList;
+import org.zkoss.zul.Menuitem;
+import org.zkoss.zul.Menupopup;
 import org.zkoss.zul.Messagebox;
 import org.zkoss.zul.Paging;
 import org.zkoss.zul.Row;
@@ -90,6 +92,8 @@ public class SearchModel extends AsyncBaseModel {
 	Button backToVideoButton;
 	@Wire
 	Combobox search;
+	@Wire
+	Menupopup searchSettings;
 
 	private String orderBy;
 	private boolean orderAscending;
@@ -97,7 +101,6 @@ public class SearchModel extends AsyncBaseModel {
 	private Map<String, String> topColorClasses;
 	private int selectedRowIndex;
 	private int selectedPageIndex;
-	private String mediaID;
 	private volatile boolean preventAfterRender;
 	private Row lastSelectedRow;
 	private int positionToScroll;
@@ -166,17 +169,9 @@ public class SearchModel extends AsyncBaseModel {
 	public void afterCompose(@ContextParam(ContextType.VIEW) Component view) {
 		Selectors.wireComponents(view, this, false);
 		Selectors.wireEventListeners(view, this);
-		Paging paging = itemsGrid.getPagingChild();
-		paging.setAutohide(false);
-
-		for (Component child : itemsGrid.getColumns().getChildren()) {
-			Column column = (Column) child;
-			column.addEventListener("onSort", evt -> doSort(evt));
-		}
-
-		mediaID = SessionUtil.getQueryParameter(MEDIA_ID);
-		if (mediaID != null)
-			searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy, orderAscending);
+		configureSearchResultGrid();
+		showExternalMediaID();
+		setSettingsPageSize(itemsGrid.getPageSize());
 	}
 
 	@Command
@@ -186,6 +181,16 @@ public class SearchModel extends AsyncBaseModel {
 		SessionUtil.putUserSearchHistory(searchHistory);
 	}
 
+	private void configureSearchResultGrid() {
+		Paging paging = itemsGrid.getPagingChild();
+		paging.setAutohide(false);
+
+		for (Component child : itemsGrid.getColumns().getChildren()) {
+			Column column = (Column) child;
+			column.addEventListener("onSort", evt -> doSort(evt));
+		}
+	}
+
 	@Command
 	public void copyMediaIdToClipboard() {
 		String port = (Executions.getCurrent().getServerPort() == 80) ? "" : (":" + Executions.getCurrent().getServerPort());
@@ -524,6 +529,15 @@ public class SearchModel extends AsyncBaseModel {
 		this.itemSelectedValidator = itemSelectedValidator;
 	}
 
+	@Command
+	public void setPageSize(@BindingParam("source") Menuitem source) {
+		if (source.isChecked())
+			return;
+		int pageSize = Integer.parseInt(source.getValue());
+		setSettingsPageSize(pageSize);
+		itemsGrid.setPageSize(pageSize);
+	}
+
 	public void setRowsExpanded(boolean rowsExpanded) {
 		this.rowsExpanded = rowsExpanded;
 	}
@@ -537,6 +551,26 @@ public class SearchModel extends AsyncBaseModel {
 		this.selectedObject = selectedObject;
 	}
 
+	private void setSettingsPageSize(int pageSize) {
+		List<Component> searchSettingItems = searchSettings.getChildren();
+		for (Component c : searchSettingItems) {
+			if (!(c instanceof Menuitem))
+				continue;
+			Menuitem menuItem = (Menuitem) c;
+			String value = menuItem.getValue();
+			if (String.valueOf(pageSize).equals(value))
+				menuItem.setChecked(true);
+			else
+				menuItem.setChecked(false);
+		}
+	}
+
+	private void showExternalMediaID() {
+		String mediaID = SessionUtil.getQueryParameter(MEDIA_ID);
+		if (mediaID != null)
+			searchResult = new InitializedCachedListModel(mediaID, searchValue, new ArrayList<String>(), orderBy, orderAscending);
+	}
+
 	@Command
 	//	@NotifyChange("itemsGrid")
 	public void showInResults() {