branch develop updated (20926d40 -> b62c44d1)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git from 20926d40 refs #1395 Correction temporaire: ne pas remonter toutes les erreurs new 0f2d1137 refs #1396 retrait @Deprecated new 6978a6cf refs #1394 affectation d'une valeur par défaut MainUiRefreshComponent new 76c960d9 refs #1396 amélioration de la vitesse d'exéction de l'import des entrées EBP new 7b8e804f refs #1396 [ISO] renommage new cefaabd6 refs #1396 correction les entrées n'étaient pas sauvegardées new 3af75d9d refs #1396 [ISO] refactoring new 28158308 refs #1396 l'export des entrées au format EBP est fait avec les transactions ordonnées par dates new b62c44d1 refs #1394 retrait de l'appel du refresh a l'initialisation de l'onglet entrées invalides. L'action refresh est déclanché pas le listener sur le combo fiscalPeriod The 8 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b62c44d15088e7e43724fa6e1a573c3e075d9b6e Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 09:39:02 2017 +0200 refs #1394 retrait de l'appel du refresh a l'initialisation de l'onglet entrées invalides. L'action refresh est déclanché pas le listener sur le combo fiscalPeriod commit 281583084577f302b16988d7c49a5ff3c5ced5a5 Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 09:35:54 2017 +0200 refs #1396 l'export des entrées au format EBP est fait avec les transactions ordonnées par dates commit 3af75d9d377cc483f8b503e655f54b8b85be98fb Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 01:03:14 2017 +0200 refs #1396 [ISO] refactoring commit cefaabd6b33080a05545e08d4259bb0887b637f9 Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 00:51:40 2017 +0200 refs #1396 correction les entrées n'étaient pas sauvegardées commit 7b8e804fd5717ef79259e1f04901b5bf0a14f1ee Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 23:42:14 2017 +0200 refs #1396 [ISO] renommage commit 76c960d99dd536626923c2932f623a2131ce0cad Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 23:30:24 2017 +0200 refs #1396 amélioration de la vitesse d'exéction de l'import des entrées EBP commit 6978a6cf33fa7e6db4d60957a5f4f3cf14dca531 Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 22:30:40 2017 +0200 refs #1394 affectation d'une valeur par défaut MainUiRefreshComponent commit 0f2d113775063f297c2abcce6d6320a8928d65be Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 21:04:29 2017 +0200 refs #1396 retrait @Deprecated Summary of changes: .../chorem/lima/business/api/EntryBookService.java | 3 + .../business/api/FinancialTransactionService.java | 7 +++ .../lima/business/ejb/EntryBookServiceImpl.java | 51 ++++++++++++---- .../lima/business/ejb/ExportServiceImpl.java | 8 ++- .../ejb/FinancialTransactionServiceImpl.java | 24 +++++++- .../lima/business/ejb/ImportServiceImpl.java | 67 +++++++++++++++------- .../lima/entity/FinancialTransactionTopiaDao.java | 7 +++ lima-swing/src/main/assembly/lima | 7 ++- lima-swing/src/main/assembly/lima.bat | 2 +- .../src/main/java/org/chorem/lima/ui/MainView.jaxx | 2 +- .../FinancialTransactionUnbalancedViewHandler.java | 4 +- .../chorem/lima/ui/importexport/ImportExport.java | 1 - 12 files changed, 142 insertions(+), 41 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 0f2d113775063f297c2abcce6d6320a8928d65be Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 21:04:29 2017 +0200 refs #1396 retrait @Deprecated --- .../src/main/java/org/chorem/lima/ui/importexport/ImportExport.java | 1 - 1 file changed, 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java index 83272027..ea3d08cb 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/importexport/ImportExport.java @@ -608,7 +608,6 @@ public class ImportExport { * @param charset charset to use for import * @return file contents */ - @Deprecated protected String loadContent(URL url, String charset) { String result = null; -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 6978a6cf33fa7e6db4d60957a5f4f3cf14dca531 Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 22:30:40 2017 +0200 refs #1394 affectation d'une valeur par défaut MainUiRefreshComponent --- lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx index 7d59735d..d1690b40 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx @@ -35,7 +35,7 @@ org.chorem.lima.enums.MainUiRefreshComponent </import> - <MainUiRefreshComponent id="mainUiRefreshComponent" javaBean='null'/> + <MainUiRefreshComponent id="mainUiRefreshComponent" javaBean='MainUiRefreshComponent.NONE'/> <script><![CDATA[ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 76c960d99dd536626923c2932f623a2131ce0cad Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 23:30:24 2017 +0200 refs #1396 amélioration de la vitesse d'exéction de l'import des entrées EBP --- .../chorem/lima/business/api/EntryBookService.java | 3 ++ .../business/api/FinancialTransactionService.java | 7 +++ .../lima/business/ejb/EntryBookServiceImpl.java | 51 +++++++++++++++++----- .../ejb/FinancialTransactionServiceImpl.java | 22 +++++++++- .../lima/business/ejb/ImportServiceImpl.java | 46 ++++++++++++------- lima-swing/src/main/assembly/lima | 7 +-- lima-swing/src/main/assembly/lima.bat | 2 +- 7 files changed, 106 insertions(+), 32 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java index 7e0ccda1..6b9a796d 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/EntryBookService.java @@ -26,6 +26,7 @@ import org.chorem.lima.business.exceptions.AlreadyExistEntryBookException; import org.chorem.lima.business.exceptions.LimaException; import org.chorem.lima.business.exceptions.UsedEntryBookException; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FinancialPeriod; import java.util.List; @@ -70,6 +71,8 @@ public interface EntryBookService { */ boolean createOrUpdateEntryBook(EntryBook entryBook); + EntryBook createImportedNewEntryBook(EntryBook entryBook, List<FinancialPeriod> financialPeriods); + /** * Create new entry book. * diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java index 43eb7825..254c6928 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java @@ -35,6 +35,7 @@ import org.chorem.lima.entity.FinancialPeriod; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; +import java.util.Collection; import java.util.Date; import java.util.List; @@ -62,6 +63,8 @@ public interface FinancialTransactionService { */ Entry createNewEntry(); + void createImportedFinancialTransactions(Collection<FinancialTransaction> financialtransactions); + FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException, LockedFinancialPeriodException, LockedEntryBookException; @@ -90,6 +93,8 @@ public interface FinancialTransactionService { List<FinancialTransaction> searchFinancialTransaction(FinancialTransactionCondition financialTransactionFilter); + void createdImportedEntry(Entry entry); + Entry createEntry(Entry entry) throws LockedFinancialPeriodException, LockedEntryBookException; void updateEntry(Entry entry) throws LockedEntryBookException, LockedFinancialPeriodException; @@ -164,4 +169,6 @@ public interface FinancialTransactionService { List<Entry> addLetter(List<Entry> entries) throws UnbalancedEntriesException, LockedEntryBookException; List<Entry> removeLetter(String letter); + + void createdImportedEntries(Collection<Entry> values); } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java index f2df8971..c91cd3e7 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/EntryBookServiceImpl.java @@ -42,6 +42,7 @@ import org.nuiton.util.beans.BinderFactory; import javax.ejb.Remote; import javax.ejb.Stateless; import javax.ejb.TransactionAttribute; +import java.util.ArrayList; import java.util.List; /** @@ -80,6 +81,20 @@ public class EntryBookServiceImpl extends AbstractLimaService implements EntryBo } @Override + public EntryBook createImportedNewEntryBook(EntryBook entryBook, List<FinancialPeriod> financialPeriods) { + + EntryBookTopiaDao entryBookTopiaDao = getDaoHelper().getEntryBookDao(); + EntryBook result = entryBookTopiaDao.create(entryBook); + + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooksToSave = getClosedPeriodicEntryBooks(result, financialPeriods); + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); + closedPeriodicEntryBookTopiaDao.createAll(closedPeriodicEntryBooksToSave); + + return result; + + } + + @Override public EntryBook createEntryBook(EntryBook entryBook) throws AlreadyExistEntryBookException { EntryBook result; // check if entrybook with is name already exist @@ -101,14 +116,16 @@ public class EntryBookServiceImpl extends AbstractLimaService implements EntryBo return result; } - protected void createClosedPeriodicEntryBook(EntryBook entryBook) { - //create ClosedPeriodicEntryBook for all unblocked financial period - ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = - getDaoHelper().getClosedPeriodicEntryBookDao(); - FinancialPeriodTopiaDao financialPeriodTopiaDao = - getDaoHelper().getFinancialPeriodDao(); - // for all unblocked financialperiod - List<FinancialPeriod> financialPeriods = financialPeriodTopiaDao.forProperties(FinancialPeriod.PROPERTY_LOCKED, false).findAll(); + protected void createClosedPeriodicEntryBook(EntryBook entryBook, List<FinancialPeriod> financialPeriods) { + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooksToSave = getClosedPeriodicEntryBooks(entryBook, financialPeriods); + + ClosedPeriodicEntryBookTopiaDao closedPeriodicEntryBookTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); + // create it + closedPeriodicEntryBookTopiaDao.createAll(closedPeriodicEntryBooksToSave); + } + + protected List<ClosedPeriodicEntryBook> getClosedPeriodicEntryBooks(EntryBook entryBook, List<FinancialPeriod> financialPeriods) { + List<ClosedPeriodicEntryBook> closedPeriodicEntryBooksToSave = new ArrayList<>(); for (FinancialPeriod financialPeriod : financialPeriods) { //new closed periodic entrybook @@ -118,9 +135,21 @@ public class EntryBookServiceImpl extends AbstractLimaService implements EntryBo closedPeriodicEntryBook.setEntryBook(entryBook); // set financial period closedPeriodicEntryBook.setFinancialPeriod(financialPeriod); - // create it - closedPeriodicEntryBookTopiaDao.create(closedPeriodicEntryBook); - } + + closedPeriodicEntryBooksToSave.add(closedPeriodicEntryBook); + + } return closedPeriodicEntryBooksToSave; + } + + protected void createClosedPeriodicEntryBook(EntryBook entryBook) { + + //create ClosedPeriodicEntryBook for all unblocked financial period + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); + + // for all unblocked financialperiod + List<FinancialPeriod> financialPeriods = financialPeriodTopiaDao.forProperties(FinancialPeriod.PROPERTY_LOCKED, false).findAll(); + + createClosedPeriodicEntryBook(entryBook, financialPeriods); } @Override diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java index b8fbabd1..95028251 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java @@ -128,6 +128,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme public FinancialTransaction createNewFinancialTransaction(){ FinancialTransactionTopiaDao financialtransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); FinancialTransaction financialTransaction = financialtransactionTopiaDao.newInstance(); + financialTransaction.setEntry(Lists.newArrayList()); return financialTransaction; } @@ -139,6 +140,13 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme } @Override + public void createImportedFinancialTransactions(Collection<FinancialTransaction> financialTransactions) { + FinancialTransactionTopiaDao financialtransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); + + financialtransactionTopiaDao.createAll(financialTransactions); + } + + @Override public FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws LockedFinancialPeriodException, LockedEntryBookException, BeforeFirstFiscalPeriodException, AfterLastFiscalPeriodException { FinancialTransaction financialTransaction = createFinancialTransaction(financialtransaction, true); @@ -159,7 +167,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme FinancialTransactionTopiaDao financialtransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); if (financialtransaction.getEntry() == null) { - financialtransaction.setEntry(Lists.<Entry>newArrayList()); + financialtransaction.setEntry(Lists.newArrayList()); } FinancialTransaction result = financialtransactionTopiaDao.create(financialtransaction); @@ -392,6 +400,12 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme return entries; } + @Override + public void createdImportedEntries(Collection<Entry> entries) { + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); + entryTopiaDao.createAll(entries); + } + public String findLastLetter(List<String> letters) { String result; @@ -580,6 +594,12 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme } @Override + public void createdImportedEntry(Entry entry) { + EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); + entryTopiaDao.create(entry); + } + + @Override public Entry createEntry(Entry entry) throws LockedFinancialPeriodException, LockedEntryBookException { AccountingRules accountingRules = LimaBusinessConfig.getInstance().getAccountingRules(); diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index 554c3195..3149378b 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -23,6 +23,7 @@ package org.chorem.lima.business.ejb; */ import com.google.common.base.Function; +import com.google.common.collect.Lists; import com.google.common.collect.Maps; import com.google.common.collect.Ordering; import com.google.common.collect.Sets; @@ -75,6 +76,8 @@ import org.chorem.lima.business.utils.EntryEBPComparator; import org.chorem.lima.entity.Account; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryBook; +import org.chorem.lima.entity.FinancialPeriod; +import org.chorem.lima.entity.FinancialPeriodTopiaDao; import org.chorem.lima.entity.FinancialStatement; import org.chorem.lima.entity.FinancialTransaction; import org.chorem.lima.entity.FiscalPeriod; @@ -993,6 +996,13 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ Date fiscalPeriodsEndingDate = fiscalPeriods.get(fiscalPeriods.size() - 1).getEndDate(); Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate = getEntryBookFinancialTransactionOrderedByDate(fiscalPeriodsBeginDate, fiscalPeriodsEndingDate); + FinancialPeriodTopiaDao financialPeriodTopiaDao = + getDaoHelper().getFinancialPeriodDao(); + + // for all unblocked financialperiod + List<FinancialPeriod> financialPeriods = financialPeriodTopiaDao.forProperties(FinancialPeriod.PROPERTY_LOCKED, false).findAll(); + + Map<FinancialTransaction, Entry> financialTransactionsToSave = new HashMap<>(); for (EntryEBP entryEBP : entryEBPs) { Date dateEcr = entryEBP.getDatEcr(); @@ -1004,13 +1014,15 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ } // create entry else { - // creation of the entry + // creation of the entry (not persisted yet) // initialisation of this attributs - Entry entry = createEntry(entryEBP, account); + // entry is validate don't redo all check + Entry entry = createNewEntry(entryEBP, account); try { // find financial transactions for entry period and entrybook - addEntryToFinancialTransaction(entry, entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionByDate, dateEcr); + FinancialTransaction transaction = persistImportedEntryToFinancialTransaction(entry, entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionByDate, dateEcr, financialPeriods); + financialTransactionsToSave.put(transaction, entry); } catch (LockedFinancialPeriodException | LockedEntryBookException | AlreadyExistEntryBookException | AfterLastFiscalPeriodException | BeforeFirstFiscalPeriodException e) { result.addException(e); @@ -1020,6 +1032,11 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ } result.increaseCreated(); } + List<FinancialTransaction> transactions = Lists.newArrayList(financialTransactionsToSave.keySet()); + financialTransactionService.createImportedFinancialTransactions(transactions); + List<Entry> entries = Lists.newArrayList(financialTransactionsToSave.values()); + financialTransactionService.createdImportedEntries(entries); + if (log.isInfoEnabled()) { long after = System.currentTimeMillis(); log.info("Imported form EBP : " + entryEBPs.size() + " entries in " @@ -1032,7 +1049,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return results; } - protected Entry createEntry(EntryEBP entryEBP, final Account account) { + protected Entry createNewEntry(EntryEBP entryEBP, final Account account) { Entry entry; BigDecimal debit; entry = financialTransactionService.createNewEntry(); @@ -1054,14 +1071,10 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return entry; } - protected void addEntryToFinancialTransaction(Entry entry, String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Date dateEcr) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { + protected FinancialTransaction persistImportedEntryToFinancialTransaction(Entry entry, String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Date dateEcr, List<FinancialPeriod> financialPeriods) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { - EntryBook entryBook = getEntryBook(indexedEntryBooks, entryBookCode); - Map<Date, FinancialTransaction> financialTransactionsByDate = entryBookFinancialTransactionByDate.get(entryBook); - if (financialTransactionsByDate == null) { - financialTransactionsByDate = new HashMap<>(); - entryBookFinancialTransactionByDate.put(entryBook, financialTransactionsByDate); - } + EntryBook entryBook = getOrCreateEntryBook(indexedEntryBooks, entryBookCode, financialPeriods); + Map<Date, FinancialTransaction> financialTransactionsByDate = entryBookFinancialTransactionByDate.computeIfAbsent(entryBook, k -> new HashMap<>()); // create transaction FinancialTransaction financialTransaction = financialTransactionsByDate.get(dateEcr); @@ -1075,14 +1088,15 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ financialTransaction = financialTransactionService.createNewFinancialTransaction(); financialTransaction.setEntryBook(entryBook); financialTransaction.setTransactionDate(dateEcr); - financialTransaction = financialTransactionService.createFinancialTransaction(financialTransaction); + //financialTransaction = financialTransactionService.createImportedFinancialTransactions(financialTransaction); financialTransactionsByDate.put(financialTransaction.getTransactionDate(), financialTransaction); } - financialTransaction.addEntry(entry); - financialTransactionService.createEntry(entry); +// financialTransaction.addEntry(entry); +// financialTransactionService.createdImportedEntry(entry); + return financialTransaction; } - protected EntryBook getEntryBook(Map<String, EntryBook> indexedEntryBooks, String entryBookCode) throws AlreadyExistEntryBookException { + protected EntryBook getOrCreateEntryBook(Map<String, EntryBook> indexedEntryBooks, String entryBookCode, List<FinancialPeriod> financialPeriods) throws AlreadyExistEntryBookException { EntryBook entryBook; // entryBook loading entryBook = indexedEntryBooks.get(entryBookCode); @@ -1093,7 +1107,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ entryBook.setCode(entryBookCode); //financialTransaction = null; // create it - entryBook = entryBookService.createEntryBook(entryBook); + entryBook = entryBookService.createImportedNewEntryBook(entryBook, financialPeriods); indexedEntryBooks.put(entryBook.getCode(), entryBook); } return entryBook; diff --git a/lima-swing/src/main/assembly/lima b/lima-swing/src/main/assembly/lima index cdc295e8..b57b3201 100755 --- a/lima-swing/src/main/assembly/lima +++ b/lima-swing/src/main/assembly/lima @@ -1,9 +1,10 @@ #!/bin/sh -MX=512M +MX=1024M +MS=1024M cd `dirname $0` if [ -n "$JAVA_HOME" ]; then - $JAVA_HOME/bin/java -Xmx$MX -Xms$MX -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine -jar ./lima.jar $* + $JAVA_HOME/bin/java -Xmx$MX -Xms$MS -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine -jar ./lima.jar $* else - java -Xmx$MX -Xms$MX -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine -jar ./lima.jar $* + java -Xmx$MX -Xms$MS -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine -jar ./lima.jar $* fi cd "$OLDPWD" diff --git a/lima-swing/src/main/assembly/lima.bat b/lima-swing/src/main/assembly/lima.bat index 1a75eb00..5cda5d78 100644 --- a/lima-swing/src/main/assembly/lima.bat +++ b/lima-swing/src/main/assembly/lima.bat @@ -1,2 +1,2 @@ -java -Xmx1024M -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine -jar lima.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 +java -Xms1024M -Xmx1024M -Dawt.useSystemAAFontSettings=lcd -Dswing.aatext=true -Dsun.java2d.renderer=sun.java2d.marlin.MarlinRenderingEngine -jar lima.jar %1 %2 %3 %4 %5 %6 %7 %8 %9 -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 7b8e804fd5717ef79259e1f04901b5bf0a14f1ee Author: David Cossé <cosse@codelutin.com> Date: Sun Oct 15 23:42:14 2017 +0200 refs #1396 [ISO] renommage --- .../src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index 3149378b..7aee724a 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -1021,7 +1021,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ try { // find financial transactions for entry period and entrybook - FinancialTransaction transaction = persistImportedEntryToFinancialTransaction(entry, entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionByDate, dateEcr, financialPeriods); + FinancialTransaction transaction = createImportEntryFinancialTransaction(entry, entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionByDate, dateEcr, financialPeriods); financialTransactionsToSave.put(transaction, entry); } catch (LockedFinancialPeriodException | LockedEntryBookException | AlreadyExistEntryBookException | AfterLastFiscalPeriodException | BeforeFirstFiscalPeriodException e) { @@ -1071,7 +1071,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return entry; } - protected FinancialTransaction persistImportedEntryToFinancialTransaction(Entry entry, String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Date dateEcr, List<FinancialPeriod> financialPeriods) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { + protected FinancialTransaction createImportEntryFinancialTransaction(Entry entry, String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Date dateEcr, List<FinancialPeriod> financialPeriods) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { EntryBook entryBook = getOrCreateEntryBook(indexedEntryBooks, entryBookCode, financialPeriods); Map<Date, FinancialTransaction> financialTransactionsByDate = entryBookFinancialTransactionByDate.computeIfAbsent(entryBook, k -> new HashMap<>()); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit cefaabd6b33080a05545e08d4259bb0887b637f9 Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 00:51:40 2017 +0200 refs #1396 correction les entrées n'étaient pas sauvegardées --- .../business/api/FinancialTransactionService.java | 4 +-- .../ejb/FinancialTransactionServiceImpl.java | 8 +++-- .../lima/business/ejb/ImportServiceImpl.java | 36 +++++++++++++++------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java index 254c6928..ab609caf 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/FinancialTransactionService.java @@ -63,7 +63,7 @@ public interface FinancialTransactionService { */ Entry createNewEntry(); - void createImportedFinancialTransactions(Collection<FinancialTransaction> financialtransactions); + Iterable<FinancialTransaction> persistImportedFinancialTransactions(Collection<FinancialTransaction> financialtransactions); FinancialTransaction createFinancialTransaction(FinancialTransaction financialtransaction) throws AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException, LockedFinancialPeriodException, LockedEntryBookException; @@ -170,5 +170,5 @@ public interface FinancialTransactionService { List<Entry> removeLetter(String letter); - void createdImportedEntries(Collection<Entry> values); + void persistImportedEntries(Collection<Entry> values); } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java index 95028251..e1c153c0 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/FinancialTransactionServiceImpl.java @@ -140,10 +140,12 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme } @Override - public void createImportedFinancialTransactions(Collection<FinancialTransaction> financialTransactions) { + public Iterable<FinancialTransaction> persistImportedFinancialTransactions(Collection<FinancialTransaction> financialTransactions) { FinancialTransactionTopiaDao financialtransactionTopiaDao = getDaoHelper().getFinancialTransactionDao(); - financialtransactionTopiaDao.createAll(financialTransactions); + Iterable<FinancialTransaction> result = financialtransactionTopiaDao.createAll(financialTransactions); + + return result; } @Override @@ -401,7 +403,7 @@ public class FinancialTransactionServiceImpl extends AbstractLimaService impleme } @Override - public void createdImportedEntries(Collection<Entry> entries) { + public void persistImportedEntries(Collection<Entry> entries) { EntryTopiaDao entryTopiaDao = getDaoHelper().getEntryDao(); entryTopiaDao.createAll(entries); } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index 7aee724a..e7da7a83 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -1002,7 +1002,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ // for all unblocked financialperiod List<FinancialPeriod> financialPeriods = financialPeriodTopiaDao.forProperties(FinancialPeriod.PROPERTY_LOCKED, false).findAll(); - Map<FinancialTransaction, Entry> financialTransactionsToSave = new HashMap<>(); + Map<FinancialTransaction, List<Entry>> financialTransactionsToSave = new HashMap<>(); for (EntryEBP entryEBP : entryEBPs) { Date dateEcr = entryEBP.getDatEcr(); @@ -1021,8 +1021,9 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ try { // find financial transactions for entry period and entrybook - FinancialTransaction transaction = createImportEntryFinancialTransaction(entry, entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionByDate, dateEcr, financialPeriods); - financialTransactionsToSave.put(transaction, entry); + FinancialTransaction transaction = getOrCreateImportEntryFinancialTransaction(entryEBP.getJournal(), indexedEntryBooks, entryBookFinancialTransactionByDate, dateEcr, financialPeriods); + List<Entry> transactionEntriesToSave = financialTransactionsToSave.computeIfAbsent(transaction, k -> new ArrayList<>()); + transactionEntriesToSave.add(entry); } catch (LockedFinancialPeriodException | LockedEntryBookException | AlreadyExistEntryBookException | AfterLastFiscalPeriodException | BeforeFirstFiscalPeriodException e) { result.addException(e); @@ -1033,9 +1034,9 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ result.increaseCreated(); } List<FinancialTransaction> transactions = Lists.newArrayList(financialTransactionsToSave.keySet()); - financialTransactionService.createImportedFinancialTransactions(transactions); - List<Entry> entries = Lists.newArrayList(financialTransactionsToSave.values()); - financialTransactionService.createdImportedEntries(entries); + Iterable<FinancialTransaction> savedTransactions = financialTransactionService.persistImportedFinancialTransactions(transactions); + + addEntriesToTransactions(entryBookFinancialTransactionByDate, financialTransactionsToSave, savedTransactions); if (log.isInfoEnabled()) { long after = System.currentTimeMillis(); @@ -1049,6 +1050,22 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return results; } + protected void addEntriesToTransactions(Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Map<FinancialTransaction, List<Entry>> financialTransactionsToSave, Iterable<FinancialTransaction> savedTransactions) { + List<Entry> entriesToSaves = new ArrayList<>(); + for (FinancialTransaction transaction : savedTransactions) { + + Map<Date, FinancialTransaction> financialTransactionsByDate = entryBookFinancialTransactionByDate.get(transaction.getEntryBook()); + + FinancialTransaction financialTransaction = financialTransactionsByDate.get(transaction.getTransactionDate()); + + List<Entry> fEntries = financialTransactionsToSave.get(financialTransaction); + transaction.addAllEntry(fEntries); + entriesToSaves.addAll(fEntries); + } + + financialTransactionService.persistImportedEntries(entriesToSaves); + } + protected Entry createNewEntry(EntryEBP entryEBP, final Account account) { Entry entry; BigDecimal debit; @@ -1071,7 +1088,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ return entry; } - protected FinancialTransaction createImportEntryFinancialTransaction(Entry entry, String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Date dateEcr, List<FinancialPeriod> financialPeriods) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { + protected FinancialTransaction getOrCreateImportEntryFinancialTransaction(String entryBookCode, Map<String, EntryBook> indexedEntryBooks, Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate, Date dateEcr, List<FinancialPeriod> financialPeriods) throws LockedFinancialPeriodException, LockedEntryBookException, AlreadyExistEntryBookException, AfterLastFiscalPeriodException, BeforeFirstFiscalPeriodException { EntryBook entryBook = getOrCreateEntryBook(indexedEntryBooks, entryBookCode, financialPeriods); Map<Date, FinancialTransaction> financialTransactionsByDate = entryBookFinancialTransactionByDate.computeIfAbsent(entryBook, k -> new HashMap<>()); @@ -1084,15 +1101,12 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ .getCode().equals( financialTransaction.getEntryBook() .getCode()))) { - // create financial transaction + // create non persisted financial transaction financialTransaction = financialTransactionService.createNewFinancialTransaction(); financialTransaction.setEntryBook(entryBook); financialTransaction.setTransactionDate(dateEcr); - //financialTransaction = financialTransactionService.createImportedFinancialTransactions(financialTransaction); financialTransactionsByDate.put(financialTransaction.getTransactionDate(), financialTransaction); } -// financialTransaction.addEntry(entry); -// financialTransactionService.createdImportedEntry(entry); return financialTransaction; } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 3af75d9d377cc483f8b503e655f54b8b85be98fb Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 01:03:14 2017 +0200 refs #1396 [ISO] refactoring --- .../java/org/chorem/lima/business/ejb/ImportServiceImpl.java | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java index e7da7a83..5afc4c78 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ImportServiceImpl.java @@ -953,7 +953,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ else if (account == null) { importResult.addException(new ImportFileException(t("lima.import.error.invalidAccountNumber", targetedAccount))); importResult.increaseIgnored(); - result =false; + result = false; } return result; } @@ -979,11 +979,11 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ try { List<Account> accounts = accountService.getAllAccounts(); - accounts = accounts == null ? new ArrayList<Account>() : accounts; + accounts = accounts == null ? new ArrayList<>() : accounts; Map<String, Account> indexedAccounts = Maps.newHashMap(Maps.uniqueIndex(accounts, GET_ACCOUNT_NUMBER)); List<EntryBook> entryBooks = entryBookService.getAllEntryBooks(); - entryBooks = entryBooks == null ? new ArrayList<EntryBook>() : entryBooks; + entryBooks = entryBooks == null ? new ArrayList<>() : entryBooks; Map<String, EntryBook> indexedEntryBooks = Maps.newHashMap(Maps.uniqueIndex(entryBooks, GET_ENTRY_BOOK_CODE)); List<EntryEBP> entryEBPs = loadDateOrderedEntryEBPbeans(contents); @@ -996,8 +996,7 @@ public class ImportServiceImpl extends AbstractLimaService implements ImportServ Date fiscalPeriodsEndingDate = fiscalPeriods.get(fiscalPeriods.size() - 1).getEndDate(); Map<EntryBook, Map<Date, FinancialTransaction>> entryBookFinancialTransactionByDate = getEntryBookFinancialTransactionOrderedByDate(fiscalPeriodsBeginDate, fiscalPeriodsEndingDate); - FinancialPeriodTopiaDao financialPeriodTopiaDao = - getDaoHelper().getFinancialPeriodDao(); + FinancialPeriodTopiaDao financialPeriodTopiaDao = getDaoHelper().getFinancialPeriodDao(); // for all unblocked financialperiod List<FinancialPeriod> financialPeriods = financialPeriodTopiaDao.forProperties(FinancialPeriod.PROPERTY_LOCKED, false).findAll(); -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit 281583084577f302b16988d7c49a5ff3c5ced5a5 Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 09:35:54 2017 +0200 refs #1396 l'export des entrées au format EBP est fait avec les transactions ordonnées par dates --- .../main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java | 8 ++++++-- .../java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java | 7 +++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java index 7ceea96f..16a1235b 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ExportServiceImpl.java @@ -281,9 +281,13 @@ public class ExportServiceImpl extends AbstractLimaService implements ExportServ Class<Entry> exportedClass = Entry.class; ExportResult exportResult = results.createAddAndGetExportResult(exportedClass); - List<Entry> entries = getDaoHelper().getEntryDao().findAll(); + List<FinancialTransaction> financialTransactions = getDaoHelper().getFinancialTransactionDao().findAllByDates(); + List<Entry> result = new ArrayList<>(); + for (FinancialTransaction financialTransaction : financialTransactions) { + result.addAll(financialTransaction.getEntry()); + } EntryEBPModel model = new EntryEBPModel(); - processExport(charset, exportedClass, exportResult, entries, model); + processExport(charset, exportedClass, exportResult, result, model); return results; } diff --git a/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java index d0e29026..a62cf981 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/FinancialTransactionTopiaDao.java @@ -249,4 +249,11 @@ public class FinancialTransactionTopiaDao extends AbstractFinancialTransactionTo return result; } + + public List<FinancialTransaction> findAllByDates() { + HqlAndParametersBuilder<FinancialTransaction> builder = newHqlAndParametersBuilder(); + builder.setOrderByArguments(FinancialTransaction.PROPERTY_TRANSACTION_DATE, FinancialTransaction.PROPERTY_TOPIA_CREATE_DATE); + List<FinancialTransaction> transactions = findAll(builder.getHql(), builder.getHqlParameters()); + return transactions; + } } //FinancialTransactionDAO -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See https://gitlab.nuiton.org/chorem/lima.git commit b62c44d15088e7e43724fa6e1a573c3e075d9b6e Author: David Cossé <cosse@codelutin.com> Date: Mon Oct 16 09:39:02 2017 +0200 refs #1394 retrait de l'appel du refresh a l'initialisation de l'onglet entrées invalides. L'action refresh est déclanché pas le listener sur le combo fiscalPeriod --- .../FinancialTransactionUnbalancedViewHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java index 8bb48dbf..3a618c4b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java @@ -80,8 +80,10 @@ public class FinancialTransactionUnbalancedViewHandler { if (view.getFiscalPeriodComboBox().getModel().getSize() > 0) { view.getFiscalPeriodComboBox().setSelectedIndex(0); + } else { + refresh(); } - refresh(); + } protected void initShortCuts() { -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm