This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 418c4c5756aa993042dacd1f439df960951e0fb9 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Oct 30 10:33:15 2014 +0100 refs #875 #1043 : financial transaction search --- .../AccountCondition/AccountConditionView.css | 11 +++ .../AccountCondition/AccountConditionView.jaxx | 7 +- .../BigDecimalConditionView.css | 9 +++ .../BigDecimalConditionView.jaxx | 11 +-- .../BigDecimalCondition/CreditConditionView.java | 4 +- .../BigDecimalCondition/DebitConditionView.java | 4 +- .../EntryBookCondition/EntryBookConditionView.css | 11 +++ .../EntryBookCondition/EntryBookConditionView.jaxx | 7 +- .../Filter/StringCondition/StringConditionView.css | 19 ++++++ .../StringCondition/StringConditionView.jaxx | 18 ++--- .../ui/Filter/dateCondition/DateConditionView.css | 10 +++ .../ui/Filter/dateCondition/DateConditionView.jaxx | 9 +-- .../DateIntervalConditionView.css | 14 ++++ .../DateIntervalConditionView.jaxx | 8 +-- .../FinancialPeriodConditionView.css | 12 ++++ .../FinancialPeriodConditionView.jaxx | 10 +-- .../FinancialTransactionConditionView.css | 11 +++ .../FinancialTransactionConditionView.jaxx | 22 +++--- .../FiscalPeriodConditionView.css | 11 +++ .../FiscalPeriodConditionView.jaxx | 11 +-- .../FinancialPeriodViewHandler.java | 17 +++-- .../FinancialTransactionSearchView.css | 70 +++++++++++++++++++ .../FinancialTransactionSearchView.jaxx | 74 +++++++++++---------- .../resources/i18n/lima-swing_en_GB.properties | 14 +++- .../resources/i18n/lima-swing_fr_FR.properties | 20 +++--- ...=> action-filter-transaction-date-interval.png} | Bin ...png => action-filter-transaction-entryBook.png} | Bin ... action-filter-transaction-financialPeriod.png} | Bin ... => action-filter-transaction-fiscalPeriod.png} | Bin 29 files changed, 285 insertions(+), 129 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.css new file mode 100644 index 0000000..83dfb00 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.css @@ -0,0 +1,11 @@ +#accountConditionFrame { + title : "lima.account"; + preferredSize : {new Dimension(400, 100)}; +} + +#account { + preferredSize : {new Dimension(390, 30)}; + model : {accountModel}; + renderer : {new AccountListRenderer()}; + selectedItem : {handler.getAccount()}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx index de8762b..22253c1 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx @@ -17,8 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.financialTransaction.account" - preferredSize="{new Dimension(400, 100)}" +<JInternalFrame id="accountConditionFrame" onInternalFrameClosed="handler.delete()" layout="{new FlowLayout()}"> @@ -38,10 +37,6 @@ <org.chorem.lima.ui.combobox.AccountComboBoxModel id="accountModel" /> <JComboBox id="account" - preferredSize="{new Dimension(390, 30)}" - model="{accountModel}" - renderer="{new AccountListRenderer()}" - selectedItem="{handler.getAccount()}" onItemStateChanged="handler.accountSelected(event)"/> </JInternalFrame> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.css new file mode 100644 index 0000000..fcc62c5 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.css @@ -0,0 +1,9 @@ +#bigDecimalConditionFrame { + preferredSize : {new Dimension(200, 100)}; +} + +#operandComboBox { + model : {new DefaultComboBoxModel(AbstractBigDecimalCondition.Operand.values())}; + renderer : {new LabelListCellRenderer()}; + selectedItem : {handler.getOperand()}; +} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx index 83e83bd..0dfc02a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx @@ -17,9 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="" - preferredSize="{new Dimension(200, 100)}" - minimumSize="{new Dimension(200, 100)}" +<JInternalFrame id="bigDecimalConditionFrame" onInternalFrameClosed="handler.delete()" layout="{new FlowLayout()}"> <import> @@ -35,15 +33,12 @@ </import> <BigDecimalConditionHandler id="handler" - javaBean="new BigDecimalConditionHandler(this)"/> + javaBean="new BigDecimalConditionHandler(this)"/> <JComboBox id="operandComboBox" - model="{new DefaultComboBoxModel(AbstractBigDecimalCondition.Operand.values())}" - renderer="{new LabelListCellRenderer()}" - selectedItem="{handler.getOperand()}" onItemStateChanged="handler.operandSelected(event)"/> - <NumberEditor id="bigDecimaleditor" + <NumberEditor id="bigDecimalEditor" constructorParams="this" bean="{handler}" model="{handler.getValue()}" diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java index 91c8940..f9d7f82 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java @@ -33,7 +33,7 @@ public class CreditConditionView extends BigDecimalConditionView { super(); setHandler(new CreditConditionHandler(this)); setTitle(t("lima.financialTransaction.credit")); - getBigDecimaleditor().setBean(handler); - getBigDecimaleditor().init(); + getBigDecimalEditor().setBean(handler); + getBigDecimalEditor().init(); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java index 18707ee..aed05a7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java @@ -33,7 +33,7 @@ public class DebitConditionView extends BigDecimalConditionView { super(); setHandler(new DebitConditionHandler(this)); setTitle(t("lima.financialTransaction.debit")); - getBigDecimaleditor().setBean(handler); - getBigDecimaleditor().init(); + getBigDecimalEditor().setBean(handler); + getBigDecimalEditor().init(); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.css new file mode 100644 index 0000000..3612e1b --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.css @@ -0,0 +1,11 @@ +#entryBookConditionFrame { + title : "lima.entryBook"; + preferredSize : {new Dimension(400, 100)}; +} + +#entryBookList { + selectionMode : {ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}; + visibleRowCount : -1; + listData : {handler.getEntryBookList()}; + cellRenderer : {LimaRendererUtil.newDecoratorListCellRenderer(EntryBook.class)}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx index 31bac6c..597ea0f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx @@ -17,8 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.enum.list.entryBook" - preferredSize="{new Dimension(400, 100)}" +<JInternalFrame id="entryBookConditionFrame" onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension @@ -30,10 +29,6 @@ javaBean="new EntryBookConditionHandler(this)"/> <JScrollPane > <JList id="entryBookList" - selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - visibleRowCount="-1" - listData="{handler.getEntryBookList()}" - cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(EntryBook.class)}" onValueChanged="handler.setEntryBook(event)"/> </JScrollPane> </JInternalFrame> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css new file mode 100644 index 0000000..07dc9e0 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.css @@ -0,0 +1,19 @@ +#stringConditionFrame { + title : "lima.filter.date.window"; + preferredSize : {new Dimension(200, 100)}; +} + +#operandComboBox { + model : {new DefaultComboBoxModel(AbstractStringCondition.Operand.values())}; + renderer : {new LabelListCellRenderer()}; + selectedItem : {handler.getOperand()}; +} + +#textField { + text : {handler.getText()}; +} + +#sensitiveCaseCheckBox { + text : "lima.filer.condition.sensitive.case"; + selected : {handler.isSensitiveCase()}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx index 8942c3a..bd17032 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx @@ -17,9 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.filter.date.window" - preferredSize="{new Dimension(200, 100)}" - minimumSize="{new Dimension(200, 100)}" +<JInternalFrame id="stringConditionFrame" onInternalFrameClosed="handler.delete()" layout="{new FlowLayout(FlowLayout.CENTER, 0, 0)}"> <import> @@ -34,16 +32,14 @@ <StringConditionHandler id="handler" javaBean="new StringConditionHandler(this)"/> + <JComboBox id="operandComboBox" - model="{new DefaultComboBoxModel(AbstractStringCondition.Operand.values())}" - renderer="{new LabelListCellRenderer()}" - selectedItem="{handler.getOperand()}" onItemStateChanged="handler.operandSelected(event)"/> + <JTextField id="textField" - text="{handler.getText()}" - onKeyReleased="handler.setText(event)" /> + onKeyReleased="handler.setText(event)"/> + <JCheckBox id="sensitiveCaseCheckBox" - text="lima.filer.condition.sensitive.case" - selected="{handler.isSensitiveCase()}" - onActionPerformed="handler.setSensitiveCase(event)" /> + onActionPerformed="handler.setSensitiveCase(event)"/> + </JInternalFrame> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.css new file mode 100644 index 0000000..ca978f8 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.css @@ -0,0 +1,10 @@ +#dateConditionFrame { + title : "lima.date"; + preferredSize : {new Dimension(200, 100)}; +} + +#operandComboBox { + model : {new DefaultComboBoxModel(DateCondition.Operand.values())}; + renderer : {new LabelListCellRenderer()}; + selectedItem : {handler.getOperand()}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx index 4bd4b84..93e365c 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx @@ -17,9 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.financialTransaction.date" - preferredSize="{new Dimension(200, 100)}" - minimumSize="{new Dimension(200, 100)}" +<JInternalFrame id="dateConditionFrame" onInternalFrameClosed="handler.delete()" layout="{new FlowLayout()}"> <import> @@ -31,14 +29,13 @@ org.chorem.lima.beans.DateCondition org.chorem.lima.ui.common.LabelListCellRenderer </import> + <DateConditionHandler id="handler" javaBean="new DateConditionHandler(this)"/> <JComboBox id="operandComboBox" - model="{new DefaultComboBoxModel(DateCondition.Operand.values())}" - renderer="{new LabelListCellRenderer()}" - selectedItem="{handler.getOperand()}" onItemStateChanged="handler.operandSelected(event)"/> + <JAXXDatePicker id='datePicker' date='{handler.getDate()}' formats='{handler.getFormats()}' diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.css new file mode 100644 index 0000000..e8f2bba --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.css @@ -0,0 +1,14 @@ +#dateIntervaleConditionFrame { + title : "lima.dates.interval"; + preferredSize : {new Dimension(200, 100)}; +} + +#beginDateLabel{ + text : "lima.dates.interval.in"; + labelFor : {beginDatePicker}; +} + +#endDateLabel { + text : "lima.dates.interval.to"; + labelFor : {endDatePicker}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx index ca6fae0..a5fa4f6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx @@ -18,9 +18,7 @@ #L% --> -<JInternalFrame title="lima.financialTransaction.dateInterval" - preferredSize="{new Dimension(200, 100)}" - minimumSize="{new Dimension(200, 100)}" +<JInternalFrame id="dateIntervaleConditionFrame" onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension @@ -34,7 +32,7 @@ <Table> <row> <cell> - <JLabel text="lima.financialTransaction.dateInterval.in"/> + <JLabel id="beginDateLabel" /> </cell> <cell> <JAXXDatePicker id='beginDatePicker' @@ -45,7 +43,7 @@ </row> <row> <cell> - <JLabel text="lima.financialTransaction.dateInterval.to"/> + <JLabel id="endDateLabel" /> </cell> <cell> <JAXXDatePicker id='endDatePicker' diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.css new file mode 100644 index 0000000..f52b5ca --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.css @@ -0,0 +1,12 @@ +#financialPeriodConditionFrame { + title : "lima.financialPeriod"; + preferredSize : {new Dimension(200, 100)}; +} + +#financialPeriodList { + selectionMode : {ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}; + visibleRowCount : -1; + listData : {handler.getFinancialPeriodList()}; + cellRenderer : {LimaRendererUtil.newDecoratorListCellRenderer(FinancialPeriod.class)}; + +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx index f9c79e1..23714fe 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx @@ -17,9 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.enum.comboboxperiod.financialperiod" - preferredSize="{new Dimension(200, 100)}" - minimumSize="{new Dimension(200, 100)}" +<JInternalFrame id="financialPeriodConditionFrame" onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension @@ -32,10 +30,6 @@ <JScrollPane> <JList id="financialPeriodList" - selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - visibleRowCount="-1" - listData="{handler.getFinancialPeriodList()}" - cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(FinancialPeriod.class)}" - onValueChanged="handler.setFinancialPeriod(event)"/> + onValueChanged="handler.setFinancialPeriod(event)"/> </JScrollPane> </JInternalFrame> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.css new file mode 100644 index 0000000..81f6b62 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.css @@ -0,0 +1,11 @@ +#allRadioButton { + text : "lima.filter.condition.one"; + buttonGroup : "radioButtons"; + selected : {!handler.isAllConditions()}; +} + +#oneRadioButton { + text : "lima.filter.condition.all"; + buttonGroup : "radioButtons"; + selected : {handler.isAllConditions()}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx index e9a1fac..5e1afcc 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx @@ -20,27 +20,25 @@ #L% --> -<JPanel layout="{new BorderLayout()}"> +<JPanel id="financialTransactionConditionsPanel" + layout="{new BorderLayout()}"> <import> java.awt.Dimension javax.swing.ListSelectionModel javax.swing.text.Document java.awt.FlowLayout </import> + <FinancialTransactionConditionHandler id="handler" javaBean="new FinancialTransactionConditionHandler(this)"/> <JPanel constraints="BorderLayout.NORTH"> - <JRadioButton text="lima.filter.condition.one" - id="AllRadioButton" - onActionPerformed="handler.setAllConditions(false)" - buttonGroup="radioButtons" - selected="{!handler.isAllConditions()}"/> - <JRadioButton text="lima.filter.condition.all" - id="OneRadioButton" - onActionPerformed="handler.setAllConditions(true)" - buttonGroup="radioButtons" - selected="{handler.isAllConditions()}"/> + <JRadioButton id="allRadioButton" + onActionPerformed="handler.setAllConditions(false)"/> + <JRadioButton id="oneRadioButton" + onActionPerformed="handler.setAllConditions(true)"/> </JPanel> - <JPanel id="conditionPanel" constraints="BorderLayout.CENTER" layout="{new FlowLayout(FlowLayout.LEADING, 0, 0)}"/> + <JPanel id="conditionPanel" + constraints="BorderLayout.CENTER" + layout="{new FlowLayout(FlowLayout.LEADING, 0, 0)}"/> </JPanel> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.css b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.css new file mode 100644 index 0000000..4284fe1 --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.css @@ -0,0 +1,11 @@ +#fiscalPeriodConditionFrame { + title : "lima.fiscalPeriod"; + preferredSize : {new Dimension(200, 100)}; +} + +#fiscalPeriodList { + selectionMode : {ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}; + visibleRowCount : -1; + listData : {handler.getFiscalPeriodList()}; + cellRenderer : {LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class)}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx index 52941c0..b15bb07 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx @@ -17,9 +17,7 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> -<JInternalFrame title="lima.enum.comboboxperiod.fiscalperiod" - preferredSize="{new Dimension(200, 100)}" - minimumSize="{new Dimension(200, 100)}" +<JInternalFrame id="fiscalPeriodConditionFrame" onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension @@ -30,13 +28,10 @@ <FiscalPeriodConditionHandler id="handler" javaBean="new FiscalPeriodConditionHandler(this)"/> - <JScrollPane > + <JList id="fiscalPeriodList" - selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - visibleRowCount="-1" - listData="{handler.getFiscalPeriodList()}" - cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class)}" onValueChanged="handler.setFiscalPeriod(event)"/> + </JScrollPane> </JInternalFrame> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java index b967914..11a9030 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodViewHandler.java @@ -39,11 +39,16 @@ import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; -import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; +import org.chorem.lima.util.BigDecimalToString; import org.chorem.lima.util.ErrorHelper; import org.jdesktop.swingx.JXTable; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; import java.util.Collections; @@ -136,8 +141,8 @@ public class FinancialPeriodViewHandler implements ServiceListener { message.append("\n - "); message.append(t("lima.financialPeriod.block.error.unbalanced.transaction", transaction.getTransactionDate(), - BigDecimalTableCellRenderer.format(transaction.getAmountDebit()), - BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); + BigDecimalToString.format(transaction.getAmountDebit()), + BigDecimalToString.format(transaction.getAmountCredit()))); } errorHelper.showErrorMessage(message.toString()); } catch (UnfilledEntriesException e) { @@ -146,7 +151,7 @@ public class FinancialPeriodViewHandler implements ServiceListener { message.append("\n - "); message.append(t("lima.financialPeriod.block.error.unfilled.entry", entry.getFinancialTransaction().getTransactionDate(), - BigDecimalTableCellRenderer.format(entry.getAmount()))); + BigDecimalToString.format(entry.getAmount()))); if (entry.getAccount() == null) { message.append("\n - "); message.append(t("lima.financialPeriod.block.error.unfilled.noAccount")); @@ -167,7 +172,7 @@ public class FinancialPeriodViewHandler implements ServiceListener { message.append("\n - "); message.append(t("lima.financialPeriod.block.error.withoutEntryBook.transaction", transaction.getTransactionDate(), - BigDecimalTableCellRenderer.format(transaction.getAmountCredit()))); + BigDecimalToString.format(transaction.getAmountCredit()))); } errorHelper.showErrorMessage(message.toString()); } catch (NotLockedClosedPeriodicEntryBooksException e) { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.css new file mode 100644 index 0000000..ff2d98d --- /dev/null +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.css @@ -0,0 +1,70 @@ +#toolbar { + floatable : false; +} + +#addDateCondition { + toolTipText : "lima.filter.date.one"; + actionIcon : "filter-transaction-date"; +} + +#addDateIntervalCondition { + toolTipText : "lima.filter.date.interval"; + actionIcon : "filter-transaction-date-interval"; +} + +#addFinancialPeriodCondition { + toolTipText : "lima.filter.financialPeriod"; + actionIcon : "filter-transaction-financialPeriod"; +} + +#addFiscalPeriodCondition { + toolTipText : "lima.filter.fiscalPeriod"; + actionIcon : "filter-transaction-fiscalPeriod"; +} + +#addEntryBookCondition { + toolTipText : "lima.filter.entryBook"; + actionIcon : "filter-transaction-entryBook"; +} + +#addVoucherCondition { + toolTipText : "lima.filter.voucher"; + actionIcon : "filter-transaction-voucher"; +} + +#addAccountCondition { + toolTipText : "lima.filter.account"; + actionIcon : "filter-transaction-account"; +} + +#addDescriptionCondition { + toolTipText : "lima.filter.description"; + actionIcon : "filter-transaction-description"; +} + +#addLetteringCondition { + toolTipText : "lima.filter.letter"; + actionIcon : "filter-transaction-letter"; +} + +#addDebitCondition { + toolTipText : "lima.filter.debit"; + actionIcon : "filter-transaction-debit"; +} + +#addCreditCondition { + toolTipText : "lima.filter.credit"; + actionIcon : "filter-transaction-credit"; +} + +#refresh { + toolTipText : "lima.refresh.shortcut"; + actionIcon : "refresh"; + +} + +#financialTransactionSearchTable { + rowHeight : 22; + model : {getFinancialTransactionSearchTableModel()}; + selectionMode : {ListSelectionModel.SINGLE_SELECTION}; +} \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx index 53f5972..355618e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx @@ -21,6 +21,7 @@ --> <JPanel layout="{new BorderLayout()}"> + <import> java.awt.Dimension javax.swing.ListSelectionModel @@ -39,56 +40,61 @@ java.awt.Color javax.swing.BorderFactory </import> + <FinancialTransactionSearchViewHandler id="handler" javaBean="new FinancialTransactionSearchViewHandler(this)"/> + <Boolean id="selectedRow" javaBean="false"/> + <Dimension id="fieldSize" javaBean="new java.awt.Dimension()"/> - <JToolBar floatable="false" constraints="BorderLayout.NORTH"> - <JButton toolTipText="lima.filter.date.one" - actionIcon='filter-transaction-date' + + <JToolBar id="toolbar" + constraints="BorderLayout.PAGE_START"> + + <JButton id="addDateCondition" onActionPerformed="getHandler().addDateCondition()"/> - <JButton toolTipText="lima.filter.date.interval" - actionIcon='filter-transaction-interval' + + <JButton id="addDateIntervalCondition" onActionPerformed="getHandler().addDateIntervalCondition()"/> - <JButton toolTipText="lima.filter.date.financial.period" - actionIcon='filter-transaction-financial-period' + + <JButton id="addFinancialPeriodCondition" onActionPerformed="getHandler().addFinancialPeriodCondition()"/> - <JButton toolTipText="lima.filter.date.fiscal.period" - actionIcon='filter-transaction-fiscal-period' + + <JButton id="addFiscalPeriodCondition" onActionPerformed="getHandler().addFiscalPeriodCondition()"/> <JToolBar.Separator/> - <JButton toolTipText="lima.filter.entrybook" - actionIcon='filter-transaction-entrybook' + <JButton id="addEntryBookCondition" onActionPerformed="getHandler().addEntryBookCondition()"/> <JToolBar.Separator/> - <JButton toolTipText="lima.filter.voucher" - actionIcon='filter-transaction-voucher' + <JButton id="addVoucherCondition" onActionPerformed="getHandler().addVoucherCondition()"/> - <JButton toolTipText="lima.filter.account" - actionIcon='filter-transaction-account' + + <JButton id="addAccountCondition" onActionPerformed="getHandler().addAccountCondition()"/> - <JButton toolTipText="lima.filter.description" - actionIcon='filter-transaction-description' + + <JButton id="addDescriptionCondition" onActionPerformed="getHandler().addDescriptionCondition()"/> - <JButton toolTipText="lima.filter.letter" - actionIcon='filter-transaction-letter' + + <JButton id="addLetteringCondition" onActionPerformed="getHandler().addLetteringCondition()"/> <JToolBar.Separator/> - <JButton toolTipText="lima.filter.debit" - actionIcon='filter-transaction-debit' + <JButton id="addDebitCondition" onActionPerformed="getHandler().addDebitCondition()"/> - <JButton toolTipText="lima.filter.credit" - actionIcon='filter-transaction-credit' + + <JButton id="addCreditCondition" onActionPerformed="getHandler().addCreditCondition()"/> + <JToolBar.Separator/> - <JButton toolTipText="{ t("lima.refresh") + " (F5)"}" actionIcon='refresh' + + <JButton id="refresh" onActionPerformed="getHandler().refresh()"/> + </JToolBar> <JSplitPane constraints="BorderLayout.CENTER" @@ -97,17 +103,15 @@ <FinancialTransactionConditionView id="financialTransactionConditionView" /> </JScrollPane> <JScrollPane> - <FinancialTransactionSearchTableModel - id="financialTransactionSearchTableModel"/> - <FinancialTransactionDefaultTable - id="financialTransactionSearchTable" - constructorParams='handler' - rowHeight="22" - model="{getFinancialTransactionSearchTableModel()}" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> - <ListSelectionModel - javaBean="getFinancialTransactionSearchTable().getSelectionModel()" - onValueChanged="setSelectedRow(financialTransactionSearchTable.getSelectedRow() != -1)"/> + + <FinancialTransactionSearchTableModel id="financialTransactionSearchTableModel"/> + + <FinancialTransactionDefaultTable id="financialTransactionSearchTable" + constructorParams="handler"/> + + <ListSelectionModel javaBean="getFinancialTransactionSearchTable().getSelectionModel()" + onValueChanged="setSelectedRow(financialTransactionSearchTable.getSelectedRow() != -1)"/> </JScrollPane> + </JSplitPane> </JPanel> 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 531f06c..42fdd9c 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 @@ -177,6 +177,10 @@ lima.cop= lima.copy=Copy lima.data.bigDecimal.decimalSeparator= lima.data.bigDecimal.scale= +lima.date= +lima.dates.interval= +lima.dates.interval.in= +lima.dates.interval.to= lima.documents=Documents… lima.endDate=End lima.enterEntries= @@ -271,16 +275,19 @@ lima.filter.condition.delete= lima.filter.condition.one= lima.filter.credit= lima.filter.date= -lima.filter.date.financial.period= -lima.filter.date.fiscal.period= +lima.filter.date.financialPeriod= +lima.filter.date.fiscalPeriod= lima.filter.date.interval= lima.filter.date.one= lima.filter.date.window= lima.filter.debit= lima.filter.description= -lima.filter.entrybook= +lima.filter.entryBook= +lima.filter.financialPeriod= +lima.filter.fiscalPeriod= lima.filter.letter= lima.filter.voucher= +lima.financialPeriod= lima.financialPeriod.begin= lima.financialPeriod.block= lima.financialPeriod.block.error.NoLockedPreviousEntryBook.main= @@ -375,6 +382,7 @@ lima.financialTransaction.update.error.beforeFirstFiscalPeriod= lima.financialTransaction.update.error.lockedEntryBook= lima.financialTransaction.update.error.lockedFinancialPeriod= lima.financialTransaction.voucher= +lima.fiscalPeriod= lima.fiscalPeriod.add= lima.fiscalPeriod.add.beginAfterEndFiscalPeriod= lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod= 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 4c60004..c803284 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 @@ -150,6 +150,10 @@ lima.config.ui.fullscreen.description=demarrer l'application en mode plein écra lima.config.ui.fullscreen.label=Plein écran lima.confirmation=Confirmation lima.copy=Copier +lima.date=Date +lima.dates.interval=Interval de dates +lima.dates.interval.in=Du +lima.dates.interval.to=au lima.documents=Documents… lima.endDate=Fin lima.enterEntries=Écritures @@ -227,32 +231,28 @@ lima.enum.comboboxperiod.date=Date lima.enum.comboboxperiod.financialperiod=Période Financière lima.enum.comboboxperiod.fiscalperiod=Exercice lima.enum.comboboxperiod.period=Période -lima.enum.list.entryBook=Journaux -lima.enum.list.financialperiod=Périodes Financières -lima.enum.list.fiscalperiod=Exercices -lima.enum.list.period=Périodes lima.error=Erreur lima.error.errorpane.htmlmessage=<html><body><b>Une erreur s'est produite</b>\:<br/>%s</body></html> lima.file=Fichier lima.filer.condition.sensitive.case=sensible à la case lima.filter=Filtrer lima.filter.account=Ajouter un filtre sur les comptes -lima.filter.amount=Ajouter un filtre sur les montants lima.filter.condition.all=Valide toutes les conditions lima.filter.condition.delete=Supprimer la condition lima.filter.condition.one=Valide au moins une condition lima.filter.credit=Ajouter un filtre sur les crédits lima.filter.date=Ajouter un filtre sur les dates -lima.filter.date.financial.period=Ajouter un filtre sur la période financière -lima.filter.date.fiscal.period=Ajouter un filtre sur l'exercice lima.filter.date.interval=Ajouter un filtre sur un interval de dates lima.filter.date.one=Ajouter un filtre sur une date lima.filter.date.window= lima.filter.debit=Ajouter un filtre sur les débits lima.filter.description=Ajouter un filtre sur les descriptions -lima.filter.entrybook=Ajouter un filtre sur les journaux +lima.filter.entryBook=Ajouter un filtre sur les journaux +lima.filter.financialPeriod=Ajouter un filtre sur la période financière +lima.filter.fiscalPeriod=Ajouter un filtre sur l'exercice lima.filter.letter=Ajouter un filtre sur les lettres lima.filter.voucher=Ajouter un filtre sur les pièces comptables +lima.financialPeriod=Périodes Financières lima.financialPeriod.begin=Début lima.financialPeriod.block=Cloturer une période (Ctrl+C) lima.financialPeriod.block.error.noLockedPreviousEntryBook.main=Impossible de clôturer cette période car les périodes précedentes ne sont pas clôturer \: @@ -306,9 +306,6 @@ lima.financialTransaction.buttonback=← lima.financialTransaction.buttonnext=→ lima.financialTransaction.credit=Crédit lima.financialTransaction.date=Date -lima.financialTransaction.dateInterval=Interval de dates -lima.financialTransaction.dateInterval.in=Du -lima.financialTransaction.dateInterval.to=au lima.financialTransaction.debit=Débit lima.financialTransaction.delete.error.lockedEntryBook=Impossible de supprimer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.delete.error.lockedFinancialPeriod=Impossible de supprimer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. @@ -334,6 +331,7 @@ lima.financialTransaction.update.error.beforeFirstFiscalPeriod=Impossible de dé lima.financialTransaction.update.error.lockedEntryBook=Impossible de déplacer une transaction car le jounal %2$s (%1$s) est cloturé pour la période du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY. lima.financialTransaction.update.error.lockedFinancialPeriod=Impossible de deplacer une transaction car la période fiscale du %3$te %3$tB %3$tY au %4$te %4$tB %4$tY est cloturée. lima.financialTransaction.voucher=Pièce comptable +lima.fiscalPeriod=Exercices lima.fiscalPeriod.add=Nouvel exercice (Ctrl+A) lima.fiscalPeriod.add.error.beginAfterEndFiscalPeriod=Le date de fin de l'exercice (%2$te/%2$tm/%2$tY) doit être postérieur à la date de début (%1$te/%1$tm/%1$tY) lima.fiscalPeriod.add.error.moreOneUnlockFiscalPeriod=Il existe déjà %1s exercices non clôturés. diff --git a/lima-swing/src/main/resources/icons/action-filter-transaction-interval.png b/lima-swing/src/main/resources/icons/action-filter-transaction-date-interval.png similarity index 100% rename from lima-swing/src/main/resources/icons/action-filter-transaction-interval.png rename to lima-swing/src/main/resources/icons/action-filter-transaction-date-interval.png diff --git a/lima-swing/src/main/resources/icons/action-filter-transaction-entrybook.png b/lima-swing/src/main/resources/icons/action-filter-transaction-entryBook.png similarity index 100% rename from lima-swing/src/main/resources/icons/action-filter-transaction-entrybook.png rename to lima-swing/src/main/resources/icons/action-filter-transaction-entryBook.png diff --git a/lima-swing/src/main/resources/icons/action-filter-transaction-financial-period.png b/lima-swing/src/main/resources/icons/action-filter-transaction-financialPeriod.png similarity index 100% rename from lima-swing/src/main/resources/icons/action-filter-transaction-financial-period.png rename to lima-swing/src/main/resources/icons/action-filter-transaction-financialPeriod.png diff --git a/lima-swing/src/main/resources/icons/action-filter-transaction-fiscal-period.png b/lima-swing/src/main/resources/icons/action-filter-transaction-fiscalPeriod.png similarity index 100% rename from lima-swing/src/main/resources/icons/action-filter-transaction-fiscal-period.png rename to lima-swing/src/main/resources/icons/action-filter-transaction-fiscalPeriod.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.