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

r3118 - in trunk/lima-business/src/main/java/org/chorem/lima/business: ejb ejbinterface
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 13:44:11 +0200 (Fri, 13 May 2011) New Revision: 3118 Url: http://chorem.org/repositories/revision/lima/3118 Log: #352 ajout d'une selection sur la totalite des periodes fiscales et financi?\195?\168res (au lieu de seulement celles qui etaient non bloquees) Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-13 09:30:21 UTC (rev 3117) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialPeriodServiceImpl.java 2011-05-13 11:44:11 UTC (rev 3118) @@ -140,6 +140,37 @@ doCatch(topiaContext, ex, log); } } + + /** + * Return all financial period + */ + @Override + public List<FinancialPeriod> getAllFinancialPeriods() throws LimaException { + + List<FinancialPeriod> result = null; + + TopiaContext transaction = null; + try { + transaction = beginTransaction(); + + FinancialPeriodDAO financialPeriodDAO = LimaCallaoDAOHelper. + getFinancialPeriodDAO(transaction); + + TopiaQuery query = financialPeriodDAO.createQuery() + .addEquals(FinancialPeriod.LOCKED, Boolean.TRUE) + .addOrder(FinancialPeriod.BEGIN_DATE); + + result = financialPeriodDAO.findAllByQuery(query); + } + catch (TopiaException ex) { + doCatch(transaction, ex, log); + } + finally { + doFinally(transaction, log); + } + + return result; + } /** * Return all unblocked financial period Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java 2011-05-13 09:30:21 UTC (rev 3117) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejbinterface/FinancialPeriodService.java 2011-05-13 11:44:11 UTC (rev 3118) @@ -57,4 +57,7 @@ List<ClosedPeriodicEntryBook> getAllClosedPeriodicEntryBooksFromUnblockedFiscalPeriod() throws LimaException; void blockClosedPeriodicEntryBook(ClosedPeriodicEntryBook closedPeriodicEntryBook) throws LimaException; + + + List<FinancialPeriod> getAllFinancialPeriods() throws LimaException; }

1 0

r3117 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 11:30:21 +0200 (Fri, 13 May 2011) New Revision: 3117 Url: http://chorem.org/repositories/revision/lima/3117 Log: #286 description et piece comptable rendues obligatoires pour chaque transaction Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.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 2011-05-13 09:28:53 UTC (rev 3116) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2011-05-13 09:30:21 UTC (rev 3117) @@ -211,7 +211,7 @@ .addOrder("T."+FinancialTransaction.TOPIA_CREATE_DATE) .addFrom(FiscalPeriod.class, "F") .addLeftJoin("T."+FinancialTransaction.ENTRY, "E", true) - .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR T.entryBook = null") + .addWhere("T.amountCredit != T.amountDebit OR E.account = null OR T.entryBook = null OR E.voucher = null OR E.voucher = '' OR E.description = null OR E.description = ''") .addInElements("T.financialPeriod", "F.financialPeriod") .addEquals("F", fiscalPeriod) // load lazy

1 0

r3116 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: financialtransaction financialtransactionsearch financialtransactionunbalanced
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 11:28:53 +0200 (Fri, 13 May 2011) New Revision: 3116 Url: http://chorem.org/repositories/revision/lima/3116 Log: #286 prise en compte du renderer des champs invalides dans les transactions 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 trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.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/FinancialTransactionTable.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -41,6 +41,7 @@ import org.chorem.lima.ui.celleditor.AccountTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; +import org.chorem.lima.ui.celleditor.EmptyCellRenderer; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.jdesktop.swingx.JXTable; @@ -89,6 +90,10 @@ setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //get new String renderer for empty cells + setDefaultRenderer(String.class, new EmptyCellRenderer()); + //get new Account renderer for empty cells + setDefaultRenderer(Account.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); 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 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -414,7 +414,9 @@ Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); entry.setAmount(BigDecimal.ZERO); - entry.setDescription(description); + if (description != null) { + entry.setDescription(description); + } //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -35,6 +35,7 @@ import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; +import org.chorem.lima.ui.celleditor.EmptyCellRenderer; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; @@ -76,6 +77,10 @@ setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //get new String renderer for empty cells + setDefaultRenderer(String.class, new EmptyCellRenderer()); + //get new Account renderer for empty cells + setDefaultRenderer(Account.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -37,6 +37,7 @@ import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; +import org.chorem.lima.ui.celleditor.EmptyCellRenderer; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedViewHandler; import org.jdesktop.swingx.JXTable; @@ -81,6 +82,10 @@ setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); //Get new BigDecimal renderer setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //get new String renderer for empty cells + setDefaultRenderer(String.class, new EmptyCellRenderer()); + //get new Account renderer for empty cells + setDefaultRenderer(Account.class, new EmptyCellRenderer()); //highlight financial financial transactions addColorTransaction(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-13 09:03:39 UTC (rev 3115) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-13 09:28:53 UTC (rev 3116) @@ -368,7 +368,9 @@ Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); entry.setAmount(BigDecimal.ZERO); - entry.setDescription(description); + if (description != null) { + entry.setDescription(description); + } //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow;

