June 2012 - Lima-commits - mailman.cloud.codelutin.com

r3482 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by sletellier＠users.chorem.org June 27, 2012

June 27, 2012

Author: sletellier Date: 2012-06-27 14:09:05 +0200 (Wed, 27 Jun 2012) New Revision: 3482 Url: http://chorem.org/repositories/revision/lima/3482 Log: Retrieve deleted file Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 12:09:05 UTC (rev 3482) @@ -0,0 +1,31 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Component; +import java.math.BigDecimal; +import javax.swing.JTable; +import jaxx.runtime.swing.editor.cell.NumberCellEditor; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class BigDecimalTableCellEditor extends NumberCellEditor<BigDecimal> { + + protected int row; + + /** + * constructor + */ + public BigDecimalTableCellEditor() { + super(BigDecimal.class, false); + } + + public int getRow() { + return row; + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { + this.row = row; + return super.getTableCellEditorComponent(table, value, isSelected, row, column); + } +}

1 0

r3481 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction
by sletellier＠users.chorem.org June 27, 2012

June 27, 2012

Author: sletellier Date: 2012-06-27 13:46:23 +0200 (Wed, 27 Jun 2012) New Revision: 3481 Url: http://chorem.org/repositories/revision/lima/3481 Log: Push NumberCellEditor to JaxxWidget Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 10:19:17 UTC (rev 3480) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 11:46:23 UTC (rev 3481) @@ -1,151 +0,0 @@ -/* - * #%L - * Lima :: Swing - * - * $Id$ - * $HeadURL$ - * %% - * Copyright (C) 2008 - 2011 CodeLutin - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package org.chorem.lima.ui.celleditor; - -import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.math.BigDecimal; -import javax.swing.AbstractCellEditor; -import javax.swing.JTable; -import javax.swing.SwingConstants; -import javax.swing.SwingUtilities; -import javax.swing.event.AncestorEvent; -import javax.swing.event.AncestorListener; -import javax.swing.table.TableCellEditor; -import jaxx.runtime.swing.editor.NumberEditor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; - -public class BigDecimalTableCellEditor extends AbstractCellEditor - implements TableCellEditor, FocusListener, AncestorListener { - - private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); - - private static final long serialVersionUID = 1L; - - protected int row; - - protected final NumberEditor numberEditor; - - /** constructor */ - public BigDecimalTableCellEditor() { - numberEditor = new NumberEditor(); - numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); - numberEditor.getTextField().setBorder(null); - numberEditor.getTextField().addAncestorListener(this); - numberEditor.getTextField().addFocusListener(this); - - numberEditor.setModelType(BigDecimal.class); - numberEditor.setModel(new BigDecimal(0)); -// numberEditor.setUseFloat(true); - numberEditor.setUseSign(false); - numberEditor.init(); - } - - public int getRow() { - return row; - } - - @Override - public Component getTableCellEditorComponent(JTable table, Object value, - boolean isSelected, int row, int column) { - - this.row = row; - - // FIXME sletellier 20120105 : we dont need to set modelText - BigDecimal bd = (BigDecimal) value; - numberEditor.setModel(bd); - numberEditor.setModelText(bd.toPlainString()); - return numberEditor; - } - - // the editor should return a BigDecimal - public Object getCellEditorValue() { - BigDecimal bdValue = (BigDecimal)numberEditor.getModel(); - - //replace all comma by full stop -// textValue = textValue.replaceAll(",", "."); -// if (textValue.equals("")) { -// return BigDecimal.ZERO; -// } else { - //set 0 in case the user type in a non number format - if (bdValue == null) { - bdValue = BigDecimal.ZERO; - } -// try { -// BigDecimal bdValue = new BigDecimal(f); -// } catch (NumberFormatException eee) { -// if (log.isErrorEnabled()) { -// log.error("Can't set " + textValue + " to a BigDecimal", eee); -// } -// } - //round half up the number using the scale given by the configuration - bdValue = bdValue.setScale(LimaContext.getContext().getConfig().getScale(), - BigDecimal.ROUND_HALF_UP); - return bdValue; -// } - } - -// @Override -// public boolean isCellEditable(EventObject evt) { -// return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; -// } -// -// /** Listeners */ - @Override - public void focusGained(FocusEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } - }); - } - - @Override - public void focusLost(FocusEvent e) { - } - - @Override - public void ancestorAdded(AncestorEvent e) { - SwingUtilities.invokeLater(new Runnable() { - public void run() { - numberEditor.getTextField().requestFocus(); - numberEditor.getTextField().selectAll(); - } - }); - } - - @Override - public void ancestorRemoved(AncestorEvent e) { - } - - @Override - public void ancestorMoved(AncestorEvent e) { - } - -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-27 10:19:17 UTC (rev 3480) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-27 11:46:23 UTC (rev 3481) @@ -95,6 +95,8 @@ //Get new amount editor BigDecimalTableCellEditor editor = new BigDecimalTableCellEditor(); + + // FIXME sletellier 27/06/12 : hack to fix selection of first row on stopEditing cell in last row editor.addCellEditorListener(new CellEditorListener() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 10:19:17 UTC (rev 3480) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 11:46:23 UTC (rev 3481) @@ -29,6 +29,7 @@ import java.util.Date; import java.util.List; import javax.swing.table.AbstractTableModel; +import org.chorem.lima.LimaContext; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -386,11 +387,13 @@ currentEntry.setLettering((String) value); break; case 6: - currentEntry.setAmount((BigDecimal) value); + BigDecimal bigDecimalValue = getBigDecimalValue(value); + currentEntry.setAmount(bigDecimalValue); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount((BigDecimal) value); + bigDecimalValue = getBigDecimalValue(value); + currentEntry.setAmount(bigDecimalValue); currentEntry.setDebit(false); break; } @@ -417,6 +420,22 @@ fireTableRowsUpdated(trIndex, endIndex); } + protected BigDecimal getBigDecimalValue(Object value) { + + BigDecimal result = (BigDecimal)value; + + //set 0 in case the user type in a non number format + if (result == null) { + result = BigDecimal.ZERO; + } + + //round half up the number using the scale given by the configuration + result = result.setScale(LimaContext.getContext().getConfig().getScale(), + BigDecimal.ROUND_HALF_UP); + + return result; + } + public Object getElementAt(int row) { Object result = transactionAndEntries.get(row); return result;

1 0

r3480 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by sletellier＠users.chorem.org June 27, 2012

June 27, 2012

Author: sletellier Date: 2012-06-27 12:19:17 +0200 (Wed, 27 Jun 2012) New Revision: 3480 Url: http://chorem.org/repositories/revision/lima/3480 Log: Realy use BigDecimal Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 10:16:23 UTC (rev 3479) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 10:19:17 UTC (rev 3480) @@ -94,10 +94,10 @@ result = String.class; break; case 6: - result = String.class; + result = BigDecimal.class; break; case 7: - result = String.class; + result = BigDecimal.class; break; case 8: result = BigDecimal.class;

1 0

r3479 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: celleditor financialtransaction fiscalperiod
by sletellier＠users.chorem.org June 27, 2012

June 27, 2012

Author: sletellier Date: 2012-06-27 12:16:23 +0200 (Wed, 27 Jun 2012) New Revision: 3479 Url: http://chorem.org/repositories/revision/lima/3479 Log: - Fix number edition using NumberEditor - Partial fix selection of first row on stopEditing cell in last row on FinancialTransactionTable Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellEditor.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -24,105 +24,118 @@ */ package org.chorem.lima.ui.celleditor; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.chorem.lima.LimaContext; - +import java.awt.Component; +import java.awt.event.FocusEvent; +import java.awt.event.FocusListener; +import java.math.BigDecimal; import javax.swing.AbstractCellEditor; import javax.swing.JTable; -import javax.swing.JTextField; import javax.swing.SwingConstants; import javax.swing.SwingUtilities; import javax.swing.event.AncestorEvent; import javax.swing.event.AncestorListener; import javax.swing.table.TableCellEditor; -import java.awt.Component; -import java.awt.event.FocusEvent; -import java.awt.event.FocusListener; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import java.awt.event.MouseEvent; -import java.math.BigDecimal; -import java.util.EventObject; +import jaxx.runtime.swing.editor.NumberEditor; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; public class BigDecimalTableCellEditor extends AbstractCellEditor - implements TableCellEditor, FocusListener, AncestorListener, KeyListener { + implements TableCellEditor, FocusListener, AncestorListener { private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); private static final long serialVersionUID = 1L; - protected final JTextField textField; + protected int row; - private boolean keyPressed; + protected final NumberEditor numberEditor; /** constructor */ public BigDecimalTableCellEditor() { - textField = new JTextField(); - textField.setEditable(true); - textField.setHorizontalAlignment(SwingConstants.RIGHT); - textField.addFocusListener(this); - textField.addAncestorListener(this); - textField.addKeyListener(this); - keyPressed = false; + numberEditor = new NumberEditor(); + numberEditor.getTextField().setHorizontalAlignment(SwingConstants.RIGHT); + numberEditor.getTextField().setBorder(null); + numberEditor.getTextField().addAncestorListener(this); + numberEditor.getTextField().addFocusListener(this); + + numberEditor.setModelType(BigDecimal.class); + numberEditor.setModel(new BigDecimal(0)); +// numberEditor.setUseFloat(true); + numberEditor.setUseSign(false); + numberEditor.init(); } + public int getRow() { + return row; + } + @Override public Component getTableCellEditorComponent(JTable table, Object value, boolean isSelected, int row, int column) { - textField.setText(value.toString()); - return textField; + + this.row = row; + + // FIXME sletellier 20120105 : we dont need to set modelText + BigDecimal bd = (BigDecimal) value; + numberEditor.setModel(bd); + numberEditor.setModelText(bd.toPlainString()); + return numberEditor; } // the editor should return a BigDecimal public Object getCellEditorValue() { - String textValue = textField.getText().trim(); + BigDecimal bdValue = (BigDecimal)numberEditor.getModel(); + //replace all comma by full stop - textValue = textValue.replaceAll(",", "."); - if (textValue.equals("")) { - return BigDecimal.ZERO; - } else { +// textValue = textValue.replaceAll(",", "."); +// if (textValue.equals("")) { +// return BigDecimal.ZERO; +// } else { //set 0 in case the user type in a non number format - BigDecimal bdValue = BigDecimal.ZERO; - try { - bdValue = new BigDecimal(textValue); - } catch (NumberFormatException eee) { - if (log.isErrorEnabled()) { - log.error("Can't set " + textValue + " to a BigDecimal", eee); - } + if (bdValue == null) { + bdValue = BigDecimal.ZERO; } +// try { +// BigDecimal bdValue = new BigDecimal(f); +// } catch (NumberFormatException eee) { +// if (log.isErrorEnabled()) { +// log.error("Can't set " + textValue + " to a BigDecimal", eee); +// } +// } //round half up the number using the scale given by the configuration bdValue = bdValue.setScale(LimaContext.getContext().getConfig().getScale(), BigDecimal.ROUND_HALF_UP); return bdValue; - } +// } } +// @Override +// public boolean isCellEditable(EventObject evt) { +// return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; +// } +// +// /** Listeners */ @Override - public boolean isCellEditable(EventObject evt) { - return !(evt instanceof MouseEvent) || ((MouseEvent) evt).getClickCount() == 2; - } - - /** Listeners */ - @Override public void focusGained(FocusEvent e) { SwingUtilities.invokeLater(new Runnable() { public void run() { - textField.selectAll(); + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); } }); } @Override public void focusLost(FocusEvent e) { - keyPressed = false; } @Override public void ancestorAdded(AncestorEvent e) { SwingUtilities.invokeLater(new Runnable() { public void run() { - textField.requestFocus(); + numberEditor.getTextField().requestFocus(); + numberEditor.getTextField().selectAll(); } }); } @@ -135,31 +148,4 @@ public void ancestorMoved(AncestorEvent e) { } - @Override - public void keyTyped(KeyEvent e) { - - } - - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - // replace all the cell content only if all the text has been selected - if (!keyPressed - && textField.getSelectionStart() == 0 - && textField.getSelectionEnd() == textField.getText().length()) { - // delete the the cell content - if (e.getKeyChar() == KeyEvent.VK_BACK_SPACE) { - textField.setText(""); - keyPressed = true; - // replace the content by the char typed in - } else if (String.valueOf(e.getKeyChar()).matches("[a-zA-z0-9]")) { - textField.setText(String.valueOf(e.getKeyChar())); - keyPressed = true; - } - } - } - } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -25,6 +25,18 @@ package org.chorem.lima.ui.financialtransaction; +import java.awt.Color; +import java.awt.Component; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseAdapter; +import java.awt.event.MouseEvent; +import java.math.BigDecimal; +import java.util.Date; +import javax.swing.SwingUtilities; +import javax.swing.SwingWorker; +import javax.swing.event.CellEditorListener; +import javax.swing.event.ChangeEvent; import org.apache.commons.collections.CollectionUtils; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -42,16 +54,6 @@ import org.jdesktop.swingx.decorator.HighlightPredicate; import org.jdesktop.swingx.decorator.Highlighter; -import javax.swing.SwingWorker; -import java.awt.Color; -import java.awt.Component; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseAdapter; -import java.awt.event.MouseEvent; -import java.math.BigDecimal; -import java.util.Date; - /** * Table des transaction qui ajoute des comportement (keys). * @@ -92,8 +94,29 @@ setDefaultEditor(Account.class, new AccountTableCellEditor()); //Get new amount editor - setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + BigDecimalTableCellEditor editor = new BigDecimalTableCellEditor(); + editor.addCellEditorListener(new CellEditorListener() { + @Override + public void editingStopped(ChangeEvent e) { + BigDecimalTableCellEditor editor = (BigDecimalTableCellEditor)e.getSource(); + final int row = editor.getRow(); + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + getSelectionModel().setSelectionInterval(row, row); + } + }); + } + + @Override + public void editingCanceled(ChangeEvent e) { + // do nothing + } + }); + setDefaultEditor(BigDecimal.class, editor); + //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); @@ -139,12 +162,19 @@ colorTransaction = new ColorHighlighter(predicate, new Color(255, 198, 209), null); addHighlighter(colorTransaction); + + setTerminateEditOnFocusLost(true); } public FinancialTransactionViewHandler getHandler() { return handler; } + @Override + public void changeSelection(int rowIndex, int columnIndex, boolean toggle, boolean extend) { + super.changeSelection(rowIndex, columnIndex, true, true); + } + private class MyKeyAdapter extends KeyAdapter { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -25,14 +25,10 @@ package org.chorem.lima.ui.financialtransaction; -import static org.nuiton.i18n.I18n._; - import java.math.BigDecimal; import java.util.Date; import java.util.List; - import javax.swing.table.AbstractTableModel; - import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; @@ -40,6 +36,8 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.service.LimaServiceFactory; +import static org.nuiton.i18n.I18n._; + /** * Basic transaction table model. * @@ -96,10 +94,10 @@ result = String.class; break; case 6: - result = BigDecimal.class; + result = String.class; break; case 7: - result = BigDecimal.class; + result = String.class; break; case 8: result = BigDecimal.class; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-27 10:16:23 UTC (rev 3479) @@ -25,8 +25,6 @@ package org.chorem.lima.ui.financialtransaction; -import static org.nuiton.i18n.I18n._; - import java.awt.event.ItemEvent; import java.util.ArrayList; import java.util.Calendar; @@ -34,11 +32,9 @@ import java.util.Collections; import java.util.Date; import java.util.List; - import javax.swing.JComboBox; import javax.swing.JOptionPane; import javax.swing.ListSelectionModel; - import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -58,6 +54,8 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import static org.nuiton.i18n.I18n._; + /** * Handler associated with financial transaction view. * Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-26 16:10:22 UTC (rev 3478) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-27 10:16:23 UTC (rev 3479) @@ -48,8 +48,7 @@ id="fiscalPeriodTable" sortable="false" rowHeight="24" constructorParams="getFiscalPeriodTableModel()" columnControlVisible="true" - selectionModel='{model}' - /> + selectionModel='{model}'/> </JScrollPane> </cell> </row>

