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

r3506 - in trunk: lima-callao/src/main/xmi lima-swing/src/main/java/org/chorem/lima/ui/lettering
by sletellier＠users.chorem.org 09 Jul '12

09 Jul '12

Author: sletellier Date: 2012-07-09 12:23:21 +0200 (Mon, 09 Jul 2012) New Revision: 3506 Url: http://chorem.org/repositories/revision/lima/3506 Log: Start decouping ui using models Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java Modified: trunk/lima-callao/src/main/xmi/accounting.zargo trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-callao/src/main/xmi/accounting.zargo =================================================================== (Binary files differ) Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringEditModel.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -0,0 +1,55 @@ +package org.chorem.lima.ui.lettering; + +import java.math.BigDecimal; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class LetteringEditModel { + + protected boolean lettred; + protected boolean unLettred; + protected BigDecimal debit; + protected BigDecimal credit; + protected BigDecimal solde; + + public boolean isLettred() { + return lettred; + } + + public void setLettred(boolean lettred) { + this.lettred = lettred; + } + + public boolean isUnLettred() { + return unLettred; + } + + public void setUnLettred(boolean unLettred) { + this.unLettred = unLettred; + } + + public BigDecimal getDebit() { + return debit; + } + + public void setDebit(BigDecimal debit) { + this.debit = debit; + } + + public BigDecimal getCredit() { + return credit; + } + + public void setCredit(BigDecimal credit) { + this.credit = credit; + } + + public BigDecimal getSolde() { + return solde; + } + + public void setSolde(BigDecimal solde) { + this.solde = solde; + } +} Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringSelectionModel.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -0,0 +1,9 @@ +package org.chorem.lima.ui.lettering; + +import javax.swing.DefaultListSelectionModel; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class LetteringSelectionModel extends DefaultListSelectionModel { +} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-09 09:28:37 UTC (rev 3505) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-09 10:23:21 UTC (rev 3506) @@ -35,7 +35,15 @@ <LetteringViewHandler id="handler" constructorParams="this"/> <LetteringTableModel id="tableModel"/> - <LetteringModelUI id='modelUi' constructorParams='tableModel'/> +  + + <LetteringEditModel id='letteringEditModel'/> + <LetteringFilter id='filterModel'/> + + <LetteringSelectionModel id='letteringSelectionModel'/> + <DefaultListSelectionModel id='defaultListSelectionModel'/> + <LettringAndUnlettringSelectionModel id='lettringAndUnlettringSelectionModel' + constructorParams='letteringSelectionModel, defaultListSelectionModel'/>  @@ -102,7 +110,7 @@ <cell> <JRadioButton id="lettredEntryCheckBox" buttonGroup="letteredCheckGroup" onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()))"/> - </cell> + </cell> <cell> <JLabel text="lima.ui.lettering.checkLettredEntry"/> </cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-09 09:28:37 UTC (rev 3505) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -25,6 +25,13 @@ package org.chorem.lima.ui.lettering; +import java.util.ArrayList; +import java.util.Calendar; +import java.util.Date; +import java.util.List; +import javax.swing.JComboBox; +import javax.swing.event.ListSelectionEvent; +import javax.swing.event.ListSelectionListener; import org.apache.commons.lang3.time.DateUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -39,12 +46,6 @@ import org.chorem.lima.entity.FiscalPeriod; import org.chorem.lima.service.LimaServiceFactory; -import javax.swing.*; -import java.util.ArrayList; -import java.util.Calendar; -import java.util.Date; -import java.util.List; - /** * Handler associated with financial transaction view. * @@ -54,7 +55,7 @@ * Last update : $Date$ * By : $Author$ */ -public class LetteringViewHandler implements ServiceListener{ +public class LetteringViewHandler implements ServiceListener, ListSelectionListener { private static final Log log = LogFactory.getLog(LetteringViewHandler.class); @@ -84,6 +85,10 @@ */ public void init() { loadComboAndRows(); + + letteringSelectionModel; + defaultListSelectionModel; + lettringAndUnlettringSelectionModel.addD } public void loadComboAndRows(){ @@ -237,4 +242,10 @@ @Override public void notifyMethod(String serviceName, String methodeName) { } + + @Override + public void valueChanged(ListSelectionEvent e) { + LetteringEditModel editModel = view.getLetteringEditModel(); + editModel. + } } Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java (rev 0) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LettringAndUnlettringSelectionModel.java 2012-07-09 10:23:21 UTC (rev 3506) @@ -0,0 +1,17 @@ +package org.chorem.lima.ui.lettering; + +import javax.swing.DefaultListSelectionModel; + +/** + * @author sletellier <letellier(a)codelutin.com> + */ +public class LettringAndUnlettringSelectionModel { + + protected LetteringSelectionModel letteringSelectionModel; + protected DefaultListSelectionModel defaultListSelectionModel; + + public LettringAndUnlettringSelectionModel(LetteringSelectionModel letteringSelectionModel, DefaultListSelectionModel defaultListSelectionModel) { + this.letteringSelectionModel = letteringSelectionModel; + this.defaultListSelectionModel = defaultListSelectionModel; + } +}

1 0

r3505 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/beans lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 09 Jul '12

09 Jul '12