1 0

r3115 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 13, 2011

May 13, 2011

Author: vsalaun Date: 2011-05-13 11:03:39 +0200 (Fri, 13 May 2011) New Revision: 3115 Url: http://chorem.org/repositories/revision/lima/3115 Log: #286 ajout du renderer pour mettre en evidence les champs invalides de la ligne Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EmptyCellRenderer.java 2011-05-13 09:03:39 UTC (rev 3115) @@ -0,0 +1,61 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Color; +import java.awt.Component; + +import javax.swing.JLabel; +import javax.swing.JTable; +import javax.swing.border.Border; +import javax.swing.border.EmptyBorder; +import javax.swing.table.DefaultTableCellRenderer; + +import sun.swing.DefaultLookup; + +@SuppressWarnings("restriction") +public class EmptyCellRenderer extends DefaultTableCellRenderer { + + private static final long serialVersionUID = -7834417406160620726L; + + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) + { + //Create a new JLabel to avoid colouring only when row is selected + JLabel mycell = new JLabel(); + mycell.setOpaque(true); + setBorder(new EmptyBorder(1, 1, 1, 1)); + setName("Table.cellRenderer"); + mycell.setBackground(Color.WHITE); + mycell.setForeground(Color.BLACK); + //Setting default foreGround and backGround colours when isSelected + if (isSelected) { + mycell.setForeground(table.getSelectionForeground()); + mycell.setBackground(table.getSelectionBackground()); + } + //Setting default foreGround and backGround colours when hasFocus + if (hasFocus) { + Border border = null; + if (isSelected) { + border = DefaultLookup.getBorder(this, ui, "Table.focusSelectedCellHighlightBorder"); + } + if (border == null) { + border = DefaultLookup.getBorder(this, ui, "Table.focusCellHighlightBorder"); + } + mycell.setBorder(border); + } + // true for voucher and description + // false for Account Class + // if empty or null, colour background in red + // else setText + if (value instanceof String) { + if (String.valueOf(value).isEmpty() || (String.valueOf(value) == null)) { + mycell.setBackground(new Color(255, 198, 209)); + } else { + mycell.setText(value.toString()); + } + } else { + mycell.setBackground(new Color(255, 198, 209)); + } + return mycell; + } + +}

1 0

