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

r2763 - trunk/lima-dto
by tchemit＠users.chorem.org Dec. 19, 2009

Dec. 19, 2009

Author: tchemit Date: 2009-12-19 19:08:39 +0100 (Sat, 19 Dec 2009) New Revision: 2763 Modified: trunk/lima-dto/pom.xml Log: update eugene 2.0.0 configuration Modified: trunk/lima-dto/pom.xml =================================================================== --- trunk/lima-dto/pom.xml 2009-12-19 16:09:11 UTC (rev 2762) +++ trunk/lima-dto/pom.xml 2009-12-19 18:08:39 UTC (rev 2763) @@ -73,9 +73,7 @@ <id>Generator</id> <phase>process-sources</phase> <configuration> - <inputs> - <input>zargo</input> - </inputs> + <inputs>zargo</inputs> <templates>org.nuiton.topia.generator.DTOGenerator</templates> <fullPackagePath>org.chorem.lima</fullPackagePath> <extractedPackages>org.chorem.lima</extractedPackages>

1 0

r2762 - in trunk: . lima-dto lima-main
by tchemit＠users.chorem.org Dec. 19, 2009

Dec. 19, 2009

Author: tchemit Date: 2009-12-19 17:09:11 +0100 (Sat, 19 Dec 2009) New Revision: 2762 Modified: trunk/lima-dto/pom.xml trunk/lima-main/pom.xml trunk/pom.xml Log: add (in comment config for eugene-2.0.0) + clean poms and fix nuiton-utils dependency Modified: trunk/lima-dto/pom.xml =================================================================== --- trunk/lima-dto/pom.xml 2009-12-19 15:42:38 UTC (rev 2761) +++ trunk/lima-dto/pom.xml 2009-12-19 16:09:11 UTC (rev 2762) @@ -1,5 +1,5 @@ - -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> @@ -22,17 +22,12 @@ <groupId>commons-logging</groupId> <artifactId>commons-logging</artifactId> </dependency> - + <dependency> <groupId>commons-lang</groupId> <artifactId>commons-lang</artifactId> </dependency> -  - </dependencies>  @@ -62,7 +57,7 @@  <configuration> <includes>**/*.objectmodel</includes> - <templates>org.nuiton.topia.generator.DTOGenerator</templates> + <templates>org.nuiton.topia.generator.DTOGenerator</templates> <fullPackagePath>org.chorem.lima</fullPackagePath> <extractedPackages>org.chorem.lima</extractedPackages> </configuration> @@ -72,11 +67,28 @@ <goal>generate</goal> </goals> </execution> + +  +  </executions> <dependencies> <dependency> <groupId>org.nuiton.topia</groupId> - <artifactId>topia-persistence</artifactId> + <artifactId>topia-persistence</artifactId> <version>${topia.version}</version> </dependency> </dependencies> Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2009-12-19 15:42:38 UTC (rev 2761) +++ trunk/lima-main/pom.xml 2009-12-19 16:09:11 UTC (rev 2762) @@ -171,7 +171,6 @@ </executions> </plugin> -  <plugin> <groupId>org.nuiton.i18n</groupId> <artifactId>maven-i18n-plugin</artifactId> @@ -193,7 +192,6 @@ </executions> </plugin> -  <plugin> <artifactId>maven-dependency-plugin</artifactId> <executions> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-19 15:42:38 UTC (rev 2761) +++ trunk/pom.xml 2009-12-19 16:09:11 UTC (rev 2762) @@ -187,15 +187,18 @@  + <nuiton-utils.version>1.1.2-SNAPSHOT</nuiton-utils.version> + <eugene.version>1.0.0</eugene.version> - <nuiton-utils.version>1.1.1</nuiton-utils.version> <topia.version>2.2.0</topia.version> - <jaxx.version>2.0.0-SNAPSHOT</jaxx.version> -  + +  +  +  + + <jaxx.version>2.0.0-beta-1</jaxx.version> <i18n.version>1.0.1</i18n.version> -  -   <axis.version>1.3</axis.version>

1 0

r2761 - trunk/lima-service/src/main/java/org/chorem/lima/service/util
by tchemit＠users.chorem.org Dec. 19, 2009

Dec. 19, 2009

Author: tchemit Date: 2009-12-19 16:42:38 +0100 (Sat, 19 Dec 2009) New Revision: 2761 Modified: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java Log: adding missing api Modified: trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java =================================================================== --- trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java 2009-12-18 13:39:27 UTC (rev 2760) +++ trunk/lima-service/src/main/java/org/chorem/lima/service/util/ServiceHelper.java 2009-12-19 15:42:38 UTC (rev 2761) @@ -192,6 +192,15 @@ } return null; } + /** + * @param date the date to inspect + * @return the year of the given date + */ + public static String dateToYear(Date date) { + Calendar cal = Calendar.getInstance(); + cal.setTime(date); + return "" + cal.get(Calendar.YEAR); + } /** * @param trans

1 0

r2760 - trunk
by tchemit＠users.chorem.org Dec. 18, 2009

Dec. 18, 2009

Author: tchemit Date: 2009-12-18 14:39:27 +0100 (Fri, 18 Dec 2009) New Revision: 2760 Modified: trunk/pom.xml Log: use mavenpom 1.1.3 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-17 10:42:54 UTC (rev 2759) +++ trunk/pom.xml 2009-12-18 13:39:27 UTC (rev 2760) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.2</version> + <version>1.1.3</version> </parent> <groupId>org.chorem</groupId>

1 0

r2759 - trunk/lima-service-callao
by glorieux＠users.chorem.org Dec. 17, 2009

Dec. 17, 2009

Author: glorieux Date: 2009-12-17 11:42:54 +0100 (Thu, 17 Dec 2009) New Revision: 2759 Modified: trunk/lima-service-callao/pom.xml Log: Add nuiton-utlis dependency. Modified: trunk/lima-service-callao/pom.xml =================================================================== --- trunk/lima-service-callao/pom.xml 2009-12-17 08:51:11 UTC (rev 2758) +++ trunk/lima-service-callao/pom.xml 2009-12-17 10:42:54 UTC (rev 2759) @@ -25,7 +25,14 @@ <groupId>org.chorem.callao</groupId> <artifactId>callao-service</artifactId> </dependency> - + <dependency> + <groupId>org.chorem.callao</groupId> + <artifactId>callao-service</artifactId> + </dependency> + <dependency> + <groupId>org.nuiton</groupId> + <artifactId>nuiton-utils</artifactId> + </dependency> </dependencies>

1 0

r2758 - trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject
by glorieux＠users.chorem.org Dec. 17, 2009

Dec. 17, 2009

Author: glorieux Date: 2009-12-17 09:51:11 +0100 (Thu, 17 Dec 2009) New Revision: 2758 Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java Log: Modification of ConvertPeriod to allow multiple year periods Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java =================================================================== --- trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java 2009-12-17 08:50:27 UTC (rev 2757) +++ trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/convertObject/ConvertPeriod.java 2009-12-17 08:51:11 UTC (rev 2758) @@ -23,6 +23,7 @@ import java.util.Calendar; import java.util.List; +import org.apache.commons.beanutils.converters.DateConverter; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.dto.PeriodDTO; @@ -55,10 +56,8 @@ periodLima.setBegin(periodCallao.getBeginPeriod()); periodLima.setEnd(periodCallao.getEndPeriod()); // Récupère l'année - Calendar cal = Calendar.getInstance(); - cal.setTime(periodCallao.getBeginPeriod()); - String year = Integer.toString(cal.get(Calendar.YEAR)); - periodLima.setIdName(year); + String periodName = periodCallao.getBeginPeriod().getYear() != periodCallao.getEndPeriod().getYear() ? (ServiceHelper.dateToYear(periodCallao.getBeginPeriod())+"-"+ServiceHelper.dateToYear(periodCallao.getEndPeriod())) : ServiceHelper.dateToYear(periodCallao.getBeginPeriod()); + periodLima.setIdName(periodName); periodLima.setParent(null); // Si la période est bloquée if ( periodCallao.isLocked() ) @@ -82,7 +81,7 @@ periodChildLima.setIdSeq(timeSpanCallao.getId()); periodChildLima.setBegin(timeSpanCallao.getBeginTimeSpan()); periodChildLima.setEnd(timeSpanCallao.getEndTimeSpan()); - periodChildLima.setIdName(ServiceHelper.dateToMonth(timeSpanCallao.getBeginTimeSpan())+" "+year); + periodChildLima.setIdName(ServiceHelper.dateToMonth(timeSpanCallao.getBeginTimeSpan())+" "+ServiceHelper.dateToYear(timeSpanCallao.getBeginTimeSpan())); periodChildLima.setParent(periodLima); periodChildLima.setStatus(null); // Si la période est bloquée

1 0

r2757 - trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao
by glorieux＠users.chorem.org Dec. 17, 2009

Dec. 17, 2009

Author: glorieux Date: 2009-12-17 09:50:27 +0100 (Thu, 17 Dec 2009) New Revision: 2757 Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoPeriodService.java Log: Modification of CallaoPeriodService to allow 1 to 24 month periods Modified: trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoPeriodService.java =================================================================== --- trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoPeriodService.java 2009-12-17 08:48:06 UTC (rev 2756) +++ trunk/lima-service-callao/src/main/java/org/chorem/lima/service/callao/CallaoPeriodService.java 2009-12-17 08:50:27 UTC (rev 2757) @@ -94,7 +94,7 @@ /** * Permet de bloquer la période annuelle. * - * @param periodDTO + * @param periodLima * @return */ @Override @@ -111,7 +111,7 @@ /** * Permet de bloquer la période mensuelle. * - * @param periodDTO + * @param periodLima * @return */ @Override @@ -159,7 +159,7 @@ * temps la période Lima en péiode Callao. Il est possible de débloquer * seulement des périodes mensuelles et non l'exercice. * - * @param periodDTO + * @param periodLima * @return */ @Override

