From glorieux@users.chorem.org Thu Dec 17 09:46:51 2009
From: glorieux@users.chorem.org
To: lima-commits@list.chorem.org
Subject:
 [Lima-commits] r2754 -	trunk/lima-main/src/main/java/org/chorem/lima/ui
Date: Thu, 17 Dec 2009 09:46:51 +0100
Message-ID: <20091217084651.8373B15D89@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3850750782690893984=="

--===============3850750782690893984==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/AddPeriod.jaxx	2009-12-1=
6 21:42:35 UTC (rev 2753)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/AddPeriod.jaxx	2009-12-1=
7 08:46:51 UTC (rev 2754)
@@ -1,8 +1,31 @@
-<JFrame locationRelativeTo=3D"{null}" defaultCloseOperation=3D"dispose_on_cl=
ose">
+<JFrame width=3D"300" height=3D"150" locationRelativeTo=3D"{null}" defaultCl=
oseOperation=3D"dispose_on_close">
+   =20
     <style source=3D"css/lima.css" />
     <Table insets=3D'5,5,5,5'>
         <row>
             <cell>
+                <JLabel text=3D"lima.closure.period.begin"/>
+            </cell>
+            <cell>
+                <JPanel id=3D"beginMonthPeriodPanel"/>
+            </cell>
+            <cell>
+                <JPanel id=3D"beginYearPeriodPanel"/>
+            </cell>
+        </row>
+        <row>
+            <cell>
+                <JLabel text=3D"lima.to"/>
+            </cell>
+            <cell>
+                <JPanel id=3D"endMonthPeriodPanel"/>
+            </cell>
+            <cell>
+                <JPanel id=3D"endYearPeriodPanel"/>
+            </cell>
+        </row>
+        <row>
+            <cell>
                 <JButton id=3D"okButton" text=3D"lima.ok"/>
             </cell>
             <cell>

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.ja=
va
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java	200=
9-12-16 21:42:35 UTC (rev 2753)
+++ trunk/lima-main/src/main/java/org/chorem/lima/ui/ClosureViewImpl.java	200=
9-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;
=20
 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.*;
=20
 import org.jdesktop.swingx.decorator.*;
+import org.nuiton.util.PeriodDates;
=20
=20
 /**
@@ -52,7 +49,7 @@
 public class ClosureViewImpl extends ClosureView {
=20
     /**
-     * log *
+     * log
      */
     private static final Log log =3D LogFactory.getLog(ClosureViewImpl.class=
);
     private final JXTable table;
@@ -62,6 +59,10 @@
     private static boolean blockPeriod;
     private JComboBox comboBoxBeginPeriod =3D new JComboBox();
     private JComboBox comboBoxEndPeriod =3D new JComboBox();
+    private JComboBox comboBeginYearPeriod =3D new JComboBox();
+    private JComboBox comboBeginMonthPeriod =3D new JComboBox();
+    private JComboBox comboEndYearPeriod =3D new JComboBox();
+    private JComboBox comboEndMonthPeriod =3D new JComboBox();
=20
=20
     /**
@@ -122,10 +123,52 @@
          * Initialisation du formulaire pour ajouter un exercice
          */
         addPeriodForm =3D LimaContext.getContext().getMainUI().getAddPeriod(=
);
+
+        Calendar cal =3D 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 =3D 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, ja=
va.util.Locale.getDefault()));       =20
+        for(int j =3D 0; j < 11; j++){
+                cal.add(Calendar.MONTH, 1);
+                comboBeginMonthPeriod.addItem(cal.getDisplayName(Calendar.MO=
NTH, 2, java.util.Locale.getDefault()));
+                comboEndMonthPeriod.addItem(cal.getDisplayName(Calendar.MONT=
H, 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();
             }
         });
=20
@@ -141,17 +184,14 @@
          * Charge pour le JComboBox le choix des p=C3=A9riodes (exercices) =
=C3=A0 afficher.
          */
         // R=C3=A9cup=C3=A8re les p=C3=A9riodes
