WebSVN - OpenConcerto - Diff - Rev 180 and 182 - /trunk/OpenConcerto/src/org/openconcerto/sql/sqlobject/ITextArticleWithCompletion.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.
  */
  package org.openconcerto.sql.sqlobject;
 import org.openconcerto.sql.model.SQLField;
-import org.openconcerto.sql.model.SQLRow;
 import org.openconcerto.sql.model.SQLRowAccessor;
 import org.openconcerto.sql.model.SQLRowValues;
 import org.openconcerto.sql.model.SQLRowValuesListFetcher;
 import org.openconcerto.sql.model.SQLSelect;
 import org.openconcerto.sql.model.SQLTable;
 import java.awt.event.KeyListener;
 import java.beans.PropertyChangeListener;
 import java.beans.PropertyChangeSupport;
 import java.sql.SQLException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 import java.util.Stack;
 import java.util.Vector;
 import javax.swing.JComponent;
 import javax.swing.JPanel;
     private int autoCheckDelay = 1000;
     private boolean disposed = false;
     private Stack<String> searchStack = new Stack<String>();
     private boolean autoselectIfMatch;
     private static final int PAUSE_MS = 150;
+    private final boolean hasDeclinaison;
-    public ITextArticleWithCompletion(SQLTable tableArticle, SQLTable tableARticleFournisseur) {
+    public ITextArticleWithCompletion(SQLTable tableArticle, SQLTable tableARticleFournisseur, boolean withDeclinaison) {
         this.tableArticle = tableArticle;
         this.tableArticleFournisseur = tableARticleFournisseur;
+        this.hasDeclinaison = withDeclinaison;
         this.supp = new PropertyChangeSupport(this);
         this.popup = new ITextWithCompletionPopUp(this.model, this);
+        this.popup.setMinWith(450);
         this.text = new JTextField();
         this.setLayout(new GridLayout(1, 1));
         this.add(this.text);
         setTextEditor(this.text);
         setPopupInvoker(this);
         aText = aText.trim();
         if (aText.length() > 0) {
             List<SQLSelect> listSel = new ArrayList<SQLSelect>();
             // CODE ARTICLE = aText
             SQLSelect selMatchingCode = new SQLSelect();
-            // selMatchingCode.addSelectStar(this.tableArticle);
             selMatchingCode.addSelect(this.tableArticle.getKey());
             selMatchingCode.addSelect(this.tableArticle.getField("CODE"));
             selMatchingCode.addSelect(this.tableArticle.getField("NOM"));
             selMatchingCode.addSelect(this.tableArticle.getField("CODE_BARRE"));
+            if (this.hasDeclinaison) {
+                for (String fieldName : this.tableArticle.getFieldsName()) {
+                    if (fieldName.startsWith("ID_ARTICLE_DECLINAISON_")) {
+                        selMatchingCode.addSelect(this.tableArticle.getField(fieldName));
+                        SQLSelect selDecl = new SQLSelect();
+                        SQLTable tableDecl = this.tableArticle.getForeignTable(fieldName);
+                        selDecl.addSelect(tableDecl.getKey());
+                        selDecl.addSelect(tableDecl.getField("NOM"));
+                        listSel.add(selDecl);
+                    }
+                }
+            }
             Where wMatchingCode = new Where(this.tableArticle.getField("CODE"), "=", aText);
             wMatchingCode = wMatchingCode.or(new Where(this.tableArticle.getField("NOM"), "=", aText));
             wMatchingCode = wMatchingCode.or(new Where(this.tableArticle.getField("CODE_BARRE"), "=", aText));
+            wMatchingCode = wMatchingCode.and(new Where(this.tableArticle.getField("VIRTUEL"), "=", Boolean.FALSE));
             if (this.whereAdditionnal != null) {
                 wMatchingCode = wMatchingCode.and(this.whereAdditionnal);
+            }
             selMatchingCode.setWhere(wMatchingCode);
             if (this.selTransformer != null) {
             // selContains.addSelectStar(this.tableArticle);
             selContains.addSelect(this.tableArticle.getKey());
             selContains.addSelect(this.tableArticle.getField("CODE"));
             selContains.addSelect(this.tableArticle.getField("NOM"));
             selContains.addSelect(this.tableArticle.getField("CODE_BARRE"));
+            if (this.hasDeclinaison) {
+                for (String fieldName : this.tableArticle.getFieldsName()) {
+                    if (fieldName.startsWith("ID_ARTICLE_DECLINAISON_")) {
+                        selContains.addSelect(this.tableArticle.getField(fieldName));
+                    }
+                }
+            }
             Where wContains = new Where(this.tableArticle.getField("CODE"), "LIKE", "%" + aText + "%");
             wContains = wContains.or(new Where(this.tableArticle.getField("NOM"), "LIKE", "%" + aText + "%"));
             wContains = wContains.or(new Where(this.tableArticle.getField("CODE_BARRE"), "LIKE", "%" + aText + "%"));
+            wContains = wContains.and(new Where(this.tableArticle.getField("VIRTUEL"), "=", Boolean.FALSE));
             if (this.whereAdditionnal != null) {
                 wContains = wContains.and(this.whereAdditionnal);
+            }
             selContains.setWhere(wContains.and(wMatchingCode.not()));
             // Recherche dans les codes fournisseurs
             SQLTable tableCodeArt = this.tableArticle.getDBRoot().getTable("CODE_FOURNISSEUR");
             SQLRowValues rowValsCodeF = new SQLRowValues(tableCodeArt);
             rowValsCodeF.putNulls("CODE");
+            final SQLRowValues putRowValuesArt = rowValsCodeF.putRowValues("ID_ARTICLE");
-            rowValsCodeF.putRowValues("ID_ARTICLE").putNulls(this.tableArticle.getFieldsName());
+            putRowValuesArt.putNulls(this.tableArticle.getFieldsName());
+            if (this.hasDeclinaison) {
+                for (String fieldName : this.tableArticle.getFieldsName()) {
+                    if (fieldName.startsWith("ID_ARTICLE_DECLINAISON_")) {
+                        putRowValuesArt.putRowValues(fieldName).putNulls("NOM");
+                    }
+                }
+            }
             final String codeText = aText;
             SQLRowValuesListFetcher fetcher = SQLRowValuesListFetcher.create(rowValsCodeF);
             fetcher.setSelTransf(new ITransformer<SQLSelect, SQLSelect>() {
                 @Override
                 public SQLSelect transformChecked(SQLSelect input) {
+                }
             });
             List<SQLRowValues> resultCodeF = fetcher.fetch();
             resultList.add(2, resultCodeF);
+            Map<String, Map<Number, SQLRowAccessor>> mapDecl = new HashMap<>();
             for (List<? extends SQLRowAccessor> list : resultList) {
+                if (!list.isEmpty()) {
+                    if (list.get(0).getTable().getName().startsWith("ARTICLE_DECLINAISON")) {
+                        Map<Number, SQLRowAccessor> map = new HashMap<>();
+                        for (SQLRowAccessor sqlRow : list) {
+                            map.put(sqlRow.getIDNumber(), sqlRow);
+                        }
+                        mapDecl.put("ID_" + list.get(0).getTable().getName(), map);
+                    } else {
-                for (SQLRowAccessor sqlRow : list) {
+                        for (SQLRowAccessor sqlRow : list) {
-                    StringBuffer buf = new StringBuffer();
+                            StringBuffer buf = new StringBuffer();
-                    if (sqlRow.getTable().getName().equals("CODE_FOURNISSEUR")) {
+                            if (sqlRow.getTable().getName().equals("CODE_FOURNISSEUR")) {
-                        SQLRowAccessor rArt = sqlRow.getForeign("ID_ARTICLE");
+                                SQLRowAccessor rArt = sqlRow.getForeign("ID_ARTICLE");
-                        buf.append(sqlRow.getString("CODE") + " -- ");
+                                buf.append(sqlRow.getString("CODE") + " -- ");
-                        buf.append(rArt.getString("CODE") + " -- ");
+                                buf.append(rArt.getString("CODE") + " -- ");
-                        buf.append(rArt.getString("NOM"));
+                                buf.append(rArt.getString("NOM"));
+                                if (this.hasDeclinaison) {
+                                    for (String fieldName : rArt.getFields()) {
+                                        if (fieldName.startsWith("ID_ARTICLE_DECLINAISON")) {
+                                            Number rowDecl = rArt.getObject(fieldName) == null ? null : rArt.getNonEmptyForeignIDNumber(fieldName);
+                                            if (rowDecl != null) {
+                                                final Map<Number, SQLRowAccessor> mapIdDecl = mapDecl.get(fieldName);
+                                                if (mapIdDecl != null) {
+                                                    final SQLRowAccessor sqlRowAccessor = mapIdDecl.get(rowDecl);
+                                                    if (sqlRowAccessor != null) {
+                                                        buf.append(" -- " + sqlRowAccessor.getString("NOM"));
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
-                        result.add(new IComboSelectionItem(rArt, buf.toString()));
+                                result.add(new IComboSelectionItem(rArt, buf.toString()));
-                    } else {
+                            } else {
-                        if (sqlRow.getString("CODE_BARRE") != null && sqlRow.getString("CODE_BARRE").trim().length() > 0) {
+                                if (sqlRow.getString("CODE_BARRE") != null && sqlRow.getString("CODE_BARRE").trim().length() > 0) {
-                            buf.append(sqlRow.getString("CODE_BARRE") + " -- ");
+                                    buf.append(sqlRow.getString("CODE_BARRE") + " -- ");
+                                }
-                        buf.append(sqlRow.getString("CODE") + " -- ");
+                                buf.append(sqlRow.getString("CODE") + " -- ");
-                        buf.append(sqlRow.getString("NOM"));
+                                buf.append(sqlRow.getString("NOM"));
+                                if (this.hasDeclinaison) {
+                                    for (String fieldName : sqlRow.getFields()) {
+                                        if (fieldName.startsWith("ID_ARTICLE_DECLINAISON")) {
+                                            Number rowDecl = sqlRow.getObject(fieldName) == null ? null : sqlRow.getNonEmptyForeignIDNumber(fieldName);
+                                            if (rowDecl != null) {
+                                                final Map<Number, SQLRowAccessor> mapIdDecl = mapDecl.get(fieldName);
+                                                if (mapIdDecl != null) {
+                                                    final SQLRowAccessor sqlRowAccessor = mapIdDecl.get(rowDecl);
+                                                    if (sqlRowAccessor != null) {
+                                                        buf.append(" -- " + sqlRowAccessor.getString("NOM"));
+                                                    }
+                                                }
+                                            }
+                                        }
+                                    }
+                                }
-                        result.add(new IComboSelectionItem(sqlRow, buf.toString()));
+                                result.add(new IComboSelectionItem(sqlRow, buf.toString()));
+                            }
+                        }
+                    }
+                }
+            }
+        }
         return result;
+    }
         this.popup.setVisible(false);
+    }
     private synchronized void showPopup() {
         if (this.model.getSize() > 0) {
-            if (this.popupInvoker.isShowing())
+            if (this.popupInvoker.isShowing()) {
+                String max = "";
+                for (IComboSelectionItem item : this.model.getList()) {
+                    if (max.length() < item.getLabel().length()) {
+                        max = item.getLabel();
+                    }
+                }
+                final int stringWidth = this.text.getGraphics().getFontMetrics().stringWidth(max);
+                this.popup.setMinWith(Math.max(450, stringWidth + 20));
                 this.popup.show(this.popupInvoker, 0, this.text.getBounds().height);
+            }
+        }
+    }
     public void changedUpdate(DocumentEvent e) {
         updateAutoCompletion(false);
         this.supp.firePropertyChange("value", null, this.getText());
+    }

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/sql/sqlobject/ITextArticleWithCompletion.java @ 180 - Rev 180 → 182