1 0

r2756 - trunk/lima-main/src/main/java/org/chorem/lima/combobox/model
by glorieux＠users.chorem.org Dec. 17, 2009

Dec. 17, 2009

Author: glorieux Date: 2009-12-17 09:48:06 +0100 (Thu, 17 Dec 2009) New Revision: 2756 Added: trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/PeriodComboBoxModel.java Modified: trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/JournalComboBoxModel.java Log: Modification of ComboBox models for addperiod. Modified: trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/JournalComboBoxModel.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/JournalComboBoxModel.java 2009-12-17 08:47:32 UTC (rev 2755) +++ trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/JournalComboBoxModel.java 2009-12-17 08:48:06 UTC (rev 2756) @@ -19,6 +19,9 @@ package org.chorem.lima.combobox.model; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + import javax.swing.*; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; @@ -29,7 +32,13 @@ */ public class JournalComboBoxModel extends DefaultComboBoxModel implements PropertyChangeListener { + /** + * log + */ + private static final Log log = LogFactory.getLog(JournalComboBoxModel.class); + + /** * @param v */ public JournalComboBoxModel(Vector<?> v) { @@ -56,13 +65,22 @@ public void propertyChange(PropertyChangeEvent evt) { if (evt.getPropertyName().equals("add")) { addElement(evt.getNewValue()); + if (log.isDebugEnabled()) { + log.debug("add : "); + } } if (evt.getPropertyName().equals("update")) { int index = getIndexOf(evt.getNewValue()); fireContentsChanged(evt.getNewValue(), index, index); + if (log.isDebugEnabled()) { + log.debug("update : "); + } } if (evt.getPropertyName().equals("remove")) { removeElement(evt.getOldValue()); + if (log.isDebugEnabled()) { + log.debug("remove : "); + } } } } Added: trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/PeriodComboBoxModel.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/PeriodComboBoxModel.java (rev 0) +++ trunk/lima-main/src/main/java/org/chorem/lima/combobox/model/PeriodComboBoxModel.java 2009-12-17 08:48:06 UTC (rev 2756) @@ -0,0 +1,101 @@ +/** + * *##% Lima Main + * Copyright (C) 2008 CodeLutin + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Lesser Public License for more details. + * + * You should have received a copy of the GNU General Lesser Public + * License along with this program. If not, see + * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* + */ + +package org.chorem.lima.combobox.model; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.chorem.lima.dto.AccountDTO; +import org.chorem.lima.dto.PeriodDTO; +import org.chorem.lima.table.model.ClosureTableModel; + +import javax.swing.*; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; +import java.util.Vector; + +/** + * @author ore + */ +public class PeriodComboBoxModel extends DefaultComboBoxModel implements PropertyChangeListener { + + /** + * log + */ + private static final Log log = LogFactory.getLog(PeriodComboBoxModel.class); + + /** + * @param v + */ + public PeriodComboBoxModel(Vector<?> v) { + super(v); + } + + /** + * @param items + */ + public PeriodComboBoxModel(Object[] items) { + super(items); + } + + public PeriodComboBoxModel(ClosureTableModel closureModel) { + addElement(null); + for(Object period : closureModel.getData()){ + addElement(period); + } + closureModel.addPropertyChangeListener(closureModel.ADD_PROPERTY, this); + } + + /** + * @param evt + */ + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (evt.getPropertyName().equals("add")) { + addElement(evt.getNewValue()); + if (log.isDebugEnabled()) { + log.debug("add : "+evt.getNewValue()); + } + } + if (evt.getPropertyName().equals("update")) { + int index = getIndexOf(evt.getNewValue()); + fireContentsChanged(evt.getNewValue(), index, index); + if (log.isDebugEnabled()) { + log.debug("update : "); + } + } + if (evt.getPropertyName().equals("remove")) { + removeChildren((PeriodDTO) evt.getOldValue()); + removeElement(evt.getOldValue()); + if (log.isDebugEnabled()) { + log.debug("remove : "); + } + } + } + + /** + * @param parent + */ + public void removeChildren(PeriodDTO parent) { + for (PeriodDTO acc : parent.getChildren()) { + removeElement(acc); + removeChildren(acc); + } + } +} \ No newline at end of file

