Views header & filter redesigned

diff --git a/sly-crm-db/migrations/scripts/028_add_prices_to_project.sql b/sly-crm-db/migrations/scripts/028_add_prices_to_project.sql
new file mode 100644 (file)
index 0000000..2becbad
--- /dev/null
+++ b/sly-crm-db/migrations/scripts/028_add_prices_to_project.sql
@@ -0,0 +1,16 @@
+-- // add supply price, selling price to project
+-- Migration SQL that makes the change goes here.
+
+ALTER TABLE project
+    ADD COLUMN supply_price DOUBLE
+    ADD COLUMN selling_price DOUBLE
+    ADD COLUMN margin DOUBLE;
+
+-- //@UNDO
+-- SQL to undo the change goes here.
+
+ALTER TABLE project
+    DROP COLUMN supply_price
+    DROP COLUMN selling_price
+    DROP COLUMN margin;
+CALL SYSPROC.ADMIN_CMD('REORG TABLE project');

diff --git a/sly-crm-db/src/main/java/hu/user/lis/db/Project.java b/sly-crm-db/src/main/java/hu/user/lis/db/Project.java
index 4e0b93e27d513cc0e32a20d9adee3a0ccd9635e4..13d2362d99bbd2e4c09e2a006d6afb86bf9bc41f 100644 (file)
--- a/sly-crm-db/src/main/java/hu/user/lis/db/Project.java
+++ b/sly-crm-db/src/main/java/hu/user/lis/db/Project.java
@@ -9,7 +9,14 @@ import lombok.experimental.SuperBuilder;
 import org.hibernate.annotations.Fetch;
 import org.hibernate.annotations.FetchMode;
 
-import javax.persistence.*;
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.FetchType;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
+import javax.persistence.OneToMany;
+import javax.persistence.OrderColumn;
+import javax.persistence.Transient;
 import java.util.List;
 
 @Getter
@@ -60,5 +67,11 @@ public class Project extends IdEntity {
 
     private String contactName;
 
+    private Double supplyPrice;
+
+    private Double sellingPrice;
+
+    private Double margin;
+
     private boolean active;
 }

diff --git a/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ImportInvoicesSuspendedViewModel.java b/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ImportInvoicesSuspendedViewModel.java
index 9ef3518d24d4bcc215147fd020eae9600bf5f017..84e73ce1102b6723081e32241abe92db9296594c 100644 (file)
--- a/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ImportInvoicesSuspendedViewModel.java
+++ b/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ImportInvoicesSuspendedViewModel.java
@@ -1,6 +1,12 @@
 package hu.user.lis.ui.view;
 
-import hu.user.lis.db.*;
+import hu.user.lis.db.IncomingInvoice;
+import hu.user.lis.db.Invoice;
+import hu.user.lis.db.InvoiceImport;
+import hu.user.lis.db.InvoiceStatus;
+import hu.user.lis.db.OutgoingInvoice;
+import hu.user.lis.db.Partner;
+import hu.user.lis.db.Project;
 import hu.user.lis.db.repository.InvoiceImportRepository;
 import hu.user.lis.db.repository.InvoiceRepository;
 import hu.user.lis.db.repository.filter.InvoiceFilter;
@@ -18,7 +24,12 @@ import lombok.Getter;
 import lombok.extern.log4j.Log4j2;
 import org.zkoss.bind.BindUtils;
 import org.zkoss.bind.PropertyChangeEvent;
-import org.zkoss.bind.annotation.*;
+import org.zkoss.bind.annotation.AfterCompose;
+import org.zkoss.bind.annotation.Command;
+import org.zkoss.bind.annotation.ContextParam;
+import org.zkoss.bind.annotation.ContextType;
+import org.zkoss.bind.annotation.Destroy;
+import org.zkoss.bind.annotation.Init;
 import org.zkoss.zk.ui.Component;
 import org.zkoss.zk.ui.event.Event;
 import org.zkoss.zk.ui.event.EventListener;
