v0.1.1

diff --git a/lis-app/pom.xml b/lis-app/pom.xml
index e4b474469ed1313510056fa1ed2b5057254b3e69..f59bdf692f97a93f2b33cdf75a0ff1f39732c04b 100644 (file)
--- a/lis-app/pom.xml
+++ b/lis-app/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>hu.user</groupId>
     <artifactId>lis-app</artifactId>
-    <version>0.1.0-SNAPSHOT</version>
+    <version>0.1.1-SNAPSHOT</version>
     <parent>
         <groupId>hu.user</groupId>
         <artifactId>lis</artifactId>

diff --git a/lis-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java b/lis-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java
index dd5a98ceafe99af0060469e487496893bf7f4108..dde634b91a26d8f3dbc3a6390c471670dd3a8b58 100644 (file)
--- a/lis-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java
+++ b/lis-ui/src/main/java/hu/user/lis/ui/converter/DoubleToStringConverter.java
@@ -2,13 +2,13 @@ package hu.user.lis.ui.converter;
 
 import org.zkoss.bind.BindContext;
 import org.zkoss.bind.Converter;
-import org.zkoss.zul.Listcell;
+import org.zkoss.zk.ui.Component;
 
 import java.math.RoundingMode;
 import java.text.NumberFormat;
 import java.util.Locale;
 