1 0

r2755 - trunk/lima-main/src/main/java/org/chorem/lima
by glorieux＠users.chorem.org Dec. 17, 2009

Dec. 17, 2009

Author: glorieux Date: 2009-12-17 09:47:32 +0100 (Thu, 17 Dec 2009) New Revision: 2755 Modified: trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java Log: Modification of DataManager for addperiod. Modified: trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java 2009-12-17 08:46:51 UTC (rev 2754) +++ trunk/lima-main/src/main/java/org/chorem/lima/DataManager.java 2009-12-17 08:47:32 UTC (rev 2755) @@ -26,9 +26,9 @@ import org.chorem.lima.table.model.TransactionDataTableModel; import org.chorem.lima.tree.model.AccountTreeTableModel; import javax.swing.JProgressBar; - import java.util.List; -import java.util.LinkedList; +import org.chorem.lima.service.PeriodService; +import org.chorem.lima.service.ServiceFactory; /** * Cette classe permet de gérer les données de Lima. Chaque type de données @@ -77,7 +77,7 @@ if (closureModel == null) { /** Services */ // Création de la liste des périodes - LinkedList<PeriodDTO> listPeriodDTO = new LinkedList<PeriodDTO>(); + List<PeriodDTO> listPeriodDTO = LimaContext.getContext().getNeogiaFactory().getPeriodService().getAllPeriod(getStatus()); // Parcourt toutes les périodes (2007 / 2008 / etc) for (PeriodDTO period : getPeriodes()) { @@ -165,15 +165,19 @@ return transactionModel; } - /** * @return */ public List<PeriodDTO> getPeriodes() { if (periodes == null) { /** Services */ - periodes = LimaContext.getContext().getNeogiaFactory().getPeriodService().getAllPeriod( - getStatus()); + LimaContext context = LimaContext.getContext(); + ServiceFactory factory = context.getNeogiaFactory(); + PeriodService periodService =factory.getPeriodService(); + status = getStatus(); + periodes= periodService.getAllPeriod(status); +// periodes = LimaContext.getContext().getNeogiaFactory().getPeriodService().getAllPeriod( +// getStatus()); } return periodes; } @@ -221,11 +225,11 @@ } public PeriodDTO getCurrentPeriod() { - return currentPeriod == null ? getPeriodes().get(0) : currentPeriod; + return (currentPeriod == null && !getPeriodes().isEmpty()) ? getPeriodes().get(0) : currentPeriod; } public void setCurrentPeriod(PeriodDTO currentPeriod) { - this.currentPeriod = currentPeriod; + this.currentPeriod = currentPeriod; } public boolean isPeriodSelected() {