Author: mallon Date: 2012-07-09 11:28:37 +0200 (Mon, 09 Jul 2012) New Revision: 3505 Url: http://chorem.org/repositories/revision/lima/3505 Log: Correction concernant la suppression de classes inutilis?\195?\169es, le renommage et retypage de variables, et la coh?\195?\169rence de pr?\195?\169sentation (Indentation et mots-clefs hql.). Removed: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java 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/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.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-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -121,7 +121,7 @@ * and increment them * */ @Override - public String getNewLetters() throws LimaException { + public String getNextLetters() throws LimaException { String lastActualLetters; try { @@ -135,6 +135,8 @@ String nextSecondLetter = "A"; String nextFirstLetter = "A"; + //TODO:permettre de lettrer avec plus de trois lettres + if (lastActualLetters != null){ if (lastActualLetters.length() > 2 && lastActualLetters.charAt(2) != 'Z'){ nextThirdLetter = incrementLetter(2, lastActualLetters); @@ -145,7 +147,9 @@ } } - return nextFirstLetter + nextSecondLetter + nextThirdLetter; + String nextLetters = String.valueOf(nextFirstLetter + nextSecondLetter + nextThirdLetter); + + return nextLetters; } /**Increment letter alphabetically*/ @@ -259,20 +263,13 @@ return result; } - /** - * Get all entries by dates, account and lettering - * @param beginDate begin date - * @param endDate end date - * @param account acount - * @param filtreLettre lettering - * */ @Override - public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException { + public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean letterFilter) throws LimaException { List<Entry> entries; try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, filtreLettre); + entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, letterFilter); } catch (Exception ex) { throw new LimaException("Can't get entries", ex); } 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-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -76,7 +76,14 @@ void removeEntry(Entry entry) throws LimaException; - String getNewLetters() throws LimaException; + String getNextLetters() throws LimaException; - List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException; + /** + * Get all entries by dates, account and lettering + * @param beginDate begin date + * @param endDate end date + * @param account acount + * @param letterFilter lettering + * */ + List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean letterFilter) throws LimaException; } Deleted: trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java =================================================================== --- trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java 2012-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-callao/src/main/java/org/chorem/lima/beans/FiscalPeriodOpenClose.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -1,26 +0,0 @@ -package org.chorem.lima.beans; - -import org.apache.commons.lang3.tuple.Pair; - -public class FiscalPeriodOpenClose extends Pair<Object, Object>{ - - @Override - public Object setValue(Object value) { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getLeft() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Object getRight() { - // TODO Auto-generated method stub - return null; - } - - -} 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-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -185,7 +185,7 @@ * @throws TopiaException * */ public List<Entry> findAllEntryByAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws TopiaException { - List<Entry> entries = null; + List<Entry> entries; String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + " where E.financialTransaction = F" + @@ -194,14 +194,14 @@ if (filtreLettre != null){ if (filtreLettre){ query += " and E.lettering is null"; - }else if (!filtreLettre){ + }else { query += " and E.lettering is not null"; } } query += " and :beginDate <= F.transactionDate" + - " AND F.transactionDate <= :endDate"+ - " ORDER BY F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; + " and F.transactionDate <= :endDate"+ + " order by F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; entries = context.findAll(query, "account", account, "beginDate", beginDate, "endDate", endDate); return entries; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -177,7 +177,7 @@ //select entries with the same letter of the selected entry for(Entry entry : modelEntries){ if (entry.getLettering() != null && !entry.getLettering().isEmpty()){ - if (entry.getLettering().equals(lastEntrySelected.getLettering())){ + if (entry.getLettering().equals(currentLettring)){ int entryToSelect = model.getIndexOfEntry(entry); //Save current entry before changing it to add // debit / credit / solde with current entry later (Case : multiple selection Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-07 19:46:50 UTC (rev 3504) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-09 09:28:37 UTC (rev 3505) @@ -212,7 +212,7 @@ /**Add a group of three letters to n entries*/ public void addLetter() { - String newLetters = financialTransactionService.getNewLetters(); + String newLetters = financialTransactionService.getNextLetters(); changeLetter(newLetters); view.getModelUi().setLettrer(false); }

1 0

r3504 - trunk
by tchemit＠users.chorem.org 07 Jul '12

07 Jul '12

Author: tchemit Date: 2012-07-07 21:46:50 +0200 (Sat, 07 Jul 2012) New Revision: 3504 Url: http://chorem.org/repositories/revision/lima/3504 Log: updates to mavenpom 3.3.4 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-07-06 16:29:11 UTC (rev 3503) +++ trunk/pom.xml 2012-07-07 19:46:50 UTC (rev 3504) @@ -10,7 +10,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.3.3</version> + <version>3.3.4</version> </parent> <groupId>org.chorem</groupId>

1 0