@@ -70,7 +81,7 @@ public class ImportInvoicesSuspendedViewModel extends EntityViewModel<Invoice> i
         addColumns(Arrays.asList(
                 "partner.humanId,Sorszám,natural,left,true",
                 "partner.name,Partner név,natural,left,true",
-                "partner.vatNr,Partner adószám,left,true",
+                "partner.vatNr,Partner adószám,natural,left,true",
                 "project.name,Projekt név,natural,left,true",
                 "paymentDeadline,Fizetési határidő,ascending,left,true",
                 "grossAmount,Bruttó összeg,natural,left,true",

diff --git a/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ProjectsViewModel.java b/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ProjectsViewModel.java
index 20f61791922872bec3d8ed64c91a85563c64def2..34e8401bdeec9c3f34038cdca5b8b2bb2e8b2107 100644 (file)
--- a/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ProjectsViewModel.java
+++ b/sly-crm-ui/src/main/java/hu/user/lis/ui/view/ProjectsViewModel.java
@@ -56,6 +56,9 @@ public class ProjectsViewModel extends FilterActiveViewModel<Project> implements
                 "projectStatus.name,Státusz,natural,left,true",
                 "name,Megnevezés,natural,left,true",
                 "contactName,Kapcsolattartó,natural,left,true",
+                "supplyPrice,Beszerzési ár (HUF),natural,left,true",
+                "sellingPrice,Eladási ár (HUF),natural,left,true",
+                "margin,Árrés (HUF) ,natural,left,true",
                 "active,Aktív,natural,left,true"
         ));
     }

diff --git a/sly-crm-ui/src/main/resources/web/associates.zul b/sly-crm-ui/src/main/resources/web/associates.zul
index 215aa02cd38f3b637380e5915c5dcece77795e4e..5dc4a87b4eb48e570e06e45d15bd00911f84c448 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/associates.zul
+++ b/sly-crm-ui/src/main/resources/web/associates.zul
@@ -7,16 +7,21 @@
     <!--        }-->
     <!--    </style>-->
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.AssociatesViewModel')">
-        <caption sclass="list-title" label="Munkatársak"/>
+        <caption>
+            <hlayout>
+                <label value="Munkatársak" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <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>
+            </hlayout>
+        </caption>
         <borderlayout>
             <north flex="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"/>
                     <toolbarbutton mode="toggle" iconSclass="z-icon-check" label="Aktív"
                                    checked="@bind(vm.filterShowActive)"/>
                     <toolbarbutton mode="toggle" iconSclass="z-icon-ban" label="Inaktív"
@@ -36,7 +41,8 @@
                     </menupopup>
                     <listbox vflex="true" model="@load(vm.associatesDataModel)" multiple="false"
                              itemRenderer="@load(vm.associatesDataModel.renderer)"
-                             onSelect="@command('onListSelection')">
+                             onSelect="@command('onListSelection')"
+                             sizedByContent="true" span="true">
                         <listhead sizable="true" menupopup="editPopup"
                                   onColSize="@command('onHeaderSizeChanged', node=node)"
                                   children="@bind(vm.associatesDataModel.renderer.columnSettings) @template('head-item')">

diff --git a/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul b/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul
index 44a05a5b229267d7f27f4d38fd15367c943dedca..a66489ee69ba3e516d54ce2ee4ac2e54b4c64aec 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul
+++ b/sly-crm-ui/src/main/resources/web/import-invoices-approve.zul
@@ -1,21 +1,24 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ApproveInvoicesViewModel')">
         <!--        <timer id="timer" delay="1000" repeats="true" onTimer="@command('uiTick')"/>-->
-        <caption sclass="list-title" label="Számla import - Jóváhagyás"/>
-
-        <borderlayout>
-            <north flex="true">
-                <toolbar>
-                    <toolbarbutton label="Frissít" iconSclass="z-icon-refresh"
-                                   onClick="@command('onRefresh')"/>
+        <caption>
+            <hlayout>
+                <label value="Számla import - Jóváhagyás" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <toolbarbutton label="Frissít" iconSclass="z-icon-refresh" onClick="@command('onRefresh')"/>
                     <!--                    <toolbarbutton label="Léptet" iconSclass="z-icon-tasks"-->
                     <!--                                   onClick="@command('onCompleteTask')" disabled="@load(empty vm.selectedEntity)"/>-->
                 </toolbar>
