WebSVN - OpenConcerto - Diff - Rev 156 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/reports/history/ui/ListeHistoriquePanel.java

 import org.openconcerto.erp.generationDoc.AbstractSheetXml;
 import org.openconcerto.erp.model.MouseSheetXmlListeListener;
 import org.openconcerto.sql.Configuration;
 import org.openconcerto.sql.element.SQLElement;
 import org.openconcerto.sql.element.SQLElementDirectory;
+import org.openconcerto.sql.model.AliasedTable;
 import org.openconcerto.sql.model.SQLDataSource;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLFieldsSet;
 import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.FilenameFilter;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.math.BigInteger;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.HashMap;
+            }
             int selectIndex = ListeHistoriquePanel.this.jListePanel.getSelectedIndex();
             SQLRowAccessor row = ListeHistoriquePanel.this.jListePanel.getModel().getRowAt(selectIndex);
-            if ((row == null || row.isUndefined()) && undefinedLabel == null) {
+            if ((row == null || row.isUndefined()) && ListeHistoriquePanel.this.undefinedLabel == null) {
                 return;
+            }
             int id = SQLRow.NONEXISTANT_ID;
             if (row != null) {
                         SQLField field = ListeHistoriquePanel.this.listFieldMap.get(table);
                         Where w2 = new Where(field, "=", table.getForeignTable(field.getName()).getKey());
                         w2 = w2.and(new Where(table.getForeignTable(field.getName()).getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id));
                         liste.getListe().getRequest().setWhere(w2.and(w));
                     } else {
-                        if (liste.getElement().getTable().equals(jListePanel.getModel().getTable())) {
+                        if (liste.getElement().getTable().equals(ListeHistoriquePanel.this.jListePanel.getModel().getTable())) {
+                            final Where whereMatch = new Where(table.getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id);
+                            if ((table.getName().equals("COMMANDE_ELEMENT") || table.getName().equals("BON_RECEPTION_ELEMENT"))
+                                    && ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName().equals("AFFAIRE")) {
+                                // FIXME alias forcé à la main, voir pour remplacer avec un
+                                // selectTransformer
+                                final String tablePere = table.getName().replaceAll("_ELEMENT", "");
+                                AliasedTable tableAlias = new AliasedTable(table.getTable(tablePere), "tAlias__ID_" + tablePere + "__" + tablePere);
+                                final int idAffaire = id;
+                                Where wPere = new Where(tableAlias.getField("ID_AFFAIRE"), "=", idAffaire);
-                            liste.getListe().getRequest().setWhere(new Where(table.getKey(), "=", id).and(w));
+                                liste.getListe().getRequest().setWhere(whereMatch.or(wPere).and(w));
+                                // whereMatch = whereMatch.or(new Where(new
+                                // AliasedTable(table.getForeignTable("ID_"+tablePere),
+                                // alias).getField("ID_AFFAIRE"), "=", id));
+                            } else {
+                                liste.getListe().getRequest().setWhere(whereMatch.and(w));
+                            }
+                        } else {
+                            if ((table.getName().equals("MOUVEMENT_STOCK")) && ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName().equals("AFFAIRE")) {
+                                final String tableStock = "STOCK";
+                                AliasedTable tableAlias = new AliasedTable(table.getTable(tableStock), "tAlias__ID_" + tableStock + "__" + tableStock);
+                                final int idAffaire = table.getTable("AFFAIRE").getRow(id).getForeignID("ID_DEPOT_STOCK");
+                                Where w2 = new Where(table.getField("REEL"), "=", Boolean.TRUE);
+                                w2 = w2.and(new Where(table.getField("SOURCE"), "=", ""));
+                                Where wPere = new Where(tableAlias.getField("ID_DEPOT_STOCK"), "=", idAffaire).and(w2);
+                                liste.getListe().getRequest().setWhere(wPere);
+                            } else {
+                                final Where whereMatch = new Where(table.getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id);
+                                if ((table.getName().equals("FACTURE_FOURNISSEUR_ELEMENT") || table.getName().equals("COMMANDE_ELEMENT") || table.getName().equals("BON_RECEPTION_ELEMENT"))
+                                        && ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName().equals("AFFAIRE")) {
+                                    // FIXME alias forcé à la main, voir pour remplacer avec un
+                                    // selectTransformer
+                                    final String tablePere = table.getName().replaceAll("_ELEMENT", "");
+                                    AliasedTable tableAlias = new AliasedTable(table.getTable(tablePere), "tAlias__ID_" + tablePere + "__" + tablePere);
+                                    final int idAffaire = id;
+                                    Where wPere = new Where(tableAlias.getField("ID_AFFAIRE"), "=", idAffaire);
+                                    liste.getListe().getRequest().setWhere(whereMatch.or(wPere).and(w).and(new Where(table.getField("PA_HT"), "!=", BigDecimal.ZERO)));
-                        } else {
+                                } else {
-                            liste.getListe().getRequest().setWhere(new Where(table.getField("ID_" + ListeHistoriquePanel.this.jListePanel.getModel().getTable().getName()), "=", id).and(w));
+                                    liste.getListe().getRequest().setWhere(whereMatch.and(w));
+                                }
+                            }
+                        }
+                    }
                 } else {
                     liste.getListe().getRequest().setWhere(w);
+                }
                                     super.handleAction(source, evt);
+                                }
+                            }
                         };