r3114 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:51:57 +0200 (Thu, 12 May 2011) New Revision: 3114 Url: http://chorem.org/repositories/revision/lima/3114 Log: #267 ajout du renderer pour les objets de type BigDecimal 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/BigDecimalTableCellRenderer.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 2011-05-12 08:51:57 UTC (rev 3114) @@ -0,0 +1,60 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Component; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; +import java.math.BigDecimal; +import java.util.Date; +import java.util.EventObject; + +import javax.swing.AbstractCellEditor; +import javax.swing.DefaultCellEditor; +import javax.swing.JTable; +import javax.swing.JTextField; +import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; +import javax.swing.table.TableCellEditor; +import javax.swing.text.JTextComponent; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.LimaContext; + +public class BigDecimalTableCellEditor extends AbstractCellEditor implements TableCellEditor { + + private static final Log log = LogFactory.getLog(BigDecimalTableCellEditor.class); + private static final long serialVersionUID = 1L; + protected final JTextField textField; + + /** + * constructor + */ + public BigDecimalTableCellEditor() { + textField = new JTextField(); + textField.setEditable(true); + textField.setHorizontalAlignment(SwingConstants.RIGHT); + } + + @Override + public Component getTableCellEditorComponent(JTable table, Object value, + boolean isSelected, int row, int column) { + textField.setText(value.toString()); + return textField; + } + + // the editor should return a BigDecimal + public Object getCellEditorValue() { + String textValue = textField.getText().trim(); + //replace all comma by fullstop + textValue = textValue.replaceAll(",", "."); + if (textValue.equals("")) { + return BigDecimal.ZERO; + } else { + BigDecimal bdValue = new BigDecimal(textValue); + bdValue = bdValue.setScale(LimaContext.getContext().getConfig().getScale(), + BigDecimal.ROUND_HALF_UP); + return bdValue; + } + } + +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/BigDecimalTableCellRenderer.java 2011-05-12 08:51:57 UTC (rev 3114) @@ -0,0 +1,62 @@ +package org.chorem.lima.ui.celleditor; + +import java.awt.Component; +import java.awt.Font; +import java.math.BigDecimal; +import java.text.DecimalFormat; +import java.text.DecimalFormatSymbols; +import java.text.NumberFormat; +import java.util.Locale; + +import javax.swing.JTable; +import javax.swing.SwingConstants; +import javax.swing.table.TableCellRenderer; +import javax.swing.table.DefaultTableCellRenderer; + +import org.chorem.lima.LimaConfig; +import org.chorem.lima.LimaContext; +import org.chorem.lima.beans.FinancialStatementAmounts; +import org.chorem.lima.ui.financialstatementreport.FinancialStatementReportTableModel; + +public class BigDecimalTableCellRenderer extends DefaultTableCellRenderer { + + private static final long serialVersionUID = -2499433026151065390L; + + public BigDecimalTableCellRenderer() { + // + } + + public Component getTableCellRendererComponent(JTable table, Object value, + boolean isSelected, boolean hasFocus, int row, int column) + { + + Component cell = super.getTableCellRendererComponent( + table, value, isSelected, hasFocus, row, column); + setHorizontalAlignment(SwingConstants.RIGHT); + setValue(value); + return this; + } + + public void setValue(Object aValue) { + Object result = aValue; + if (( aValue != null) && (aValue instanceof BigDecimal)) { + LimaConfig config = LimaContext.getContext().getConfig(); + String scale = ""; + for (int i = 0; i < config.getScale(); i++) { + scale += "0"; + } + DecimalFormat formatter = new DecimalFormat("##0." + scale); + DecimalFormatSymbols symbol = new DecimalFormatSymbols(); + //set decimalSeparator and thousandSeparator preferences + symbol.setDecimalSeparator(config.getDecimalSeparator()); + symbol.setGroupingSeparator(config.getThousandSeparator()); + formatter.setDecimalFormatSymbols(symbol); + //always set grouping + formatter.setGroupingUsed(true); + formatter.setGroupingSize(3); + result = formatter.format(result); + } + super.setValue(result); + } + +}

1 0

r3113 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:43:28 +0200 (Thu, 12 May 2011) New Revision: 3113 Url: http://chorem.org/repositories/revision/lima/3113 Log: #267 ajout du renderer pour les objets de type BigDecimal dans le lettrage Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-12 08:42:07 UTC (rev 3112) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTable.java 2011-05-12 08:43:28 UTC (rev 3113) @@ -38,6 +38,8 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.Letter; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.celleditor.LetterTableCellEditor; @@ -80,8 +82,12 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); - //Get new letter editor + //Get new letter editor setDefaultEditor(Letter.class, new LetterTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -132,7 +138,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-12 08:42:07 UTC (rev 3112) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringTableModel.java 2011-05-12 08:43:28 UTC (rev 3113) @@ -330,10 +330,10 @@ } break; case 6: - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 7: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 8: result = null;

1 0

