WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/PointagePanel.java

 /*
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
+ *
- * Copyright 2011 OpenConcerto, by ILM Informatique. All rights reserved.
+ * Copyright 2011-2019 OpenConcerto, by ILM Informatique. All rights reserved.
+ *
  * The contents of this file are subject to the terms of the GNU General Public License Version 3
  * only ("GPL"). You may not use this file except in compliance with the License. You can obtain a
  * copy of the License at http://www.gnu.org/licenses/gpl-3.0.html See the License for the specific
  * language governing permissions and limitations under the License.
 import org.openconcerto.sql.users.rights.UserRightsManager;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.FontUtils;
 import org.openconcerto.ui.JDate;
-import org.openconcerto.ui.TitledSeparator;
+import org.openconcerto.ui.JLabelBold;
 import org.openconcerto.ui.warning.JLabelWarning;
 import org.openconcerto.utils.text.SimpleDocumentListener;
 import java.awt.Color;
+import java.awt.Component;
 import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Window;
     private final DeviseField fieldSoldeA = new DeviseField(15);
     private final DeviseField fieldEcart = new DeviseField(15);
     private final SQLBase base = ((ComptaPropsConfiguration) Configuration.getInstance()).getSQLBaseSociete();
     private final SQLTable tableEcr = this.base.getTable("ECRITURE");
-    private final SQLTable tableCpt = this.base.getTable("COMPTE_PCE");
     private final static int allEcriture = 0;
     private final static int ecriturePointee = 1;
     private final static int ecritureNotPointee = 2;
                     e.printStackTrace();
+                }
+            }
         }.execute();
-        // c.fill = GridBagConstraints.NONE;
         c.weightx = 1;
         c.gridx++;
+        c.gridwidth = 2;
-        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.fill = GridBagConstraints.NONE;
         this.add(this.selCompte, c);
         // Gestion du pointage
         c.insets = new Insets(2, 2, 1, 2);
-        TitledSeparator sepGestionPointage = new TitledSeparator("Gestion du pointage");
-        c.fill = GridBagConstraints.HORIZONTAL;
-        c.gridy++;
         c.gridx = 0;
-        this.add(sepGestionPointage, c);
-        // Panel Selection du mode d'affichage des ecritures
         c.gridy++;
-        c.gridx = 0;
         c.gridwidth = 1;
-        c.gridheight = 1;
         c.weightx = 0;
+        c.fill = GridBagConstraints.HORIZONTAL;
         // Numero de releve
-        // c.anchor = GridBagConstraints.EAST;
-        JLabel labelReleve = new JLabel("N° de relevé");
+        final JLabel labelReleve = new JLabel("N° de relevé");
         labelReleve.setHorizontalAlignment(SwingConstants.RIGHT);
         this.add(labelReleve, c);
         this.codePointage = new JTextField(10);
         c.gridx++;
         c.weightx = 0;
         c.fill = GridBagConstraints.NONE;
-        c.anchor = GridBagConstraints.WEST;
         this.add(this.codePointage, c);
         // Warning si aucun code rentré
         c.gridx++;
-        c.fill = GridBagConstraints.HORIZONTAL;
+        c.fill = GridBagConstraints.NONE;
-        createPanelWarning();
         c.gridwidth = 1;
-        c.weightx = 1;
+        c.weightx = 0;
+        createPanelWarning();
         this.add(this.warningPanel, c);
         // Date de pointage
         // MAYBE si date invalide grisée le bouton pointer
         JLabel labelDate = new JLabel("Date de pointage");
         labelDate.setHorizontalAlignment(SwingConstants.RIGHT);
+        c.fill = GridBagConstraints.HORIZONTAL;
         c.gridx = 0;
         c.gridy++;
         c.gridwidth = 1;
         c.weightx = 0;
         this.add(labelDate, c);
         cCheck.fill = GridBagConstraints.NONE;
         cCheck.weightx = 1;
         cCheck.gridx++;
         cCheck.gridwidth = 1;
         this.fieldEcart.setEditable(false);
         panelCheckValue.add(this.fieldEcart, cCheck);
         c.gridx++;
-        c.gridwidth = 3;
+        c.gridwidth = 1;
         c.weightx = 1;
+        c.fill = GridBagConstraints.HORIZONTAL;
         this.add(panelCheckValue, c);
         this.fieldSoldeA.getDocument().addDocumentListener(new SimpleDocumentListener() {
             @Override
             public void update(DocumentEvent e) {
             public void update(DocumentEvent e) {
                 PointagePanel.this.model.updateTotauxCompte(PointagePanel.this.fieldSoldeD, PointagePanel.this.fieldSoldeA, PointagePanel.this.fieldEcart);
+            }
         });
-        TitledSeparator sepPeriode = new TitledSeparator("Filtre ");
+        JLabelBold sepPeriode = new JLabelBold("Liste des écritures");
         c.gridy++;
         c.gridx = 0;
         c.anchor = GridBagConstraints.WEST;
-        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.gridwidth = 3;
         c.fill = GridBagConstraints.HORIZONTAL;
         this.add(sepPeriode, c);
         JPanel panelSelectEcritures = createPanelSelectionEcritures();
         c.gridy++;
         c.weightx = 0;
         c.gridwidth = 1;
         c.gridx = 0;
-        final JLabel labelEcr = new JLabel("Ecritures");
+        final JLabel labelEcr = new JLabel("Etats");
         labelEcr.setHorizontalAlignment(SwingConstants.RIGHT);
         this.add(labelEcr, c);
         c.gridx++;
         c.fill = GridBagConstraints.NONE;
-        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.gridwidth = 2;
         c.weightx = 1;
         this.add(panelSelectEcritures, c);
         c.fill = GridBagConstraints.HORIZONTAL;
         c.gridy++;
         panelPeriode.add(this.dateFin);
         c.weightx = 1;
         c.fill = GridBagConstraints.NONE;
-        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.gridwidth = 2;
         this.add(panelPeriode, c);
-        TitledSeparator sepEcriture = new TitledSeparator("Ecritures ");
-        c.gridy++;
-        c.gridx = 0;
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        c.fill = GridBagConstraints.HORIZONTAL;
-        this.add(sepEcriture, c);
         // Liste des ecritures
         final EcritureSQLElement ecritureElem = directory.getElement(EcritureSQLElement.class);
         this.ecriturePanel = new ListPanelEcritures(ecritureElem, new IListe(ecritureElem.createPointageTableSource()));
         this.ecriturePanel.setShowReadOnlyFrameOnDoubleClick(false);
         c.gridx = 0;
         c.gridy++;
         c.weighty = 1;
         c.weightx = 1;
         c.fill = GridBagConstraints.BOTH;
-        c.gridwidth = GridBagConstraints.REMAINDER;
+        c.gridwidth = 3;
         this.ecriturePanel.getListe().setPreferredSize(new Dimension(this.ecriturePanel.getListe().getPreferredSize().width, 200));
         this.add(this.ecriturePanel, c);
-        // JTable Totaux
         c.gridy++;
-        c.gridx = 0;
         c.weighty = 0;
-        c.weightx = 1;
-        c.fill = GridBagConstraints.BOTH;
-        c.gridwidth = 4;
-        c.gridheight = 3;
-        this.model = new PointageModel(this.selCompte.getSelectedId(), this);
-        JTable table = new JTable(this.model);
-        table.setRowHeight(FontUtils.getPreferredRowHeight(table));
-        // AlternateTableCellRenderer.setAllColumns(table);
-        final DeviseNiceTableCellRenderer cellRenderer = new DeviseNiceTableCellRenderer();
-        for (int i = 0; i < table.getColumnCount(); i++) {
-            // if (table.getColumnClass(i) == Long.class || table.getColumnClass(i) ==
-            // BigInteger.class) {
-            table.getColumnModel().getColumn(i).setCellRenderer(cellRenderer);
-            // }else{
-            //
-            // }
-        }
-        JScrollPane sPane = new JScrollPane(table);
-        // TODO Gerer la taille des colonnes
-        Dimension d = new Dimension(table.getPreferredSize().width, table.getPreferredSize().height + table.getTableHeader().getPreferredSize().height + 4);
-        sPane.setPreferredSize(d);
-        this.add(sPane, c);
-        // Legende
-        c.gridx += 4;
-        c.gridwidth = 1;
-        c.anchor = GridBagConstraints.WEST;
-        c.fill = GridBagConstraints.NONE;
-        c.weightx = 0;
-        this.add(createPanelLegende(), c);
+        this.add(createBottomPanel(), c);
-        // Validation des ecritures pointées
-        this.boxValidEcriture = new JCheckBox("Valider les écritures pointées");
-        c.gridx++;
-        c.gridheight = 1;
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        this.add(this.boxValidEcriture, c);
-        // Bouton Pointer
-        c.anchor = GridBagConstraints.SOUTHEAST;
-        this.buttonPointer = new JButton("Pointer");
-        c.gridwidth = 1;
-        c.gridheight = 1;
-        c.weightx = 0;
-        c.gridx = 5;
-        c.gridy++;
-        c.fill = GridBagConstraints.NONE;
-        this.add(this.buttonPointer, c);
-        // Bouton Depointer
-        JButton buttonDepointer = new JButton("Dépointer");
-        c.gridx++;
-        c.weightx = 0;
-        this.add(buttonDepointer, c);
-        c.gridwidth = GridBagConstraints.REMAINDER;
-        c.gridheight = 1;
-        c.weightx = 0;
-        c.gridx = 5;
-        c.gridy++;
-        c.fill = GridBagConstraints.NONE;
-        c.anchor = GridBagConstraints.EAST;
-        JButton buttonClose = new JButton("Fermer");
-        buttonClose.addActionListener(new ActionListener() {
-            @Override
-            public void actionPerformed(ActionEvent e) {
-                ((Window) SwingUtilities.getRoot(PointagePanel.this)).dispose();
-            }
-        });
-        this.add(buttonClose, c);
-        this.buttonPointer.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                int[] rowIndex = PointagePanel.this.ecriturePanel.getListe().getJTable().getSelectedRows();
-                for (int i = 0; i < rowIndex.length; i++) {
-                    System.err.println("Action pointage sur " + i);
-                    actionPointage(rowIndex[i]);
-                }
-            }
-        });
-        buttonDepointer.addActionListener(new ActionListener() {
-            public void actionPerformed(ActionEvent e) {
-                int[] rowIndex = PointagePanel.this.ecriturePanel.getListe().getJTable().getSelectedRows();
-                for (int i = 0; i < rowIndex.length; i++) {
-                    System.err.println("Action depointage sur " + i);
-                    actionDepointage(rowIndex[i]);
-                }
-            }
-        });
         // Changement de compte
-        this.selCompte.addValueListener(new PropertyChangeListener() {
+        this.selCompte.addModelListener("wantedID", new PropertyChangeListener() {
             public void propertyChange(PropertyChangeEvent evt) {
                 changeListRequest();
             };
         });
         changeListRequest();
         this.warningPanel.setVisible((this.codePointage.getText().trim().length() == 0));
         this.buttonPointer.setEnabled((this.codePointage.getText().trim().length() != 0));
+    }
+    private Component createBottomPanel() {
+        JPanel p = new JPanel();
+        GridBagConstraints c = new DefaultGridBagConstraints();
+        p.setLayout(new GridBagLayout());
+        // JTable Totaux
+        c.weighty = 1;
+        c.weightx = 1;
+        c.gridheight = 3;
+        c.fill = GridBagConstraints.BOTH;
+        this.model = new PointageModel(this.selCompte.getSelectedId(), this);
+        JTable table = new JTable(this.model);
+        table.setRowHeight(FontUtils.getPreferredRowHeight(table));
+        final DeviseNiceTableCellRenderer cellRenderer = new DeviseNiceTableCellRenderer();
+        for (int i = 0; i < table.getColumnCount(); i++) {
+            table.getColumnModel().getColumn(i).setCellRenderer(cellRenderer);
+        }
+        JScrollPane sPane = new JScrollPane(table);
+        // TODO Gerer la taille des colonnes
+        Dimension d = new Dimension(table.getPreferredSize().width, table.getPreferredSize().height + table.getTableHeader().getPreferredSize().height + 4);
+        sPane.setPreferredSize(d);
+        p.add(sPane, c);
+        // Legende
+        c.gridx++;
+        c.anchor = GridBagConstraints.WEST;
+        c.fill = GridBagConstraints.NONE;
+        c.weightx = 0;
+        p.add(createPanelLegende(), c);
+        // Validation des ecritures pointées
+        this.boxValidEcriture = new JCheckBox("Valider les écritures pointées");
+        c.gridx++;
+        c.gridheight = 1;
+        c.gridwidth = 2;
+        p.add(this.boxValidEcriture, c);
+        // Bouton Pointer
+        c.anchor = GridBagConstraints.SOUTHEAST;
+        this.buttonPointer = new JButton("Pointer");
+        c.gridwidth = 1;
+        c.gridy++;
+        c.fill = GridBagConstraints.NONE;
+        p.add(this.buttonPointer, c);
+        // Bouton Depointer
+        JButton buttonDepointer = new JButton("Dépointer");
+        c.gridx++;
+        p.add(buttonDepointer, c);
+        c.gridy++;
+        c.fill = GridBagConstraints.NONE;
+        c.anchor = GridBagConstraints.EAST;
+        JButton buttonClose = new JButton("Fermer");
+        buttonClose.addActionListener(new ActionListener() {
+            @Override
+            public void actionPerformed(ActionEvent e) {
+                ((Window) SwingUtilities.getRoot(PointagePanel.this)).dispose();
+            }
+        });
+        p.add(buttonClose, c);
+        this.buttonPointer.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                int[] rowIndex = PointagePanel.this.ecriturePanel.getListe().getJTable().getSelectedRows();
+                for (int i = 0; i < rowIndex.length; i++) {
+                    actionPointage(rowIndex[i]);
+                }
+            }
+        });
+        buttonDepointer.addActionListener(new ActionListener() {
+            public void actionPerformed(ActionEvent e) {
+                int[] rowIndex = PointagePanel.this.ecriturePanel.getListe().getJTable().getSelectedRows();
+                for (int i = 0; i < rowIndex.length; i++) {
+                    actionDepointage(rowIndex[i]);
+                }
+            }
+        });
+        return p;
+    }
     /* Menu clic Droit */
     private void actionMenuDroit(final MouseEvent mE) {
         JPopupMenu menu = new JPopupMenu();
         menu.add(new AbstractAction("Voir la source") {
             public void actionPerformed(ActionEvent e) {
                 int rowIndex = PointagePanel.this.ecriturePanel.getListe().getJTable().rowAtPoint(mE.getPoint());
                 int id = PointagePanel.this.ecriturePanel.getListe().idFromIndex(rowIndex);
                 SQLTable ecriture = PointagePanel.this.base.getTable("ECRITURE");
                 SQLRow rowEcr = ecriture.getRow(id);
         });
         if (this.codePointage.getText().trim().length() != 0) {
             menu.add(new AbstractAction("Pointer") {
                 public void actionPerformed(ActionEvent e) {
                     int rowIndex = PointagePanel.this.ecriturePanel.getListe().getJTable().rowAtPoint(mE.getPoint());
                     actionPointage(rowIndex);
+                }
             });
+        }
         menu.add(new AbstractAction("Dépointer") {
             public void actionPerformed(ActionEvent e) {
                 int rowIndex = PointagePanel.this.ecriturePanel.getListe().getJTable().rowAtPoint(mE.getPoint());
                 actionDepointage(rowIndex);
+            }
         });
+        }
         this.model.updateTotauxCompte(PointagePanel.this.fieldSoldeD, PointagePanel.this.fieldSoldeA, PointagePanel.this.fieldEcart);
+    }
     public ListPanelEcritures getEcriturePanel() {
-        return ecriturePanel;
+        return this.ecriturePanel;
+    }
     // Pointe la ligne passée en parametre
     private void actionDepointage(int rowIndex) {
     /*
      * MaJ de la requete pour remplir la IListe en fonction du compte sélectionner et du mode de
      * sélection
      */
     private void changeListRequest() {
-        Object idCpt = this.selCompte.getSelectedId();
+        Object idCpt = this.selCompte.getWantedID();
         // filtre de selection
         Where w = new Where(this.tableEcr.getField("ID_COMPTE_PCE"), "=", idCpt);

Dépôt officiel du code source de l'ERP OpenConcerto

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/finance/accounting/ui/PointagePanel.java - Rev 180 → 182