+            </hlayout>
+        </caption>
+
+        <borderlayout>
+            <north flex="true">
             </north>
             <center border="none" flex="true">
                 <listbox vflex="true" model="@load(vm.approveInvoicesDataModel)"
                          autopaging="true" mold="paging" pagingPosition="top" multiple="false"
-                         onSelect="@command('onListSelection')">
+                         onSelect="@command('onListSelection')" sizedByContent="true" span="true">
                     <listhead sizable="true">
                         <listheader label="Azonosító" sort="auto(humanId)" align="left"/>
                         <listheader label="Partner" sort="auto(partner.name)" align="left"/>

diff --git a/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul b/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul
index e39c5fb2c18a9e2133e9f074910a4cea4fac55b5..fec78df39a16dec1cfea25bdc9625fcf87dcb0b8 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul
+++ b/sly-crm-ui/src/main/resources/web/import-invoices-assign.zul
@@ -1,21 +1,24 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.AssignInvoicesViewModel')">
         <!--        <timer id="timer" delay="1000" repeats="true" onTimer="@command('uiTick')"/>-->
-        <caption sclass="list-title" label="Számla import - Csatolás"/>
+        <caption>
+            <hlayout>
+                <label value="Számla import - Csatolás" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <toolbarbutton label="Frissít" iconSclass="z-icon-refresh" onClick="@command('onRefresh')"/>
+                    <!--                    <toolbarbutton label="Léptet" iconSclass="z-icon-tasks"-->
+                    <!--                                   onClick="@command('onCompleteTask')" disabled="@load(empty vm.selectedEntity)"/>-->
+                </toolbar>
+            </hlayout>
+        </caption>
 
         <borderlayout>
             <north flex="true">
-                <toolbar>
-                    <toolbarbutton label="Frissít" iconSclass="z-icon-refresh"
-                                   onClick="@command('onRefresh')"/>
-                    <!--                    <toolbarbutton label="Léptet" iconSclass="z-icon-tasks"-->
-                    <!--                                   onClick="@command('onHandleTask')" disabled="@load(empty vm.selectedEntity)"/>-->
-                </toolbar>
             </north>
             <center border="none" flex="true">
                 <listbox vflex="true" model="@load(vm.assignInvoicesDataModel)"
                          autopaging="true" mold="paging" pagingPosition="top" multiple="false"
-                         onSelect="@command('onListSelection')">
+                         onSelect="@command('onListSelection')" sizedByContent="true" span="true">
                     <listhead sizable="true">
                         <listheader label="Azonosító" sort="auto(humanId)" align="left"/>
                         <listheader label="Partner" sort="auto(partner.name)" align="left"/>

diff --git a/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul b/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul
index 8cb69ff6b3ae15c3b5c8be8f39821f12406bf521..9cc8a199aaa6f91ae837c748d46a525b0134a9e9 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul
+++ b/sly-crm-ui/src/main/resources/web/import-invoices-suspended.zul
@@ -1,27 +1,35 @@
 <?component name="entity-selector" inline="true" class="hu.user.lis.ui.editor.widget.EntitySelector"?>
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ImportInvoicesSuspendedViewModel')">
-        <caption sclass="list-title" label="Számla parkoló"/>
+        <caption>
+            <hlayout>
+                <label value="Számla parkoló" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <toolbarbutton label="Iktatás" iconSclass="z-icon-forward" onClick="@command('onStartAssignment')"
+                                   disabled="@load(empty vm.selectedEntity)"/>
+                </toolbar>
+            </hlayout>
+        </caption>
         <borderlayout>
             <north hflex="true">