1 0

r3478 - in trunk: . lima-business
by echatellier＠users.chorem.org June 26, 2012

June 26, 2012

Author: echatellier Date: 2012-06-26 18:10:22 +0200 (Tue, 26 Jun 2012) New Revision: 3478 Url: http://chorem.org/repositories/revision/lima/3478 Log: Add missing dependency Modified: trunk/lima-business/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) +++ trunk/lima-business/pom.xml 2012-06-26 16:10:22 UTC (rev 3478) @@ -45,7 +45,7 @@ </dependency> <dependency> <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox-example</artifactId> + <artifactId>pdfbox-examples</artifactId> </dependency> <dependency> <groupId>org.eclipse.jetty</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) +++ trunk/pom.xml 2012-06-26 16:10:22 UTC (rev 3478) @@ -226,7 +226,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> - <artifactId>pdfbox-example</artifactId> + <artifactId>pdfbox-examples</artifactId> <version>1.7.0</version> </dependency>

1 0

r3477 - in trunk: . lima-business
by echatellier＠users.chorem.org June 26, 2012

June 26, 2012

Author: echatellier Date: 2012-06-26 18:05:11 +0200 (Tue, 26 Jun 2012) New Revision: 3477 Url: http://chorem.org/repositories/revision/lima/3477 Log: Add missing dependency Modified: trunk/lima-business/pom.xml trunk/pom.xml Modified: trunk/lima-business/pom.xml =================================================================== --- trunk/lima-business/pom.xml 2012-06-26 15:48:13 UTC (rev 3476) +++ trunk/lima-business/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) @@ -44,6 +44,10 @@ <artifactId>pdfbox</artifactId> </dependency> <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-example</artifactId> + </dependency> + <dependency> <groupId>org.eclipse.jetty</groupId> <artifactId>jetty-servlet</artifactId> </dependency> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-26 15:48:13 UTC (rev 3476) +++ trunk/pom.xml 2012-06-26 16:05:11 UTC (rev 3477) @@ -224,6 +224,12 @@ <version>1.7.0</version> </dependency> + <dependency> + <groupId>org.apache.pdfbox</groupId> + <artifactId>pdfbox-example</artifactId> + <version>1.7.0</version> + </dependency> + </dependencies> </dependencyManagement>

1 0

r3476 - in trunk: . lima-callao/src/main/java/org/chorem/lima/entity
by echatellier＠users.chorem.org June 26, 2012

June 26, 2012