r3503 - in trunk: lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 18:29:11 +0200 (Fri, 06 Jul 2012) New Revision: 3503 Url: http://chorem.org/repositories/revision/lima/3503 Log: commit #684 : Correction sur les montants, quand la m?\195?\170me ligne est d?\195?\169-/s?\195?\169lectionn?\195?\169e (Ecritures lettr?\195?\169es.). Modified: trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 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-07-06 14:51:49 UTC (rev 3502) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-06 16:29:11 UTC (rev 3503) @@ -186,10 +186,6 @@ * */ public List<Entry> findAllEntryByAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws TopiaException { List<Entry> entries = null; - /* String query = "FROM " + FinancialTransaction.class.getName() + " T"+ - " WHERE :beginDate <= T.transactionDate" + - " AND T.transactionDate <= :endDate" + - " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE;*/ String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + " where E.financialTransaction = F" + @@ -202,7 +198,6 @@ query += " and E.lettering is not null"; } } - System.out.println(query); query += " and :beginDate <= F.transactionDate" + " AND F.transactionDate <= :endDate"+ Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:51:49 UTC (rev 3502) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 16:29:11 UTC (rev 3503) @@ -8,6 +8,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.math.BigDecimal; +import java.util.ArrayList; import java.util.List; public class LetteringModelUI extends DefaultListSelectionModel{ @@ -42,6 +43,7 @@ protected boolean lettrer; protected boolean delettrer; protected String currentLettring; + protected List<Entry> precedentEntries; protected Entry currentEntry; public LetteringModelUI(LetteringTableModel model) { @@ -146,14 +148,15 @@ public void setSelectionInterval(int row, int column) { setLettrer(false); setDelettrer(false); - Entry entryAt = model.getEntryAt(row); + Entry lastEntrySelected = model.getEntryAt(row); List<Entry> modelEntries = model.getEntries(); - setSelectedEntry(entryAt); + setSelectedEntry(lastEntrySelected); + precedentEntries=new ArrayList<Entry>(); - if (entryAt.getLettering() != null){ + if (lastEntrySelected.getLettering() != null){ // no line selected or line selected different of the current - if (isSelectionEmpty() || currentEntry != null || !currentLettring.equals(entryAt.getLettering())){ + if (isSelectionEmpty() || currentEntry != null || !currentLettring.equals(lastEntrySelected.getLettering())){ if (log.isInfoEnabled()) { log.info("First"); } @@ -169,15 +172,18 @@ soldeTotal = BigDecimal.ZERO; } - currentLettring = entryAt.getLettering(); + currentLettring = lastEntrySelected.getLettering(); super.setSelectionInterval(row, column); //select entries with the same letter of the selected entry for(Entry entry : modelEntries){ if (entry.getLettering() != null && !entry.getLettering().isEmpty()){ - if (entry.getLettering().equals(entryAt.getLettering())){ + if (entry.getLettering().equals(lastEntrySelected.getLettering())){ int entryToSelect = model.getIndexOfEntry(entry); + //Save current entry before changing it to add + // debit / credit / solde with current entry later (Case : multiple selection + //for entries with same letters.) + precedentEntries.add(entry); super.addSelectionInterval(entryToSelect, entryToSelect); - //TODO add debit / credit / balance of entry with same letters } } } @@ -185,7 +191,7 @@ }else{ //no line selected or line selected different of the current //Test null for currentEntry cause of selection before entry with letter - if (isSelectionEmpty() || currentEntry == null || !currentEntry.equals(entryAt)){ + if (isSelectionEmpty() || currentEntry == null || !currentEntry.equals(lastEntrySelected)){ if (log.isInfoEnabled()) { log.info("Second"); } @@ -199,7 +205,7 @@ creditTotal = BigDecimal.ZERO; soldeTotal = BigDecimal.ZERO; } - currentEntry = entryAt; + currentEntry = lastEntrySelected; super.addSelectionInterval(row, column); //remove entry and get precedent entry for currentEntry @@ -212,60 +218,94 @@ /**Managing components when n rows are selected * */ if (!isSelectionEmpty()){ - boolean debitSelected = selectedEntry.getDebit(); - BigDecimal amountSelected = selectedEntry.getAmount(); - BigDecimal debitVal = debitSelected ? amountSelected : BigDecimal.ZERO; - if (log.isInfoEnabled()) { log.info("debit : " + debitTotal + "\n" + "credit : " + creditTotal + "\n" + "solde : " + soldeTotal); } - if (debitVal == BigDecimal.ZERO){ - BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; - if (creditVal != BigDecimal.ZERO){ + //Case of selection of entry not lettered + if (precedentEntries.isEmpty()){ + boolean debitSelected = selectedEntry.getDebit(); + BigDecimal amountSelected = selectedEntry.getAmount(); + + BigDecimal debitVal = debitSelected ? amountSelected : BigDecimal.ZERO; + if (debitVal == BigDecimal.ZERO){ + BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; + if (creditVal != BigDecimal.ZERO){ + if (selectedEntry != currentEntry){ + creditTotal = creditTotal.subtract(creditVal); + soldeTotal = soldeTotal.add(creditVal); + }else{ + creditTotal = creditTotal.add(creditVal); + soldeTotal = soldeTotal.subtract(creditVal); + } + } + }else{ if (selectedEntry != currentEntry){ - creditTotal = creditTotal.subtract(creditVal); - soldeTotal = soldeTotal.add(creditVal); + debitTotal = debitTotal.subtract(debitVal); + soldeTotal = soldeTotal.subtract(debitVal); }else{ - creditTotal = creditTotal.add(creditVal); - soldeTotal = soldeTotal.subtract(creditVal); + debitTotal = debitTotal.add(debitVal); + soldeTotal = soldeTotal.add(debitVal); } } + + if (log.isInfoEnabled()) { + log.info("AFTER / debit : " + debitTotal + "\n" + + "credit : " + creditTotal + "\n" + + "solde : " + soldeTotal); + } }else{ - if (selectedEntry != currentEntry){ - debitTotal = debitTotal.subtract(debitVal); - soldeTotal = soldeTotal.subtract(debitVal); - }else{ - debitTotal = debitTotal.add(debitVal); - soldeTotal = soldeTotal.add(debitVal); - } - } + if (log.isInfoEnabled()) { + log.info("precedentEntries.size() : " + precedentEntries.size()); + } + //In case of multiple selection (Entry with same letters) + //add debit / credit / balance of entries selected + for (Entry precedentEntry : precedentEntries){ + if (precedentEntry != null){ + if (log.isInfoEnabled()) { + log.info("precedentEntries not null"); + } + boolean precedentDebitSelected = precedentEntry.getDebit(); + BigDecimal precedentAmountSelected = precedentEntry.getAmount(); - if (log.isInfoEnabled()) { - log.info("AFTER / debit : " + debitTotal + "\n" + - "credit : " + creditTotal + "\n" + - "solde : " + soldeTotal); - } + BigDecimal precedentDebitVal = precedentDebitSelected ? precedentAmountSelected : BigDecimal.ZERO; + BigDecimal precedentCreditVal = precedentDebitSelected ? BigDecimal.ZERO : precedentAmountSelected; - setDebit(debitTotal); - setCredit(creditTotal); - setSolde(soldeTotal); + if (log.isInfoEnabled()) { + log.info("precedentDebitVal : " + precedentDebitVal + "\n" + + "precedentCreditVal : " + precedentCreditVal); + } - //Managing lettering buttons - String lettering = null; + debitTotal = debitTotal.add(precedentDebitVal); + soldeTotal = soldeTotal.add(precedentDebitVal); - //lettering impossible if one of entries have letter - lettering = entryAt.getLettering(); - if (lettering != null && !lettering.isEmpty()){ - setDelettrer(true); + creditTotal = creditTotal.add(precedentCreditVal); + soldeTotal = soldeTotal.subtract(precedentCreditVal); + + } + } + precedentEntries.clear(); } - if (solde.intValue() == 0 && !delettrer){ - setLettrer(true); - } + setDebit(debitTotal); + setCredit(creditTotal); + setSolde(soldeTotal); + + //Managing lettering buttons + String lettering = null; + + //lettering impossible if one of entries have letter + lettering = lastEntrySelected.getLettering(); + if (lettering != null && !lettering.isEmpty()){ + setDelettrer(true); + } + + if (solde.intValue() == 0 && !delettrer){ + setLettrer(true); + } } else{ debitTotal = BigDecimal.ZERO;

