From scm@users.chorem.org Fri May 15 07:16:41 2015
From: "chorem.org scm" <scm@users.chorem.org>
To: lima-commits@list.chorem.org
Subject: [Lima-commits] 08/28: refs #1187 : Vat chart popups
Date: Fri, 15 May 2015 07:16:45 +0000
Message-ID: <20150515071640.E816E5C4070@goh.codelutin.com>
In-Reply-To: <20150515071637.8551.35000@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============2329156993403788766=="

--===============2329156993403788766==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

This is an automated email from the git hooks/post-receive script.

New commit to branch feature/1176 in repository lima.

See http://git.chorem.org/lima.git

commit b7d050836fb9584e2a1aac069c93ae41d34a6c0d
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Tue Mar 31 09:09:09 2015 +0200

    refs #1187 : Vat chart popups
---
 .../chorem/lima/enums/VatStatementsChartEnum.java  | 26 +++++--
 .../FinancialStatementImportForm.jaxx              |  1 -
 .../chorem/lima/ui/vatchart/VatChartImportForm.css | 35 ++++-----
 .../lima/ui/vatchart/VatChartImportForm.jaxx       | 84 +++++++++-----------=
--
 .../lima/ui/vatchart/VatChartMovementForm.css      | 29 ++++----
 .../lima/ui/vatchart/VatChartMovementForm.jaxx     | 59 ++++++++-------
 .../lima/ui/vatchart/VatChartViewHandler.java      |  7 +-
 .../resources/i18n/lima-swing_en_GB.properties     |  3 +
 .../resources/i18n/lima-swing_fr_FR.properties     | 13 ++--
 9 files changed, 122 insertions(+), 135 deletions(-)

diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChar=
tEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChar=
tEnum.java
index f66d246..3a6d206 100644
--- a/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.j=
ava
+++ b/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.j=
ava
@@ -21,22 +21,36 @@
  */
 package org.chorem.lima.enums;
=20
+import org.chorem.lima.beans.Labeled;
+
 import java.net.URL;
=20
-public enum VatStatementsChartEnum {
+import static org.nuiton.i18n.I18n.t;
=20
-    IMPORT(""), SHORTENED("vat_shortened.csv"), BASE("vat_base.csv"),
-    DEVELOPED("vat_developed.csv"), DEFAULT("vat_default.csv");
+public enum VatStatementsChartEnum implements Labeled {
=20
-    private final String filePath;
+    DEFAULT("vat_default.csv", t("lima.vatStatement.default")),
+    SHORTENED("vat_shortened.csv", t("lima.vatStatement.shortened")),
+    BASE("vat_base.csv", t("lima.vatStatement.base")),
+    DEVELOPED("vat_developed.csv", t("lima.vatStatement.developed")),
+    IMPORT("", t("lima.vatStatement.import"));
=20
-    VatStatementsChartEnum(String filePath) {
-        this.filePath =3D filePath;
+    protected final String filePath;
+
+    protected String label;
=20
+    VatStatementsChartEnum(String filePath, String label) {
+        this.filePath =3D filePath;
+        this.label =3D label;
     }
=20
     public URL getDefaultFileUrl() {
         URL url =3D ImportExportEnum.getFileURL("/import/" + filePath);
         return url;
     }
+
+    @Override
+    public String getLabel() {
+        return label;
+    }
 }
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementch=
art/FinancialStatementImportForm.jaxx b/lima-swing/src/main/java/org/chorem/l=
ima/ui/financialstatementchart/FinancialStatementImportForm.jaxx
index 9667238..288adef 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/Fin=
ancialStatementImportForm.jaxx
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/Fin=
ancialStatementImportForm.jaxx
@@ -32,7 +32,6 @@
     org.chorem.lima.ui.common.LabelListCellRenderer
   </import>
=20
-  <JAXXButtonGroup id=3D"radioButtons" javaBean=3D'new JAXXButtonGroup()'/>
   <Boolean id=3D"addState" javaBean=3D'true'/>
=20
   <script>
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImp=
ortForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartIm=
portForm.css
index 568554c..362e236 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm=
.css
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm=
.css
@@ -20,47 +20,36 @@
  * #L%
  */
 #vatStatementImportFormg {
-    title : "lima.vatStatement.import.form";
+    title : "lima.vatStatement.import";
 }
=20
-#nothingLabel {
-    text : "lima.vatStatement.nothing";
-}
=20
-#shortened {
-    text : "lima.vatStatement.shortened";
-    value : "{VatStatementsChartEnum.SHORTENED}";
-    buttonGroup : "{getRadioButtons()}";
-    selected : true;
-}
=20
-#vatBase {
-    text : "lima.vatStatement.base";
-    value : "{VatStatementsChartEnum.BASE}";
-    buttonGroup : "{getRadioButtons()}";
+#description {
+    text : "lima.vatStatement.import.description";
+    border : {BorderFactory.createEmptyBorder(6, 6, 6, 6)};
 }