Author: echatellier Date: 2012-06-26 17:48:13 +0200 (Tue, 26 Jun 2012) New Revision: 3476 Url: http://chorem.org/repositories/revision/lima/3476 Log: Update topia and some other libs. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java trunk/pom.xml Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/AccountDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -88,7 +88,7 @@ protected List<Account> findIntervalAccountByNumber(String accountNumberLow, String accountNumberHigh) throws TopiaException { String query = "FROM " + Account.class.getName() + " WHERE :accountNumberLow <= accountNumber AND accountNumber <= :accountNumberHigh"; - return (List<Account>) context.find(query, "accountNumberLow", + return (List<Account>) context.findAll(query, "accountNumberLow", accountNumberLow, "accountNumberHigh", accountNumberHigh); } @@ -102,7 +102,7 @@ public List<Account> findAllSubAccounts(Account account) throws TopiaException { String query = "FROM " + Account.class.getName() + " a WHERE a.accountNumber LIKE concat(:accountNumber, '_%')"; - List<Account> accounts = context.find(query, "accountNumber", account.getAccountNumber()); + List<Account> accounts = context.findAll(query, "accountNumber", account.getAccountNumber()); return accounts; } @@ -165,7 +165,7 @@ String query = "FROM " + Account.class.getName() + " a WHERE NOT IN (" + "FROM " + Account.class.getName() + " b where b.accountNumber like a.accountNumber+'%')" + " AND a.accountNumber LIKE ?"; - List<Account> accountsResult = getContext().find(query, s); + List<Account> accountsResult = getContext().findAll(query, s); if (accountsResult != null) { //if first if (first) { Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -77,10 +77,10 @@ if (financialPeriod != null) { query += " AND financialPeriod = :financialPeriod"; //context.find(query, 0, 0, "entryBook", entryBook, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.findAll(query, "entryBook", entryBook, "financialPeriod", financialPeriod); } else { //context.find(query, 0, 0, "entryBook", entryBook); - closedPeriodicEntryBooks = context.find(query, "entryBook", entryBook); + closedPeriodicEntryBooks = context.findAll(query, "entryBook", entryBook); } } else { if (financialPeriod != null) { @@ -88,7 +88,7 @@ } //context.find(query, 0, 0, "financialPeriod", financialPeriod); - closedPeriodicEntryBooks = context.find(query, "financialPeriod", financialPeriod); + closedPeriodicEntryBooks = context.findAll(query, "financialPeriod", financialPeriod); } // get only first one @@ -115,7 +115,7 @@ " WHERE :beginDate <= financialPeriod.beginDate " + " AND financialPeriod.beginDate <= :endDate" + " ORDER BY entryBook.code"; - return context.find(query, "beginDate", beginDate, "endDate", endDate); + return context.findAll(query, "beginDate", beginDate, "endDate", endDate); } /** @@ -135,7 +135,7 @@ " WHERE :beginDate <= financialPeriod.beginDate " + " AND financialPeriod.beginDate <= :endDate" + " AND entryBook = :entryBook"; - return context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + return context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } /** @@ -156,7 +156,7 @@ " AND financialPeriod.beginDate <= :endDate" + " AND entryBook = :entryBook" + " AND locked = true"; - return context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + return context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } /** @@ -172,7 +172,7 @@ " AND F.locked = false" + " ORDER BY C.financialPeriod.beginDate"; - List<ClosedPeriodicEntryBook> result = context.find(query); + List<ClosedPeriodicEntryBook> result = context.findAll(query); return result; } @@ -189,7 +189,7 @@ " AND F = :fiscalPeriod" + " ORDER BY C.financialPeriod.beginDate"; - List<ClosedPeriodicEntryBook> result = context.find(query, "fiscalPeriod", fiscalPeriod); + List<ClosedPeriodicEntryBook> result = context.findAll(query, "fiscalPeriod", fiscalPeriod); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -68,7 +68,7 @@ // concerne le compte " AND E.account = :account"; - List<Entry> entries = context.find(query, "beginDate", beginDate, + List<Entry> entries = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "account", account); return entries; } @@ -91,7 +91,7 @@ " AND E.account = :account" + " GROUP BY E.debit"; - List<Object[]> result = context.find(query, "beginDate", beginDate, + List<Object[]> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "account", account); return result; } @@ -113,7 +113,7 @@ // fix order " ORDER BY E.financialTransaction.transactionDate, E.financialTransaction.topiaId"; - List<Entry> entries = context.find(query, "beginDate", beginDate, + List<Entry> entries = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return entries; } @@ -136,7 +136,7 @@ " AND E.financialTransaction.entryBook = :entryBook" + " GROUP BY E.debit"; - List<Object[]> result = context.find(query, "beginDate", beginDate, + List<Object[]> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } @@ -159,7 +159,7 @@ // concerne le journal " AND E.financialTransaction.entryBook = :entryBook"; - List<Entry> entries = context.find(query, "beginDate", beginDate, + List<Entry> entries = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return entries; } @@ -185,7 +185,7 @@ " AND E.financialTransaction.entryBook = :entryBook" + " GROUP BY E.debit"; - List<Object[]> result = context.find(query, "beginDate", beginDate, + List<Object[]> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialPeriodDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -47,12 +47,8 @@ " AND :date <= endDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query, "date", date); - FinancialPeriod result = null; - if (!financialPeriod.isEmpty()) { - result = financialPeriod.get(0); - } - return result; + FinancialPeriod financialPeriod = (FinancialPeriod)context.findUnique(query, "date", date); + return financialPeriod; } /** @@ -71,7 +67,7 @@ " ORDER by beginDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query, "beginDate", beginDate, "endDate", endDate); + List<FinancialPeriod> financialPeriod = context.findAll(query, "beginDate", beginDate, "endDate", endDate); return financialPeriod; } @@ -86,7 +82,7 @@ " ORDER BY beginDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query); + List<FinancialPeriod> financialPeriod = context.findAll(query); return financialPeriod; } @@ -102,7 +98,7 @@ " ORDER BY beginDate"; // add unique result here - List<FinancialPeriod> financialPeriod = context.find(query); + List<FinancialPeriod> financialPeriod = context.findAll(query); return financialPeriod; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialStatementDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -47,7 +47,7 @@ public List<FinancialStatement> findAllOrderedByCreateDate() throws TopiaException { String query = "FROM " + FinancialStatement.class.getName() + " ORDER BY " + FinancialStatement.TOPIA_CREATE_DATE; - List<FinancialStatement> result = context.find(query); + List<FinancialStatement> result = context.findAll(query); return result; } @@ -59,7 +59,7 @@ String query = "FROM " + FinancialStatement.class.getName() + " WHERE masterFinancialStatement = :masterFinancialStatement" + " ORDER BY " + FinancialStatement.TOPIA_CREATE_DATE; - List<FinancialStatement> result = context.find(query, "masterFinancialStatement", financialStatement); + List<FinancialStatement> result = context.findAll(query, "masterFinancialStatement", financialStatement); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -70,7 +70,7 @@ */ public long getCountByEntryBook(EntryBook entryBook) throws TopiaException { String query = "SELECT count(*) FROM " + FinancialTransaction.class.getName() + " t WHERE t.entryBook = :entryBook"; - Number count = (Number)context.find(query, "entryBook", entryBook).get(0); + Number count = (Number)context.findAll(query, "entryBook", entryBook).get(0); return count.longValue(); } @@ -87,7 +87,7 @@ " WHERE :beginDate <= T.transactionDate" + " AND T.transactionDate <= :endDate" + " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE; - List<FinancialTransaction> result = context.find(query, "beginDate", + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); return result; } @@ -107,7 +107,7 @@ " AND T.transactionDate <= :endDate" + " AND T.entryBook = :entryBook" + " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE; - List<FinancialTransaction> result = context.find(query, "beginDate", + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } @@ -133,9 +133,9 @@ List<FinancialTransaction> result = null; if (entryBook != null) { query += " AND T.entryBook = :entryBook"; - result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } else { - result = context.find(query, "beginDate", beginDate, "endDate", endDate); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); } return result; @@ -162,9 +162,9 @@ List<FinancialTransaction> result = null; if (entryBook != null) { query += " AND T.entryBook = :entryBook"; - result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } else { - result = context.find(query, "beginDate", beginDate, "endDate", endDate); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); } return result; @@ -201,9 +201,9 @@ List<FinancialTransaction> result = null; if (entryBook != null) { query += " AND T.entryBook = :entryBook"; - result = context.find(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); } else { - result = context.find(query, "beginDate", beginDate, "endDate", endDate); + result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); } return result; @@ -230,7 +230,7 @@ " AND T.entryBook = :entryBook" + " AND :beginDate <= T.transactionDate" + " AND T.transactionDate <= :endDate"; - List<FinancialTransaction> result = context.find(query, "beginDate", beginDate, + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate, "entryBook", entryBook); return result; } @@ -256,7 +256,7 @@ " AND entryBook = null" + " AND :beginDate <= T.transactionDate" + " AND T.transactionDate <= :endDate"; - List<FinancialTransaction> result = context.find(query, "beginDate", + List<FinancialTransaction> result = context.findAll(query, "beginDate", beginDate, "endDate", endDate); return result; @@ -377,7 +377,7 @@ } // perform query - List<FinancialTransaction> result = context.find(query, args.toArray()); + List<FinancialTransaction> result = context.findAll(query, args.toArray()); return result; } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -67,7 +67,7 @@ String query = "FROM " + FiscalPeriod.class.getName() + " WHERE :financialPeriod in elements(financialPeriod)"; - List<FiscalPeriod> fiscalPeriods = context.find(query, "financialPeriod", financialPeriod); + List<FiscalPeriod> fiscalPeriods = context.findAll(query, "financialPeriod", financialPeriod); FiscalPeriod result = null; if (!fiscalPeriods.isEmpty()) { result = fiscalPeriods.get(0); @@ -85,7 +85,7 @@ String query = "FROM " + FiscalPeriod.class.getName() + " ORDER BY endDate desc"; - List<FiscalPeriod> fiscalPeriods = context.find(query); + List<FiscalPeriod> fiscalPeriods = context.findAll(query); FiscalPeriod result = null; if (!fiscalPeriods.isEmpty()) { result = fiscalPeriods.get(0); @@ -104,7 +104,7 @@ String query = "FROM " + FiscalPeriod.class.getName() + " ORDER BY endDate"; - List<FiscalPeriod> fiscalPeriods = context.find(query); + List<FiscalPeriod> fiscalPeriods = context.findAll(query); FiscalPeriod result = null; if (!fiscalPeriods.isEmpty()) { result = fiscalPeriods.get(0); @@ -123,12 +123,7 @@ " WHERE locked = false" + " ORDER BY endDate desc"; - List<FiscalPeriod> fiscalPeriods = context.find(query); - FiscalPeriod result = null; - if (!fiscalPeriods.isEmpty()) { - result = fiscalPeriods.get(0); - } - - return result; + FiscalPeriod fiscalPeriod = (FiscalPeriod)context.findUnique(query); + return fiscalPeriod; } } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/VatStatementDAOImpl.java 2012-06-26 15:48:13 UTC (rev 3476) @@ -48,7 +48,7 @@ public List<VatStatement> findAllOrderedByCreateDate() throws TopiaException { String query = "FROM " + VatStatement.class.getName() + " ORDER BY " + VatStatement.TOPIA_CREATE_DATE; - List<VatStatement> result = context.find(query); + List<VatStatement> result = context.findAll(query); return result; } @@ -63,7 +63,7 @@ String query = "FROM " + VatStatement.class.getName() + " WHERE masterVatStatement = :masterVatStatement" + " ORDER BY " + VatStatement.TOPIA_CREATE_DATE; - List<VatStatement> result = context.find(query, "masterVatStatement", masterVatStatement); + List<VatStatement> result = context.findAll(query, "masterVatStatement", masterVatStatement); return result; } @@ -79,7 +79,7 @@ public VatStatement findVatStatementByLabel(String label) throws TopiaException { String query = "FROM " + VatStatement.class.getName() + " WHERE label LIKE :label"; - List<VatStatement> statements = context.find(query, "label", "%" + label + "%"); + List<VatStatement> statements = context.findAll(query, "label", "%" + label + "%"); VatStatement result = null; if (!statements.isEmpty()) { result = statements.get(0); Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-06-25 16:45:50 UTC (rev 3475) +++ trunk/pom.xml 2012-06-26 15:48:13 UTC (rev 3476) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.2</version> + <version>3.3.3</version> </parent> <groupId>org.chorem</groupId> @@ -130,7 +130,7 @@ <dependency> <groupId>org.apache.openejb</groupId> <artifactId>javaee-api</artifactId> - <version>6.0-3</version> + <version>6.0-4</version> <scope>runtime</scope> </dependency> @@ -172,7 +172,7 @@ <dependency> <groupId>org.jdom</groupId> <artifactId>jdom</artifactId> - <version>2.0.1</version> + <version>2.0.2</version> <scope>compile</scope> </dependency> @@ -221,7 +221,7 @@ <dependency> <groupId>org.apache.pdfbox</groupId> <artifactId>pdfbox</artifactId> - <version>1.6.0</version> + <version>1.7.0</version> </dependency> </dependencies> @@ -324,13 +324,13 @@ <projectId>lima</projectId>  - <nuitonUtilsVersion>2.4.8</nuitonUtilsVersion> + <nuitonUtilsVersion>2.5</nuitonUtilsVersion> <eugenePluginVersion>2.4.2</eugenePluginVersion> - <topiaVersion>2.6.10</topiaVersion> + <topiaVersion>2.6.11</topiaVersion> <jaxxVersion>2.5-SNAPSHOT</jaxxVersion> <nuitonI18nVersion>2.4.1</nuitonI18nVersion> <openEjbVersion>4.0.0</openEjbVersion> - <slf4jVersion>1.6.5</slf4jVersion> + <slf4jVersion>1.6.6</slf4jVersion>  <license.licenseName>gpl_v3</license.licenseName>

1 0

r3475 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org June 25, 2012

June 25, 2012

Author: mallon Date: 2012-06-25 18:45:50 +0200 (Mon, 25 Jun 2012) New Revision: 3475 Url: http://chorem.org/repositories/revision/lima/3475 Log: Correction sur la saisie des ?\195?\169critures : il est d?\195?\169sormais possible d'ajouter une transaction via les deux boutons copier / coller. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-25 15:32:20 UTC (rev 3474) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-25 16:45:50 UTC (rev 3475) @@ -34,7 +34,6 @@ <FinancialTransactionViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedRow" javaBean="false"/> - <Boolean id="noEntryBooks" javaBean="false"/> <script> <![CDATA[ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 15:32:20 UTC (rev 3474) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 16:45:50 UTC (rev 3475) @@ -198,34 +198,50 @@ } /** - * Copy selected transaction or entry. + * Copy selected row * * @param indexSelectedRow */ - public void copyRow(int indexSelectedRow) { - clipBoard = view.getFinancialTransactionTableModel().getElementAt(indexSelectedRow); + public void copyRow(int indexSelectedRow){ + clipBoard = view.getFinancialTransactionTableModel().getElementAt(indexSelectedRow); } - + /** - * Paste entry. + * Paste row. * - * @param indexSelectedRow selected row to paste entry + * @param indexSelectedRow selected row to paste */ - public void pasteRow(int indexSelectedRow) { + public void pasteRow(int indexSelectedRow){ FinancialTransactionTable table = view.getFinancialTransactionTable(); + //select the new line + ListSelectionModel selectionModel = table.getSelectionModel(); if (clipBoard instanceof Entry) { int index = addEntry((Entry) clipBoard, indexSelectedRow); - - //select the new line - ListSelectionModel selectionModel = table.getSelectionModel(); + selectionModel.setSelectionInterval(indexSelectedRow + 1, indexSelectedRow + 1); //focus on second column table.changeSelection(index, 1, false, false); table.requestFocusInWindow(); + }else{ + FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); + FinancialTransaction financialTransactionTemp = (FinancialTransaction) clipBoard; + + //need to know number of entries of copied transaction + //to select the new transaction + int nbentries = financialTransactionTemp.getEntry().size()+1; + + //new transaction with only entrybook and date + FinancialTransaction financialTransaction = new FinancialTransactionImpl(); + financialTransaction.setEntryBook(financialTransactionTemp.getEntryBook()); + financialTransaction.setTransactionDate(financialTransactionTemp.getTransactionDate()); + + financialTransactionService.createFinancialTransaction(financialTransaction); + tableModel.addRow(financialTransaction); + selectionModel.setSelectionInterval(indexSelectedRow + nbentries, indexSelectedRow + nbentries); } } - + /** * @param entry * @param row

1 0

r3474 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org June 25, 2012

June 25, 2012

Author: mallon Date: 2012-06-25 17:32:20 +0200 (Mon, 25 Jun 2012) New Revision: 3474 Url: http://chorem.org/repositories/revision/lima/3474 Log: Correction sur l'ajout d'une entr?\195?\169e via les deux boutons copier / coller. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-25 14:59:00 UTC (rev 3473) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2012-06-25 15:32:20 UTC (rev 3474) @@ -446,8 +446,7 @@ */ public void addRow(Object object, int newRow) { transactionAndEntries.add(newRow, object); - fireTableRowsInserted(newRow, newRow); - + fireTableRowsInserted(newRow, newRow); } /** Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 14:59:00 UTC (rev 3473) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 15:32:20 UTC (rev 3474) @@ -233,6 +233,7 @@ */ protected int addEntry(Entry entry, int row) { FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); + FinancialTransactionTable table = view.getFinancialTransactionTable(); FinancialTransaction currentTransaction = null; int financialTransactionRow = 0; Object currentRow = tableModel.getElementAt(row); @@ -257,8 +258,9 @@ //fireTableRowsUpdated(financialTransactionRow, financialTransactionRow + currentTransaction.getEntry().size() - 1); // on met a jour l'ui - int newRow = financialTransactionRow + currentTransaction.getEntry().size() + 1; + int newRow = financialTransactionRow + currentTransaction.getEntry().size() /*+ 1*/; tableModel.addRow(newEntry, newRow); + table.addRowSelectionInterval(newRow, newRow); return newRow; }

1 0

r3473 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org June 25, 2012

June 25, 2012

Author: mallon Date: 2012-06-25 16:59:00 +0200 (Mon, 25 Jun 2012) New Revision: 3473 Url: http://chorem.org/repositories/revision/lima/3473 Log: Correction portant sur la suppression d'une transaction vide (Sans entr?\195?\169es). D?\195?\169sormais, plus aucune erreur n'est g?\195?\169n?\195?\169r?\195?\169e, et la transaction est bien supprim?\195?\169e. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 13:16:58 UTC (rev 3472) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 14:59:00 UTC (rev 3473) @@ -411,10 +411,12 @@ FinancialTransaction currentTransaction = (FinancialTransaction) selectedValue; //must delete the entries of the deleted transaction - Collection<Entry> entries = currentTransaction.getEntry(); - for (Entry entry : entries){ - tableModel.deleteRow(tableModel.indexOf(entry)); - } + Collection<Entry> entries = currentTransaction.getEntry(); + if (entries != null){ + for (Entry entry : entries){ + tableModel.deleteRow(tableModel.indexOf(entry)); + } + } financialTransactionService.removeFinancialTransaction(currentTransaction);

1 0