1 0

r3502 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 16:51:49 +0200 (Fri, 06 Jul 2012) New Revision: 3502 Url: http://chorem.org/repositories/revision/lima/3502 Log: refs #684 : Correction sur les montants, quand la m?\195?\170me ligne est d?\195?\169-/s?\195?\169lectionn?\195?\169e (Ecritures non-lettr?\195?\169es.). Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:32:58 UTC (rev 3501) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:51:49 UTC (rev 3502) @@ -177,6 +177,7 @@ if (entry.getLettering().equals(entryAt.getLettering())){ int entryToSelect = model.getIndexOfEntry(entry); super.addSelectionInterval(entryToSelect, entryToSelect); + //TODO add debit / credit / balance of entry with same letters } } } @@ -210,7 +211,7 @@ /**Managing components when n rows are selected * */ - if (!isSelectionEmpty() /*&& selectedEntry != currentEntry*/){ + if (!isSelectionEmpty()){ boolean debitSelected = selectedEntry.getDebit(); BigDecimal amountSelected = selectedEntry.getAmount(); @@ -225,12 +226,22 @@ if (debitVal == BigDecimal.ZERO){ BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; if (creditVal != BigDecimal.ZERO){ - creditTotal = creditTotal.add(creditVal); - soldeTotal = soldeTotal.subtract(creditVal); + if (selectedEntry != currentEntry){ + creditTotal = creditTotal.subtract(creditVal); + soldeTotal = soldeTotal.add(creditVal); + }else{ + creditTotal = creditTotal.add(creditVal); + soldeTotal = soldeTotal.subtract(creditVal); + } } }else{ - debitTotal = debitTotal.add(debitVal); - soldeTotal = soldeTotal.add(debitVal); + if (selectedEntry != currentEntry){ + debitTotal = debitTotal.subtract(debitVal); + soldeTotal = soldeTotal.subtract(debitVal); + }else{ + debitTotal = debitTotal.add(debitVal); + soldeTotal = soldeTotal.add(debitVal); + } } if (log.isInfoEnabled()) {

1 0

r3501 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 16:32:58 +0200 (Fri, 06 Jul 2012) New Revision: 3501 Url: http://chorem.org/repositories/revision/lima/3501 Log: refs #684 : Remise ?\195?\160 z?\195?\169ro des attributs de d?\195?\169bits / cr?\195?\169dit / soldes totaux lorsqu'aucune ligne n'est s?\195?\169lectionn?\195?\169e. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:26:12 UTC (rev 3500) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:32:58 UTC (rev 3501) @@ -210,7 +210,7 @@ /**Managing components when n rows are selected * */ - if (!isSelectionEmpty()){ + if (!isSelectionEmpty() /*&& selectedEntry != currentEntry*/){ boolean debitSelected = selectedEntry.getDebit(); BigDecimal amountSelected = selectedEntry.getAmount(); @@ -257,6 +257,9 @@ } } else{ + debitTotal = BigDecimal.ZERO; + creditTotal = BigDecimal.ZERO; + soldeTotal = BigDecimal.ZERO; setDebit(BigDecimal.ZERO); setCredit(BigDecimal.ZERO); setSolde(BigDecimal.ZERO);

1 0

r3500 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 16:26:12 +0200 (Fri, 06 Jul 2012) New Revision: 3500 Url: http://chorem.org/repositories/revision/lima/3500 Log: Remise ?\195?\160 z?\195?\169ro des d?\195?\169bits / cr?\195?\169dit / soldes lorsqu'aucune ligne n'est s?\195?\169lectionn?\195?\169e. Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.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-07-06 13:28:17 UTC (rev 3499) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-06 14:26:12 UTC (rev 3500) @@ -268,21 +268,11 @@ * */ @Override public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException { - List<FinancialTransaction> financialTransactions = null; - List<Entry> entries = new ArrayList<Entry>(); + List<Entry> entries; - /* try{ - FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); - financialTransactions = transactionDAO.findAllByDates(beginDate, endDate); - }catch (Exception ex){ - throw new LimaException("Can't get financial transactions", ex); - }*/ - try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - //for (FinancialTransaction financialTransaction : financialTransactions){ - entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, filtreLettre); - // } + entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, filtreLettre); } catch (Exception ex) { throw new LimaException("Can't get entries", ex); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 13:28:17 UTC (rev 3499) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringModelUI.java 2012-07-06 14:26:12 UTC (rev 3500) @@ -211,7 +211,6 @@ /**Managing components when n rows are selected * */ if (!isSelectionEmpty()){ - boolean debitSelected = selectedEntry.getDebit(); BigDecimal amountSelected = selectedEntry.getAmount(); @@ -225,13 +224,9 @@ if (debitVal == BigDecimal.ZERO){ BigDecimal creditVal = debitSelected ? BigDecimal.ZERO : amountSelected; - if (creditVal != BigDecimal.ZERO){ creditTotal = creditTotal.add(creditVal); soldeTotal = soldeTotal.subtract(creditVal); - }else{ - creditTotal = creditTotal.add(creditVal); - soldeTotal = soldeTotal.add(creditVal); } }else{ debitTotal = debitTotal.add(debitVal); @@ -261,6 +256,11 @@ setLettrer(true); } } + else{ + setDebit(BigDecimal.ZERO); + setCredit(BigDecimal.ZERO); + setSolde(BigDecimal.ZERO); + } } @Override

1 0

