From 87392724599ba16bac8f480b4f2be987855cad4c Mon Sep 17 00:00:00 2001
From: =?utf8?q?V=C3=A1s=C3=A1ry=20D=C3=A1niel?= <vasary@elgekko.net>
Date: Sun, 25 Feb 2024 23:22:36 +0100
Subject: [PATCH] Columns show/hide first look

---
 .../ui/data/common/CachedSpringDataModel.java |  8 +++
 lis-ui/src/main/resources/web/partners.zul    | 61 +++++++++++--------
 2 files changed, 44 insertions(+), 25 deletions(-)

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/data/common/CachedSpringDataModel.java b/lis-ui/src/main/java/hu/user/lis/ui/data/common/CachedSpringDataModel.java
index 5d8ad8b..9c27842 100644
--- a/lis-ui/src/main/java/hu/user/lis/ui/data/common/CachedSpringDataModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/data/common/CachedSpringDataModel.java
@@ -41,6 +41,13 @@ public abstract class CachedSpringDataModel<T> extends CachedDataModel<T> {
         } else {
             JSONObject savedColumns = entityDataService.fromJSON(profile.getSetting(), JSONObject.class);
             if (savedColumns.keySet().equals(columns.keySet())) {
+//                log.info("{}", Strings.join(objects, ','));
+                columnSettings.keySet().forEach(colName -> {
+                    LinkedHashMap<String, Object> colSetting = (LinkedHashMap<String, Object>) savedColumns.get(colName);
+                    if (!colSetting.containsKey("visible")) {
+                        colSetting.put("visible", true);
+                    }
+                });
                 columnSettings = savedColumns;
             } else {
                 saveProfileSetting();
@@ -60,6 +67,7 @@ public abstract class CachedSpringDataModel<T> extends CachedDataModel<T> {
     private void addColumn(String name, String direction) {
         JSONObject sort = new JSONObject();
         sort.put("sortDirection", direction);
+        sort.put("visible", true);
         columnSettings.put(name, sort);
 
         if (!direction.equals(NATURAL)) {
diff --git a/lis-ui/src/main/resources/web/partners.zul b/lis-ui/src/main/resources/web/partners.zul
index 33562f9..57dd7d6 100644
--- a/lis-ui/src/main/resources/web/partners.zul
+++ b/lis-ui/src/main/resources/web/partners.zul
@@ -17,34 +17,45 @@
                     <toolbarbutton mode="toggle" iconSclass="z-icon-adjust" label="Mind"
                                    checked="@bind(vm.filterShowBoth)"/>
                 </toolbar>
+
             </north>
             <center border="none" flex="true">
-                <listbox vflex="true" model="@load(vm.partnersDataModel)"
-                         autopaging="true" mold="paging" pagingPosition="top" multiple="false"
-                         onSelect="@command('onListSelection')">
-                    <listhead sizable="true">
-                        <listheader label="Név" sort="auto(name)" align="left"
-                                    sortDirection="@load(vm.cols['name'].sortDirection)"/>
-                        <listheader label="Adószám" sort="auto(vatNr)" align="left"
-                                    sortDirection="@load(vm.cols['vatNr'].sortDirection)"/>
-                        <listheader label="Cím" sort="auto(address)" align="left"
-                                    sortDirection="@load(vm.cols['address'].sortDirection)"/>
-                        <listheader label="Aktív" sort="auto(active)" align="left"
-                                    sortDirection="@load(vm.cols['active'].sortDirection)"/>
+                <vlayout>
+                    <!--                    https://www.zkoss.org/wiki/ZK_Developer%27s_Reference/MVVM/Data_Binding/Children_Binding-->
+                    <menupopup id="editPopup">
+                        <menuitem label="Group" image="~./zul/img/grid/menu-group.png"/>
+                        <menuitem label="Sort Ascending" image="~./zul/img/grid/menu-arrowup.png"/>
+                        <menuitem label="Sort Descending" image="~./zul/img/grid/menu-arrowdown.png"/>
+                    </menupopup>
+                    <listbox vflex="true" model="@load(vm.partnersDataModel)"
+                             autopaging="true" mold="paging" pagingPosition="top" multiple="false"
+                             onSelect="@command('onListSelection')">
+                        <listhead sizable="true" menupopup="editPopup">
+                            <listheader label="Név" sort="auto(name)" align="left"
+                                        visible="@bind(vm.cols['name'].visible)"
+                                        sortDirection="@load(vm.cols['name'].sortDirection)"/>
+                            <listheader label="Adószám" sort="auto(vatNr)" align="left"
+                                        sortDirection="@load(vm.cols['vatNr'].sortDirection)"/>
+                            <listheader label="Cím" sort="auto(address)" align="left"
+                                        sortDirection="@load(vm.cols['address'].sortDirection)"/>
+                            <listheader label="Aktív" sort="auto(active)" align="left"
+                                        sortDirection="@load(vm.cols['active'].sortDirection)"/>
+
+                        </listhead>
+                        <template name="model">
+                            <listitem onDoubleClick="@command('onEdit')">
+                                <listcell label="@load(each.name)"/>
+                                <listcell label="@load(each.vatNr)"/>
+                                <listcell label="@load(each.address)"/>
+                                <listcell>
+                                    <a iconSclass="z-icon-check" visible="@load(each.active)"/>
+                                    <a iconSclass="z-icon-ban" visible="@load(!each.active)"/>
+                                </listcell>
+                            </listitem>
+                        </template>
+                    </listbox>
 
-                    </listhead>
-                    <template name="model">
-                        <listitem onDoubleClick="@command('onEdit')">
-                            <listcell label="@load(each.name)"/>
-                            <listcell label="@load(each.vatNr)"/>
-                            <listcell label="@load(each.address)"/>
-                            <listcell>
-                                <a iconSclass="z-icon-check" visible="@load(each.active)"/>
-                                <a iconSclass="z-icon-ban" visible="@load(!each.active)"/>
-                            </listcell>
-                        </listitem>
-                    </template>
-                </listbox>
+                </vlayout>
             </center>
         </borderlayout>
     </window>
-- 
2.54.0