=20
-#developed {
-    text : "lima.vatStatement.developed";
-    value : "{VatStatementsChartEnum.DEVELOPED}";
-    buttonGroup : "{getRadioButtons()}";
+#chartVatStatementLabel {
+    text : "lima.vatStatement";
 }
=20
-#importCSV {
-    text : "lima.vatStatement.import";
-    value : "{VatStatementsChartEnum.IMPORT}";
-    buttonGroup : "{getRadioButtons()}";
+#chartVatStatementCombo {
+    model : {new DefaultComboBoxModel(VatStatementsChartEnum.values())};
+    renderer : {new LabelListCellRenderer()};
 }
=20
 #deleteVatStatementChart {
-    text : "lima.vatStatement.delete";
+    text : "lima.vatStatement.import.delete";
     selected : false;
 }
=20
 #cancel {
     text : "lima.cancel";
+    actionIcon : cancel;
 }
=20
 #ok {
     text : "lima.ok";
+    actionIcon : ok;
 }
\ No newline at end of file
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImp=
ortForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartI=
mportForm.jaxx
index 4cc2852..7c924a3 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm=
.jaxx
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm=
.jaxx
@@ -22,14 +22,15 @@
 <JDialog id=3D"vatStatementImportForm"
          modal=3D"true"
          defaultCloseOperation=3D"{JDialog.DO_NOTHING_ON_CLOSE}"
+         layout=3D"{new BorderLayout()}"
          onWindowClosing=3D"performCancel();">
=20
   <import>
-    jaxx.runtime.swing.JAXXButtonGroup
     org.chorem.lima.enums.VatStatementsChartEnum
+    javax.swing.DefaultComboBoxModel
+    org.chorem.lima.ui.common.LabelListCellRenderer
   </import>
=20
-  <JAXXButtonGroup id=3D"radioButtons" javaBean=3D'new JAXXButtonGroup()'/>
   <Boolean id=3D"addState" javaBean=3D'true'/>
=20
   <script>
@@ -37,58 +38,39 @@
=20
     getRootPane().setDefaultButton(ok);
     protected void performCancel() {
-        getRadioButtons().setSelectedValue(null);
+        getChartVatStatementCombo().setSelectedItem(null);
         dispose();
     }
     ]]>
   </script>
