This is an automated email from the git hooks/post-receive script. New commit to branch feature/1187 in repository lima. See http://git.chorem.org/lima.git commit b3f089bd72f9d554865702a3dd17dba0d934173c 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/VatStatementsChartEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java index f66d246..3a6d206 100644 --- a/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java +++ b/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java @@ -21,22 +21,36 @@ */ package org.chorem.lima.enums; +import org.chorem.lima.beans.Labeled; + import java.net.URL; -public enum VatStatementsChartEnum { +import static org.nuiton.i18n.I18n.t; - IMPORT(""), SHORTENED("vat_shortened.csv"), BASE("vat_base.csv"), - DEVELOPED("vat_developed.csv"), DEFAULT("vat_default.csv"); +public enum VatStatementsChartEnum implements Labeled { - 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")); - VatStatementsChartEnum(String filePath) { - this.filePath = filePath; + protected final String filePath; + + protected String label; + VatStatementsChartEnum(String filePath, String label) { + this.filePath = filePath; + this.label = label; } public URL getDefaultFileUrl() { URL url = ImportExportEnum.getFileURL("/import/" + filePath); return url; } + + @Override + public String getLabel() { + return label; + } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx index 9667238..288adef 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx @@ -32,7 +32,6 @@ org.chorem.lima.ui.common.LabelListCellRenderer </import> - <JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> <script> diff --git 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 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"; } -#nothingLabel { - text : "lima.vatStatement.nothing"; -} -#shortened { - text : "lima.vatStatement.shortened"; - value : "{VatStatementsChartEnum.SHORTENED}"; - buttonGroup : "{getRadioButtons()}"; - selected : true; -} -#vatBase { - text : "lima.vatStatement.base"; - value : "{VatStatementsChartEnum.BASE}"; - buttonGroup : "{getRadioButtons()}"; +#description { + text : "lima.vatStatement.import.description"; + border : {BorderFactory.createEmptyBorder(6, 6, 6, 6)}; } -#developed { - text : "lima.vatStatement.developed"; - value : "{VatStatementsChartEnum.DEVELOPED}"; - buttonGroup : "{getRadioButtons()}"; +#chartVatStatementLabel { + text : "lima.vatStatement"; } -#importCSV { - text : "lima.vatStatement.import"; - value : "{VatStatementsChartEnum.IMPORT}"; - buttonGroup : "{getRadioButtons()}"; +#chartVatStatementCombo { + model : {new DefaultComboBoxModel(VatStatementsChartEnum.values())}; + renderer : {new LabelListCellRenderer()}; } #deleteVatStatementChart { - text : "lima.vatStatement.delete"; + text : "lima.vatStatement.import.delete"; selected : false; } #cancel { text : "lima.cancel"; + actionIcon : cancel; } #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/VatChartImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.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="vatStatementImportForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> - jaxx.runtime.swing.JAXXButtonGroup org.chorem.lima.enums.VatStatementsChartEnum + javax.swing.DefaultComboBoxModel + org.chorem.lima.ui.common.LabelListCellRenderer </import> - <JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> <script> @@ -37,58 +38,39 @@ getRootPane().setDefaultButton(ok); protected void performCancel() { - getRadioButtons().setSelectedValue(null); + getChartVatStatementCombo().setSelectedItem(null); dispose(); } ]]> </script> - <Table> - <row> - <cell> - <JLabel id="nothingLabel"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="shortened"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="vatBase"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="developed"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="importCSV"/> - </cell> - </row> - <row> - <cell> - <JCheckBox id='deleteVatStatementChart'/> - </cell> - </row> - <row> - <cell> - <Table> - <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="dispose()"/> - </cell> - </row> - </Table> - </cell> - </row> - </Table> + <JLabel constraints="BorderLayout.NORTH" + id="description"/> + + <JPanel constraints="BorderLayout.CENTER" + layout="{new BorderLayout()}"> + + <Table constraints="BorderLayout.CENTER"> + <row> + <cell anchor="east"> + <JLabel id="chartVatStatementLabel"/> + </cell> + <cell anchor="west"> + <JComboBox id="chartVatStatementCombo"/> + </cell> + </row> + </Table> + + <JCheckBox constraints="BorderLayout.SOUTH" + id="deleteVatStatementChart"/> + + </JPanel> + + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css index 3f47d08..1dfeea2 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css @@ -23,20 +23,21 @@ title : "lima.vatStatement.movement"; } -#labelLabel { - text : "lima.vatStatement.label"; +#masterLabel { + text : "lima.vatStatement.master"; } -#labelTextField { - text : "{getVatStatement().getLabel()}"; +#masterTextField { + text : "{getVatStatement().getMasterVatStatement().getLabel()}"; + enabled : false; } -#boxNameLabel { - text : "lima.vatStatement.boxName"; +#labelLabel { + text : "lima.vatStatement.label"; } -#boxNameTextField { - text : "{getVatStatement().getBoxName()}"; +#labelTextField { + text : "{getVatStatement().getLabel()}"; } #accountsLabel { @@ -47,19 +48,21 @@ text : "{getVatStatement().getAccounts()}"; } -#masterLabel { - text : "lima.vatStatement.master"; +#boxNameLabel { + text : "lima.vatStatement.boxName"; } -#masterTextField { - text : "{getVatStatement().getMasterVatStatement().getLabel()}"; - editable : false; +#boxNameTextField { + text : "{getVatStatement().getBoxName()}"; } + #cancel { text : "lima.cancel"; + actionIcon : cancel; } #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/VatChartMovementForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx index 14dc657..cca1dea 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx @@ -22,6 +22,7 @@ <JDialog id="VatChartMovementForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> @@ -46,58 +47,54 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> - <cell fill="horizontal"> - <JLabel id="labelLabel"/> + <cell anchor="east"> + <JLabel id="masterLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="labelTextField"/> - <Document javaBean="getLabelTextField().getDocument()" - onInsertUpdate='getVatStatement().setLabel(getLabelTextField().getText())' - onRemoveUpdate='getVatStatement().setLabel(getLabelTextField().getText())'/> + <JTextField id="masterTextField"/> </cell> </row> + <row> - <cell fill="horizontal"> - <JLabel id="boxNameLabel"/> + <cell anchor="east"> + <JLabel id="labelLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="boxNameTextField"/> - <Document javaBean="getBoxNameTextField().getDocument()" - onInsertUpdate='getVatStatement().setBoxName(getBoxNameTextField().getText())' - onRemoveUpdate='getVatStatement().setBoxName(getBoxNameTextField().getText())'/> + <JTextField id="labelTextField" + onKeyReleased="getVatStatement().setLabel(labelTextField.getText())"/> </cell> </row> + <row> - <cell fill="horizontal"> + <cell anchor="east"> <JLabel id="accountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="accountsTextField"/> - <Document javaBean="getAccountsTextField().getDocument()" - onInsertUpdate='getVatStatement().setAccounts(getAccountsTextField().getText())' - onRemoveUpdate='getVatStatement().setAccounts(getAccountsTextField().getText())'/> + <JTextField id="accountsTextField" + onKeyReleased="getVatStatement().setAccounts(getAccountsTextField().getText())"/> </cell> </row> + <row> - <cell fill="horizontal"> - <JLabel id="masterLabel"/> + <cell anchor="east"> + <JLabel id="boxNameLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="masterTextField"/> - </cell> - </row> - <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="dispose()"/> + <JTextField id="boxNameTextField" + onKeyReleased="getVatStatement().setBoxName(getAccountsTextField().getText())"/> </cell> </row> + </Table> + + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java index cc56408..f8d0ea9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java @@ -197,7 +197,6 @@ public class VatChartViewHandler implements ServiceListener { treePath, vatStatement); } } - refresh(); } public void importVatStatementChart() { @@ -218,17 +217,17 @@ public class VatChartViewHandler implements ServiceListener { form.setLocationRelativeTo(view); form.setVisible(true); - Object value = form.getRadioButtons().getSelectedValue(); + Object value = form.getChartVatStatementCombo().getSelectedItem(); // if action confirmed if (value != null) { if (form.getDeleteVatStatementChart().isSelected()) { vatStatementService.removeAllVatStatement(); } - VatStatementsChartEnum defaultVatStatementsEnum = + VatStatementsChartEnum vatStatementsEnum = (VatStatementsChartEnum) value; ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT, - null, null, true); + null, vatStatementsEnum.getDefaultFileUrl(), 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 36f012a..5c5afd6 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 @@ -473,11 +473,14 @@ lima.vatStatement=VAT statement chart lima.vatStatement.accounts=List of accounts lima.vatStatement.base=Base VAT statement chart lima.vatStatement.boxName=PDF BoxName +lima.vatStatement.default= lima.vatStatement.delete=Delete actual VAT statement chart before import new lima.vatStatement.delete.parent=Remove parent lima.vatStatement.developed=Developped VAT statement chart lima.vatStatement.error.alreadyExistVatStatement= lima.vatStatement.import=Impport CSV +lima.vatStatement.import.delete= +lima.vatStatement.import.description= lima.vatStatement.label=Label lima.vatStatement.master=Master VAT statement lima.vatStatement.movement=Movement 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 098cd95..2d5abde 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 @@ -483,20 +483,21 @@ lima.update=Modifier lima.update.shortcut=Modifier (Ctrl+M) lima.vatStatement=Plan TVA lima.vatStatement.accounts=Liste des comptes -lima.vatStatement.base=Plan TVA de base +lima.vatStatement.base=Standard lima.vatStatement.boxName=PDF BoxName -lima.vatStatement.delete=Supprimer le plan TVA actuel avant d'importer +lima.vatStatement.default=Par défaut lima.vatStatement.delete.parent=Veuillez supprimer les sous-catégories de cette ligne -lima.vatStatement.developed=Plan TVA développé +lima.vatStatement.developed=Développé lima.vatStatement.error.alreadyExistVatStatement=u00C9chec \: Le plan %s exist déjà \! -lima.vatStatement.import=Import CSV +lima.vatStatement.import=Importé +lima.vatStatement.import.delete=Supprimer le plan TVA actuel avant d'importer +lima.vatStatement.import.description=Sélectionnez un plan de TVA lima.vatStatement.label=Libellé lima.vatStatement.master=Plan parent lima.vatStatement.movement=Regroupement lima.vatStatement.movement.add=Ajouter un regrouprement (Ctrl+N) -lima.vatStatement.nothing=<html><center>Aucun plan TVA chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> lima.vatStatement.remove.confirm=Etes vous sur de vouloir supprimer cette ligne ? lima.vatStatement.remove.title=supprimer de ligne ? -lima.vatStatement.shortened=Plan TVA abrégé +lima.vatStatement.shortened=Abrégé lima.vatStatements=Plan TVA lima.wait=Traitement en cours -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.