-                <vlayout>
-                    <toolbar>
+                <toolbar>
+                    <toolbarbutton label="Partner" tooltip="partner_filter"/>
+                    <popup id="partner_filter">
                         <label value="Partner"/>
                         <separator orient="vertical"/>
                         <entity-selector selector_id="inv_suspended_partner" entity="Partner"
-                                         style="display: inline-block;" width="300px"/>
-                        <space bar="true"/>
+                                         style="display: inline-block;"
+                                         width="300px"/>
+                    </popup>
+                    <toolbarbutton label="Projekt" tooltip="project_filter"/>
+                    <popup id="project_filter">
                         <label value="Projekt"/>
                         <separator orient="vertical"/>
                         <entity-selector selector_id="inv_suspended_project" entity="Project"
-                                         style="display: inline-block;" width="300px"/>
-
-                        <space bar="true"/>
-                        <toolbarbutton label="Iktatás" iconSclass="z-icon-forward"
-                                       onClick="@command('onStartAssignment')"/>
-
-                    </toolbar>
-                </vlayout>
+                                         style="display: inline-block;"
+                                         width="300px"/>
+                    </popup>
+                </toolbar>
             </north>
             <center border="none">
                 <vlayout vflex="true">
@@ -33,7 +41,8 @@
                         </template>
                     </menupopup>
                     <listbox vflex="true" model="@load(vm.invoicesDataModel)" multiple="false"
-                             itemRenderer="@load(vm.invoicesDataModel.renderer)" onSelect="@command('onListSelection')">
+                             itemRenderer="@load(vm.invoicesDataModel.renderer)" onSelect="@command('onListSelection')"
+                             sizedByContent="true" span="true">
                         <listhead sizable="true" menupopup="editPopup"
                                   onColSize="@command('onHeaderSizeChanged', node=node)"
                                   children="@bind(vm.invoicesDataModel.renderer.columnSettings) @template('head-item')">

diff --git a/sly-crm-ui/src/main/resources/web/index.zul b/sly-crm-ui/src/main/resources/web/index.zul
index 6066abaf6e817917e6e9ab4491ab1333e21b44b9..47c48acfff93cd749f6bfc74b872eb869120ba7a 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/index.zul
+++ b/sly-crm-ui/src/main/resources/web/index.zul
@@ -90,12 +90,6 @@
                                               onClick="@command(vm.selectPage('~./invoices.zul'))"/>
                                     <menuitem iconSclass="z-icon-credit-card" label="Számla kiegyenlítés"
                                               onClick="@command(vm.selectPage('~./invoice-payment.zul'))"/>
-                                    <menu iconSclass="z-icon-exchange" label="Követelés követés">
-                                        <menupopup>
-                                            <menuitem label="Vevő"/>
-                                            <menuitem label="Szállító"/>
-                                        </menupopup>
-                                    </menu>
                                     <menuseparator/>
                                     <menu iconSclass="z-icon-tasks" label="Számla iktatás"
                                           sclass="@bind(vm.importInvoiceMenuClassName)">

diff --git a/sly-crm-ui/src/main/resources/web/invoice-payment.zul b/sly-crm-ui/src/main/resources/web/invoice-payment.zul
index 25912ee9af7bde8a9cb30b0999f7748483791ec8..396b02eadf67b3601417d1ce1e35db43cd4b89ed 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/invoice-payment.zul
+++ b/sly-crm-ui/src/main/resources/web/invoice-payment.zul
@@ -9,7 +9,12 @@
         }
     </style>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoicePaymentViewModel')">
-        <caption sclass="list-title" label="Számla kiegyenlítés"/>
+        <caption>
+            <hlayout>
+                <label value="Számla kiegyenlítés" sclass="list-title"/>
+            </hlayout>
+        </caption>
+
         <borderlayout>
             <north flex="true">
                 <toolbar>