-        List<PeriodDTO> periodes =3D LimaContext.getContext().getDataManager=
().getPeriodes();
-        // Pour chaque p=C3=A9riode
-        Vector<PeriodDTO> v =3D new Vector<PeriodDTO>();
-        for (PeriodDTO period : periodes) {
-            v.add(period);
-        }
+        ClosureTableModel closureModel =3D LimaContext.getContext().getDataM=
anager().getClosureModel();
+        PeriodComboBoxModel periodModel =3D new PeriodComboBoxModel(closureM=
odel);
         // Cr=C3=A9ation Combobox debut p=C3=A9riode
-        comboBoxPeriod.setModel(new DefaultComboBoxModel(v));
-        comboBoxPeriod.setRenderer(PeriodClosureComboBoxRenderer.getInstance=
());
+        comboBoxPeriod.setModel(periodModel);
+        comboBoxPeriod.setRenderer(PeriodComboBoxRenderer.getInstance());
         // Ajout des combobox
         periodPanel.add(comboBoxPeriod);
+        periodPanel.validate();
     }
=20
=20
@@ -189,29 +229,18 @@
          * Charge pour les JComboBox le choix des p=C3=A9riodes mensuelles =
=C3=A0 bloquer.
          */
         // R=C3=A9cup=C3=A8re les p=C3=A9riodes
-        List<PeriodDTO> periodes =3D LimaContext.getContext().getDataManager=
().getPeriodes();
-        Vector<PeriodDTO> v =3D new Vector<PeriodDTO>();
-
-        // R=C3=A9cup=C3=A8re la p=C3=A9riode annuelle s=C3=A9lectionn=C3=A9=
e dans la comboBox
-        PeriodDTO periodMaster =3D (PeriodDTO) comboBoxPeriod.getSelectedIte=
m();
-
-        // Parcours de toutes les p=C3=A9riodes pour trouver la p=C3=A9riode=
 master     =20
-        for (PeriodDTO period : periodes) {
-            if (period.equals(periodMaster)) {
-                v.addAll(period.getChildren());
-            }
-        }
-
+        ClosureTableModel closureModel =3D LimaContext.getContext().getDataM=
anager().getClosureModel();
+        PeriodComboBoxModel periodModel =3D new PeriodComboBoxModel(closureM=
odel);
         // Cr=C3=A9ation Combobox debut p=C3=A9riode
-        comboBoxBeginPeriod.setModel(new DefaultComboBoxModel(v));
-        comboBoxBeginPeriod.setRenderer(PeriodClosureComboBoxRenderer.getIns=
tance());
+        comboBoxBeginPeriod.setModel(periodModel);
+        comboBoxBeginPeriod.setRenderer(PeriodComboBoxRenderer.getInstance()=
);
         // Cr=C3=A9ation Combobox fin p=C3=A9riode
-        comboBoxEndPeriod.setModel(new DefaultComboBoxModel(v));
-        comboBoxEndPeriod.setRenderer(PeriodClosureComboBoxRenderer.getInsta=
nce());
+        comboBoxEndPeriod.setModel(periodModel);
+        comboBoxEndPeriod.setRenderer(PeriodComboBoxRenderer.getInstance());
         // Ajout des combobox
         form.beginPeriod.add(comboBoxBeginPeriod);
         form.endPeriod.add(comboBoxEndPeriod);