1 0

r2754 - trunk/lima-main/src/main/java/org/chorem/lima/ui
by glorieux＠users.chorem.org Dec. 17, 2009

Dec. 17, 2009

Author: glorieux Date: 2009-12-17 09:46:51 +0100 (Thu, 17 Dec 2009) New Revision: 2754 Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/AddPeriod.jaxx trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java trunk/lima-main/src/main/java/org/chorem/lima/ui/TransactionViewImpl.java Log: Add an addperiod panel. Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/AddPeriod.jaxx =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/AddPeriod.jaxx 2009-12-16 21:42:35 UTC (rev 2753) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/AddPeriod.jaxx 2009-12-17 08:46:51 UTC (rev 2754) @@ -1,8 +1,31 @@ -<JFrame locationRelativeTo="{null}" defaultCloseOperation="dispose_on_close"> +<JFrame width="300" height="150" locationRelativeTo="{null}" defaultCloseOperation="dispose_on_close"> + <style source="css/lima.css" /> <Table insets='5,5,5,5'> <row> <cell> + <JLabel text="lima.closure.period.begin"/> + </cell> + <cell> + <JPanel id="beginMonthPeriodPanel"/> + </cell> + <cell> + <JPanel id="beginYearPeriodPanel"/> + </cell> + </row> + <row> + <cell> + <JLabel text="lima.to"/> + </cell> + <cell> + <JPanel id="endMonthPeriodPanel"/> + </cell> + <cell> + <JPanel id="endYearPeriodPanel"/> + </cell> + </row> + <row> + <cell> <JButton id="okButton" text="lima.ok"/> </cell> <cell> Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2009-12-16 21:42:35 UTC (rev 2753) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java 2009-12-17 08:46:51 UTC (rev 2754) @@ -22,26 +22,23 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; +import org.chorem.lima.combobox.model.PeriodComboBoxModel; +import org.chorem.lima.combobox.renderer.PeriodComboBoxRenderer; import static org.nuiton.i18n.I18n._; -import org.chorem.lima.combobox.renderer.PeriodClosureComboBoxRenderer; import org.chorem.lima.dto.PeriodDTO; import org.chorem.lima.dto.StatusDTO; import org.chorem.lima.dto.TransactionDTO; import org.chorem.lima.dto.util.TriPeriodAsc; import org.chorem.lima.dto.util.TriPeriodDesc; import org.chorem.lima.table.model.ClosureTableModel; -import org.chorem.lima.util.Util; import org.jdesktop.swingx.JXTable; import javax.swing.*; import java.awt.event.*; -import java.util.Collections; -import java.util.Date; -import java.util.List; -import java.util.LinkedList; -import java.util.Vector; +import java.util.*; import org.jdesktop.swingx.decorator.*; +import org.nuiton.util.PeriodDates; /** @@ -52,7 +49,7 @@ public class ClosureViewImpl extends ClosureView { /** - * log * + * log */ private static final Log log = LogFactory.getLog(ClosureViewImpl.class); private final JXTable table; @@ -62,6 +59,10 @@ private static boolean blockPeriod; private JComboBox comboBoxBeginPeriod = new JComboBox(); private JComboBox comboBoxEndPeriod = new JComboBox(); + private JComboBox comboBeginYearPeriod = new JComboBox(); + private JComboBox comboBeginMonthPeriod = new JComboBox(); + private JComboBox comboEndYearPeriod = new JComboBox(); + private JComboBox comboEndMonthPeriod = new JComboBox(); /** @@ -122,10 +123,52 @@ * Initialisation du formulaire pour ajouter un exercice */ addPeriodForm = LimaContext.getContext().getMainUI().getAddPeriod(); + + Calendar cal = new GregorianCalendar(); + + //Init YEAR Periode Combobox + cal.add(Calendar.YEAR, 0); + comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR)); + comboEndYearPeriod.addItem(cal.get(Calendar.YEAR)); + for(int i = 0; i < 5; i++){ + cal.add(Calendar.YEAR, 1); + comboBeginYearPeriod.addItem(cal.get(Calendar.YEAR)); + comboEndYearPeriod.addItem(cal.get(Calendar.YEAR)); + } + + //Add BeginYear ComboBox to addPeriodForm + addPeriodForm.getBeginYearPeriodPanel().add(comboBeginYearPeriod); + addPeriodForm.getBeginYearPeriodPanel().validate(); + + //Add EndYear ComboBox to addPeriodForm + addPeriodForm.getEndYearPeriodPanel().add(comboEndYearPeriod); + addPeriodForm.getEndYearPeriodPanel().validate(); + + //Init MONTH Periode Combobox + cal.set(Calendar.MONTH, Calendar.JANUARY); + cal.add(Calendar.MONTH, 0); + comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); + comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); + for(int j = 0; j < 11; j++){ + cal.add(Calendar.MONTH, 1); + comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); + comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONTH, 2, java.util.Locale.getDefault())); + } + + //Add BeginMonth ComboBox to addPeriodForm + addPeriodForm.getBeginMonthPeriodPanel().add(comboBeginMonthPeriod); + addPeriodForm.getBeginMonthPeriodPanel().validate(); + + //Add EndMonth ComboBox to addPeriodForm + addPeriodForm.getEndMonthPeriodPanel().add(comboEndMonthPeriod); + addPeriodForm.getEndMonthPeriodPanel().validate(); + + addPeriodForm.setVisible(true); addPeriodForm.getOkButton().addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { addPeriod(); + addPeriodForm.dispose(); } }); @@ -141,17 +184,14 @@ * Charge pour le JComboBox le choix des périodes (exercices) à afficher. */ // Récupère les périodes - List<PeriodDTO> periodes = LimaContext.getContext().getDataManager().getPeriodes(); - // Pour chaque période - Vector<PeriodDTO> v = new Vector<PeriodDTO>(); - for (PeriodDTO period : periodes) { - v.add(period); - } + ClosureTableModel closureModel = LimaContext.getContext().getDataManager().getClosureModel(); + PeriodComboBoxModel periodModel = new PeriodComboBoxModel(closureModel); // Création Combobox debut période - comboBoxPeriod.setModel(new DefaultComboBoxModel(v)); - comboBoxPeriod.setRenderer(PeriodClosureComboBoxRenderer.getInstance()); + comboBoxPeriod.setModel(periodModel); + comboBoxPeriod.setRenderer(PeriodComboBoxRenderer.getInstance()); // Ajout des combobox periodPanel.add(comboBoxPeriod); + periodPanel.validate(); } @@ -189,29 +229,18 @@ * Charge pour les JComboBox le choix des périodes mensuelles à bloquer. */ // Récupère les périodes - List<PeriodDTO> periodes = LimaContext.getContext().getDataManager().getPeriodes(); - Vector<PeriodDTO> v = new Vector<PeriodDTO>(); - - // Récupère la période annuelle sélectionnée dans la comboBox - PeriodDTO periodMaster = (PeriodDTO) comboBoxPeriod.getSelectedItem(); - - // Parcours de toutes les périodes pour trouver la période master - for (PeriodDTO period : periodes) { - if (period.equals(periodMaster)) { - v.addAll(period.getChildren()); - } - } - + ClosureTableModel closureModel = LimaContext.getContext().getDataManager().getClosureModel(); + PeriodComboBoxModel periodModel = new PeriodComboBoxModel(closureModel); // Création Combobox debut période - comboBoxBeginPeriod.setModel(new DefaultComboBoxModel(v)); - comboBoxBeginPeriod.setRenderer(PeriodClosureComboBoxRenderer.getInstance()); + comboBoxBeginPeriod.setModel(periodModel); + comboBoxBeginPeriod.setRenderer(PeriodComboBoxRenderer.getInstance()); // Création Combobox fin période - comboBoxEndPeriod.setModel(new DefaultComboBoxModel(v)); - comboBoxEndPeriod.setRenderer(PeriodClosureComboBoxRenderer.getInstance()); + comboBoxEndPeriod.setModel(periodModel); + comboBoxEndPeriod.setRenderer(PeriodComboBoxRenderer.getInstance()); // Ajout des combobox form.beginPeriod.add(comboBoxBeginPeriod); form.endPeriod.add(comboBoxEndPeriod); - + /** * Positionne, si les lignes sont sélectionnées, les comboBox sur * les bonnes périodes (période min et période max). @@ -237,18 +266,33 @@ } PeriodDTO periodCurrent = LimaContext.getContext().getDataManager().getCurrentPeriod(); List<StatusDTO> status = LimaContext.getContext().getDataManager().getStatus(); - Date begin = Util.InitDateFirstDayMonth(new Date(periodCurrent.getBegin().getYear() + 1, 0, 1)); - Date end = Util.InitDateEndDayMonth(new Date(periodCurrent.getBegin().getYear() + 1, 11, 1)); - PeriodDTO period = new PeriodDTO("", "", begin, end, null, null, status.get(3)); - // Création des enfants periodes - List<PeriodDTO> listPeriodChild = new LinkedList<PeriodDTO>(); - for (int i = 0; i < 12; i++) { - begin = Util.InitDateFirstDayMonth(new Date(periodCurrent.getBegin().getYear() + 1, i, 1)); - end = Util.InitDateEndDayMonth(new Date(periodCurrent.getBegin().getYear() + 1, i, 1)); - PeriodDTO periodChild = new PeriodDTO("", Integer.toString(begin.getYear()), begin, end, null, period, status.get(3)); - listPeriodChild.add(periodChild); + // TODO gere locale courante + Calendar cal_beg = new GregorianCalendar(); + if (periodCurrent != null) + { + cal_beg.setTime(periodCurrent.getBegin()); + cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); + } + else { + cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelectedIndex()); } - period.setChildren(listPeriodChild); + cal_beg.set(Calendar.DAY_OF_MONTH, 1); + cal_beg.set(Calendar.MONTH, comboBeginMonthPeriod.getSelectedIndex()); + + Date begin = cal_beg.getTime(); + + Calendar cal_end = new GregorianCalendar(); + cal_end.add(Calendar.YEAR, comboEndYearPeriod.getSelectedIndex()); + cal_end.set(Calendar.MONTH , comboEndMonthPeriod.getSelectedIndex()); + int maximum = cal_end.getActualMaximum(Calendar.DAY_OF_MONTH); + cal_end.set(Calendar.DAY_OF_MONTH, maximum); + + Date end = cal_end.getTime(); + log.debug("Date de debut: "+begin+" Date de fin: "+end); + + String periodName = comboBeginYearPeriod.getSelectedIndex() != comboEndYearPeriod.getSelectedIndex() ? Integer.toString(cal_beg.get(Calendar.YEAR))+"-"+Integer.toString(cal_end.get(Calendar.YEAR)) : Integer.toString(cal_beg.get(Calendar.YEAR)); + PeriodDTO period = new PeriodDTO("", periodName, begin, end, null, null, status.get(3)); + ClosureTableModel closureModel = (ClosureTableModel) table.getModel(); closureModel.addPeriod(period, status); } Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/TransactionViewImpl.java =================================================================== --- trunk/lima-main/src/main/java/org/chorem/lima/ui/TransactionViewImpl.java 2009-12-16 21:42:35 UTC (rev 2753) +++ trunk/lima-main/src/main/java/org/chorem/lima/ui/TransactionViewImpl.java 2009-12-17 08:46:51 UTC (rev 2754) @@ -29,6 +29,7 @@ import org.apache.commons.logging.LogFactory; import org.chorem.lima.LimaContext; import org.chorem.lima.combobox.model.JournalComboBoxModel; +import org.chorem.lima.combobox.model.PeriodComboBoxModel; import org.chorem.lima.combobox.renderer.JournalComboBoxRenderer; import org.chorem.lima.combobox.renderer.PeriodComboBoxRenderer; import org.chorem.lima.dto.EntryDTO; @@ -194,7 +195,10 @@ } } } - getComboPeriod().setSelectedIndex(index); + if (index != 0){ + getComboPeriod().setSelectedIndex(index); + + } /** * Implémente le clic droit @@ -220,7 +224,6 @@ LimaContext.getContext().getDataManager().getJournalModel().addPropertyChangeListener(comboBoxModel); getComboJournal().setModel(comboBoxModel); getComboJournal().setRenderer(JournalComboBoxRenderer.getInstance()); - // AutoCompletion // AutoCompleteDecorator.decorate(comboJournal, JournalToStringConverter.getInstance()); journalPanel.add(getComboJournal()); @@ -232,22 +235,13 @@ */ private void initPeriodComboBox() { // Recherche la liste de toutes les périodes - List<PeriodDTO> periodes = LimaContext.getContext().getDataManager().getPeriodes(); - // Model pour les périodes - Vector<PeriodDTO> v = new Vector<PeriodDTO>(); - // On ajoute un élément null pour permettre d'afficher toutes les périodes - v.addElement(null); - // Pour chaque période (annuelle et NON mensuelle !) - for (PeriodDTO period : periodes) { - v.addElement(period); - v.addAll(period.getChildren()); - } - getComboPeriod().setModel(new DefaultComboBoxModel(v)); + ClosureTableModel closureModel = LimaContext.getContext().getDataManager().getClosureModel(); + PeriodComboBoxModel periodModel = new PeriodComboBoxModel(closureModel); + getComboPeriod().setModel(periodModel); getComboPeriod().setRenderer(PeriodComboBoxRenderer.getInstance()); // AutoCompletion // AutoCompleteDecorator.decorate(comboPeriod, PeriodToStringConverter.getInstance()); - periodPanel.add(getComboPeriod()); periodPanel.validate(); }