-                    } else {
+                    } else
+                    {
                         liste = new ListeAddPanel(elt, new IListe(createTableSource), "historique-" + title) {
                             @Override
                             protected void handleAction(JButton source, ActionEvent evt) {
                                 if (source == this.buttonAjouter) {
         });
         this.addAncestorListener(new AncestorListener() {
             @Override
             public void ancestorAdded(AncestorEvent event) {
-                jListePanel.addListSelectionListener(listListener);
+                ListeHistoriquePanel.this.jListePanel.addListSelectionListener(ListeHistoriquePanel.this.listListener);
+            }
             @Override
             public void ancestorMoved(AncestorEvent event) {
+            }
             @Override
             public void ancestorRemoved(AncestorEvent event) {
-                jListePanel.removeListSelectionListener(listListener);
+                ListeHistoriquePanel.this.jListePanel.removeListSelectionListener(ListeHistoriquePanel.this.listListener);
+            }
         });
+    }
+        }
+    }
     public void addListSelectionListener(ListSelectionListener l) {
         this.jListePanel.addListSelectionListener(l);
-        System.out.println("ListeHistoriquePanel.addListSelectionListener()" + jListePanel);
+        System.out.println("ListeHistoriquePanel.addListSelectionListener()" + this.jListePanel);
+    }
     public void removeListSelectionListener(ListSelectionListener l) {
         this.jListePanel.removeListSelectionListener(l);
+    }
     public List<Integer> getListId(String tableName) {
         IListe liste = getIListeFromTableName(tableName);
         List<Integer> listeIds = null;
         if (liste != null) {
+            ITableModel m = liste.getModel();
-            int size = liste.getRowCount();
+            int size = m.getRowCount();
-            listeIds = new ArrayList<Integer>(size);
+            listeIds = new ArrayList<>(size);
             for (int i = 0; i < size; i++) {
+                try {
-                listeIds.add(liste.idFromIndex(i));
+                    listeIds.add(m.idFromIndex(i));
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
         } else {
             listeIds = Collections.emptyList();
+        }
         return listeIds;
+    }
     public void removeAllTableListener() {
         this.jListePanel.removeAllTableListener();
         for (Integer i : this.mapListener.keySet()) {
-            IListPanel panel = vectListePanel.get(i);
+            IListPanel panel = this.vectListePanel.get(i);
             List<TableModelListener> l = this.mapListener.get(i);
             for (TableModelListener tableModelListener : l) {
                 final IListe liste = panel.getListe();
                 if (liste != null) {
                     final TableModel tableModel = liste.getTableModel();

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/reports/history/ui/ListeHistoriquePanel.java - Rev 156 → 177