-public class DoubleToStringConverter implements Converter<String, Double, Listcell> {
+public class DoubleToStringConverter implements Converter<String, Double, Component> {
     static private NumberFormat nf = NumberFormat.getInstance(new Locale("hu", "HU"));
 
     static {
@@ -18,12 +18,12 @@ public class DoubleToStringConverter implements Converter<String, Double, Listce
     }
 
     @Override
-    public String coerceToUi(Double date, Listcell listCell, BindContext bindContext) {
+    public String coerceToUi(Double date, Component listCell, BindContext bindContext) {
         return nf.format(date);
     }
 
     @Override
-    public Double coerceToBean(String data, Listcell listCell, BindContext bindContext) {
+    public Double coerceToBean(String data, Component listCell, BindContext bindContext) {
         return null;
     }
 }

diff --git a/lis-ui/src/main/resources/web/partner-selector.zul b/lis-ui/src/main/resources/web/partner-selector.zul
index 21f89e9e286a90e1ad2facacedbc17cf7b4b8680..54ae1ecce3a400675fc9928719d78a3c5143b213 100644 (file)
--- a/lis-ui/src/main/resources/web/partner-selector.zul
+++ b/lis-ui/src/main/resources/web/partner-selector.zul
@@ -1,6 +1,6 @@
 <zk xmlns:c="client">
-    <hlayout hflex="true">
-        <bandbox id="partnerBandBox" autodrop="true" iconSclass="z-icon-sort-down"
+    <hlayout>
+        <bandbox id="partnerBandBox" autodrop="true" iconSclass="z-icon-sort-down" hflex="true"
                  value="@load(vm.formDocument.partner) @converter('hu.user.lis.ui.converter.PartnerToNameConverter')"
                  onChanging="@command('onPartnerBandChanging')" onOpen="@command('onPartnerBandOpen')"
                  forward="onOK=submit.onClick, onCancel=cancel.onClick">

diff --git a/lis-ui/src/main/resources/web/project-editor.zul b/lis-ui/src/main/resources/web/project-editor.zul
index 201531004d38a2fe5fecdaf2e39d59bd5f2a6abe..aa0bfadeba5a7e91239b75c705859cc398df7ae7 100644 (file)
--- a/lis-ui/src/main/resources/web/project-editor.zul
+++ b/lis-ui/src/main/resources/web/project-editor.zul
@@ -14,55 +14,60 @@
                                 </tabs>
                                 <tabpanels>
                                     <tabpanel>
-                                        <vlayout hflex="true">
-                                            <hlayout>
-                                                <vlayout>
-                                                    <label value="Azonosító"/>
-                                                    <textbox instant="true" width="180px"
-                                                             value="@bind(vm.formDocument.humanId) @validator(vm)"
-                                                             readonly="true"
-                                                             forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
-                                                </vlayout>
-                                                <vlayout hflex="true">
-                                                    <label value="Megnevezés"/>
-                                                    <textbox instant="true" hflex="true"
-                                                             value="@bind(vm.formDocument.name) @validator(vm)"
-                                                             forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
-                                                </vlayout>
-                                            </hlayout>
-                                            <hlayout>
-                                                <vlayout>
-                                                    <label value="Ügyfél"/>
-                                                    <partner-selector/>
-                                                </vlayout>
-                                                <vlayout hflex="true">
-                                                    <label value="Kapcsolattartó"/>
-                                                    <textbox instant="true" hflex="true"
-                                                             value="@bind(vm.formDocument.contactName) @validator(vm)"
-                                                             forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
-                                                </vlayout>
-                                            </hlayout>
-                                            <hlayout>
-                                                <vlayout>
-                                                    <label value="Státusz"/>
-                                                    <selectbox model="@load(vm.projectStatusDataModel)" width="180px"
-                                                               selectedIndex="@bind(vm.formDocument.projectStatusId) @converter(vm.projectStatusConverter) @validator(vm)"
-                                                               forward="onOK=submit.onClick, onCancel=cancel.onClick">
-                                                        <template name="model">
-                                                            ${each.name}
-                                                        </template>
-                                                    </selectbox>
-
-                                                </vlayout>
-                                                <vlayout>
-                                                    <label value="Aktív"/>
-                                                    <checkbox mold="switch"
-                                                              checked="@bind(vm.formDocument.active) @validator(vm)"/>
-
-                                                </vlayout>
-
-                                            </hlayout>
-                                        </vlayout>
+                                        <grid sclass="no-hover-grid" oddRowSclass="none"
+                                              forward="onOK=submit.onClick, onCancel=cancel.onClick">
+                                            <columns visible="false">
+                                                <column width="40%"/>
+                                                <column width="60%"/>
+                                            </columns>
+                                            <rows>
+                                                <row>
+                                                    <vlayout>
+                                                        <label value="Azonosító"/>
+                                                        <textbox instant="true" width="100%"
+                                                                 value="@bind(vm.formDocument.humanId) @validator(vm)"
+                                                                 readonly="true"
+                                                                 forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
+                                                    </vlayout>
+                                                    <vlayout>
+                                                        <label value="Megnevezés"/>
+                                                        <textbox instant="true" width="100%"
+                                                                 value="@bind(vm.formDocument.name) @validator(vm)"
+                                                                 forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
+                                                    </vlayout>
+                                                </row>
+                                                <row>
+                                                    <vlayout>
+                                                        <label value="Ügyfél"/>
+                                                        <partner-selector/>
+                                                    </vlayout>
+                                                    <vlayout>
+                                                        <label value="Kapcsolattartó"/>
+                                                        <textbox instant="true" width="100%"
+                                                                 value="@bind(vm.formDocument.contactName) @validator(vm)"
+                                                                 forward="onOK=submit.onClick, onCancel=cancel.onClick"/>
+                                                    </vlayout>
+                                                </row>
+                                                <row>
+                                                    <vlayout>
+                                                        <label value="Státusz"/>
+                                                        <selectbox model="@load(vm.projectStatusDataModel)"
+                                                                   width="100%"
+                                                                   selectedIndex="@bind(vm.formDocument.projectStatusId) @converter(vm.projectStatusConverter) @validator(vm)"
+                                                                   forward="onOK=submit.onClick, onCancel=cancel.onClick">
+                                                            <template name="model">
+                                                                ${each.name}
+                                                            </template>
+                                                        </selectbox>
+                                                    </vlayout>
+                                                    <vlayout>
+                                                        <label value="Aktív"/>
+                                                        <checkbox mold="switch"
+                                                                  checked="@bind(vm.formDocument.active) @validator(vm)"/>
+                                                    </vlayout>
+                                                </row>
+                                            </rows>
+                                        </grid>
                                     </tabpanel>
                                 </tabpanels>
                             </tabbox>
@@ -76,20 +81,23 @@
                                 <tabpanels>
                                     <tabpanel>
                                         <vlayout vflex="true">
-                                            <listbox model="@load(vm.incomeMarginsDataModel)" vflex="true"
-                                                     forward="onOK=submit.onClick, onCancel=cancel.onClick">
-                                                <listhead visible="true">
-                                                    <listheader label="Pénznem" align="left"/>
-                                                    <listheader label="Összeg" align="right"/>
-                                                </listhead>
-                                                <template name="model">
-                                                    <listitem>
-                                                        <listcell label="@load(each.currency)"/>
-                                                        <listcell
-                                                                label="@load(each.amount) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"/>
-                                                    </listitem>
-                                                </template>
-                                            </listbox>
+                                            <grid sclass="no-hover-grid" oddRowSclass="none"
+                                                  model="@load(vm.incomeMarginsDataModel)"
+                                                  forward="onOK=submit.onClick, onCancel=cancel.onClick">
+                                                <columns visible="false">
+                                                    <column width="50px" label="Pénznem"/>
+                                                    <column width="100%" label="Összeg"/>
+                                                </columns>
+                                                <rows>
+                                                    <template name="model">
+                                                        <row>
+                                                            <label value="@load(each.currency)"/>
+                                                            <label value="@load(each.amount) @converter('hu.user.lis.ui.converter.DoubleToStringConverter')"/>
+                                                        </row>
+                                                    </template>
+                                                </rows>
+                                            </grid>
+
                                         </vlayout>
                                     </tabpanel>
                                 </tabpanels>

diff --git a/lis-ui/src/main/resources/web/project-selector.zul b/lis-ui/src/main/resources/web/project-selector.zul
index 24d1cc9b47243afc65e75573bc7db415599fa817..b1488b4ca759b8a2b9bd2a55e462bc476b2413ba 100644 (file)
--- a/lis-ui/src/main/resources/web/project-selector.zul
+++ b/lis-ui/src/main/resources/web/project-selector.zul
@@ -1,5 +1,5 @@
 <zk xmlns:c="client">
-    <hlayout hflex="min">
+    <hlayout>
         <bandbox id="projectBandBox" autodrop="true" iconSclass="z-icon-sort-down" hflex="true"
                  value="@load(vm.formDocument.project) @converter('hu.user.lis.ui.converter.ProjectToInfoConverter')"
                  onChanging="@command('onProjectBandChanging')" onOpen="@command('onProjectBandOpen')"

diff --git a/lis-ui/src/main/resources/web/static/css/webclient.css b/lis-ui/src/main/resources/web/static/css/webclient.css
index 18d486a8d3b722ba46b7d4c744de2315ea36685f..60942b55ed627b5c7f20089391a30940fb059a19 100644 (file)
--- a/lis-ui/src/main/resources/web/static/css/webclient.css
+++ b/lis-ui/src/main/resources/web/static/css/webclient.css
@@ -21,6 +21,14 @@
   font-style: italic;
   opacity: 1;
 }
+
+.no-hover-grid .z-row .z-grid-odd,
+.no-hover-grid .z-row:hover>.z-row-inner,
+.no-hover-grid .z-row:hover>.z-cell {
+    background: none;
+}
+/**/
+
 textarea {
     resize: none;
 }

diff --git a/lis-ui/src/main/resources/web/timeout.zul b/lis-ui/src/main/resources/web/timeout.zul
index 9709c4ca8a4b08d95977d4a233b4eec3a8049a1b..4dccfd02e60fecfd11d23a6c229d55c8c9532ef4 100644 (file)
--- a/lis-ui/src/main/resources/web/timeout.zul
+++ b/lis-ui/src/main/resources/web/timeout.zul
@@ -1,9 +1,9 @@
 <zk>
     <window title="A munkamenet lejárt!" border="normal" width="500px" height="250px" position="center"
             mode="overlapped">
-        <vlayout hflex="true" vflex="true">
+        <vbox hflex="true" vflex="true" align="center" pack="center">
             <!--            <a href="/login">Bejelentkezés</a>-->
             <a href="/">Tovább</a>
-        </vlayout>
+        </vbox>
     </window>
 </zk>
\ No newline at end of file

diff --git a/start-lis.sh b/start-lis.sh
new file mode 100644 (file)
index 0000000..a8876ce
--- /dev/null
+++ b/start-lis.sh
@@ -0,0 +1 @@
+java -DLIS-APPLICATION -jar lis-app-0.1.1-SNAPSHOT.jar > /dev/null 2>&1 & 

diff --git a/stop-lis.sh b/stop-lis.sh
new file mode 100644 (file)
index 0000000..b0804d4
--- /dev/null
+++ b/stop-lis.sh
@@ -0,0 +1 @@
+pkill -f LIS-APPLICATION