r3472 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/fiscalperiod java/org/chorem/lima/ui/home resources
by mallon＠users.chorem.org June 25, 2012

June 25, 2012

Author: mallon Date: 2012-06-25 15:16:58 +0200 (Mon, 25 Jun 2012) New Revision: 3472 Url: http://chorem.org/repositories/revision/lima/3472 Log: Mise ?\195?\160 jour du panneau d'accueil : du code inutile a ?\195?\169t?\195?\169 supprim?\195?\169 (Acc?\195?\168s ?\195?\160 la saisie des ?\195?\169critures), et la mise ?\195?\160 jour du panneau se fait selon la suppression d'un exercice / d'un journal et la cl?\195?\180ture d'un exercice. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -50,6 +50,7 @@ import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; +import org.chorem.lima.ui.home.FinancialTransactionsPane; import org.jdesktop.swingx.JXTable; import org.nuiton.util.DateUtil; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/AccountsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -78,6 +78,8 @@ public void refresh() { + log.debug("Rafraîchissement accounts pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -110,6 +112,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("Account") || methodeName.contains("importAll") || methodeName.contains("importAs")) { refresh(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/EntryBooksPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -81,6 +81,8 @@ public void refresh() { + log.debug("Rafraîchissement entry books pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -133,6 +135,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("EntryBook") || methodeName.contains("importAll") || methodeName.contains("importAs") || methodeName.contains("importEntries")) { refresh(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FinancialTransactionsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -36,14 +36,18 @@ import org.chorem.lima.LimaContext; import org.chorem.lima.business.LimaException; import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.api.EntryBookService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.api.FiscalPeriodService; import org.chorem.lima.business.api.ImportService; +import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; import org.chorem.lima.ui.MainView; +import com.google.common.collect.Multiset.Entry; + /** * Home view pane that display statistics about unbalanced transactions. * @@ -62,12 +66,15 @@ protected FinancialTransactionService financialTransactionService; protected FiscalPeriodService fiscalPeriodService; + + protected EntryBookService entryBookService; public FinancialTransactionsPane(HomeView view) { super(view); financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); fiscalPeriodService = LimaServiceFactory.getService(FiscalPeriodService.class); + entryBookService = LimaServiceFactory.getService(EntryBookService.class); LimaServiceFactory.addServiceListener(FinancialTransactionService.class, this); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); @@ -90,7 +97,9 @@ } public void refresh() { - + + log.debug("Rafraîchissement financial transaction pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -99,7 +108,10 @@ List<FiscalPeriod> unblockedFiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); - if (unblockedFiscalPeriods.size() != 0) { + List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); + + //Au moins un exercice ouvert et un journal ouvert + if (unblockedFiscalPeriods.size() != 0 && entryBooks.size() != 0) { List<FinancialTransaction> financialTransactionsUnbal = financialTransactionService. getAllInexactFinancialTransactions(unblockedFiscalPeriods.get(0)); @@ -121,20 +133,19 @@ + " " + _("lima.ui.home.transaction.balanced") + "<br/><br/><a href='#financialtransactionbalanced'>" + _("lima.ui.home.transaction.modifiy.balanced") + "</a>"; - //set Text setText(htmlBegin + transactionsString + htmlEnd); } else { setBackground(RED_BACKGROUND); String transactionsString = _("lima.ui.home.transaction.nothing") + "<br/><br/><a href='#financialtransactionbalanced'>" + _("lima.ui.home.transaction.create") + "</a>"; - //set Text setText(htmlBegin + transactionsString + htmlEnd); } } - } else { + }else { setBackground(RED_BACKGROUND); + setText(""); } } catch (LimaException eee) { @@ -143,10 +154,11 @@ } @Override - public void notifyMethod(String serviceName, String methodeName) { + public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("FiscalPeriod") || methodeName.contains("FinancialTransaction") || methodeName.contains("Entry") || methodeName.contains("importEntries") - || methodeName.contains("importAll") || methodeName.contains("importAs")) { + || methodeName.contains("importAll") || methodeName.contains("importAs")) { refresh(); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/home/FiscalPeriodsPane.java 2012-06-25 13:16:58 UTC (rev 3472) @@ -87,6 +87,8 @@ public void refresh() { + log.debug("Rafraîchissement fiscal periods pane"); + String htmlBegin = "<font face='sans-serif' size=3>" + "<p style=vertical-align:'bottom', horizontal-align:'center'>"; String htmlEnd = "</p></font>"; @@ -130,6 +132,7 @@ @Override public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); if (methodeName.contains("FiscalPeriod") || methodeName.contains("importAll") || methodeName.contains("importAs")) { Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-06-25 10:13:27 UTC (rev 3471) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-06-25 13:16:58 UTC (rev 3472) @@ -40,4 +40,5 @@ log4j.logger.org.chorem.lima=INFO log4j.logger.org.chorem.lima.business.ejb=DEBUG log4j.logger.org.chorem.lima.ui.account=DEBUG +log4j.logger.org.chorem.lima.ui.home=DEBUG log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG \ No newline at end of file

1 0

r3471 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialtransaction resources/i18n
by mallon＠users.chorem.org June 25, 2012

June 25, 2012

Author: mallon Date: 2012-06-25 12:13:27 +0200 (Mon, 25 Jun 2012) New Revision: 3471 Url: http://chorem.org/repositories/revision/lima/3471 Log: Suppression du code grisant l'interface d'ajout d'?\195?\169criture (Quand il n'existe aucun journal), et ce pour des raisons d'omptimisation, mais aussi afin d'?\195?\170tre sur la m?\195?\170me logique d'ui que lorsqu'il n'y a pas d'exercie ouvert. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-25 10:13:27 UTC (rev 3471) @@ -52,8 +52,7 @@ <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> <JComboBox id="fiscalPeriodComboBox" model="{fiscalPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" - onItemStateChanged="handler.fiscalPeriodSelected(event)" - enabled="{isNoEntryBooks()}"/> + onItemStateChanged="handler.fiscalPeriodSelected(event)"/> </cell> <cell anchor="east"> <JLabel text="lima.ui.financialtransaction.financialperiod" labelFor='{financialPeriodComboBox}'/> @@ -64,14 +63,11 @@ <JComboBox id="financialPeriodComboBox" model="{financialPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}" - onItemStateChanged="handler.financialPeriodSelected(event)" - enabled="{isNoEntryBooks()}"/> + onItemStateChanged="handler.financialPeriodSelected(event)"/> <JButton id="back" text="lima.ui.financialtransaction.buttonback" - onActionPerformed="handler.back(financialPeriodComboBox)" - enabled="{isNoEntryBooks()}"/> + onActionPerformed="handler.back(financialPeriodComboBox)"/> <JButton id="next" text="lima.ui.financialtransaction.buttonnext" - onActionPerformed="handler.next(financialPeriodComboBox)" - enabled="{isNoEntryBooks()}"/> + onActionPerformed="handler.next(financialPeriodComboBox)"/> </JPanel> </cell> <cell anchor="east"> @@ -81,8 +77,7 @@ <org.chorem.lima.ui.common.EntryBookComboBoxModel id="entryBookComboBoxModel"/> <JComboBox id="entryBookComboBox" model="{entryBookComboBoxModel}" renderer="{new org.chorem.lima.ui.common.EntryBookListRenderer()}" - onItemStateChanged="handler.entryBookSelected(event)" - enabled="{isNoEntryBooks()}"/> + onItemStateChanged="handler.entryBookSelected(event)"/> </cell> </row> <row> @@ -94,8 +89,7 @@ <JButton text="lima.common.paste" enabled="{isSelectedRow()}" onActionPerformed="handler.pasteRow(financialTransactionTable.getSelectedRow())"/> <JButton text="lima.entries.addTransaction" - onActionPerformed="handler.addFinancialTransaction()" - enabled="{isNoEntryBooks()}"/> + onActionPerformed="handler.addFinancialTransaction()"/> <JButton text="lima.entries.addEntry" enabled="{isSelectedRow()}" onActionPerformed="handler.addEntry()"/> <JButton text="lima.common.remove" enabled="{isSelectedRow()}" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-25 10:13:27 UTC (rev 3471) @@ -93,30 +93,11 @@ LimaServiceFactory.addServiceListener(FinancialPeriodService.class, this); LimaServiceFactory.addServiceListener(FiscalPeriodService.class, this); LimaServiceFactory.addServiceListener(ImportService.class, this); - } - - //impossible to add transaction without entrybook - public boolean controlEntryBook(){ - boolean result = true; - - if (entryBookService.getAllEntryBooks().isEmpty()){ - JOptionPane.showMessageDialog(view, _("lima.ui.financialtransaction.messagenoentrybooks"), - _("lima.ui.financialtransaction.titlenoentrybooks"), JOptionPane.ERROR_MESSAGE); - result = false; - }else{ - result=true; - } - - view.setNoEntryBooks(result); - return result; - } - + } /** * Init all combo box in view. */ public void init() { - - if (controlEntryBook()){ // fiscal periods List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); @@ -135,7 +116,6 @@ if (log.isDebugEnabled()) { log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); } - } } /** Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-25 10:13:27 UTC (rev 3471) @@ -250,10 +250,8 @@ lima.ui.financialtransaction.financialperiod= lima.ui.financialtransaction.fiscalyear= lima.ui.financialtransaction.letter= -lima.ui.financialtransaction.messagenoentrybooks=At least one entry books must to be opened to create the corresponding transactions lima.ui.financialtransaction.messageremoveentry= lima.ui.financialtransaction.messageremovetransaction= -lima.ui.financialtransaction.titlenoentrybooks=No entry books opened lima.ui.financialtransaction.titleremoveentry= lima.ui.financialtransaction.titleremovetransaction= lima.ui.financialtransaction.voucher= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-22 13:03:22 UTC (rev 3470) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-25 10:13:27 UTC (rev 3471) @@ -250,10 +250,8 @@ lima.ui.financialtransaction.financialperiod=Périodes comptables lima.ui.financialtransaction.fiscalyear=Exercices lima.ui.financialtransaction.letter=Lettre -lima.ui.financialtransaction.messagenoentrybooks=Au moins un journal doit être ouvert pour créer les transactions correspondantes lima.ui.financialtransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? lima.ui.financialtransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? -lima.ui.financialtransaction.titlenoentrybooks=Aucun journal ouvert lima.ui.financialtransaction.titleremoveentry=Suppression lima.ui.financialtransaction.titleremovetransaction=Suppression lima.ui.financialtransaction.voucher=Pièce comptable

1 0

r3470 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction lima-swing/src/main/resources
by mallon＠users.chorem.org June 22, 2012

June 22, 2012