=20
-  <Table>
-    <row>
-      <cell>
-        <JLabel id=3D"nothingLabel"/>
-      </cell>
-    </row>
-    <row>
-      <cell>
-        <JRadioButton id=3D"shortened"/>
-      </cell>
-    </row>
-    <row>
-      <cell>
-        <JRadioButton id=3D"vatBase"/>
-      </cell>
-    </row>
-    <row>
-      <cell>
-        <JRadioButton id=3D"developed"/>
-      </cell>
-    </row>
-    <row>
-      <cell>
-        <JRadioButton id=3D"importCSV"/>
-      </cell>
-    </row>
-    <row>
-      <cell>
-        <JCheckBox id=3D'deleteVatStatementChart'/>
-      </cell>
-    </row>
-    <row>
-      <cell>
-        <Table>
-          <row>
-            <cell fill=3D"none">
-              <JButton id=3D"cancel"
-                       onActionPerformed=3D"performCancel()"/>
-            </cell>
-            <cell fill=3D"none">
-              <JButton id=3D"ok"
-                       onActionPerformed=3D"dispose()"/>
-            </cell>
-          </row>
-        </Table>
-      </cell>
-    </row>
-  </Table>
+  <JLabel constraints=3D"BorderLayout.NORTH"
+          id=3D"description"/>
+
+  <JPanel constraints=3D"BorderLayout.CENTER"
+          layout=3D"{new BorderLayout()}">
+
+    <Table constraints=3D"BorderLayout.CENTER">
+      <row>
+        <cell anchor=3D"east">
+          <JLabel id=3D"chartVatStatementLabel"/>
+        </cell>
+        <cell anchor=3D"west">
+          <JComboBox id=3D"chartVatStatementCombo"/>
+        </cell>
+      </row>
+    </Table>
+
+    <JCheckBox constraints=3D"BorderLayout.SOUTH"
+               id=3D"deleteVatStatementChart"/>
+
+  </JPanel>
+
+  <JPanel constraints=3D"BorderLayout.SOUTH"
+          layout=3D'{new GridLayout(1,0)}'>
+    <JButton id=3D"cancel"
+             onActionPerformed=3D"performCancel()"/>
+    <JButton id=3D"ok"
+             onActionPerformed=3D"dispose()"/>
+  </JPanel>
 </JDialog>
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMov=
ementForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChart=
MovementForm.css
index 3f47d08..1dfeea2 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementFo=
rm.css
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementFo=
rm.css
@@ -23,20 +23,21 @@
     title : "lima.vatStatement.movement";
 }
=20
-#labelLabel {
-    text : "lima.vatStatement.label";
+#masterLabel {
+    text : "lima.vatStatement.master";
 }
=20
-#labelTextField {
-    text : "{getVatStatement().getLabel()}";
+#masterTextField {
+    text : "{getVatStatement().getMasterVatStatement().getLabel()}";
+    enabled : false;
 }
=20
-#boxNameLabel {
-    text : "lima.vatStatement.boxName";
+#labelLabel {
+    text : "lima.vatStatement.label";
 }
=20
-#boxNameTextField {
-    text : "{getVatStatement().getBoxName()}";
+#labelTextField {
+    text : "{getVatStatement().getLabel()}";
 }
=20
 #accountsLabel {
@@ -47,19 +48,21 @@
     text : "{getVatStatement().getAccounts()}";
 }
=20
-#masterLabel {
-    text : "lima.vatStatement.master";
+#boxNameLabel {
+    text : "lima.vatStatement.boxName";
 }
=20
-#masterTextField {
-    text : "{getVatStatement().getMasterVatStatement().getLabel()}";
-    editable : false;
+#boxNameTextField {
+    text : "{getVatStatement().getBoxName()}";
 }
=20
+
 #cancel {
     text : "lima.cancel";
+    actionIcon : cancel;
 }
=20
 #ok {
     text : "lima.ok";
+    actionIcon : ok;
 }
\ No newline at end of file
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMov=
ementForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChar=
tMovementForm.jaxx
index 14dc657..cca1dea 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementFo=
rm.jaxx
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementFo=
rm.jaxx
@@ -22,6 +22,7 @@
 <JDialog id=3D"VatChartMovementForm"
          modal=3D"true"
          defaultCloseOperation=3D"{JDialog.DO_NOTHING_ON_CLOSE}"
+         layout=3D"{new BorderLayout()}"
          onWindowClosing=3D"performCancel();">
=20
   <import>
@@ -46,58 +47,54 @@
     ]]>
   </script>
=20
-  <Table>
+  <Table constraints=3D"BorderLayout.CENTER">
=20
     <row>
-      <cell fill=3D"horizontal">
-        <JLabel id=3D"labelLabel"/>
+      <cell anchor=3D"east">
+        <JLabel id=3D"masterLabel"/>
       </cell>
       <cell fill=3D"horizontal">