diff --git a/sly-crm-ui/src/main/resources/web/invoices.zul b/sly-crm-ui/src/main/resources/web/invoices.zul
index fccc6954191aa43ea12e01a1a4c927f220dce6cb..42b9d68ba7fda1dc2c637ff5affbb1aa6fefea9d 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/invoices.zul
+++ b/sly-crm-ui/src/main/resources/web/invoices.zul
@@ -5,74 +5,83 @@
         ListModelList dateTypes = new ListModelList(DateType.values());
     </zscript>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.InvoicesViewModel')">
-        <caption sclass="list-title" label="Számlák"/>
+        <caption>
+            <hlayout hflex="true">
+                <label value="Számlák" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <toolbarbutton label="Szerkeszt" iconSclass="z-icon-edit" onClick="@command('onEdit')"
+                                   disabled="@load(empty vm.selectedEntity)"/>
+                    <!--                        <toolbarbutton label="Projekt módosítás" iconSclass="z-icon-forward"-->
+                    <!--                                       onClick="@command('onChangeProject')" disabled="@load(empty vm.selectedEntity)"/>-->
+                    <toolbarbutton label="Kiegyenlít" iconSclass="z-icon-credit-card"
+                                   onClick="@command('onInvoicePayment')"
+                                   disabled="@load(empty vm.selectedEntity || vm.selectedEntity.planned)"/>
+                </toolbar>
+            </hlayout>
+        </caption>
+
         <borderlayout>
             <north hflex="true">
-                <vlayout>
-                    <toolbar>
+                <toolbar>
+                    <toolbarbutton label="Partner" tooltip="partner_filter"/>
+                    <popup id="partner_filter">
                         <label value="Partner"/>
                         <separator orient="vertical"/>
-                        <entity-selector selector_id="inv_partner" entity="Partner" style="display: inline-block;"
+                        <entity-selector selector_id="inv_partner" entity="Partner"
+                                         style="display: inline-block;"
                                          width="300px"/>
-
-                        <space bar="true"/>
-
+                    </popup>
+                    <toolbarbutton label="Projekt" tooltip="project_filter"/>
+                    <popup id="project_filter">
                         <label value="Projekt"/>
                         <separator orient="vertical"/>
-                        <entity-selector selector_id="inv_project" entity="Project" style="display: inline-block;"
+                        <entity-selector selector_id="inv_project" entity="Project"
+                                         style="display: inline-block;"
                                          width="300px"/>
-
-                        <space bar="true"/>
-
-                        <toolbarbutton mode="toggle" iconSclass="z-icon-external-link" label="Bejövő"
-                                       checked="@load(vm.invoiceFilter.incoming)"
-                                       onClick="@command('setIncoming', incoming=true)"/>
-                        <toolbarbutton mode="toggle" iconSclass="z-icon-sign-in" label="Kimenő"
-                                       checked="@load(!vm.invoiceFilter.incoming)"
-                                       onClick="@command('setIncoming', incoming=false)"/>
-
-                        <space bar="true"/>
-                        <!--                        <selectbox model="${dateTypes}"-->
-                        <!--                                   width="100%"-->
-                        <!--                                   selectedIndex="@bind(vm.invoiceFilter.dateType) @converter(vm.dateTypeConverter)">-->
-                        <!--                            <template name="model">-->
-                        <!--                                ${each.display}-->
-                        <!--                            </template>-->
-                        <!--                        </selectbox>-->
-
-                        <combobox instant="true" model="${dateTypes}" selectedItem="@bind(vm.invoiceFilter.dateType)"
+                    </popup>
+                    <toolbarbutton label="Dátum" tooltip="date_filter"/>
+                    <popup id="date_filter">
+                        <combobox instant="true" model="${dateTypes}"
+                                  selectedItem="@bind(vm.invoiceFilter.dateType)"
                                   readonly="true">
                             <template name="model">
                                 <comboitem label="${each.display}"/>
                             </template>
                         </combobox>
+
                         <separator orient="vertical"/>