1 0

r2753 - trunk/lima-main
by tchemit＠users.chorem.org Dec. 16, 2009

Dec. 16, 2009

Author: tchemit Date: 2009-12-16 22:42:35 +0100 (Wed, 16 Dec 2009) New Revision: 2753 Modified: trunk/lima-main/pom.xml Log: clean pom Modified: trunk/lima-main/pom.xml =================================================================== --- trunk/lima-main/pom.xml 2009-12-15 16:23:24 UTC (rev 2752) +++ trunk/lima-main/pom.xml 2009-12-16 21:42:35 UTC (rev 2753) @@ -61,17 +61,6 @@ <artifactId>jaxx-widgets</artifactId> </dependency> -  -  <dependency> <groupId>dom4j</groupId>

1 0

r2752 - trunk/src/site/rst
by jcouteau＠users.chorem.org Dec. 15, 2009

Dec. 15, 2009

Author: jcouteau Date: 2009-12-15 17:23:24 +0100 (Tue, 15 Dec 2009) New Revision: 2752 Modified: trunk/src/site/rst/planComptable.rst Log: Doc cr?\195?\169er modifier son plan comptable Modified: trunk/src/site/rst/planComptable.rst =================================================================== --- trunk/src/site/rst/planComptable.rst 2009-12-15 15:47:04 UTC (rev 2751) +++ trunk/src/site/rst/planComptable.rst 2009-12-15 16:23:24 UTC (rev 2752) @@ -1,4 +1,12 @@ -plan Comptable --------------- - -TODO \ No newline at end of file +Créer-modifier son plan comptable +--------------------------------- + +Lima possède un plan-comptable simple, cependant vous pouvez modifier ce dernier ou bien créer le votre. Pour accéder au plan comptable, il suffit de cliquer sur 'Editer>Compte'. Cela ouvre un nouvel onglet contenant le plan comptable utilisé. + +Pour ajouter un compte, il suffit de sélectionner son compte père et de cliquer sur 'Ajout'. Il faut ensuite compléter le nom et le numéro du compte ainsi que son type (Actif, Passif, Produit ou Charge). + +Pour une modification, il suffit de sélectionner le compte et de cliquer sur 'Mettre à jour', seuls la description et le type de compte sont modifiables. + +Pour une suppression, il suffit de sélectionner le compte à supprimer et de cliquer sur 'Supprimer', une validation plus tard, le compte est supprimé. + +Attention, si vous supprimer un compte, tous ses compte-fils seront aussi supprimés. \ No newline at end of file