-        <JTextField id=3D"labelTextField"/>
-        <Document javaBean=3D"getLabelTextField().getDocument()"
-                  onInsertUpdate=3D'getVatStatement().setLabel(getLabelTextF=
ield().getText())'
-                  onRemoveUpdate=3D'getVatStatement().setLabel(getLabelTextF=
ield().getText())'/>
+        <JTextField id=3D"masterTextField"/>
       </cell>
     </row>
+
     <row>
-      <cell fill=3D"horizontal">
-        <JLabel id=3D"boxNameLabel"/>
+      <cell anchor=3D"east">
+        <JLabel id=3D"labelLabel"/>
       </cell>
       <cell fill=3D"horizontal">
-        <JTextField id=3D"boxNameTextField"/>
-        <Document javaBean=3D"getBoxNameTextField().getDocument()"
-                  onInsertUpdate=3D'getVatStatement().setBoxName(getBoxNameT=
extField().getText())'
-                  onRemoveUpdate=3D'getVatStatement().setBoxName(getBoxNameT=
extField().getText())'/>
+        <JTextField id=3D"labelTextField"
+                    onKeyReleased=3D"getVatStatement().setLabel(labelTextFie=
ld.getText())"/>
       </cell>
     </row>
+
     <row>
-      <cell fill=3D"horizontal">
+      <cell anchor=3D"east">
         <JLabel id=3D"accountsLabel"/>
       </cell>
       <cell fill=3D"horizontal">
-        <JTextField id=3D"accountsTextField"/>
-        <Document javaBean=3D"getAccountsTextField().getDocument()"
-                  onInsertUpdate=3D'getVatStatement().setAccounts(getAccount=
sTextField().getText())'
-                  onRemoveUpdate=3D'getVatStatement().setAccounts(getAccount=
sTextField().getText())'/>
+        <JTextField id=3D"accountsTextField"
+                    onKeyReleased=3D"getVatStatement().setAccounts(getAccoun=
tsTextField().getText())"/>
       </cell>
     </row>
+
     <row>
-      <cell fill=3D"horizontal">
-        <JLabel id=3D"masterLabel"/>
+      <cell anchor=3D"east">
+        <JLabel id=3D"boxNameLabel"/>
       </cell>
       <cell fill=3D"horizontal">
-        <JTextField id=3D"masterTextField"/>
-      </cell>
-    </row>
-    <row>
-      <cell fill=3D"none">
-        <JButton id=3D"cancel"
-                 onActionPerformed=3D"performCancel()"/>
-      </cell>
-      <cell fill=3D"none">
-        <JButton id=3D"ok"
-                 onActionPerformed=3D"dispose()"/>
+        <JTextField id=3D"boxNameTextField"
+                    onKeyReleased=3D"getVatStatement().setBoxName(getAccount=
sTextField().getText())"/>
       </cell>
     </row>
+
   </Table>
+
+  <JPanel constraints=3D"BorderLayout.SOUTH"
+          layout=3D'{new GridLayout(1,0)}'>
+    <JButton id=3D"cancel"
+             onActionPerformed=3D"performCancel()"/>
+    <JButton id=3D"ok"
+             onActionPerformed=3D"dispose()"/>
+  </JPanel>
 </JDialog>
diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartVie=
wHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChart=
ViewHandler.java
index 6ac3baf..a876f34 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandle=
r.java
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandle=
r.java
@@ -197,7 +197,6 @@ public class VatChartViewHandler implements ServiceListen=
er {
                         treePath, vatStatement);
             }
         }
-        refresh();
     }