Author: mallon Date: 2012-06-22 15:03:22 +0200 (Fri, 22 Jun 2012) New Revision: 3470 Url: http://chorem.org/repositories/revision/lima/3470 Log: Correction sur la gestion des dates des transactions : - Probl?\195?\168me sur l'enregistrement de la date mise ?\195?\160 jour par l'user (Du point de vue fonctionnelle, car du point de vue technique, reste le probl?\195?\168me de rattachement de session et d'utilisation de deux objets.) - Correction de l'interface, en ce qui concerne le changement de la liste d?\195?\169roulante des p?\195?\169riodes comptables en fonction du changement de celle des exercices. - Suppression des tests sur les entr?\195?\169es, puisque ceux-ci sont d?\195?\169j?\195?\160 effectu?\195?\169s lors de la mise ?\195?\160 jour des entr?\195?\169es. - Un utilisateur peut donc entrer n'importe quelle date de transaction, mais elle n'est pas enregistr?\195?\169e et un message avertit l'utilisateur dans deux cas : si la date est en-dehors de tout exercice, ou bien si l'exercice est bloqu?\195?\169. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/resources/log4j.properties Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/DefaultAccountingRules.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -290,119 +290,69 @@ /** * Check : - * 1. if old financialtransaction date are on periodblocked - * 2. if new financialtransaction date are on periodblocked - * 3. if the actual entrybook belong to a blocked closedPeriodicEntryBook - * 4. if the new entrybook belong to a blocked closedPeriodicEntryBook - * 5. if date are on fiscal period - * 6. if all closedperiod are open + * 1. if date are on fiscal period + * 2. if old financialtransaction date are on periodblocked + * 3. if new financialtransaction date are on periodblocked */ @Override public void updateFinancialTransactionDateRules( FinancialTransaction financialTransaction, FinancialTransaction financialTransactionOld) throws LimaException { - try { - FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); - FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(financialTransaction.getTransactionDate()); - FinancialPeriod financialPeriodOld = financialPeriodDAO.findByDate(financialTransactionOld.getTransactionDate()); - - //1. check old financial period locked - if (financialPeriodOld.getLocked()) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialtransactionblocked")); - } - - //2. check new financial period locked - if (financialPeriod.getLocked()) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialnewdateblocked")); - } - - ClosedPeriodicEntryBookDAO closedPeriodicEntryBookDAO = getDaoHelper().getClosedPeriodicEntryBookDAO(); - - //3. the actual entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBookOld = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransactionOld.getEntryBook(), financialPeriod); - if (closedPeriodicEntryBookOld.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updateentryerror")); - } - - //4. the new entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBook = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransaction.getEntryBook(), financialPeriod); - if (closedPeriodicEntryBook.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updatenewentryerror")); - } - - //5. the actual entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBookOld2 = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransactionOld.getEntryBook(), financialPeriodOld); - if (closedPeriodicEntryBookOld2.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updatefinancialtransactionperioderror")); - } - - //6. the new entrybook belong to a blocked closedPeriodicEntryBook - ClosedPeriodicEntryBook closedPeriodicEntryBook2 = - closedPeriodicEntryBookDAO.findByEntryBookAndFinancialPeriod( - financialTransaction.getEntryBook(), financialPeriodOld); - if (closedPeriodicEntryBook2.getLocked()) { - throw new LimaBusinessException(_("lima-Business.defaultaccountingrules.updatefinancialtransactionnewperioderror")); - } - - - //7. check if date are on fiscal period + try { + + Date financialTransactionDate = financialTransaction.getTransactionDate(); FiscalPeriodDAO fiscalPeriodDAO = getDaoHelper().getFiscalPeriodDAO(); - - //search fiscalperiod have financialperiod in params - FiscalPeriod fiscalPeriod = fiscalPeriodDAO.findByFinancialPeriod(financialPeriod); - - Date beginDateFiscalPeriod = fiscalPeriod.getBeginDate(); - Date endDateFiscalPeriod = fiscalPeriod.getEndDate(); - Date financialTransactionDate = - financialTransaction.getTransactionDate(); - if (financialTransactionDate.before(beginDateFiscalPeriod)) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.datebeforeerror")); - } - if (financialTransactionDate.after(endDateFiscalPeriod)) { - throw new LimaBusinessException(_("lima-business.defaultaccountingrules.dateaftererror")); - } - - /* - //6. check all entrybook of old and new financial period are blocked - //FIXME Make this check by topia query ? - List<EntryBook> entryBooks = new ArrayList<EntryBook>(); - List<EntryBook> newClosedEntryBooks = new ArrayList<EntryBook>(); - List<EntryBook> oldClosedEntryBooks = new ArrayList<EntryBook>(); + FiscalPeriod lastFiscalPeriod = fiscalPeriodDAO.getLastFiscalPeriod(); + FiscalPeriod firstFiscalPeriod = fiscalPeriodDAO.getFirstFiscalPeriod(); + Date beginDateFirstFiscalPeriod = firstFiscalPeriod.getBeginDate(); + Date endDateLastFiscalPeriod = lastFiscalPeriod.getEndDate(); + + //check if date are on fiscal period (test if date is after begindate of first f.p. and before enddate of last f.p.) - EntryBookDAO entryBookDAO = - LimaCallaoDAOHelper.getEntryBookDAO(topiaContext); + if (log.isDebugEnabled()) { + log.debug("Date de transaction modifiée sur l'ui " + financialTransactionDate); + log.debug("Date de début du premier exercice : " + beginDateFirstFiscalPeriod); + log.debug("Date de fin du dernier exercice : " + endDateLastFiscalPeriod); + } - entryBooks = entryBookDAO.findAll(); - - for (EntryBook entryBook : entryBooks) { - ClosedPeriodicEntryBook newClosedPeriodicEntryBook = - closedPeriodicEntryBookDAO.findbyEntryBookAndFinancialPeriod( - entryBook, financialPeriod); - ClosedPeriodicEntryBook oldClosedPeriodicEntryBook = - closedPeriodicEntryBookDAO.findbyEntryBookAndFinancialPeriod( - entryBook, financialPeriodOld); - if(newClosedPeriodicEntryBook.getLocked()){ - newClosedEntryBooks.add(entryBook); + //1-date not on a fiscal period + if (financialTransactionDate.before(beginDateFirstFiscalPeriod) || financialTransactionDate.after(endDateLastFiscalPeriod)){ + if (financialTransactionDate.before(beginDateFirstFiscalPeriod)) { + if (log.isDebugEnabled()) { + log.debug("Date de la transaction avant (antérieure) la date de début du premier exercice"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.datebeforeerror")); } - if(oldClosedPeriodicEntryBook.getLocked()){ - oldClosedEntryBooks.add(entryBook); + + if (financialTransactionDate.after(endDateLastFiscalPeriod)) { + if (log.isDebugEnabled()) { + log.debug("Date de la transaction après (postérieure) la date de fin du dernier exercice"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.dateaftererror")); } + }else{ //date on a fiscal period (and consequently on a financial), now test if financial is open + + FinancialPeriodDAO financialPeriodDAO = getDaoHelper().getFinancialPeriodDAO(); + FinancialPeriod financialPeriod = financialPeriodDAO.findByDate(financialTransaction.getTransactionDate()); + FinancialPeriod financialPeriodOld = financialPeriodDAO.findByDate(financialTransactionOld.getTransactionDate()); + + //2. check old financial period locked + if (financialPeriodOld.getLocked()) { + if (log.isDebugEnabled()) { + log.debug("Periode (Old) financière bloquée"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialtransactionblocked")); + } + + //3. check new financial period locked + if (financialPeriod.getLocked()) { + if (log.isDebugEnabled()) { + log.debug("Periode (New) financière bloquée"); + } + throw new LimaBusinessException(_("lima-business.defaultaccountingrules.financialnewdateblocked")); + } } - if (oldClosedEntryBooks.size() >0){ - throw new LimaBusinessException("All EntryBook of this financialperiod are not open"); - } - if (newClosedEntryBooks.size() >0){ - throw new LimaBusinessException("All EntryBook of old financialperiod are not open"); - }*/ - - } catch (TopiaException ex) { throw new LimaException("Can't check financial transaction", ex); } Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -227,23 +227,32 @@ * Method used by update entry and remove entry for update amounts. */ @Override - public void updateFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { + public void updateFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException { AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); try { + + //FIXME mallon 22/06/2012 : Revoir l'utilisation du rattachement à la session et celle des deux objets 'financialTransactionOld' + //et 'financialTransaction' FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); - FinancialTransaction financialTransactionOld = - transactionDAO.findByTopiaId(financialtransaction.getTopiaId()); + FinancialTransaction financialTransactionOld = transactionDAO.findByTopiaId(financialTransaction.getTopiaId()); - // FIXME echatellier 20120509, plusieurs chose à verifier ici: - // changement de date induisant en changement de période, verifier - // la permission (periode close/non close à l'arrivée) - accountingRules.updateFinancialTransactionDateRules( - financialtransaction, financialTransactionOld); - - financialTransactionOld.setEntryBook( - financialtransaction.getEntryBook()); + accountingRules.updateFinancialTransactionDateRules(financialTransaction, financialTransactionOld); + + Date financialTransactionOldDate = financialTransactionOld.getTransactionDate(); + Date financialTransactionDate = financialTransaction.getTransactionDate(); + + if (log.isDebugEnabled()) { + log.debug("Date de la transaction (Old) : " + financialTransactionOldDate); + } + if (log.isDebugEnabled()) { + log.debug("Date de la transaction (New) : " + financialTransactionDate); + } + + financialTransactionOld.setEntryBook(financialTransaction.getEntryBook()); + financialTransactionOld.setTransactionDate(financialTransactionDate); + transactionDAO.update(financialTransactionOld); } catch (TopiaException ex) { throw new LimaException("Can't update financial transaction", ex); Modified: trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-06-22 13:03:22 UTC (rev 3470) @@ -6,8 +6,8 @@ lima-business.common.failed=Échec \: %s \n lima-business.defaultaccountingrules.allentrybookclosed=Tous les journaux de cette période financière sont fermés lima-business.defaultaccountingrules.blockerrorequillibrate=Impossible de bloquer la période financière / le journal, il contient des transactions non équilibrées -lima-business.defaultaccountingrules.dateaftererror=La date est antérieure à la période fiscale -lima-business.defaultaccountingrules.datebeforeerror=La date est postérieure à la période fiscale +lima-business.defaultaccountingrules.dateaftererror=La date est postérieure à la période fiscale +lima-business.defaultaccountingrules.datebeforeerror=La date est antérieure à la période fiscale lima-business.defaultaccountingrules.deleteaccounterror=Impossible de supprimer un comte contenant des entrées lima-business.defaultaccountingrules.deleteentrybookerror=Impossible de supprimer un journal contenant des transactions lima-business.defaultaccountingrules.enddateerror=La date de fin est antérieure à la date de début Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -33,6 +33,7 @@ import org.apache.commons.collections.CollectionUtils; import org.chorem.lima.FinancialStatementWayEnum; import org.chorem.lima.beans.FinancialTransactionSearch; +import org.hibernate.HibernateException; import org.nuiton.topia.TopiaException; /** @@ -47,6 +48,20 @@ public class FinancialTransactionDAOImpl<E extends FinancialTransaction> extends FinancialTransactionDAOAbstract<FinancialTransaction> { /** + * FIXME echatellier, remove this method when implemented in topia + * just overriden to use merge() instead of saveOrUpdate() + */ + public FinancialTransaction merge(FinancialTransaction e) throws TopiaException { + try { + e = (FinancialTransaction)getContext().getHibernate().merge(e); + getContext().getFiresSupport().warnOnUpdateEntity(e); + return e; + } catch (HibernateException ex) { + throw new TopiaException(ex); + } + } + + /** * Return how many transaction are found with specified entryBook. * * @param entryBook entry book Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -95,6 +95,24 @@ } /** + * Get first fiscal period (higher end date). + * + * @return last fiscal period + * @throws TopiaException + */ + public FiscalPeriod getFirstFiscalPeriod() throws TopiaException { + String query = "FROM " + FiscalPeriod.class.getName() + + " ORDER BY endDate"; + + List<FiscalPeriod> fiscalPeriods = context.find(query); + FiscalPeriod result = null; + if (!fiscalPeriods.isEmpty()) { + result = fiscalPeriods.get(0); + } + return result; + } + + /** * Get last non locked fiscal period (higher end date). * * @return last fiscal period Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-22 13:03:22 UTC (rev 3470) @@ -154,7 +154,8 @@ log.debug(String.format("Loaded %d financial periods", financialPeriods.size())); } view.getFinancialPeriodComboBoxModel().setObjects(financialPeriods); - + view.getFinancialPeriodComboBoxModel().setSelectedItem(financialPeriods.get(0)); + // update transactions updateFinancialTransactions(); } Modified: trunk/lima-swing/src/main/resources/log4j.properties =================================================================== --- trunk/lima-swing/src/main/resources/log4j.properties 2012-06-21 14:38:23 UTC (rev 3469) +++ trunk/lima-swing/src/main/resources/log4j.properties 2012-06-22 13:03:22 UTC (rev 3470) @@ -39,4 +39,5 @@ # package level log4j.logger.org.chorem.lima=INFO log4j.logger.org.chorem.lima.business.ejb=DEBUG -log4j.logger.org.chorem.lima.ui.account=DEBUG \ No newline at end of file +log4j.logger.org.chorem.lima.ui.account=DEBUG +log4j.logger.org.chorem.lima.business.accountingrules.DefaultAccountingRules=DEBUG \ No newline at end of file

1 0

r3469 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by mallon＠users.chorem.org June 21, 2012

June 21, 2012