r3499 - trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 15:28:17 +0200 (Fri, 06 Jul 2012) New Revision: 3499 Url: http://chorem.org/repositories/revision/lima/3499 Log: refs #684 : Correction concernant l'?\195?\169tat des boutons lettrer/d?\195?\169lettrer apr?\195?\168s d?\195?\169- / lettrage. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-06 13:19:17 UTC (rev 3498) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-06 13:28:17 UTC (rev 3499) @@ -214,11 +214,13 @@ public void addLetter() { String newLetters = financialTransactionService.getNewLetters(); changeLetter(newLetters); + view.getModelUi().setLettrer(false); } /**Remove a group of three letters to n entries*/ public void removeLetter() { changeLetter(null); + view.getModelUi().setDelettrer(false); } /**Add or remove a group of three letters to n entries*/

1 0

r3498 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business-api/src/main/java/org/chorem/lima/business/api lima-callao/src/main/java/org/chorem/lima/entity lima-swing/src/main/java/org/chorem/lima/ui/lettering
by mallon＠users.chorem.org 06 Jul '12

06 Jul '12

Author: mallon Date: 2012-07-06 15:19:17 +0200 (Fri, 06 Jul 2012) New Revision: 3498 Url: http://chorem.org/repositories/revision/lima/3498 Log: Correction concernant la gestion du filtre sur le lettrage des ?\195?\169critures (Boolean) et la requ?\195?\170te de chargement du tableau. 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/ejb/FinancialTransactionServiceImpl.java trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.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-07-06 12:04:32 UTC (rev 3497) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java 2012-07-06 13:19:17 UTC (rev 3498) @@ -267,22 +267,22 @@ * @param filtreLettre lettering * */ @Override - public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, String filtreLettre) throws LimaException { + public List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException { List<FinancialTransaction> financialTransactions = null; List<Entry> entries = new ArrayList<Entry>(); - try{ + /* try{ FinancialTransactionDAO transactionDAO = getDaoHelper().getFinancialTransactionDAO(); financialTransactions = transactionDAO.findAllByDates(beginDate, endDate); }catch (Exception ex){ throw new LimaException("Can't get financial transactions", ex); - } + }*/ try { EntryDAO entryDAO = getDaoHelper().getEntryDAO(); - for (FinancialTransaction financialTransaction : financialTransactions){ - entries.addAll(entryDAO.findAllEntryByAccountAndLettering(financialTransaction, account, filtreLettre)); - } + //for (FinancialTransaction financialTransaction : financialTransactions){ + entries = entryDAO.findAllEntryByAccountAndLettering(beginDate, endDate, account, filtreLettre); + // } } catch (Exception ex) { throw new LimaException("Can't get entries", ex); } 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-07-06 12:04:32 UTC (rev 3497) +++ trunk/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java 2012-07-06 13:19:17 UTC (rev 3498) @@ -78,5 +78,5 @@ String getNewLetters() throws LimaException; - List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, String filtreLettre) throws LimaException; + List<Entry> getAllEntrieByDatesAndAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws LimaException; } 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-07-06 12:04:32 UTC (rev 3497) +++ trunk/lima-callao/src/main/java/org/chorem/lima/entity/EntryDAOImpl.java 2012-07-06 13:19:17 UTC (rev 3498) @@ -178,25 +178,37 @@ /** * Retourne toutes les entrées d'une transaction * pour un compte et un lettrage - * - * @param financialTransaction transaction sur laquelle les entrées sont filtrées + * @param beginDate debut de la période + * @param endDate fin de la période * @param account compte sur lequel les entrées sont filtrées * @param filtreLettre toutes (all), non-lettrées ("null") ou lettrées ("notNull") * @throws TopiaException * */ - public List<Entry> findAllEntryByAccountAndLettering(FinancialTransaction financialTransaction, Account account, String filtreLettre) throws TopiaException { + public List<Entry> findAllEntryByAccountAndLettering(Date beginDate, Date endDate, Account account, Boolean filtreLettre) throws TopiaException { List<Entry> entries = null; + /* String query = "FROM " + FinancialTransaction.class.getName() + " T"+ + " WHERE :beginDate <= T.transactionDate" + + " AND T.transactionDate <= :endDate" + + " ORDER BY T.transactionDate, T." + FinancialTransaction.TOPIA_CREATE_DATE;*/ - String query = "from " + Entry.class.getName() + " E " + - " where E.financialTransaction = :financialTransaction" + - " and E.account = :account "; - if (filtreLettre.equals("null")){ - query += " and E.lettering is null"; - }else if (filtreLettre.equals("notNull")){ - query += " and E.lettering is not null"; + String query = "Select E from " + Entry.class.getName() + " E, " + FinancialTransaction.class.getName() + " F" + + " where E.financialTransaction = F" + + " and E.account = :account "; + + if (filtreLettre != null){ + if (filtreLettre){ + query += " and E.lettering is null"; + }else if (!filtreLettre){ + query += " and E.lettering is not null"; + } } + System.out.println(query); - entries = context.findAll(query, "financialTransaction", financialTransaction, "account", account); + query += " and :beginDate <= F.transactionDate" + + " AND F.transactionDate <= :endDate"+ + " ORDER BY F.transactionDate, F." + FinancialTransaction.TOPIA_CREATE_DATE; + + entries = context.findAll(query, "account", account, "beginDate", beginDate, "endDate", endDate); return entries; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-06 12:04:32 UTC (rev 3497) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-06 13:19:17 UTC (rev 3498) @@ -64,7 +64,7 @@ <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> <JComboBox id="accountComboBox" model="{accountComboBoxModel}" renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), (String)letteredCheckGroup.getSelectedValue())"/> + onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), ( letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()) || letteredCheckGroup.isSelected(lettredEntryCheckBox.getModel())))"/> <JButton id="backCount" text="lima.ui.account.buttonback" onActionPerformed="handler.back(accountComboBox)"/> <JButton id="nextCount" text="lima.ui.account.buttonnext" @@ -80,7 +80,7 @@ </cell> <cell> <JXDatePicker id="pickerDebut" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), (String)letteredCheckGroup.getSelectedValue())"/> + onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), ( letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()) || letteredCheckGroup.isSelected(lettredEntryCheckBox.getModel())))"/> </cell> </row> <row> @@ -89,7 +89,7 @@ </cell> <cell> <JXDatePicker id="pickerFin" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), (String)letteredCheckGroup.getSelectedValue())"/> + onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), ( letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()) || letteredCheckGroup.isSelected(lettredEntryCheckBox.getModel())))"/> </cell> </row> </Table> @@ -100,8 +100,8 @@ <Table> <row> <cell> - <JRadioButton id="lettredEntryCheckBox" buttonGroup="letteredCheckGroup" value="notNull" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), (String)letteredCheckGroup.getSelectedValue())"/> + <JRadioButton id="lettredEntryCheckBox" buttonGroup="letteredCheckGroup" + onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()))"/> </cell> <cell> <JLabel text="lima.ui.lettering.checkLettredEntry"/> @@ -109,8 +109,8 @@ </row> <row> <cell> - <JRadioButton id="noLettredEntryCheckBox" selected="true" buttonGroup="letteredCheckGroup" value="null" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), (String)letteredCheckGroup.getSelectedValue())"/> + <JRadioButton id="noLettredEntryCheckBox" selected="true" buttonGroup="letteredCheckGroup" + onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), letteredCheckGroup.isSelected(noLettredEntryCheckBox.getModel()))"/> </cell> <cell> <JLabel text="lima.ui.lettering.checkNoLettredEntry"/> @@ -118,8 +118,8 @@ </row> <row> <cell> - <JRadioButton id="allCheckBox" buttonGroup="letteredCheckGroup" value="all" - onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), (String)letteredCheckGroup.getSelectedValue())"/> + <JRadioButton id="allCheckBox" buttonGroup="letteredCheckGroup" + onActionPerformed="handler.updateAllEntries(pickerDebut.getDate(), pickerFin.getDate(), (Account)accountComboBox.getSelectedItem(), null)"/> </cell> <cell> <JLabel text="lima.ui.lettering.checkAll"/> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-06 12:04:32 UTC (rev 3497) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java 2012-07-06 13:19:17 UTC (rev 3498) @@ -131,25 +131,25 @@ log.debug("Val select letter : " + view.getLetteredCheckGroup().getSelectedButton().getName()); //Load entry with the default dates, default account 4 and with no letter - updateAllEntries(defaultDateBegFiscalPeriod, defaultDateEndCurrent, (Account)view.getAccountComboBoxModel().getSelectedItem(), (String)view.getLetteredCheckGroup().getSelectedValue()); + updateAllEntries(defaultDateBegFiscalPeriod, defaultDateEndCurrent, (Account)view.getAccountComboBoxModel().getSelectedItem(), view.getLetteredCheckGroup().isSelected(view.getNoLettredEntryCheckBox().getModel())); if (log.isInfoEnabled()) { log.info("Nb entries model (After update all entries) : " + view.getTableModel().getNumberOfEntries()); } } - protected List<Entry> findAllEntries(Date selectedBeginDate, Date selectedEndDate, Account compte, String filtreLettre){ + protected List<Entry> findAllEntries(Date selectedBeginDate, Date selectedEndDate, Account compte, Boolean filtreLettre){ if (selectedBeginDate != null && selectedEndDate != null) { if (log.isInfoEnabled()) { log.info("FiltreLettre : " + filtreLettre); } List<Entry> entries = - financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(selectedBeginDate, selectedEndDate, compte, filtreLettre); + financialTransactionService.getAllEntrieByDatesAndAccountAndLettering(selectedBeginDate, selectedEndDate, compte, filtreLettre); return entries; } return null; } - public void updateAllEntries(Date selectedBeginDate, Date selectedEndDate, Account compte, String filtreLettre) { + public void updateAllEntries(Date selectedBeginDate, Date selectedEndDate, Account compte, Boolean filtreLettre) { if (selectedBeginDate != null && selectedEndDate != null){ log.debug("updateAllEntries");