=20
     public void importVatStatementChart() {
@@ -218,17 +217,17 @@ public class VatChartViewHandler implements ServiceList=
ener {
         form.setLocationRelativeTo(view);
         form.setVisible(true);
=20
-        Object value =3D form.getRadioButtons().getSelectedValue();
+        Object value =3D form.getChartVatStatementCombo().getSelectedItem();
         // if action confirmed
         if (value !=3D null) {
             if (form.getDeleteVatStatementChart().isSelected()) {
                 vatStatementService.removeAllVatStatement();
             }
-            VatStatementsChartEnum defaultVatStatementsEnum =3D
+            VatStatementsChartEnum vatStatementsEnum =3D
                     (VatStatementsChartEnum) value;
             ImportExport importExport =3D new ImportExport(view);
             importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT,
-                                      null, null, true);
+                                      null, vatStatementsEnum.getDefaultFile=
Url(), true);
             refresh();
         }
     }
diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b=
/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
index eb3d98b..e714505 100644
--- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
+++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
@@ -469,11 +469,14 @@ lima.vatStatement=3DVAT statement chart
 lima.vatStatement.accounts=3DList of accounts
 lima.vatStatement.base=3DBase VAT statement chart
 lima.vatStatement.boxName=3DPDF BoxName
+lima.vatStatement.default=3D
 lima.vatStatement.delete=3DDelete actual VAT statement chart before import n=
ew
 lima.vatStatement.delete.parent=3DRemove parent
 lima.vatStatement.developed=3DDevelopped VAT statement chart
 lima.vatStatement.error.alreadyExistVatStatement=3D
 lima.vatStatement.import=3DImpport CSV
+lima.vatStatement.import.delete=3D
+lima.vatStatement.import.description=3D
 lima.vatStatement.label=3DLabel
 lima.vatStatement.master=3DMaster VAT statement
 lima.vatStatement.movement=3DMovement
diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b=
/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
index 8cb3330..1045050 100644
--- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
+++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
@@ -485,20 +485,21 @@ lima.update=3DModifier
 lima.update.shortcut=3DModifier (Ctrl+M)
 lima.vatStatement=3DPlan TVA
 lima.vatStatement.accounts=3DListe des comptes
-lima.vatStatement.base=3DPlan TVA de base
+lima.vatStatement.base=3DStandard
 lima.vatStatement.boxName=3DPDF BoxName
-lima.vatStatement.delete=3DSupprimer le plan TVA actuel avant d'importer
+lima.vatStatement.default=3DPar d=C3=A9faut
 lima.vatStatement.delete.parent=3DVeuillez supprimer les sous-cat=C3=A9gorie=
s de cette ligne
-lima.vatStatement.developed=3DPlan TVA d=C3=A9velopp=C3=A9
+lima.vatStatement.developed=3DD=C3=A9velopp=C3=A9
 lima.vatStatement.error.alreadyExistVatStatement=3Du00C9chec \: Le plan %s e=
xist d=C3=A9j=C3=A0 \!
-lima.vatStatement.import=3DImport CSV
+lima.vatStatement.import=3DImport=C3=A9
+lima.vatStatement.import.delete=3DSupprimer le plan TVA actuel avant d'impor=
ter
+lima.vatStatement.import.description=3DS=C3=A9lectionnez un plan de TVA
 lima.vatStatement.label=3DLibell=C3=A9
 lima.vatStatement.master=3DPlan parent
 lima.vatStatement.movement=3DRegroupement
 lima.vatStatement.movement.add=3DAjouter un regrouprement (Ctrl+N)
-lima.vatStatement.nothing=3D<html><center>Aucun plan TVA charg=C3=A9<br/>Veu=
illez s=C3=A9lectionner un plan par d=C3=A9faut, <br/>importer un plan person=
nalis=C3=A9<br/> ou annuler pour cr=C3=A9er votre propre plan.</center></html>
 lima.vatStatement.remove.confirm=3DEtes vous sur de vouloir supprimer cette =
ligne ?
 lima.vatStatement.remove.title=3Dsupprimer de ligne ?
-lima.vatStatement.shortened=3DPlan TVA abr=C3=A9g=C3=A9
+lima.vatStatement.shortened=3DAbr=C3=A9g=C3=A9
 lima.vatStatements=3DPlan TVA
 lima.wait=3DTraitement en cours

--=20
To stop receiving notification emails like this one, please contact
chorem.org SCM administrator <admin+scm@chorem.org>.

--===============2329156993403788766==--