r3112 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:42:07 +0200 (Thu, 12 May 2011) New Revision: 3112 Url: http://chorem.org/repositories/revision/lima/3112 Log: #267 ajout du renderer pour les objets de type BigDecimal dans l'edition du grand livre Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-12 08:40:28 UTC (rev 3111) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTable.java 2011-05-12 08:42:07 UTC (rev 3112) @@ -27,6 +27,9 @@ import java.awt.Color; import java.awt.Component; +import java.math.BigDecimal; + +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -54,6 +57,10 @@ public LedgerTable(LedgerViewHandler handler) { this.handler = handler; + + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); + //highlight financial financial transactions addColorReportsDatas(); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2011-05-12 08:40:28 UTC (rev 3111) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerTableModel.java 2011-05-12 08:42:07 UTC (rev 3112) @@ -29,12 +29,16 @@ import java.math.BigDecimal; import java.text.SimpleDateFormat; +import java.util.Date; import java.util.List; import javax.swing.table.AbstractTableModel; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.beans.ReportsDatas; +import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; +import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.Letter; /** * Entry book table model. @@ -73,7 +77,44 @@ public int getColumnCount() { return 8; } + + @Override + public Class<?> getColumnClass(int column) { + Class<?> result = null; + + switch (column) { + case 0: + result = Account.class; + break; + case 1: + result = Date.class; + break; + case 2: + result = EntryBook.class; + break; + case 3: + result = String.class; + break; + case 4: + result = String.class; + break; + case 5: + result = BigDecimal.class; + break; + case 6: + result = BigDecimal.class; + break; + case 7: + result = BigDecimal.class; + break; + } + + return result; + } + + + @Override public String getColumnName(int column) { String res = "n/a"; @@ -155,8 +196,8 @@ } else if (result instanceof Entry) { Entry currentRow = (Entry)result; - BigDecimal amountDebit = new BigDecimal(0), - amountCredit = new BigDecimal(0); + BigDecimal amountDebit = BigDecimal.ZERO, + amountCredit = BigDecimal.ZERO; if (currentRow.getDebit()){ amountDebit = currentRow.getAmount(); }

1 0

r3111 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:40:28 +0200 (Thu, 12 May 2011) New Revision: 3111 Url: http://chorem.org/repositories/revision/lima/3111 Log: #267 ajout du renderer pour les objets de type BigDecimal dans la saisie des ecritures non equilibrees Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-12 08:37:36 UTC (rev 3110) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTable.java 2011-05-12 08:40:28 UTC (rev 3111) @@ -34,6 +34,8 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.chorem.lima.ui.financialtransactionunbalanced.FinancialTransactionUnbalancedViewHandler; @@ -75,6 +77,10 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -123,7 +129,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-12 08:37:36 UTC (rev 3110) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2011-05-12 08:40:28 UTC (rev 3111) @@ -312,10 +312,10 @@ result = currentEntry.getDescription(); break; case 5 : - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 6: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 7: result = null; @@ -367,7 +367,7 @@ FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); - entry.setAmount(new BigDecimal(0)); + entry.setAmount(BigDecimal.ZERO); entry.setDescription(description); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { @@ -433,13 +433,11 @@ currentEntry.setDescription((String)value); break; case 5 : - //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName - // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(true); break; case 6: - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(false); break; case 8:

1 0

r3110 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:37:36 +0200 (Thu, 12 May 2011) New Revision: 3110 Url: http://chorem.org/repositories/revision/lima/3110 Log: #267 ajout du renderer pour les objets de type BigDecimal dans la recherche des transactions Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-12 08:35:16 UTC (rev 3109) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTable.java 2011-05-12 08:37:36 UTC (rev 3110) @@ -32,6 +32,8 @@ import org.chorem.lima.entity.Account; import org.chorem.lima.entity.EntryBook; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; import org.jdesktop.swingx.JXTable; @@ -70,6 +72,10 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -118,7 +124,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { isHighlighted = true; } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-05-12 08:35:16 UTC (rev 3109) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java 2011-05-12 08:37:36 UTC (rev 3110) @@ -293,10 +293,10 @@ result = currentEntry.getDescription(); break; case 5 : - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 6: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 7: result = null; @@ -348,7 +348,7 @@ FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); - entry.setAmount(new BigDecimal(0)); + entry.setAmount(BigDecimal.ZERO); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { currentTransaction = (FinancialTransaction)currentRow;