-
+       =20
         /**
          * Positionne, si les lignes sont s=C3=A9lectionn=C3=A9es, les combo=
Box sur
          * les bonnes p=C3=A9riodes (p=C3=A9riode min et p=C3=A9riode max).
@@ -237,18 +266,33 @@
         }
         PeriodDTO periodCurrent =3D LimaContext.getContext().getDataManager(=
).getCurrentPeriod();
         List<StatusDTO> status =3D LimaContext.getContext().getDataManager()=
.getStatus();
-        Date begin =3D Util.InitDateFirstDayMonth(new Date(periodCurrent.get=
Begin().getYear() + 1, 0, 1));
-        Date end =3D Util.InitDateEndDayMonth(new Date(periodCurrent.getBegi=
n().getYear() + 1, 11, 1));
-        PeriodDTO period =3D new PeriodDTO("", "", begin, end, null, null, s=
tatus.get(3));
-        // Cr=C3=A9ation des enfants periodes
-        List<PeriodDTO> listPeriodChild =3D new LinkedList<PeriodDTO>();
-        for (int i =3D 0; i < 12; i++) {
-            begin =3D Util.InitDateFirstDayMonth(new Date(periodCurrent.getB=
egin().getYear() + 1, i, 1));
-            end =3D Util.InitDateEndDayMonth(new Date(periodCurrent.getBegin=
().getYear() + 1, i, 1));
-            PeriodDTO periodChild =3D new PeriodDTO("", Integer.toString(beg=
in.getYear()), begin, end, null, period, status.get(3));
-            listPeriodChild.add(periodChild);
+        // TODO gere locale courante
+        Calendar cal_beg =3D new GregorianCalendar();
+        if (periodCurrent !=3D null)
+            {
+                cal_beg.setTime(periodCurrent.getBegin());
+                cal_beg.add(Calendar.YEAR , comboBeginYearPeriod.getSelected=
Index());
+            }
+        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()=
);
+       =20
+        Date begin =3D cal_beg.getTime();
+
+        Calendar cal_end =3D new GregorianCalendar();
+        cal_end.add(Calendar.YEAR, comboEndYearPeriod.getSelectedIndex());
+        cal_end.set(Calendar.MONTH , comboEndMonthPeriod.getSelectedIndex());
+        int maximum =3D cal_end.getActualMaximum(Calendar.DAY_OF_MONTH);
+        cal_end.set(Calendar.DAY_OF_MONTH, maximum);
+
+        Date end =3D cal_end.getTime();
+        log.debug("Date de debut: "+begin+" Date de fin: "+end);
+
+        String periodName =3D comboBeginYearPeriod.getSelectedIndex() !=3D c=
omboEndYearPeriod.getSelectedIndex() ? Integer.toString(cal_beg.get(Calendar.=
YEAR))+"-"+Integer.toString(cal_end.get(Calendar.YEAR)) : Integer.toString(ca=
l_beg.get(Calendar.YEAR));
+        PeriodDTO period =3D new PeriodDTO("", periodName, begin, end, null,=
 null, status.get(3));
+
         ClosureTableModel closureModel =3D (ClosureTableModel) table.getMode=
l();
         closureModel.addPeriod(period, status);
     }

Modified: trunk/lima-main/src/main/java/org/chorem/lima/ui/TransactionViewImp=
l.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- 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 !=3D 0){
+            getComboPeriod().setSelectedIndex(index);
+           =20
+        }
=20
         /**
          * Impl=C3=A9mente le clic droit
@@ -220,7 +224,6 @@
         LimaContext.getContext().getDataManager().getJournalModel().addPrope=
rtyChangeListener(comboBoxModel);
         getComboJournal().setModel(comboBoxModel);
         getComboJournal().setRenderer(JournalComboBoxRenderer.getInstance());
-
         // AutoCompletion
         // AutoCompleteDecorator.decorate(comboJournal, JournalToStringConve=
rter.getInstance());
         journalPanel.add(getComboJournal());
@@ -232,22 +235,13 @@
      */
     private void initPeriodComboBox() {
         // Recherche la liste de toutes les p=C3=A9riodes
-        List<PeriodDTO> periodes =3D LimaContext.getContext().getDataManager=
().getPeriodes();
-        // Model pour les p=C3=A9riodes
-        Vector<PeriodDTO> v =3D new Vector<PeriodDTO>();
-        // On ajoute un =C3=A9l=C3=A9ment null pour permettre d'afficher tou=
tes les p=C3=A9riodes
-        v.addElement(null);
-        // Pour chaque p=C3=A9riode (annuelle et NON mensuelle !)
-        for (PeriodDTO period : periodes) {
-            v.addElement(period);
-            v.addAll(period.getChildren());
-        }
=20
-        getComboPeriod().setModel(new DefaultComboBoxModel(v));
+        ClosureTableModel closureModel =3D LimaContext.getContext().getDataM=
anager().getClosureModel();
+        PeriodComboBoxModel periodModel =3D new PeriodComboBoxModel(closureM=
odel);
+        getComboPeriod().setModel(periodModel);
         getComboPeriod().setRenderer(PeriodComboBoxRenderer.getInstance());
         // AutoCompletion
         // AutoCompleteDecorator.decorate(comboPeriod, PeriodToStringConvert=
er.getInstance());
-
         periodPanel.add(getComboPeriod());
         periodPanel.validate();
     }


--===============3850750782690893984==--