+
                         <datebox instant="true" format="yyyy. MM. dd."
                                  value="@bind(vm.invoiceFilter.paymentDeadLineFrom)"/>
                         <label value="-"/>
                         <datebox instant="true" format="yyyy. MM. dd."
                                  value="@bind(vm.invoiceFilter.paymentDeadLineTo)"/>
+                    </popup>
+                    <toolbarbutton mode="toggle" iconSclass="z-icon-external-link" label="Bejövő"
+                                   checked="@load(vm.invoiceFilter.incoming)"
+                                   onClick="@command('setIncoming', incoming=true)"/>
+                    <toolbarbutton mode="toggle" iconSclass="z-icon-sign-in" label="Kimenő"
+                                   checked="@load(!vm.invoiceFilter.incoming)"
+                                   onClick="@command('setIncoming', incoming=false)"/>
 
-                        <space bar="true"/>
-
-                        <toolbarbutton mode="toggle" iconSclass="z-icon-credit-card" label="Kiegyenlítve"
-                                       checked="@bind(vm.invoiceFilter.paid)"/>
-                    </toolbar>
-                    <toolbar>
-                        <toolbarbutton label="Szerkesztés" iconSclass="z-icon-edit" onClick="@command('onEdit')"
-                                       disabled="@load(empty vm.selectedEntity)"/>
-                        <!--                        <toolbarbutton label="Projekt módosítás" iconSclass="z-icon-forward"-->
-                        <!--                                       onClick="@command('onChangeProject')" disabled="@load(empty vm.selectedEntity)"/>-->
-                        <toolbarbutton label="Számla kiegyenlítés" iconSclass="z-icon-credit-card"
-                                       onClick="@command('onInvoicePayment')"
-                                       disabled="@load(empty vm.selectedEntity || vm.selectedEntity.planned)"/>
-                    </toolbar>
-                </vlayout>
+                    <separator orient="vertical"/>
+                    
+                    <toolbarbutton mode="toggle" iconSclass="z-icon-credit-card" label="Kiegyenlítve"
+                                   checked="@bind(vm.invoiceFilter.paid)"/>
+                </toolbar>
             </north>
             <center border="none">
                 <vlayout vflex="true">
+                    <menupopup id="editPopup"
+                               children="@bind(vm.invoicesDataModel.renderer.columnSettings) @template('menu-item')">
+                        <template name="menu-item" var="node">
+                            <menuitem label="@load(node.label)" checked="@load(node.visible)"
+                                      onClick="@command('onHeaderMenuClicked', node=node)"/>
+                        </template>
+                    </menupopup>
                     <listbox id="invoicesList" vflex="true" model="@load(vm.invoicesDataModel)" multiple="false"
-                             itemRenderer="@load(vm.invoicesDataModel.renderer)" onSelect="@command('onListSelection')">
+                             itemRenderer="@load(vm.invoicesDataModel.renderer)" onSelect="@command('onListSelection')"
+                             sizedByContent="true" span="true">
                         <listhead sizable="true" menupopup="editPopup"
                                   onColSize="@command('onHeaderSizeChanged', node=node)"
                                   children="@bind(vm.invoicesDataModel.renderer.columnSettings) @template('head-item')">
@@ -114,13 +123,6 @@
                             </listitem>
                         </template>
                     </listbox>
-                    <menupopup id="editPopup"
-                               children="@bind(vm.invoicesDataModel.renderer.columnSettings) @template('menu-item')">
-                        <template name="menu-item" var="node">
-                            <menuitem label="@load(node.label)" checked="@load(node.visible)"
-                                      onClick="@command('onHeaderMenuClicked', node=node)"/>
-                        </template>
-                    </menupopup>
                 </vlayout>
             </center>
         </borderlayout>

diff --git a/sly-crm-ui/src/main/resources/web/partners.zul b/sly-crm-ui/src/main/resources/web/partners.zul
index d14c6199c5e81e99325c33f28d27da1b0828ae96..8d02a090b4cf607560fc6681d253bc30a6301ecf 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/partners.zul
+++ b/sly-crm-ui/src/main/resources/web/partners.zul
@@ -1,15 +1,23 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.PartnersViewModel')">
-        <caption sclass="list-title" label="Partnerek"/>
+        <caption>
+            <hlayout>
+                <label value="Partnerek" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <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>
+            </hlayout>
+        </caption>
         <borderlayout>
             <north hflex="true">