1 0

r2751 - trunk/src/site/rst
by jcouteau＠users.chorem.org Dec. 15, 2009

Dec. 15, 2009

Author: jcouteau Date: 2009-12-15 16:47:04 +0100 (Tue, 15 Dec 2009) New Revision: 2751 Modified: trunk/src/site/rst/journal.rst Log: Doc Cr?\195?\169er et modifier les journaux Modified: trunk/src/site/rst/journal.rst =================================================================== --- trunk/src/site/rst/journal.rst 2009-12-15 14:55:02 UTC (rev 2750) +++ trunk/src/site/rst/journal.rst 2009-12-15 15:47:04 UTC (rev 2751) @@ -1,4 +1,10 @@ -Journal -------- +Créer et modifier les journaux +------------------------------ -Todo \ No newline at end of file +Pour obtenir la liste des journaux, il suffit de cliquer sur Editer > Journal. Vous ouvrez ainsi un onglet qui indique la liste des journaux créés. Si c'est la première fois que vous utilisez Lima, cette liste est vide. + +Pour créer un journal, il suffit de cliquer sur 'Ajout'. Il est demandé de renseigner les différentes information du journal : Nom, Description et Préfixe. + +Pour modifier un journal, il suffit de le sélectionner dans la liste et de cliquer sur 'Mettre à jour'. Il est ainsi possible de modifier le préfixe et la description d'un journal. + +Pour supprimer un journal, on le sélectionne dans la liste et on clique sur 'Supprimer' une validation plus tard, le journal est supprimé. \ No newline at end of file