1 0

r3109 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction
by vsalaun＠users.chorem.org May 12, 2011

May 12, 2011

Author: vsalaun Date: 2011-05-12 10:35:16 +0200 (Thu, 12 May 2011) New Revision: 3109 Url: http://chorem.org/repositories/revision/lima/3109 Log: #267 ajout du renderer pour les objets de type BigDecimal dans la saisie des ecritures 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 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 2011-05-12 08:32:13 UTC (rev 3108) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java 2011-05-12 08:35:16 UTC (rev 3109) @@ -39,8 +39,10 @@ import org.chorem.lima.entity.EntryBook; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.ui.celleditor.AccountTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer; import org.chorem.lima.ui.celleditor.DateTableCellEditor; import org.chorem.lima.ui.celleditor.EntryBookTableCellEditor; +import org.chorem.lima.ui.celleditor.BigDecimalTableCellEditor; import org.jdesktop.swingx.JXTable; import org.jdesktop.swingx.decorator.ColorHighlighter; import org.jdesktop.swingx.decorator.ComponentAdapter; @@ -83,6 +85,10 @@ setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor()); //Get new account editor setDefaultEditor(Account.class, new AccountTableCellEditor()); + //Get new amount editor + setDefaultEditor(BigDecimal.class, new BigDecimalTableCellEditor()); + //Get new BigDecimal renderer + setDefaultRenderer(BigDecimal.class, new BigDecimalTableCellRenderer()); //highlight financial financial transactions addColorTransaction(); @@ -131,7 +137,9 @@ Object value = adapter.getValueAt(adapter.row, 8); if (value instanceof BigDecimal) { BigDecimal currentBalance = (BigDecimal) value; - if (currentBalance != BigDecimal.ZERO) { + // can compare two BigDecimals with different scales + // e.g: 3.1 == 3.10 + if (currentBalance.compareTo(BigDecimal.ZERO) != 0) { isHighlighted = true; } } 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 2011-05-12 08:32:13 UTC (rev 3108) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTableModel.java 2011-05-12 08:35:16 UTC (rev 3109) @@ -312,10 +312,10 @@ } break; case 6: - result = currentEntry.getDebit() ? currentEntry.getAmount() : 0; + result = currentEntry.getDebit() ? currentEntry.getAmount() : BigDecimal.ZERO; break; case 7: - result = currentEntry.getDebit() ? 0 : currentEntry.getAmount(); + result = currentEntry.getDebit() ? BigDecimal.ZERO : currentEntry.getAmount(); break; case 8: result = null; @@ -360,8 +360,8 @@ public void addFinancialTransaction() throws LimaException{ /* Calling transaction service */ FinancialTransaction financialTransaction = new FinancialTransactionImpl(); - financialTransaction.setAmountDebit(new BigDecimal(0)); - financialTransaction.setAmountCredit(new BigDecimal(0)); + financialTransaction.setAmountDebit(BigDecimal.ZERO); + financialTransaction.setAmountCredit(BigDecimal.ZERO); //if a period is selected if (selectedFinancialPeriod != null){ financialTransaction.setFinancialPeriod(selectedFinancialPeriod); @@ -413,7 +413,7 @@ FinancialTransaction currentTransaction = null; Object currentRow = cacheDataList.get(row); Entry entry = new EntryImpl(); - entry.setAmount(new BigDecimal(0)); + entry.setAmount(BigDecimal.ZERO); entry.setDescription(description); //check if current row is a transaction or an entry if (currentRow instanceof FinancialTransaction) { @@ -513,13 +513,11 @@ currentEntry.setLetter((Letter)value); break; case 6: - //FIXME jpepin 20101231 transtypage "superflu" pour éviter un bug de getColumnName - // qui ne fonctionne plus avec les BigDecimal - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(true); break; case 7: - currentEntry.setAmount(new BigDecimal((Long)value)); + currentEntry.setAmount((BigDecimal) value); currentEntry.setDebit(false); break; }

1 0