Partner layout test

diff --git a/sly-crm-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java b/sly-crm-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java
index b766784b8cf857af51216708d1a32537ebea91b5..1b108f5ac8976a281cece66f9e09b77d650a3146 100644 (file)
--- a/sly-crm-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java
+++ b/sly-crm-ui/src/main/java/hu/user/lis/ui/view/renderer/ReorderedItemsRenderer.java
@@ -10,7 +10,6 @@ import org.zkoss.bind.impl.AbstractForEachStatus;
 import org.zkoss.bind.impl.BindListitemRenderer;
 import org.zkoss.bind.impl.BinderUtil;
 import org.zkoss.bind.impl.IndirectBinding;
-import org.zkoss.lang.Objects;
 import org.zkoss.zk.ui.UiException;
 import org.zkoss.zk.ui.util.ForEachStatus;
 import org.zkoss.zk.ui.util.Template;
@@ -18,6 +17,7 @@ import org.zkoss.zul.*;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 
 @Log4j2
 @Component
@@ -27,6 +27,11 @@ public class ReorderedItemsRenderer extends BindListitemRenderer {
     @Setter
     private ColDef[] columnSettings;
 
+
+    public int getColCount() {
+        return Objects.isNull(columnSettings) ? 0 : columnSettings.length;
+    }
+
     @Override
     public void render(Listitem item, final Object data, final int index) throws Exception {
         final Listbox listbox = (Listbox) item.getParent();

diff --git a/sly-crm-ui/src/main/resources/web/partners.zul b/sly-crm-ui/src/main/resources/web/partners.zul
index bbf9bf1fc4d3ec2bb2a14cb82d9ab9715c288d9b..d14c6199c5e81e99325c33f28d27da1b0828ae96 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/partners.zul
+++ b/sly-crm-ui/src/main/resources/web/partners.zul
@@ -3,13 +3,13 @@
         <caption sclass="list-title" label="Partnerek"/>
         <borderlayout>
             <north hflex="true">
-                <toolbar>
-                    <toolbarbutton label="Hozzáadás" iconSclass="z-icon-plus" onClick="@command('onAdd')"/>
-                    <toolbarbutton label="Szerkesztés" iconSclass="z-icon-edit" onClick="@command('onEdit')"
-                                   disabled="@load(empty vm.selectedEntity)"/>
-                    <toolbarbutton label="Törlés" iconSclass="z-icon-remove" onClick="@command('onDelete')"
-                                   disabled="@load(empty vm.selectedEntity)"/>
-                    <separator orient="vertical"/>
+                <toolbar style="margin: 5px">
+                    <!--                    <toolbarbutton label="Hozzáadás" iconSclass="z-icon-plus" onClick="@command('onAdd')"/>-->
+                    <!--                    <toolbarbutton label="Szerkesztés" iconSclass="z-icon-edit" onClick="@command('onEdit')"-->
+                    <!--                                   disabled="@load(empty vm.selectedEntity)"/>-->
+                    <!--                    <toolbarbutton label="Törlés" iconSclass="z-icon-remove" onClick="@command('onDelete')"-->
+                    <!--                                   disabled="@load(empty vm.selectedEntity)"/>-->
+                    <!--                    <separator orient="vertical"/>-->
                     <toolbarbutton mode="toggle" iconSclass="z-icon-check" label="Aktív"
                                    checked="@bind(vm.filterShowActive)"/>
                     <toolbarbutton mode="toggle" iconSclass="z-icon-ban" label="Inaktív"
@@ -29,6 +29,34 @@
                     </menupopup>
                     <listbox vflex="true" model="@load(vm.partnersDataModel)" multiple="false"
                              itemRenderer="@load(vm.partnersDataModel.renderer)" onSelect="@command('onListSelection')">
+                        <!--                        <listfoot>-->
+                        <!--                            <listfooter colspan="@load(vm.partnersDataModel.renderer.colCount)">-->
+                        <!--                                <toolbar>-->
+                        <!--                                    <toolbarbutton label="Hozzáadás" iconSclass="z-icon-plus"-->
+                        <!--                                                   onClick="@command('onAdd')"/>-->
+                        <!--                                    <toolbarbutton label="Szerkesztés" iconSclass="z-icon-edit"-->
+                        <!--                                                   onClick="@command('onEdit')"-->
+                        <!--                                                   disabled="@load(empty vm.selectedEntity)"/>-->
+                        <!--                                    <toolbarbutton label="Törlés" iconSclass="z-icon-remove"-->
+                        <!--                                                   onClick="@command('onDelete')"-->
+                        <!--                                                   disabled="@load(empty vm.selectedEntity)"/>-->
+                        <!--                                </toolbar>-->
+                        <!--                            </listfooter>-->
+                        <!--                        </listfoot>-->
+                        <auxhead>
+                            <auxheader colspan="@load(vm.partnersDataModel.renderer.colCount)">
+                                <toolbar>
+                                    <toolbarbutton label="Új" iconSclass="z-icon-plus"
+                                                   onClick="@command('onAdd')"/>
+                                    <toolbarbutton label="Szerkeszt" iconSclass="z-icon-edit"
+                                                   onClick="@command('onEdit')"
+                                                   disabled="@load(empty vm.selectedEntity)"/>
+                                    <toolbarbutton label="Töröl" iconSclass="z-icon-remove"
+                                                   onClick="@command('onDelete')"
+                                                   disabled="@load(empty vm.selectedEntity)"/>
+                                </toolbar>
+                            </auxheader>
+                        </auxhead>
                         <listhead sizable="true" menupopup="editPopup"
                                   onColSize="@command('onHeaderSizeChanged', node=node)"
                                   children="@bind(vm.partnersDataModel.renderer.columnSettings) @template('head-item')">