1 0

r2750 - trunk/src/site/rst
by jcouteau＠users.chorem.org Dec. 15, 2009

Dec. 15, 2009

Author: jcouteau Date: 2009-12-15 15:55:02 +0100 (Tue, 15 Dec 2009) New Revision: 2750 Modified: trunk/src/site/rst/install.rst Log: Installation et lancement Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2009-12-14 17:20:22 UTC (rev 2749) +++ trunk/src/site/rst/install.rst 2009-12-15 14:55:02 UTC (rev 2750) @@ -1,4 +1,6 @@ -Install -------- - -TODO \ No newline at end of file +Installer et lancer Lima +------------------------ + +Le lancement de Lima est assez simple, il suffit de télécharger le zip de la dernière version à partir du lien download et de le décompresser à l'endroit ou vous souhaitez le voir installé. + +Pour le lancer, il suffit de double-cliquer sur lima.exe si vous êtes sur Windows ou sur go.sh si vous êtes sur un système Linux. \ No newline at end of file

2 1

r2749 - trunk
by echatellier＠users.chorem.org Dec. 14, 2009

Dec. 14, 2009

Author: echatellier Date: 2009-12-14 18:20:22 +0100 (Mon, 14 Dec 2009) New Revision: 2749 Modified: trunk/pom.xml Log: Use correct scm url Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-11 14:14:27 UTC (rev 2748) +++ trunk/pom.xml 2009-12-14 17:20:22 UTC (rev 2749) @@ -255,8 +255,7 @@ <scm> <connection>scm:svn:http://svn.chorem.org/svn/lima/trunk</connection> - <developerConnection>scm:svn:svn+ssh://publish@svn.chorem.org/var/lib/svn/svn-chorem/lima/trunk - </developerConnection> + <developerConnection>scm:svn:http://svn.chorem.org/svn/lima/trunk</developerConnection> <url>http://www.chorem.org/repositories/browse/lima/trunk</url> </scm>