Author: mallon Date: 2012-06-21 16:38:23 +0200 (Thu, 21 Jun 2012) New Revision: 3469 Url: http://chorem.org/repositories/revision/lima/3469 Log: La suppression d'une transaction ne g?\195?\169n?\195?\168re plus d'erreurs, et les entr?\195?\169es correspondantes sont bien supprim?\195?\169es. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -255,15 +255,18 @@ * call accounting rules */ @Override - public void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException { + public void removeFinancialTransaction(FinancialTransaction financialTransaction) throws LimaException { // check if the financial period is blocked AccountingRules accountingRules = LimaConfig.getInstance().getAccountingRules(); - accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialtransaction); + accountingRules.checkFinancialPeriodBlockedWithFinancialTransaction(financialTransaction); try { + FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); - transactionDAO.delete(financialtransaction); + FinancialTransaction financialTransactionOld = transactionDAO.findByTopiaId(financialTransaction.getTopiaId()); + transactionDAO.delete(financialTransactionOld); + } catch (Exception ex) { throw new LimaException("Can't remove financial transaction", ex); } Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -163,7 +163,7 @@ "endDate", endDate, "entryBook", entryBook); return entries; } - + /** * Retourne la somme des entrées des transaction entre * deux dates pour un journal donné. Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FinancialTransactionDAOImpl.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -246,7 +246,7 @@ return result; } - + /** * Search financial transaction. * Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 12:49:13 UTC (rev 3468) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 14:38:23 UTC (rev 3469) @@ -30,6 +30,7 @@ import java.awt.event.ItemEvent; import java.util.ArrayList; import java.util.Calendar; +import java.util.Collection; import java.util.Collections; import java.util.Date; import java.util.List; @@ -426,8 +427,14 @@ if (response == JOptionPane.YES_OPTION) { if (selectedValue instanceof FinancialTransaction) { - FinancialTransaction currentTransaction = - (FinancialTransaction) selectedValue; + FinancialTransaction currentTransaction = (FinancialTransaction) selectedValue; + + //must delete the entries of the deleted transaction + Collection<Entry> entries = currentTransaction.getEntry(); + for (Entry entry : entries){ + tableModel.deleteRow(tableModel.indexOf(entry)); + } + financialTransactionService.removeFinancialTransaction(currentTransaction); } else if (selectedValue instanceof Entry) {

1 0

r3468 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: common financialtransaction
by mallon＠users.chorem.org June 21, 2012

June 21, 2012

Author: mallon Date: 2012-06-21 14:49:13 +0200 (Thu, 21 Jun 2012) New Revision: 3468 Url: http://chorem.org/repositories/revision/lima/3468 Log: Une transaction ne peut maintenant plus ?\195?\170tre ajout?\195?\169e sans avoir s?\195?\169lectionn?\195?\169e de p?\195?\169riode comptable (P?\195?\169riode comptable par d?\195?\169faut.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java 2012-06-21 12:36:51 UTC (rev 3467) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialPeriodComboBoxModel.java 2012-06-21 12:49:13 UTC (rev 3468) @@ -37,4 +37,17 @@ /** serialVersionUID. */ private static final long serialVersionUID = 6991293987668268456L; + + + /*By default, selection of the first financial period (Because a + * transaction concern one financial period) + */ + @Override + public Object getElementAt(int index) { + if (getSelectedItem() == null){ + setSelectedItem(objects.get(0)); + return objects.get(0); + } + return objects.get(index); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 12:36:51 UTC (rev 3467) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 12:49:13 UTC (rev 3468) @@ -283,16 +283,16 @@ /** * Add new transaction. */ - public void addFinancialTransaction() { - FinancialTransactionTable table = view.getFinancialTransactionTable(); - ListSelectionModel selectionModel = table.getSelectionModel(); - addFinancialTransactionAfterService(); - //select the new line - int numberRow = table.getRowCount(); - selectionModel.setSelectionInterval(numberRow - 1, numberRow - 1); - //focus on first column - table.changeSelection(numberRow, 0, false, false); - table.scrollCellToVisible(numberRow, 0); + public void addFinancialTransaction() { + FinancialTransactionTable table = view.getFinancialTransactionTable(); + ListSelectionModel selectionModel = table.getSelectionModel(); + addFinancialTransactionAfterService(); + //select the new line + int numberRow = table.getRowCount()-1; + selectionModel.setSelectionInterval(numberRow, numberRow); + //focus on first column + table.changeSelection(numberRow, 0, false, false); + table.scrollCellToVisible(numberRow, 0); } /** @@ -302,8 +302,8 @@ FinancialPeriod financialPeriod = (FinancialPeriod)view.getFinancialPeriodComboBox().getSelectedItem(); EntryBook entryBook = (EntryBook)view.getEntryBookComboBox().getSelectedItem(); - FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); - + FinancialTransactionTableModel tableModel = view.getFinancialTransactionTableModel(); + FinancialTransaction financialTransaction = new FinancialTransactionImpl(); // can be defined later by user if (entryBook != null) {

1 0

r3467 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/common
by mallon＠users.chorem.org June 21, 2012

June 21, 2012

Author: mallon Date: 2012-06-21 14:36:51 +0200 (Thu, 21 Jun 2012) New Revision: 3467 Url: http://chorem.org/repositories/revision/lima/3467 Log: Correction concernant la s?\195?\169lection par d?\195?\169faut du premier journal ouvert. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-21 12:28:00 UTC (rev 3466) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-21 12:36:51 UTC (rev 3467) @@ -43,7 +43,7 @@ */ @Override public Object getElementAt(int index) { - if (selectedObject == null){ + if (getSelectedItem() == null){ setSelectedItem(objects.get(0)); return objects.get(0); }

1 0

r3466 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/common
by mallon＠users.chorem.org June 21, 2012

June 21, 2012

Author: mallon Date: 2012-06-21 14:28:00 +0200 (Thu, 21 Jun 2012) New Revision: 3466 Url: http://chorem.org/repositories/revision/lima/3466 Log: Correction concernant la s?\195?\169lection par d?\195?\169faut du premier journal dans la saisie des ?\195?\169critures Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-21 11:45:00 UTC (rev 3465) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-21 12:28:00 UTC (rev 3466) @@ -45,7 +45,6 @@ private static final long serialVersionUID = 4778917695588663498L; protected List<E> objects; - protected Object selectedObject = super.getSelectedItem(); @Override public int getSize() {

1 0

r3465 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/common java/org/chorem/lima/ui/financialtransaction resources/i18n
by mallon＠users.chorem.org June 21, 2012

June 21, 2012

Author: mallon Date: 2012-06-21 13:45:00 +0200 (Thu, 21 Jun 2012) New Revision: 3465 Url: http://chorem.org/repositories/revision/lima/3465 Log: D?\195?\169sormais, au sein du panneau de saisie des ?\195?\169critures, si aucun journal n'est ouvert, il est impossible d'ajouter une transaction; et un message indique ?\195?\160 l'utilisateur qu'il doit d'abord cr?\195?\169er un journal. De plus, lorsqu'au moins un journal est ouvert, celui-ci est s?\195?\169lectionn?\195?\169 par d?\195?\169faut au sein de la liste d?\195?\169roulante. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/EntryBookComboBoxModel.java 2012-06-21 11:45:00 UTC (rev 3465) @@ -37,4 +37,16 @@ /** serialVersionUID. */ private static final long serialVersionUID = 6991293987668268456L; + + /*By default, selection of the first entryBook (Because a + * transaction without an entrybook is forbidden) + */ + @Override + public Object getElementAt(int index) { + if (selectedObject == null){ + setSelectedItem(objects.get(0)); + return objects.get(0); + } + return objects.get(index); + } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/GenericComboBoxModel.java 2012-06-21 11:45:00 UTC (rev 3465) @@ -45,7 +45,8 @@ private static final long serialVersionUID = 4778917695588663498L; protected List<E> objects; - + protected Object selectedObject = super.getSelectedItem(); + @Override public int getSize() { int result = 0; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionView.jaxx 2012-06-21 11:45:00 UTC (rev 3465) @@ -34,6 +34,7 @@ <FinancialTransactionViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedRow" javaBean="false"/> + <Boolean id="noEntryBooks" javaBean="false"/> <script> <![CDATA[ @@ -51,7 +52,8 @@ <org.chorem.lima.ui.common.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/> <JComboBox id="fiscalPeriodComboBox" model="{fiscalPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}" - onItemStateChanged="handler.fiscalPeriodSelected(event)"/> + onItemStateChanged="handler.fiscalPeriodSelected(event)" + enabled="{isNoEntryBooks()}"/> </cell> <cell anchor="east"> <JLabel text="lima.ui.financialtransaction.financialperiod" labelFor='{financialPeriodComboBox}'/> @@ -62,11 +64,14 @@ <JComboBox id="financialPeriodComboBox" model="{financialPeriodComboBoxModel}" renderer="{new org.chorem.lima.ui.common.FinancialPeriodListRenderer()}" - onItemStateChanged="handler.financialPeriodSelected(event)"/> + onItemStateChanged="handler.financialPeriodSelected(event)" + enabled="{isNoEntryBooks()}"/> <JButton id="back" text="lima.ui.financialtransaction.buttonback" - onActionPerformed="handler.back(financialPeriodComboBox)"/> + onActionPerformed="handler.back(financialPeriodComboBox)" + enabled="{isNoEntryBooks()}"/> <JButton id="next" text="lima.ui.financialtransaction.buttonnext" - onActionPerformed="handler.next(financialPeriodComboBox)"/> + onActionPerformed="handler.next(financialPeriodComboBox)" + enabled="{isNoEntryBooks()}"/> </JPanel> </cell> <cell anchor="east"> @@ -76,7 +81,8 @@ <org.chorem.lima.ui.common.EntryBookComboBoxModel id="entryBookComboBoxModel"/> <JComboBox id="entryBookComboBox" model="{entryBookComboBoxModel}" renderer="{new org.chorem.lima.ui.common.EntryBookListRenderer()}" - onItemStateChanged="handler.entryBookSelected(event)"/> + onItemStateChanged="handler.entryBookSelected(event)" + enabled="{isNoEntryBooks()}"/> </cell> </row> <row> @@ -88,7 +94,8 @@ <JButton text="lima.common.paste" enabled="{isSelectedRow()}" onActionPerformed="handler.pasteRow(financialTransactionTable.getSelectedRow())"/> <JButton text="lima.entries.addTransaction" - onActionPerformed="handler.addFinancialTransaction()"/> + onActionPerformed="handler.addFinancialTransaction()" + enabled="{isNoEntryBooks()}"/> <JButton text="lima.entries.addEntry" enabled="{isSelectedRow()}" onActionPerformed="handler.addEntry()"/> <JButton text="lima.common.remove" enabled="{isSelectedRow()}" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionViewHandler.java 2012-06-21 11:45:00 UTC (rev 3465) @@ -94,27 +94,47 @@ LimaServiceFactory.addServiceListener(ImportService.class, this); } + //impossible to add transaction without entrybook + public boolean controlEntryBook(){ + boolean result = true; + + if (entryBookService.getAllEntryBooks().isEmpty()){ + JOptionPane.showMessageDialog(view, _("lima.ui.financialtransaction.messagenoentrybooks"), + _("lima.ui.financialtransaction.titlenoentrybooks"), JOptionPane.ERROR_MESSAGE); + result = false; + }else{ + result=true; + } + + view.setNoEntryBooks(result); + return result; + } + /** * Init all combo box in view. */ public void init() { - // fiscal periods - List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); - view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods); - if (log.isDebugEnabled()) { - log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size())); + if (controlEntryBook()){ + + // fiscal periods + List<FiscalPeriod> fiscalPeriods = fiscalPeriodService.getAllUnblockedFiscalPeriods(); + view.getFiscalPeriodComboBoxModel().setObjects(fiscalPeriods); + if (log.isDebugEnabled()) { + log.debug(String.format("Loaded %d fiscal periods", fiscalPeriods.size())); + } + if (!fiscalPeriods.isEmpty()) { + view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0)); + } + + // entry books + List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); + view.getEntryBookComboBoxModel().setObjects(allEntryBooks); + + if (log.isDebugEnabled()) { + log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); + } } - if (!fiscalPeriods.isEmpty()) { - view.getFiscalPeriodComboBoxModel().setSelectedItem(fiscalPeriods.get(0)); - } - - // entry books - List<EntryBook> allEntryBooks = entryBookService.getAllEntryBooks(); - view.getEntryBookComboBoxModel().setObjects(allEntryBooks); - if (log.isDebugEnabled()) { - log.debug(String.format("Loaded %d entry books", allEntryBooks.size())); - } } /** @@ -266,8 +286,7 @@ public void addFinancialTransaction() { FinancialTransactionTable table = view.getFinancialTransactionTable(); ListSelectionModel selectionModel = table.getSelectionModel(); - - addFinancialTransaction2(); + addFinancialTransactionAfterService(); //select the new line int numberRow = table.getRowCount(); selectionModel.setSelectionInterval(numberRow - 1, numberRow - 1); @@ -279,7 +298,7 @@ /** * Add new transaction after calling service. */ - public void addFinancialTransaction2() { + public void addFinancialTransactionAfterService() { FinancialPeriod financialPeriod = (FinancialPeriod)view.getFinancialPeriodComboBox().getSelectedItem(); EntryBook entryBook = (EntryBook)view.getEntryBookComboBox().getSelectedItem(); Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-06-21 11:45:00 UTC (rev 3465) @@ -250,8 +250,10 @@ lima.ui.financialtransaction.financialperiod= lima.ui.financialtransaction.fiscalyear= lima.ui.financialtransaction.letter= +lima.ui.financialtransaction.messagenoentrybooks=At least one entry books must to be opened to create the corresponding transactions lima.ui.financialtransaction.messageremoveentry= lima.ui.financialtransaction.messageremovetransaction= +lima.ui.financialtransaction.titlenoentrybooks=No entry books opened lima.ui.financialtransaction.titleremoveentry= lima.ui.financialtransaction.titleremovetransaction= lima.ui.financialtransaction.voucher= Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties =================================================================== --- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-20 15:14:10 UTC (rev 3464) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-06-21 11:45:00 UTC (rev 3465) @@ -250,8 +250,10 @@ lima.ui.financialtransaction.financialperiod=Périodes comptables lima.ui.financialtransaction.fiscalyear=Exercices lima.ui.financialtransaction.letter=Lettre +lima.ui.financialtransaction.messagenoentrybooks=Au moins un journal doit être ouvert pour créer les transactions correspondantes lima.ui.financialtransaction.messageremoveentry=Voulez-vous supprimer cette ligne de transaction? lima.ui.financialtransaction.messageremovetransaction=Voulez-vous supprimer cette transaction? +lima.ui.financialtransaction.titlenoentrybooks=Aucun journal ouvert lima.ui.financialtransaction.titleremoveentry=Suppression lima.ui.financialtransaction.titleremovetransaction=Suppression lima.ui.financialtransaction.voucher=Pièce comptable

