Project info added to invoice list and editor

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java
index ee1a8b2dd5f96b2f5ecfe6d0d7b6445c5e6156bd..6dda1b3279a3fb3a3770513d1bbf7de32ace2ced 100644 (file)
--- a/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/view/InvoicesViewModel.java
@@ -62,7 +62,7 @@ public class InvoicesViewModel extends EntityViewModel<Invoice> implements Event
         addColumns(ImmutableMap.of(
                 "partner.humanId", NATURAL,
                 "partner.name", NATURAL,
-                "partner.vatNr", NATURAL,
+                "project.humanId", NATURAL,
                 "project.name", NATURAL,
                 "paymentDeadline", ASCENDING,
                 "grossAmount", NATURAL,

diff --git a/lis-ui/src/main/resources/web/form/invoice-form.zul b/lis-ui/src/main/resources/web/form/invoice-form.zul
index 78695297e839cac467e10adac3e7f40e66ce96f9..c77f9aaf8a650ee7cb01bc45fa72571124cc1b47 100644 (file)
--- a/lis-ui/src/main/resources/web/form/invoice-form.zul
+++ b/lis-ui/src/main/resources/web/form/invoice-form.zul
@@ -12,6 +12,16 @@
         <tabpanels>
             <tabpanel>
                 <vlayout hflex="true">
+                    <hlayout>
+                        <vlayout hflex="min">
+                            <label value="Projekt"/>
+                            <hlayout>
+                                <label value="@bind(vm.formDocument.project.humanId)"/>
+                                <separator/>
+                                <label value="@bind(vm.formDocument.project.name)"/>
+                            </hlayout>
+                        </vlayout>
+                    </hlayout>
                     <label value="Leírás"/>
                     <textbox hflex="true" instant="true"
                              value="@bind(vm.formDocument.title) @validator(vm)"
@@ -81,10 +91,18 @@
                                      disabled="@bind(vm.readonlyForm)"/>
                         </vlayout>
                     </hlayout>
-                    <label value="Tervezett"/>
-                    <checkbox mold="switch" checked="@bind(vm.formDocument.planned)" disabled="@bind(vm.readonlyForm)"/>
-                    <label value="Fizetve"/>
-                    <checkbox mold="switch" checked="@bind(vm.formDocument.paid)" disabled="@bind(vm.readonlyForm)"/>
+                    <hlayout>
+                        <vlayout>
+                            <label value="Tervezett"/>
+                            <checkbox mold="switch" checked="@bind(vm.formDocument.planned)"
+                                      disabled="@bind(vm.readonlyForm)"/>
+                        </vlayout>
+                        <vlayout>
+                            <label value="Fizetve"/>
+                            <checkbox mold="switch" checked="@bind(vm.formDocument.paid)"
+                                      disabled="@bind(vm.readonlyForm)"/>
+                        </vlayout>
+                    </hlayout>
                 </vlayout>
             </tabpanel>
             <tabpanel>

diff --git a/lis-ui/src/main/resources/web/invoices.zul b/lis-ui/src/main/resources/web/invoices.zul
index 60fa52e7535c5f017e39635e0bd959e6f35cde5f..d07b27f2c626e1bc293277e4632679231c8c4d1f 100644 (file)
--- a/lis-ui/src/main/resources/web/invoices.zul
+++ b/lis-ui/src/main/resources/web/invoices.zul
@@ -83,8 +83,8 @@
                                     sortDirection="@load(vm.cols['partner.name'].sortDirection)"/>
                         <listheader label="Partner név" sort="auto(partner.name)" align="left"
                                     sortDirection="@load(vm.cols['partner.name'].sortDirection)"/>
-                        <listheader label="Partner adószám" sort="auto(partner.vatNr)" align="left"
-                                    sortDirection="@load(vm.cols['partner.vatNr'].sortDirection)"/>
+                        <listheader label="Projekt azonosító" sort="auto(project.humanId)" align="left"
+                                    sortDirection="@load(vm.cols['project.humanId'].sortDirection)"/>
                         <listheader label="Projekt név" sort="auto(project.name)" align="left"
                                     sortDirection="@load(vm.cols['project.name'].sortDirection)"/>
                         <listheader label="Fizetési határidő" sort="auto(paymentDeadline)" align="left"
@@ -101,7 +101,7 @@
                         <listitem>
                             <listcell label="@load(each.humanId)"/>
                             <listcell label="@load(each.partner.name)"/>
-                            <listcell label="@load(each.partner.vatNr)"/>
+                            <listcell label="@load(each.project.humanId)"/>
                             <listcell label="@load(each.project.name)"/>
                             <listcell
                                     label="@load(each.paymentDeadline) @converter('hu.user.lis.ui.converter.DateToStringConverter')"/>