This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit f9c60c647bbb8a0be812af360305bf5ee311cdea Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Thu Jun 4 16:26:20 2015 +0200 change Datepiker pattern adn fix account combobox dimension --- .../main/java/org/chorem/lima/ui/lettering/LetteringView.css | 3 +++ .../main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx | 11 +++++++---- .../org/chorem/lima/ui/lettering/LetteringViewHandler.java | 2 +- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css index 7f829da..2663ad9 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.css @@ -50,6 +50,9 @@ toolTipText : "lima.lettering.account"; showDecorator : false; selectedItem : {getHandler().getAccount()}; + minimumSize : {new Dimension(300,10)}; + preferredSize : {new Dimension(400,25)}; + maximumSize : {new Dimension(500,40)}; } #back { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx index 66e9796..76ee663 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx @@ -21,6 +21,7 @@ <JPanel layout="{new BorderLayout()}"> <import> + java.awt.Dimension org.chorem.lima.util.WrapToolBarLayout org.chorem.lima.ui.common.FinancialPeriodComboBoxModel org.chorem.lima.util.BigDecimalToString @@ -71,12 +72,14 @@ <JToolBar.Separator/> <JLabel id="beginPeriodLabel"/> - <JXDatePicker id="beginPeriodPicker" - onActionPerformed="handler.setDateStart(beginPeriodPicker.getDate())"/> + <JAXXDatePicker id="beginPeriodPicker" + patternLayout="dd/MM/yyy" + onActionPerformed="handler.setDateStart(beginPeriodPicker.getDate())"/> <JLabel id="endPeriodLabel"/> - <JXDatePicker id="endPeriodPicker" - onActionPerformed="handler.setDateEnd(endPeriodPicker.getDate())"/> + <JAXXDatePicker id="endPeriodPicker" + patternLayout="dd/MM/yyy" + onActionPerformed="handler.setDateEnd(endPeriodPicker.getDate())"/> <JToolBar.Separator/> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java index de55ae4..fd77b1a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringViewHandler.java @@ -376,7 +376,7 @@ public class LetteringViewHandler{ int premierJourMoisCourant = calendar.getActualMinimum(Calendar.DATE); if (fiscalPeriod != null){ - defaultDateBegFiscalPeriod = fiscalPeriodService.getLastFiscalPeriod().getBeginDate(); + defaultDateBegFiscalPeriod = fiscalPeriod.getBeginDate(); } else{ defaultDateBegFiscalPeriod = DateUtils.setDays(new Date(), premierJourMoisCourant); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.