1 0

r3464 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org June 20, 2012

June 20, 2012

Author: mallon Date: 2012-06-20 17:14:10 +0200 (Wed, 20 Jun 2012) New Revision: 3464 Url: http://chorem.org/repositories/revision/lima/3464 Log: Lorsqu'un exercice est clot, la table est maintenant correctement mise ?\195?\160 jour. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 14:45:14 UTC (rev 3463) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 15:14:10 UTC (rev 3464) @@ -147,6 +147,7 @@ public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { int row = fiscalPeriods.indexOf(fiscalPeriod); + fiscalPeriods.set(row, fiscalPeriod); fireTableRowsInserted(row, row); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 14:45:14 UTC (rev 3463) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 15:14:10 UTC (rev 3464) @@ -203,7 +203,7 @@ */ public void blockFiscalPeriod() { JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); - FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTable().getModel(); + FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTableModel(); int selectedRow = fiscalPeriodeTable.getSelectedRow(); FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow);

1 0

r3463 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org June 20, 2012

June 20, 2012

Author: mallon Date: 2012-06-20 16:45:14 +0200 (Wed, 20 Jun 2012) New Revision: 3463 Url: http://chorem.org/repositories/revision/lima/3463 Log: Correction concernant la cl?\195?\180ture d'un exercice. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-20 14:20:05 UTC (rev 3462) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-20 14:45:14 UTC (rev 3463) @@ -176,7 +176,7 @@ /** * Règles de vérification de fermeture d'un exercice, appliquées à la comptabilité française. * - * On ne peut pas clore la dernière period comptable ouverte, si la précédente ne l'est pas. + * On ne peut pas clore la dernière periode comptable ouverte. */ @Override public void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException { @@ -187,7 +187,7 @@ fiscalPeriodDAO.getLastUnlockedFiscalPeriod(); //Check if the fiscal period to block is the oldest - if (oldestUnBlockedFiscalPeriod.equals(fiscalPeriod)) { + if (!oldestUnBlockedFiscalPeriod.equals(fiscalPeriod)) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.antefiscalperiodnotblocked")); } } catch (TopiaException ex) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 14:20:05 UTC (rev 3462) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 14:45:14 UTC (rev 3463) @@ -146,21 +146,6 @@ } public void updateFiscalPeriod(FiscalPeriod fiscalPeriod) throws LimaException { - /*List<FinancialTransaction> financialTransactionsUnbal = - financialTransactionService.getAllInexactFinancialTransactions(fiscalPeriod); - if (financialTransactionsUnbal.size() > 0) { - JFrame f = new JFrame(); - f.setIconImage(Resource.getIcon("icons/lima.png").getImage()); - JOptionPane.showMessageDialog( - f, - _("lima.fiscalperiod.unbalancedtransactions"), - _("lima.common.error"), - JOptionPane.ERROR_MESSAGE); - f.dispose(); - } else { - fiscalPeriodService.blockFiscalPeriod(fiscalPeriod); - refresh(); - }*/ int row = fiscalPeriods.indexOf(fiscalPeriod); fireTableRowsInserted(row, row); }

1 0

r3462 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org June 20, 2012

June 20, 2012

Author: mallon Date: 2012-06-20 16:20:05 +0200 (Wed, 20 Jun 2012) New Revision: 3462 Url: http://chorem.org/repositories/revision/lima/3462 Log: Si deux exercices sont ouverts, la r?\195?\168gle indiquant que le dernier ne doit pas ?\195?\170tre cl?\195?\180t avant le pr?\195?\169c?\195?\169dent est maintenant respect?\195?\169e. Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.out.xml Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-20 12:43:59 UTC (rev 3461) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-20 14:20:05 UTC (rev 3462) @@ -176,7 +176,7 @@ /** * Règles de vérification de fermeture d'un exercice, appliquées à la comptabilité française. * - * On ne peut pas clore la dernière period comptable ouverte. + * On ne peut pas clore la dernière period comptable ouverte, si la précédente ne l'est pas. */ @Override public void blockFiscalPeriodRules(FiscalPeriod fiscalPeriod) throws LimaException { @@ -187,7 +187,7 @@ fiscalPeriodDAO.getLastUnlockedFiscalPeriod(); //Check if the fiscal period to block is the oldest - if (!oldestUnBlockedFiscalPeriod.equals(fiscalPeriod)) { + if (oldestUnBlockedFiscalPeriod.equals(fiscalPeriod)) { throw new LimaBusinessException(_("lima-business.franceaccountingrules.antefiscalperiodnotblocked")); } } catch (TopiaException ex) { Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-20 12:43:59 UTC (rev 3461) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/FiscalPeriodDAOImpl.java 2012-06-20 14:20:05 UTC (rev 3462) @@ -103,7 +103,7 @@ public FiscalPeriod getLastUnlockedFiscalPeriod() throws TopiaException { String query = "FROM " + FiscalPeriod.class.getName() + " WHERE locked = false" + - " ORDER BY endDate"; + " ORDER BY endDate desc"; List<FiscalPeriod> fiscalPeriods = context.find(query); FiscalPeriod result = null; Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.out.xml =================================================================== Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 12:43:59 UTC (rev 3461) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 14:20:05 UTC (rev 3462) @@ -202,9 +202,10 @@ * Block selected fiscal period after user confirmation. */ public void blockFiscalPeriod() { - JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = (FiscalPeriodTableModel) view.getFiscalPeriodTable().getModel(); + int selectedRow = fiscalPeriodeTable.getSelectedRow(); - FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); //check if the user want to block the fiscal year @@ -212,6 +213,7 @@ _("lima.ui.fiscalperiod.block.confirmation"), _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION, JOptionPane.WARNING_MESSAGE); + if (response == JOptionPane.YES_OPTION) { //use to tell if the user wants to create a new fiscal year boolean newyear = false;

1 0

r3461 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org June 20, 2012

June 20, 2012

Author: mallon Date: 2012-06-20 14:43:59 +0200 (Wed, 20 Jun 2012) New Revision: 3461 Url: http://chorem.org/repositories/revision/lima/3461 Log: Suppression d'affichages console inutiles. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 12:38:11 UTC (rev 3460) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 12:43:59 UTC (rev 3461) @@ -36,7 +36,6 @@ import java.util.List; import javax.swing.JOptionPane; -import javax.swing.text.View; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -321,19 +320,13 @@ //no action possible for fiscal period closed if (!selectedFiscalPeriod.getLocked()){ enableBlock = true; - - System.out.println(" ! selectedFiscalPeriod.getLocked()"); - + //only an empty and open fiscal period may be deleted if (financialTransactionList.size() <= 0){ enableDelete = true; - System.out.println("open and financialTransactionList.size() <= 0"); - }else{ - enableDelete = false; - - System.out.println("open and financialTransactionList.size() > 0"); + enableDelete = false; } } }

1 0

r3460 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org June 20, 2012

June 20, 2012

Author: mallon Date: 2012-06-20 14:38:11 +0200 (Wed, 20 Jun 2012) New Revision: 3460 Url: http://chorem.org/repositories/revision/lima/3460 Log: Un mod?\195?\168le d'UI pour la gestion des boutons des exercices (Cloture, suppression) a ?\195?\169t?\195?\169 rajout?\195?\169. Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodModelUI.java 2012-06-20 12:38:11 UTC (rev 3460) @@ -0,0 +1,94 @@ +package org.chorem.lima.ui.fiscalperiod; + +import java.beans.PropertyChangeListener; +import java.beans.PropertyChangeSupport; + +import javax.swing.DefaultListSelectionModel; + +import org.chorem.lima.entity.FiscalPeriod; + +public class FiscalPeriodModelUI extends DefaultListSelectionModel { + + public static final String SELECTED_FISCAL_PERIOD_PROPERTY = "selectedFiscalPeriod"; + + public static final String BLOCK_ENABLED_PROPERTY = "blockEnabled"; + + public static final String DELETE_ENABLED_PROPERTY = "deleteEnabled"; + + protected final PropertyChangeSupport pcs = new PropertyChangeSupport(this); + + protected FiscalPeriodTableModel model; + + protected FiscalPeriod selectedFiscalPeriod; + protected boolean blockEnabled; + protected boolean deleteEnabled; + + public FiscalPeriodModelUI(FiscalPeriodTableModel model) { + this.model = model; + } + + public boolean isDeleteEnabled() { + return deleteEnabled; + } + + public boolean isBlockEnabled() { + return blockEnabled; + } + + public FiscalPeriod getSelectedFiscalPeriod() { + return selectedFiscalPeriod; + } + + public void setBlockEnabled(boolean blockEnabled) { + Boolean oldValue = isBlockEnabled(); + this.blockEnabled = blockEnabled; + firePropertyChange(BLOCK_ENABLED_PROPERTY, oldValue, blockEnabled); + } + + public void setDeleteEnabled(boolean deleteEnabled) { + Boolean oldValue = isDeleteEnabled(); + this.deleteEnabled = deleteEnabled; + firePropertyChange(DELETE_ENABLED_PROPERTY, oldValue, deleteEnabled); + } + + public void setSelectedFiscalPeriod(FiscalPeriod selectedFiscalPeriod) { + FiscalPeriod oldValue = getSelectedFiscalPeriod(); + this.selectedFiscalPeriod = selectedFiscalPeriod; + firePropertyChange(SELECTED_FISCAL_PERIOD_PROPERTY, oldValue, selectedFiscalPeriod); + + int rowToSelect = model.getRow(selectedFiscalPeriod); + super.setSelectionInterval(rowToSelect, rowToSelect); + } + + public void addPropertyChangeListener(PropertyChangeListener listener) { + pcs.addPropertyChangeListener(listener); + } + + public void addPropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.addPropertyChangeListener(propertyName, listener); + } + + public void removePropertyChangeListener(PropertyChangeListener listener) { + pcs.removePropertyChangeListener(listener); + } + + public void removePropertyChangeListener(String propertyName, PropertyChangeListener listener) { + pcs.removePropertyChangeListener(propertyName, listener); + } + + protected void firePropertyChange(String propertyName, Object oldValue, Object newValue) { + pcs.firePropertyChange(propertyName, oldValue, newValue); + } + + @Override + public void setSelectionInterval(int index0, int index1) { + super.setSelectionInterval(index0, index1); + setSelectedFiscalPeriod(model.getFiscalPeriodAt(index0)); + } + + @Override + public int getSelectionMode() { + return SINGLE_SELECTION; + } + +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-19 15:49:11 UTC (rev 3459) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTableModel.java 2012-06-20 12:38:11 UTC (rev 3460) @@ -71,10 +71,20 @@ } public FiscalPeriod getFiscalPeriodAt(int row) { + if (row == -1) { + return null; + } FiscalPeriod result = fiscalPeriods.get(row); return result; } + public int getRow(FiscalPeriod period) { + if (period == null) { + return -1; + } + return fiscalPeriods.indexOf(period); + } + @Override public String getColumnName(int columnIndex) { Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 15:49:11 UTC (rev 3459) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-20 12:38:11 UTC (rev 3460) @@ -32,7 +32,8 @@ </import> <FiscalPeriodViewHandler id="handler" constructorParams="this"/> - <Boolean id="selectedPeriod" javaBean="false"/> + <FiscalPeriodTableModel id="fiscalPeriodTableModel" /> + <FiscalPeriodModelUI id='model' constructorParams='fiscalPeriodTableModel'/> <script><![CDATA[ void $afterCompleteSetup() { @@ -43,16 +44,12 @@ <row> <cell fill="both" weightx="1" weighty="1" rows="5"> <JScrollPane> - <FiscalPeriodTableModel id="fiscalPeriodTableModel" /> <FiscalPeriodTable id="fiscalPeriodTable" sortable="false" rowHeight="24" - constructorParams="getFiscalPeriodTableModel()" - selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" + constructorParams="getFiscalPeriodTableModel()" columnControlVisible="true" + selectionModel='{model}' /> - <ListSelectionModel - javaBean="getFiscalPeriodTable().getSelectionModel()" - onValueChanged="getHandler().reloadEnablingButton()"/> </JScrollPane> </cell> </row> @@ -65,12 +62,14 @@ <row> <cell fill="horizontal"> <JButton id="blockButton" text="lima.charts.fiscalperiod.block" + enabled="{getModel().isBlockEnabled()}" onActionPerformed="getHandler().blockFiscalPeriod()"/> </cell> </row> <row> <cell fill="horizontal"> <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete" + enabled="{getModel().isDeleteEnabled()}" onActionPerformed="getHandler().deleteFiscalPeriod()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 15:49:11 UTC (rev 3459) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-20 12:38:11 UTC (rev 3460) @@ -27,6 +27,8 @@ import static org.nuiton.i18n.I18n._; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.math.BigDecimal; import java.util.Calendar; import java.util.Collection; @@ -34,6 +36,7 @@ import java.util.List; import javax.swing.JOptionPane; +import javax.swing.text.View; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; @@ -87,6 +90,15 @@ public void init() { loadAllFiscalPeriod(); + FiscalPeriodModelUI model = view.getModel(); + model.addPropertyChangeListener(FiscalPeriodModelUI.SELECTED_FISCAL_PERIOD_PROPERTY, new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + FiscalPeriodModelUI model = (FiscalPeriodModelUI)evt.getSource(); + FiscalPeriod selectedFiscalPeriod = (FiscalPeriod)evt.getNewValue(); + reloadEnablingButton(model, selectedFiscalPeriod); + } + }); } /** @@ -294,39 +306,39 @@ /** * Manage the differents buttons for fiscal period * */ - public void reloadEnablingButton(){ + protected void reloadEnablingButton(FiscalPeriodModelUI model, FiscalPeriod selectedFiscalPeriod){ - JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); - FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); + List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod); - int selectedRow = fiscalPeriodeTable.getSelectedRow(); + boolean enableBlock = false; + boolean enableDelete = false; + - //when a fiscal period is deleted, no row is selected ('-1') - if (selectedRow != -1){ - FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); - - financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); - List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod); - - //no action possible for fiscal period closed - if (selectedFiscalPeriod.getLocked()){ - view.blockButton.setEnabled(false); - view.deleteButton.setEnabled(false); - }else{ - view.blockButton.setEnabled(true); - - //only an empty fiscal period may be deleted - if (financialTransactionList.size() <= 0){ - view.deleteButton.setEnabled(true); - }else{ - view.deleteButton.setEnabled(false); - } - } - }else{ - //after an action (delete or closure), reinitialization at false - view.blockButton.setEnabled(false); - view.deleteButton.setEnabled(false); + //when a fiscal period is deleted, no row is selected ('-1') + if (selectedFiscalPeriod != null){ + + //no action possible for fiscal period closed + if (!selectedFiscalPeriod.getLocked()){ + enableBlock = true; + + System.out.println(" ! selectedFiscalPeriod.getLocked()"); + + //only an empty and open fiscal period may be deleted + if (financialTransactionList.size() <= 0){ + enableDelete = true; + + System.out.println("open and financialTransactionList.size() <= 0"); + + }else{ + enableDelete = false; + + System.out.println("open and financialTransactionList.size() > 0"); + } + } } + model.setBlockEnabled(enableBlock); + model.setDeleteEnabled(enableDelete); } }

