WebSVN - OpenConcerto - Diff - Rev 151 and 177 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/IListTotalPanel.java

 import org.openconcerto.erp.core.finance.accounting.model.CurrencyConverter;
 import org.openconcerto.sql.model.SQLField;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.view.list.IListe;
 import org.openconcerto.sql.view.list.ITableModel;
+import org.openconcerto.sql.view.list.ListSQLLine;
 import org.openconcerto.sql.view.list.SQLTableModelColumn;
 import org.openconcerto.ui.DefaultGridBagConstraints;
 import org.openconcerto.ui.JLabelBold;
+import org.openconcerto.utils.TableSorter;
 import org.openconcerto.utils.Tuple2;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.beans.PropertyChangeListener;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.event.EventListenerList;
 import javax.swing.event.TableModelEvent;
 import javax.swing.event.TableModelListener;
+import javax.swing.table.TableModel;
 public class IListTotalPanel extends JPanel {
     CurrencyConverter cc = new CurrencyConverter();
     public enum Type {
     public static List<Tuple2<? extends SQLTableModelColumn, Type>> initListe(IListe iL, List<SQLField> l) {
         List<Tuple2<? extends SQLTableModelColumn, Type>> lFinal = new ArrayList<Tuple2<? extends SQLTableModelColumn, Type>>();
         for (SQLField field : l) {
+            final SQLTableModelColumn col = iL.getSource().getColumn(field);
+            if (col == null)
+                throw new IllegalArgumentException("No column with just " + field + " : " + iL.getSource().getColumns());
-            lFinal.add(Tuple2.create(iL.getSource().getColumn(field), Type.SOMME));
+            lFinal.add(Tuple2.create(col, Type.SOMME));
+        }
         return lFinal;
+    }
     public IListTotalPanel(IListe l, final List<Tuple2<? extends SQLTableModelColumn, Type>> listField, final List<Tuple2<SQLField, ?>> filters, String title) {
+            }
             c.gridy++;
+        }
         this.list.addListener(new TableModelListener() {
+            private Object getValueAt(final ListSQLLine line, final SQLTableModelColumn col, final List<SQLTableModelColumn> columns) {
+                final int indexOf = columns.indexOf(col);
+                final Object res = line.getValueAt(indexOf);
+                if (res == null)
+                    throw new IllegalStateException("Null value for " + col + " in " + line);
+                return res;
+            }
             @Override
             public void tableChanged(TableModelEvent e) {
+                final TableModel model = (TableModel) e.getSource();
+                final ITableModel sqlModel;
+                if (model instanceof ITableModel)
+                    sqlModel = (ITableModel) model;
+                else
+                    sqlModel = (ITableModel) ((TableSorter) model).getTableModel();
                 Map<SQLTableModelColumn, BigDecimal> mapTotal = new HashMap<SQLTableModelColumn, BigDecimal>();
                 Map<SQLTableModelColumn, Double> mapPourcent = new HashMap<SQLTableModelColumn, Double>();
                 Map<SQLTableModelColumn, Integer> mapPourcentSize = new HashMap<SQLTableModelColumn, Integer>();
                 for (Tuple2<? extends SQLTableModelColumn, Type> field : listField) {
                     if (field.get1() == Type.COUNT) {
-                        map.get(field.get0()).setText(String.valueOf(list.getRowCount()));
+                        map.get(field.get0()).setText(String.valueOf(model.getRowCount()));
+                    }
+                }
-                for (int i = 0; i < list.getRowCount(); i++) {
+                for (int i = 0; i < model.getRowCount(); i++) {
+                    final ListSQLLine line = sqlModel.getRow(i);
-                    final SQLRowValues rowAt = ITableModel.getLine(list.getModel(), i).getRow();
+                    final SQLRowValues rowAt = line.getRow();
-                    for (Tuple2<? extends SQLTableModelColumn, Type> field : listField) {
+                    final List<SQLTableModelColumn> columns = line.getColumns().getColumns();
+                    for (final Tuple2<? extends SQLTableModelColumn, Type> field : listField) {
-                        if (field.get1() == Type.MOYENNE_POURCENT) {
+                        final Type type = field.get1();
+                        if (type == Type.MOYENNE_POURCENT) {
-                            Double n2 = (Double) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(field.get0()));
+                            final Double n2 = (Double) getValueAt(line, field.get0(), columns);
                             boolean in = true;
                             if (filters != null) {
                                 for (Tuple2<SQLField, ?> tuple2 : filters) {
                                 } else {
                                     mapPourcentSize.put(field.get0(), mapPourcentSize.get(field.get0()).intValue() + 1);
+                                }
+                            }
-                        } else if (field.get1() == Type.AVANCEMENT_TTC) {
+                        } else if (type == Type.AVANCEMENT_TTC) {
                             BigDecimal n = mapTotal.get(field.get0());
-                            final SQLTableModelColumn columnTTC = list.getSource().getColumn(list.getSource().getPrimaryTable().getField("T_TTC"));
-                            BigDecimal ttc = BigDecimal.valueOf(((Number) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(columnTTC))).doubleValue());
+                            BigDecimal ttc = BigDecimal.valueOf(line.getRow().getObjectAs("T_TTC", Number.class).doubleValue());
-                            BigDecimal av = BigDecimal.valueOf(((Number) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(field.get0()))).doubleValue());
+                            BigDecimal av = BigDecimal.valueOf(((Number) getValueAt(line, field.get0(), columns)).doubleValue());
                             boolean in = true;
                             if (filters != null) {
                                 for (Tuple2<SQLField, ?> tuple2 : filters) {
                                     mapTotal.put(field.get0(), ttc.multiply(av).movePointLeft(2));
                                 } else {
                                     mapTotal.put(field.get0(), n.add(ttc.multiply(av).movePointLeft(2)));
+                                }
+                            }
-                        } else if (field.get1() != Type.MOYENNE_MARGE && field.get1() != Type.COUNT) {
+                        } else if (type != Type.MOYENNE_MARGE && type != Type.COUNT) {
                             BigDecimal n = mapTotal.get(field.get0());
+                            final Object value = getValueAt(line, field.get0(), columns);
-                            BigDecimal n2 = BigDecimal.valueOf(((Number) list.getModel().getValueAt(i, list.getSource().getColumns().indexOf(field.get0()))).doubleValue());
+                            final BigDecimal n2 = BigDecimal.valueOf(((Number) value).doubleValue());
                             boolean in = true;
                             if (filters != null) {
                                 for (Tuple2<SQLField, ?> tuple2 : filters) {

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/common/ui/IListTotalPanel.java - Rev 151 → 177