This is an automated email from the git hooks/post-receive script. New commit to branch feature/1158 in repository lima. See http://git.chorem.org/lima.git commit 1abd1d35ccd9981e543760297206c2dc565ea805 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed Apr 1 10:52:41 2015 +0200 refs #1158 : recupération du ClosedPeriodEntryBook et stockage dans un map pour le cache. --- .../api/ClosedPeriodicEntryBookService.java | 3 ++ .../ejb/ClosedPeriodicEntryBookServiceImpl.java | 11 ++++ .../entity/ClosedPeriodicEntryBookTopiaDao.java | 23 +++++++++ .../ui/common/FinancialTransactionTableModel.java | 58 ++++++++++++++++++++-- .../FinancialTransactionTable.java | 2 +- .../FinancialTransactionSearchTableModel.java | 1 + 6 files changed, 93 insertions(+), 5 deletions(-) diff --git a/lima-business-api/src/main/java/org/chorem/lima/business/api/ClosedPeriodicEntryBookService.java b/lima-business-api/src/main/java/org/chorem/lima/business/api/ClosedPeriodicEntryBookService.java index 5a06347..1cb6954 100644 --- a/lima-business-api/src/main/java/org/chorem/lima/business/api/ClosedPeriodicEntryBookService.java +++ b/lima-business-api/src/main/java/org/chorem/lima/business/api/ClosedPeriodicEntryBookService.java @@ -39,4 +39,7 @@ public interface ClosedPeriodicEntryBookService { List<ClosedPeriodicEntryBook> getAllByDates(Date beginDate, Date endDate); List<ClosedPeriodicEntryBook> getAllByEntryBookAndDates(EntryBook entryBook, Date beginDate, Date endDate); + + ClosedPeriodicEntryBook getByEntryBookAndFinancialPeriod(EntryBook entryBook, Date date); + } diff --git a/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java b/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java index 19230bf..352d51e 100644 --- a/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java +++ b/lima-business/src/main/java/org/chorem/lima/business/ejb/ClosedPeriodicEntryBookServiceImpl.java @@ -66,4 +66,15 @@ public class ClosedPeriodicEntryBookServiceImpl extends AbstractLimaService impl closedPeriodicEntryBookTopiaDao.findAllByEntryBookAndDates(entryBook, beginDate, endDate); return result; } + + @Override + public ClosedPeriodicEntryBook getByEntryBookAndFinancialPeriod(EntryBook entryBook, Date date) { + + ClosedPeriodicEntryBookTopiaDao accountTopiaDao = getDaoHelper().getClosedPeriodicEntryBookDao(); + ClosedPeriodicEntryBook result = accountTopiaDao.findByEntryBookAndDate(entryBook, date); + + return result; + } + + } diff --git a/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java b/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java index 6abae2d..8fa7516 100644 --- a/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java +++ b/lima-business/src/main/java/org/chorem/lima/entity/ClosedPeriodicEntryBookTopiaDao.java @@ -71,6 +71,29 @@ public class ClosedPeriodicEntryBookTopiaDao extends AbstractClosedPeriodicEntry } /** + * Return ClosedPeriodicEntryBook by EntryBook and FinancialPeriod. + * + * @param entryBook + * @param date + * @return ClosedPeriodicEntryBook + */ + public ClosedPeriodicEntryBook findByEntryBookAndDate( + EntryBook entryBook, Date date) { + + HqlAndParametersBuilder<ClosedPeriodicEntryBook> builder = newHqlAndParametersBuilder(); + + builder.addEquals(ClosedPeriodicEntryBook.PROPERTY_ENTRY_BOOK, entryBook); + + builder.addLowerOrEquals(PROPERTY_BEGIN_DATE, date); + + builder.addGreaterOrEquals(PROPERTY_END_DATE, date); + + ClosedPeriodicEntryBook closedPeriodicEntryBook = findUnique(builder.getHql(), builder.getHqlParameters()); + + return closedPeriodicEntryBook; + } + + /** * Retourne toutes les ClosedPeriodicEntryBook par interval de date * sur les periodes sur lequelles elles portent ordonnée par journal. * diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java index ecb9e9d..9b09b64 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/common/FinancialTransactionTableModel.java @@ -22,14 +22,19 @@ package org.chorem.lima.ui.common; * #L% */ +import com.google.common.collect.Maps; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.chorem.lima.business.ServiceListener; +import org.chorem.lima.business.api.ClosedPeriodicEntryBookService; +import org.chorem.lima.business.api.FinancialPeriodService; import org.chorem.lima.business.api.FinancialTransactionService; import org.chorem.lima.business.exceptions.AfterLastFiscalPeriodException; import org.chorem.lima.business.exceptions.BeforeFirstFiscalPeriodException; import org.chorem.lima.business.exceptions.LockedEntryBookException; import org.chorem.lima.business.exceptions.LockedFinancialPeriodException; import org.chorem.lima.business.utils.EntryComparator; +import org.chorem.lima.entity.ClosedPeriodicEntryBook; import org.chorem.lima.entity.Entry; import org.chorem.lima.entity.EntryImpl; import org.chorem.lima.entity.FinancialTransaction; @@ -45,13 +50,14 @@ import org.chorem.lima.ui.financialtransaction.VoucherColumn; import java.math.BigDecimal; import java.util.Collection; import java.util.List; +import java.util.Map; import static org.nuiton.i18n.I18n.t; /** * @author Sylvain Bavencoff <bavencoff@codelutin.com> */ -public class FinancialTransactionTableModel extends TableModelWithGroup<Entry> { +public class FinancialTransactionTableModel extends TableModelWithGroup<Entry> implements ServiceListener { /** serialVersionUID. */ private static final long serialVersionUID = -7495388454688562991L; @@ -61,16 +67,22 @@ public class FinancialTransactionTableModel extends TableModelWithGroup<Entry> { /** Service (just to update setValueAt(). */ protected FinancialTransactionService financialTransactionService; + protected Map<FinancialTransaction, Boolean> lockedByTransaction; + + protected ClosedPeriodicEntryBookService closedPeriodicEntryBookService; + public FinancialTransactionTableModel() { setComparator(new EntryComparator()); - financialTransactionService = - LimaServiceFactory.getService(FinancialTransactionService.class); + financialTransactionService = LimaServiceFactory.getService(FinancialTransactionService.class); + closedPeriodicEntryBookService = LimaServiceFactory.getService(ClosedPeriodicEntryBookService.class); + LimaServiceFactory.addServiceListener(FinancialPeriodService.class, this); + lockedByTransaction = Maps.newHashMap(); } @Override protected void initColumn() { - addColumn(new DayColumn()); + addColumn(new DateColumn()); addColumn(new VoucherColumn()); addColumn(new AccountColumn()); addColumn(new DescriptionColumn()); @@ -90,6 +102,36 @@ public class FinancialTransactionTableModel extends TableModelWithGroup<Entry> { return entry.getFinancialTransaction(); } + public boolean isLocked(int row) { + + FinancialTransaction transaction = getTransactionAt(row); + + Boolean locked = lockedByTransaction.get(transaction); + + if (locked == null) { + ClosedPeriodicEntryBook closedPeriodicEntryBook = + closedPeriodicEntryBookService.getByEntryBookAndFinancialPeriod( + transaction.getEntryBook(), + transaction.getTransactionDate()); + if (log.isDebugEnabled()) { + log.debug("transaction " + transaction.getTransactionDate() + " : " + closedPeriodicEntryBook.isLocked()); + } + locked = closedPeriodicEntryBook.isLocked(); + lockedByTransaction.put(transaction, locked); + } + + return locked; + } + + public boolean isCellNavigable(int row, int column) { + return super.isCellEditable(row, column); + } + + @Override + public boolean isCellEditable(int row, int column) { + return super.isCellEditable(row, column) && !isLocked(row); + } + public int indexOf(FinancialTransaction transaction) { int index = 0; Collection<Entry> entriesTransaction = transaction.getEntry(); @@ -262,4 +304,12 @@ public class FinancialTransactionTableModel extends TableModelWithGroup<Entry> { int lastRow = firstRow + transaction.sizeEntry() - 1; fireTableRowsUpdated(firstRow, lastRow); } + + @Override + public void notifyMethod(String serviceName, String methodeName) { + log.debug("Nom de la méthode : " + methodeName); + if (methodeName.contains("blockClosedPeriodicEntryBook")) { + lockedByTransaction.clear(); + } + } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java index cae0c9c..54aa2c7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionTable.java @@ -115,7 +115,7 @@ public class FinancialTransactionTable extends FinancialTransactionDefaultTable< } else { column++; } - } while (!end && !tableModel.isCellEditable(row,column)); + } while (!end && !tableModel.isCellNavigable(row,column)); changeSelection(row, column, false, false); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java index 7dc70ae..195f241 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchTableModel.java @@ -102,6 +102,7 @@ public class FinancialTransactionSearchTableModel extends FinancialTransactionTa } public void notifyMethod(String serviceName, String methodeName) { + super.notifyMethod(serviceName, methodeName); if ((serviceName.contains("FinancialTransaction") || methodeName.contains("importEntries") || methodeName.contains("importAll")) && !methodeName.contains("search")) { //on recharge la liste -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.