1 0

r3459 - in trunk: lima-business/src/main/java/org/chorem/lima/business/accountingrules lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org June 19, 2012

June 19, 2012

Author: mallon Date: 2012-06-19 17:49:11 +0200 (Tue, 19 Jun 2012) New Revision: 3459 Url: http://chorem.org/repositories/revision/lima/3459 Log: Gestion des boutons de suppression et de cloture d'exercices : d?\195?\169sormais, les boutons apparaissent selon l'etat de l'exercie selectionn?\195?\169 (Clot / Ouvert et vide / Ouvert) Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/accountingrules/FranceAccountingRules.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -213,11 +213,9 @@ } } catch (TopiaException ex) { throw new LimaException("Can't check rule", ex); - } - - } + } + } - /** * Check if old financialperiod for a an entrybook are closed before bock the asked closedperiodicentrybook * <p/> Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -126,7 +126,24 @@ FinancialPeriod period) throws LimaException { return getAllFinancialTransactions(period, null); } + + /** + * Return the list of all financial transaction of a fiscal period. + */ + @Override + public List<FinancialTransaction> getAllFinancialTransactions( + FiscalPeriod period) throws LimaException { + List<FinancialTransaction> financialTransactions = null; + try { + FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); + financialTransactions = transactionDAO.findAllByDates(period.getBeginDate(), period.getEndDate()); + } catch (Exception ex) { + throw new LimaException("Can't get financial transactions", ex); + } + return financialTransactions; + } + /** * Return the list of all financial transaction of a financial period and an entrybook. */ Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FiscalPeriodServiceImpl.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -211,7 +211,7 @@ return result; } - + /** * to block a fiscal period * <p/> Modified: trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java =================================================================== --- trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -55,7 +55,7 @@ void removeFinancialTransaction(FinancialTransaction financialtransaction) throws LimaException; - List<FinancialTransaction> getAllFinancialTransactions(FinancialPeriod period) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactions(FinancialPeriod period) throws LimaException; List<FinancialTransaction> getAllFinancialTransactions(Date beginDate, Date endDate) throws LimaException; @@ -65,6 +65,8 @@ List<FinancialTransaction> getAllFinancialTransactionsBalanced(FiscalPeriod fiscalPeriod) throws LimaException; + List<FinancialTransaction> getAllFinancialTransactions(FiscalPeriod period) throws LimaException; + List<Object> searchFinancialTransaction(FinancialTransactionSearch financialTransactionSearch) throws LimaException; Entry createEntry(Entry entry) throws LimaException; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 15:49:11 UTC (rev 3459) @@ -65,14 +65,12 @@ <row> <cell fill="horizontal"> <JButton id="blockButton" text="lima.charts.fiscalperiod.block" - enabled="{isSelectedPeriod()}" onActionPerformed="getHandler().blockFiscalPeriod()"/> </cell> </row> <row> <cell fill="horizontal"> <JButton id="deleteButton" text="lima.charts.fiscalperiod.delete" - enabled="{isSelectedPeriod()}" onActionPerformed="getHandler().deleteFiscalPeriod()"/> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:45:12 UTC (rev 3458) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 15:49:11 UTC (rev 3459) @@ -300,17 +300,33 @@ FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); int selectedRow = fiscalPeriodeTable.getSelectedRow(); - - Object valueColumnClos = model.getValueAt(selectedRow, 1 ); - if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) ){ + //when a fiscal period is deleted, no row is selected ('-1') + if (selectedRow != -1){ + FiscalPeriod selectedFiscalPeriod = model.getFiscalPeriodAt(selectedRow); + + financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); + List<FinancialTransaction> financialTransactionList = financialTransactionService.getAllFinancialTransactions(selectedFiscalPeriod); + + //no action possible for fiscal period closed + if (selectedFiscalPeriod.getLocked()){ + view.blockButton.setEnabled(false); + view.deleteButton.setEnabled(false); + }else{ + view.blockButton.setEnabled(true); + + //only an empty fiscal period may be deleted + if (financialTransactionList.size() <= 0){ + view.deleteButton.setEnabled(true); + }else{ + view.deleteButton.setEnabled(false); + } + } + }else{ + //after an action (delete or closure), reinitialization at false view.blockButton.setEnabled(false); - view.deleteButton.setEnabled(false); - }else{ - view.blockButton.setEnabled(true); - view.deleteButton.setEnabled(true); - //TODO : si l'exercice est non-vide, suppression reste a false - } + view.deleteButton.setEnabled(false); + } } }

1 0

r3458 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod
by mallon＠users.chorem.org June 19, 2012

June 19, 2012

Author: mallon Date: 2012-06-19 16:45:12 +0200 (Tue, 19 Jun 2012) New Revision: 3458 Url: http://chorem.org/repositories/revision/lima/3458 Log: Correction concernant la gestion des boutons de suppression et de cloture des exercices ('onMouseClicked' supprim?\195?\169, et d?\195?\169placement de la m?\195?\169thode de gestion des boutons dans le handler.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodView.jaxx 2012-06-19 14:45:12 UTC (rev 3458) @@ -34,30 +34,7 @@ <FiscalPeriodViewHandler id="handler" constructorParams="this"/> <Boolean id="selectedPeriod" javaBean="false"/> - <script><![CDATA[ - import static org.nuiton.i18n.I18n._; - - /** - * Manage the differents buttons for fiscal period - * */ - public void reloadEnablingButton() - { - int selectedRow = fiscalPeriodTable.getSelectedRow(); - - Object valueColumnClos = fiscalPeriodTableModel.getValueAt(selectedRow, 1 ); - - if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) )//Cloture - { - blockButton.setEnabled(false); - deleteButton.setEnabled(false); - } - else - { - blockButton.setEnabled(true); - deleteButton.setEnabled(true); - } - } - + <script><![CDATA[ void $afterCompleteSetup() { getHandler().init(); } @@ -72,11 +49,10 @@ constructorParams="getFiscalPeriodTableModel()" selectionMode="{ListSelectionModel.SINGLE_INTERVAL_SELECTION}" columnControlVisible="true" - onMouseClicked="reloadEnablingButton()" /> <ListSelectionModel javaBean="getFiscalPeriodTable().getSelectionModel()" - onValueChanged="setSelectedPeriod(fiscalPeriodTable.getSelectedRow() != -1)"/> + onValueChanged="getHandler().reloadEnablingButton()"/> </JScrollPane> </cell> </row> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:15:41 UTC (rev 3457) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2012-06-19 14:45:12 UTC (rev 3458) @@ -109,9 +109,20 @@ addPeriodDialog.setVisible(true); FiscalPeriod fiscalPeriod = addPeriodDialog.getPeriod(); - if (fiscalPeriod != null) { - int response = JOptionPane.YES_OPTION; - if (response == checkTimeFiscalPeriod(fiscalPeriod)) { + if (fiscalPeriod != null) { + + //check if fiscalperiod have 12 months, ask a confirmation + int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), + fiscalPeriod.getEndDate()); + int response = JOptionPane.YES_OPTION; + if (nbMonth != 12) { + response = JOptionPane.showConfirmDialog(view, + _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), + _("lima.ui.fiscalperiod.addfiscalperiodtitle"), + JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); + } + + if (response == JOptionPane.YES_OPTION) { fiscalPeriod = fiscalPeriodService.createFiscalPeriod(fiscalPeriod); model.addFiscalPeriod(fiscalPeriod); } @@ -280,19 +291,26 @@ } } - private int checkTimeFiscalPeriod(FiscalPeriod fiscalPeriod){ - //check if fiscalperiod have 12 months, ask a confirmation - int nbMonth = DateUtil.getDifferenceInMonths(fiscalPeriod.getBeginDate(), - fiscalPeriod.getEndDate()); - int response = JOptionPane.YES_OPTION; - if (nbMonth != 12) { - response = JOptionPane.showConfirmDialog(view, - _("lima.ui.fiscalperiod.addfiscalperiod.morethan12"), - _("lima.ui.fiscalperiod.addfiscalperiodtitle"), - JOptionPane.YES_NO_OPTION, JOptionPane.QUESTION_MESSAGE); - } + /** + * Manage the differents buttons for fiscal period + * */ + public void reloadEnablingButton(){ - return response; - } - + JXTable fiscalPeriodeTable = view.getFiscalPeriodTable(); + FiscalPeriodTableModel model = view.getFiscalPeriodTableModel(); + + int selectedRow = fiscalPeriodeTable.getSelectedRow(); + + Object valueColumnClos = model.getValueAt(selectedRow, 1 ); + + if ( String.valueOf(valueColumnClos).equals( _("lima.ui.fiscalperiod.closed") ) ){ + view.blockButton.setEnabled(false); + view.deleteButton.setEnabled(false); + }else{ + view.blockButton.setEnabled(true); + view.deleteButton.setEnabled(true); + //TODO : si l'exercice est non-vide, suppression reste a false + } + } + }

1 0