-                <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"/>-->
+                <toolbar>
                     <toolbarbutton mode="toggle" iconSclass="z-icon-check" label="Aktív"
                                    checked="@bind(vm.filterShowActive)"/>
                     <toolbarbutton mode="toggle" iconSclass="z-icon-ban" label="Inaktív"
@@ -28,7 +36,8 @@
                         </template>
                     </menupopup>
                     <listbox vflex="true" model="@load(vm.partnersDataModel)" multiple="false"
-                             itemRenderer="@load(vm.partnersDataModel.renderer)" onSelect="@command('onListSelection')">
+                             itemRenderer="@load(vm.partnersDataModel.renderer)" onSelect="@command('onListSelection')"
+                             sizedByContent="true" span="true">
                         <!--                        <listfoot>-->
                         <!--                            <listfooter colspan="@load(vm.partnersDataModel.renderer.colCount)">-->
                         <!--                                <toolbar>-->
@@ -43,20 +52,6 @@
                         <!--                                </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')">

diff --git a/sly-crm-ui/src/main/resources/web/projects.zul b/sly-crm-ui/src/main/resources/web/projects.zul
index 65d06728df1e9bdd5f22508d8d7e6762e4b62f7e..90caacc386525ff7918b6c018f41a3d6186dfb6d 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/projects.zul
+++ b/sly-crm-ui/src/main/resources/web/projects.zul
@@ -1,19 +1,27 @@
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ProjectsViewModel')">
-        <caption sclass="list-title" label="Projektek"/>
-        <borderlayout>
-            <north flex="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')"
+        <caption>
+            <hlayout>
+                <label value="Projektek" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <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örlés" iconSclass="z-icon-remove" onClick="@command('onDelete')"
+                    <toolbarbutton label="Töröl" iconSclass="z-icon-remove"
+                                   onClick="@command('onDelete')"
                                    disabled="@load(empty vm.selectedEntity)"/>
-                    <separator orient="vertical"/>
                     <toolbarbutton label="Háttér folyamat indítása" iconSclass="z-icon-play-circle"
                                    onClick="@command('onStartProcess')"
                                    disabled="@load(empty vm.selectedEntity)"/>
-                    <separator orient="vertical"/>
+                </toolbar>
+            </hlayout>
+        </caption>
+
+        <borderlayout>
+            <north flex="true">
+                <toolbar>
                     <toolbarbutton mode="toggle" iconSclass="z-icon-check" label="Aktív"
                                    checked="@bind(vm.filterShowActive)"/>
                     <toolbarbutton mode="toggle" iconSclass="z-icon-ban" label="Inaktív"
@@ -32,7 +40,8 @@
                         </template>
                     </menupopup>
                     <listbox vflex="true" model="@load(vm.projectsDataModel)" multiple="false"
-                             itemRenderer="@load(vm.projectsDataModel.renderer)" onSelect="@command('onListSelection')">
+                             itemRenderer="@load(vm.projectsDataModel.renderer)" onSelect="@command('onListSelection')"
+                             sizedByContent="true" span="true">
                         <listhead sizable="true" menupopup="editPopup"
                                   onColSize="@command('onHeaderSizeChanged', node=node)"
                                   children="@bind(vm.projectsDataModel.renderer.columnSettings) @template('head-item')">
@@ -50,6 +59,9 @@
                                 <listcell label="@load(each.projectStatus.name)"/>
                                 <listcell label="@load(each.name)"/>
                                 <listcell label="@load(each.contactName)"/>
+                                <listcell label="@load(each.supplyPrice)"/>
+                                <listcell label="@load(each.sellingPrice)"/>
+                                <listcell label="@load(each.margin)"/>
                                 <listcell>
                                     <a iconSclass="z-icon-check" visible="@load(each.active)"/>
                                     <a iconSclass="z-icon-ban" visible="@load(!each.active)"/>