1 0

r3497 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/i18n lima-swing/src/main/java/org/chorem/lima/enums lima-swing/src/main/java/org/chorem/lima/ui lima-swing/src/main/java/org/chorem/lima/ui/importexport lima-swing/src/main/resources/i18n
by echatellier＠users.chorem.org 06 Jul '12

06 Jul '12

Author: echatellier Date: 2012-07-06 14:04:32 +0200 (Fri, 06 Jul 2012) New Revision: 3497 Url: http://chorem.org/repositories/revision/lima/3497 Log: fixes #685 : apply provided patch Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.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-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java 2012-07-06 12:04:32 UTC (rev 3497) @@ -396,11 +396,11 @@ public String importAllAsCSV(String datas) throws LimaException { StringBuilder result = new StringBuilder(); - LinkedHashMap<String, ArrayList<FinancialStatementImport>> financialStatements = - new LinkedHashMap<String, ArrayList<FinancialStatementImport>>(); + Map<String, List<FinancialStatementImport>> financialStatements = + new LinkedHashMap<String, List<FinancialStatementImport>>(); - LinkedHashMap<String, ArrayList<VatStatementImport>> vatStatements = - new LinkedHashMap<String, ArrayList<VatStatementImport>>(); + Map<String, List<VatStatementImport>> vatStatements = + new LinkedHashMap<String, List<VatStatementImport>>(); List<FiscalPeriod> fiscalPeriods = new ArrayList<FiscalPeriod>(); @@ -484,21 +484,31 @@ */ @Override public String importAsCSV(String datas, - ImportExportEntityEnum importExportEntityEnum) throws LimaException { + ImportExportEntityEnum importExportEntityEnum) + throws LimaException { StringBuilder result = new StringBuilder(); // FinancialStatements - LinkedHashMap<String, ArrayList<FinancialStatementImport>> financialStatements = null; + Map<String, List<FinancialStatementImport>> financialStatements = null; // VatStatement - LinkedHashMap<String, ArrayList<VatStatementImport>> vatStatements = null; + Map<String, List<VatStatementImport>> vatStatements = null; + // Transactions and entries + Map<Integer, FinancialTransactionImport> financialTransactions = null; + Map<Integer, List<EntryImport>> entries = null; + switch (importExportEntityEnum) { case FINANCIALSTATEMENT: - financialStatements = new LinkedHashMap<String, ArrayList<FinancialStatementImport>>(); + financialStatements = new LinkedHashMap<String, List<FinancialStatementImport>>(); break; case VATSTATEMENT: - vatStatements = new LinkedHashMap<String, ArrayList<VatStatementImport>>(); + vatStatements = new LinkedHashMap<String, List<VatStatementImport>>(); break; + case FINANCIALTRANSACTION: + case ENTRY: + financialTransactions = new HashMap<Integer, FinancialTransactionImport>(); + entries = new HashMap<Integer, List<EntryImport>>(); + break; } try { @@ -507,7 +517,9 @@ CSVReader csvReader = new CSVReader(new StringReader(datas), ';'); while ((nextLine = csvReader.readNext()) != null) { - if (ImportExportEntityEnum.valueOfLabel(nextLine[0]) == importExportEntityEnum) { + if (ImportExportEntityEnum.valueOfLabel(nextLine[0]) == importExportEntityEnum + || importExportEntityEnum == ImportExportEntityEnum.FINANCIALTRANSACTION + || importExportEntityEnum == ImportExportEntityEnum.ENTRY) { switch (importExportEntityEnum) { case ENTRYBOOK: result.append(importEntryBooksChartCSV(nextLine)); @@ -523,6 +535,23 @@ result.append(importVatStatementChartCSV(nextLine, vatStatements)); break; + case FINANCIALTRANSACTION: + case ENTRY: + // Entries and transactions always go along + ImportExportEntityEnum type = + ImportExportEntityEnum.valueOfLabel(nextLine[0]); + if (type != null) { + switch (type) { + case FINANCIALTRANSACTION: + importFinancialTransactionsCSV(nextLine, + financialTransactions); + break; + case ENTRY: + importEntriesCSV(nextLine, entries); + break; + } + } + break; } } } @@ -535,6 +564,11 @@ case VATSTATEMENT: result.append(createVatStatements(vatStatements)); break; + case FINANCIALTRANSACTION: + case ENTRY: + result.append(createFinancialTransactionsAndEntries( + financialTransactions, entries)); + break; } } catch (Exception ex) { @@ -597,31 +631,36 @@ /** * Import and create accounts Structure : TYPE | accountNumber | label - * | thirdparty | masterAccountNumber | generalLedgerNumber + * | [thirdparty] * - * @param nextLine - * @param topiaContext - * @return - * @throws LimaException + * @param nextLine The line to import + * @return Success or error message + * @throws LimaException If the line format is invalid * @throws TopiaException */ protected String importAccountsChartsCSV(String[] nextLine) throws LimaException, TopiaException { - + // Check line format + if (nextLine.length < 3 + || ! nextLine[0].equals(ImportExportEntityEnum.ACCOUNT.getLabel())) { + throw new LimaException(_("lima-business.import.lineformatmismatch")); + } + StringBuilder result = new StringBuilder(); - String accountNumber = nextLine[1]; - String label = nextLine[2]; - String thirdParty = nextLine[3]; AccountDAO accountDAO = getDaoHelper().getAccountDAO(); - - // if not exist, create it + String accountNumber = nextLine[1]; + // if not exists, create it if (accountDAO.findByAccountNumber(accountNumber) == null) { Account account = new AccountImpl(); account.setAccountNumber(accountNumber); + String label = nextLine[2]; account.setLabel(label); - account.setThirdParty(thirdParty); + if (nextLine.length > 3) { + String thirdParty = nextLine[3]; + account.setThirdParty(thirdParty); + } accountDAO.create(account); result.append(_("lima-business.import.accountadded", @@ -741,7 +780,7 @@ * @throws TopiaException */ protected String importFinancialsStatementChartCSV(String[] nextLine, - LinkedHashMap<String, ArrayList<FinancialStatementImport>> financialStatements) throws LimaException, TopiaException { + Map<String, List<FinancialStatementImport>> financialStatements) throws LimaException, TopiaException { StringBuilder result = new StringBuilder(); String label = nextLine[1]; @@ -802,7 +841,7 @@ * @throws TopiaException */ protected String importVatStatementChartCSV(String[] nextLine, - Map<String, ArrayList<VatStatementImport>> vatStatements) throws LimaException, TopiaException { + Map<String, List<VatStatementImport>> vatStatements) throws LimaException, TopiaException { StringBuilder result = new StringBuilder(); @@ -842,12 +881,10 @@ /** * Import and create financialtransactions Structure : TYPE | NumTransac | - * TransactionDate | AmountDebit | AmountCredit | FinancialPeriod BeginDate - * | FinancialPeriod EndDate | EntryBook Code + * TransactionDate | AmountDebit | AmountCredit | EntryBook Code * * @param nextLine * @param financialTransactions - * @param topiaContext * @throws LimaException */ protected void importFinancialTransactionsCSV(String[] nextLine, @@ -864,13 +901,10 @@ /** * Import and create entries Structure : TYPE | NumTransac | Description | - * Amount | Debit | Lettering | Detail | Voucher | Position - * | FinancialTransaction Date | FinancialTransaction EntryBookCode | - * FinancialTransaction AmountDebit | FinancialTransaction AmountCredit + * Amount | Debit | Lettering | Detail | Voucher | Position | Account * * @param nextLine * @param entries - * @param topiaContext * @throws LimaException */ protected void importEntriesCSV(String[] nextLine, @@ -904,13 +938,13 @@ * @deprecated do only one method import without bean use (and remove beans) */ @Deprecated - protected String createFinancialStatements(Map<String, ArrayList<FinancialStatementImport>> financialStatements) throws LimaException, TopiaException { + protected String createFinancialStatements(Map<String, List<FinancialStatementImport>> financialStatements) throws LimaException, TopiaException { StringBuilder result = new StringBuilder(); FinancialStatementDAO financialStatementDAO = getDaoHelper().getFinancialStatementDAO(); while (financialStatements.size() > 0) { - for (Iterator<ArrayList<FinancialStatementImport>> itr = financialStatements + for (Iterator<List<FinancialStatementImport>> itr = financialStatements .values().iterator(); itr.hasNext(); ) { List<FinancialStatementImport> financialStatementImports = itr.next(); @@ -987,14 +1021,14 @@ * @deprecated do only one method import without bean use (and remove beans) */ @Deprecated - protected String createVatStatements(Map<String, ArrayList<VatStatementImport>> vatStatements) throws LimaException, TopiaException { + protected String createVatStatements(Map<String, List<VatStatementImport>> vatStatements) throws LimaException, TopiaException { StringBuilder result = new StringBuilder(); VatStatementDAO vatStatementDAO = getDaoHelper().getVatStatementDAO(); while (vatStatements.size() > 0) { - for (Iterator<ArrayList<VatStatementImport>> itr = vatStatements + for (Iterator<List<VatStatementImport>> itr = vatStatements .values().iterator(); itr.hasNext(); ) { List<VatStatementImport> vatStatementImports = itr.next(); @@ -1161,7 +1195,6 @@ financialTransaction.addEntry(entry); } } - return result.toString(); } Modified: trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties =================================================================== --- trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-business/src/main/resources/i18n/lima-business_en_GB.properties 2012-07-06 12:04:32 UTC (rev 3497) @@ -85,6 +85,7 @@ lima-business.import.fiscalperiodadded=SUCCESS \: The fiscalPeriod %s - %s is created \! \n lima-business.import.fiscalperiodalreadyexist=FAILED \: The fiscal period %s - %s already exists \!\n lima-business.import.identityadded=SUCCESS \: The identity %s is created \! \n +lima-business.import.lineformatmismatch=Line format is invalid. lima-business.import.noaccount=ERROR \: This file contains no account lima-business.import.nofiscalperiodopen=FAILED \: No Fiscal period open \! \n lima-business.import.transactionadded=SUCCES \: FinancialTransaction, %s - %s, added\n 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-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-business/src/main/resources/i18n/lima-business_fr_FR.properties 2012-07-06 12:04:32 UTC (rev 3497) @@ -85,6 +85,7 @@ lima-business.import.fiscalperiodadded=Succès \: Exercice %s - %s ajoutée \! \n lima-business.import.fiscalperiodalreadyexist=u00C9chec \: L'exerice %s - %s existe déjà \!\n lima-business.import.identityadded=Succès \: Identité %s ajoutée \! \n +lima-business.import.lineformatmismatch=Le format de la ligne est incorrect. lima-business.import.noaccount=Erreur \: Ce fichier ne contient aucun compte. lima-business.import.nofiscalperiodopen=u00C9chec \: Aucun exercice ouvert \! \n lima-business.import.transactionadded=Succès \: Transaction, %s, %s, ajoutée\n Modified: trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2012-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-swing/src/main/java/org/chorem/lima/enums/ImportExportEnum.java 2012-07-06 12:04:32 UTC (rev 3497) @@ -33,6 +33,7 @@ CSV_ENTRYBOOKS_EXPORT(false, true), CSV_ENTRYBOOKS_IMPORT(true, true), CSV_FINANCIALSTATEMENTS_EXPORT(false, true), CSV_FINANCIALSTATEMENTS_IMPORT(true, true), CSV_VAT_EXPORT(false, true), CSV_VAT_IMPORT(true, true), + CSV_ENTRIES_IMPORT(true, true), PDF_VAT_EXPORT(false, true), PDF_VAT_IMPORT(true, true), EBP_ACCOUNTCHARTS_EXPORT(false, false), EBP_ENTRIES_EXPORT(false, false), EBP_ACCOUNTCHARTS_IMPORT(true, false), EBP_ENTRIES_IMPORT(true, false); Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2012-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2012-07-06 12:04:32 UTC (rev 3497) @@ -74,6 +74,8 @@ onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT)'/> <JMenuItem text="lima.ui.importexport.vatstatements" onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_VAT_IMPORT)'/> + <JMenuItem text="lima.ui.importexport.financialtransactions" + onActionPerformed='getHandler().showImportExportView(this, ImportExportEnum.CSV_ENTRIES_IMPORT)'/> </JMenu> <JMenu text="lima.ui.importexport.export" actionIcon='export-element'> <JMenuItem text="lima.ui.importexport.all" Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java 2012-07-06 12:04:32 UTC (rev 3497) @@ -174,6 +174,10 @@ datas = extractFile(filePath, charset.getEncoding()); result = importService.importAsCSV(datas, ImportExportEntityEnum.VATSTATEMENT); break; + case CSV_ENTRIES_IMPORT: + datas = extractFile(filePath, charset.getEncoding()); + result = importService.importAsCSV(datas, ImportExportEntityEnum.ENTRY); + break; case PDF_VAT_IMPORT: int response = JOptionPane.showConfirmDialog(waitView, _("lima.importexport.usevatpdf"), 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-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2012-07-06 12:04:32 UTC (rev 3497) @@ -311,6 +311,7 @@ lima.ui.importexport.export=Export lima.ui.importexport.export.terminated=Export terminated lima.ui.importexport.financialstatements=FinancialStatements chart +lima.ui.importexport.financialtransactions=Moves lima.ui.importexport.import= lima.ui.importexport.import.terminated=Import terminated lima.ui.importexport.import.vatpdfimport=The PDF has been imported. It can be found inside the Lima resources directory 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-07-06 10:17:38 UTC (rev 3496) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2012-07-06 12:04:32 UTC (rev 3497) @@ -311,6 +311,7 @@ lima.ui.importexport.export=Export lima.ui.importexport.export.terminated=Export terminé lima.ui.importexport.financialstatements=Plan BCR +lima.ui.importexport.financialtransactions=Écritures lima.ui.importexport.import=Importer lima.ui.importexport.import.terminated=Import terminé lima.ui.importexport.import.vatpdfimport=Le PDF a bien été importé dans le répertoire des ressources de Lima

1 0