1 0

r2748 - in trunk/src/site: . rst
by jcouteau＠users.chorem.org Dec. 11, 2009

Dec. 11, 2009

Author: jcouteau Date: 2009-12-11 15:14:27 +0100 (Fri, 11 Dec 2009) New Revision: 2748 Modified: trunk/src/site/rst/install.rst trunk/src/site/rst/journal.rst trunk/src/site/rst/planComptable.rst trunk/src/site/site_fr.xml Log: Improve site Modified: trunk/src/site/rst/install.rst =================================================================== --- trunk/src/site/rst/install.rst 2009-12-11 10:49:58 UTC (rev 2747) +++ trunk/src/site/rst/install.rst 2009-12-11 14:14:27 UTC (rev 2748) @@ -0,0 +1,4 @@ +Install +------- + +TODO \ No newline at end of file Modified: trunk/src/site/rst/journal.rst =================================================================== --- trunk/src/site/rst/journal.rst 2009-12-11 10:49:58 UTC (rev 2747) +++ trunk/src/site/rst/journal.rst 2009-12-11 14:14:27 UTC (rev 2748) @@ -0,0 +1,4 @@ +Journal +------- + +Todo \ No newline at end of file Modified: trunk/src/site/rst/planComptable.rst =================================================================== --- trunk/src/site/rst/planComptable.rst 2009-12-11 10:49:58 UTC (rev 2747) +++ trunk/src/site/rst/planComptable.rst 2009-12-11 14:14:27 UTC (rev 2748) @@ -0,0 +1,4 @@ +plan Comptable +-------------- + +TODO \ No newline at end of file Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-12-11 10:49:58 UTC (rev 2747) +++ trunk/src/site/site_fr.xml 2009-12-11 14:14:27 UTC (rev 2748) @@ -17,7 +17,7 @@ <item name="Présentation" href="presentation.html"/> <item name="ScreenShots" href="screenshots.html"/> <item name="Features" href="features.html"/> - <item name="Lancer Lima" href="lima-main/jnlp/launch.jnlp" /> + <item name="Lancer Lima en ligne" href="lima-main/jnlp/launch.jnlp" /> <item name="Téléchargements" href="http://chorem.org/projects/list_files/lima" /> <item name="Lexique comptable" href="lexique.html" /> <item name="Contacts" href="contact.html" />

1 0

r2747 - trunk
by jcouteau＠users.chorem.org Dec. 11, 2009

Dec. 11, 2009

Author: jcouteau Date: 2009-12-11 11:49:58 +0100 (Fri, 11 Dec 2009) New Revision: 2747 Modified: trunk/pom.xml Log: Use mavenpom 1.1.2 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-12-11 10:36:10 UTC (rev 2746) +++ trunk/pom.xml 2009-12-11 10:49:58 UTC (rev 2747) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.1</version> + <version>1.1.2</version> </parent> <groupId>org.chorem</groupId>

1 0

r2746 - in trunk/src/site: . rst
by jcouteau＠users.chorem.org Dec. 11, 2009

Dec. 11, 2009

Author: jcouteau Date: 2009-12-11 11:36:10 +0100 (Fri, 11 Dec 2009) New Revision: 2746 Added: trunk/src/site/rst/install.rst trunk/src/site/rst/journal.rst trunk/src/site/rst/planComptable.rst Modified: trunk/src/site/site_fr.xml Log: Prepare site for scmwebeditor tests Modified: trunk/src/site/site_fr.xml =================================================================== --- trunk/src/site/site_fr.xml 2009-12-11 10:34:51 UTC (rev 2745) +++ trunk/src/site/site_fr.xml 2009-12-11 10:36:10 UTC (rev 2746) @@ -24,7 +24,9 @@ <item name="Dépôt SVN" href="http://svn.chorem.org/svn/lima/"/> </menu> <menu name="Utilisateur" inherit="top" > - <item name="How To" href="howto.html" /> + <item name="Installer et lancer" href="install.html" /> + <item name="Créer les journaux" href="journal.html" /> + <item name="Créer le plan comptable général" href="planComptable.html" /> </menu> <menu ref="reports"/> </body>

1 0

r2745 - trunk
by jcouteau＠users.chorem.org Dec. 11, 2009

Dec. 11, 2009

Author: jcouteau Date: 2009-12-11 11:34:51 +0100 (Fri, 11 Dec 2009) New Revision: 2745 Modified: trunk/pom.xml Log: Use mavenpom 1.1.1 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-08 15:26:23 UTC (rev 2744) +++ trunk/pom.xml 2009-12-11 10:34:51 UTC (rev 2745) @@ -11,7 +11,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0</version> + <version>1.1.1</version> </parent> <groupId>org.chorem</groupId>

1 0