diff --git a/sly-crm-ui/src/main/resources/web/service-records.zul b/sly-crm-ui/src/main/resources/web/service-records.zul
index 2a0416a52ceef3d9d396699642a36e36db416e59..fb66a7f01c71a5b0f222a7fbd6cdf5b6a004d5ca 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/service-records.zul
+++ b/sly-crm-ui/src/main/resources/web/service-records.zul
@@ -1,26 +1,38 @@
 <?component name="entity-selector" inline="true" class="hu.user.lis.ui.editor.widget.EntitySelector"?>
 <zk>
     <window vflex="true" viewModel="@id('vm') @init('hu.user.lis.ui.view.ServiceRecordsViewModel')">
-        <caption sclass="list-title" label="Munkalapok"/>
+        <caption>
+            <hlayout>
+                <label value="Munkalapok" sclass="list-title"/>
+                <toolbar style="margin-left: 50px">
+                    <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>
+            </hlayout>
+        </caption>
+
         <borderlayout>
             <north flex="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"/>
-                    <separator orient="vertical"/>
-                    <label value="Projekt"/>
-                    <separator orient="vertical"/>
-                    <entity-selector selector_id="sr_project" entity="Project" style="display: inline-block;"
-                                     width="300px"/>
-                    <separator orient="vertical"/>
-                    <label value="Munkatárs"/>
+                    <toolbarbutton label="Projekt" tooltip="project_filter"/>
+                    <popup id="project_filter">
+                        <label value="Projekt"/>
+                        <separator orient="vertical"/>
+                        <entity-selector selector_id="sr_project" entity="Project" style="display: inline-block;"
+                                         width="300px"/>
+                    </popup>
+                    <toolbarbutton label="Munkatárs" tooltip="associate_filter"/>
+                    <popup id="associate_filter">
+                        <label value="Munkatárs"/>
+                        <separator orient="vertical"/>
+                        <entity-selector selector_id="sr_associate" entity="Associate" style="display: inline-block;"
+                                         width="300px"/>
+                    </popup>
                     <separator orient="vertical"/>
-                    <entity-selector selector_id="sr_associate" entity="Associate" style="display: inline-block;"/>
-                    <toolbarbutton label="Nincs szűrés" iconSclass="z-icon-ban" onClick="@command('onClearFilters')"/>
+                    <toolbarbutton label="Alaphelyzet" iconSclass="z-icon-ban" onClick="@command('onClearFilters')"/>
                 </toolbar>
             </north>
             <center border="none">
@@ -34,7 +46,8 @@
                     </menupopup>
                     <listbox vflex="true" model="@load(vm.serviceRecordsDataModel)" multiple="false"
                              itemRenderer="@load(vm.serviceRecordsDataModel.renderer)"
-                             onSelect="@command('onListSelection')">
+                             onSelect="@command('onListSelection')"
+                             sizedByContent="true" span="true">
                         <listhead sizable="true" menupopup="editPopup"
                                   onColSize="@command('onHeaderSizeChanged', node=node)"
                                   children="@bind(vm.serviceRecordsDataModel.renderer.columnSettings) @template('head-item')">

diff --git a/sly-crm-ui/src/main/resources/web/static/css/webclient.css b/sly-crm-ui/src/main/resources/web/static/css/webclient.css
index f0286d675b9c0b9d8fbff0407337364ce5583bbb..65393ac3837e617c1c34a91aa01a1b85b4d47246 100644 (file)
--- a/sly-crm-ui/src/main/resources/web/static/css/webclient.css
+++ b/sly-crm-ui/src/main/resources/web/static/css/webclient.css
@@ -3,7 +3,7 @@
     width: 100px;
 }
 .list-title {
-    font-size: 1.5em;
+    font-size: 2em;
     font-weight: bold;
     margin: 5px 10px 5px 10px;
 }