WebSVN - OpenConcerto - Diff - Rev 156 and 174 - /trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/quote/element/DevisSQLElement.java

 import org.openconcerto.sql.model.SQLTable;
 import org.openconcerto.sql.model.Where;
 import org.openconcerto.sql.model.graph.Path;
 import org.openconcerto.sql.preferences.SQLPreferences;
 import org.openconcerto.sql.request.ListSQLRequest;
+import org.openconcerto.sql.ui.light.CustomRowEditor;
 import org.openconcerto.sql.users.UserManager;
 import org.openconcerto.sql.users.rights.UserRightsManager;
 import org.openconcerto.sql.view.EditFrame;
 import org.openconcerto.sql.view.EditPanel;
 import org.openconcerto.sql.view.EditPanel.EditMode;
 import org.openconcerto.sql.view.list.RowAction.PredicateRowAction;
 import org.openconcerto.sql.view.list.SQLTableModelSource;
 import org.openconcerto.ui.light.ActivationOnSelectionControler;
 import org.openconcerto.ui.light.ColumnSpec;
 import org.openconcerto.ui.light.ColumnsSpec;
-import org.openconcerto.ui.light.CustomEditorProvider;
 import org.openconcerto.ui.light.LightController;
 import org.openconcerto.ui.light.LightUIButtonUnmanaged;
 import org.openconcerto.ui.light.LightUIComboBox;
 import org.openconcerto.ui.light.LightUIElement;
 import org.openconcerto.ui.light.LightUILine;
 import java.util.Calendar;
 import java.util.Collections;
 import java.util.Date;
 import java.util.HashSet;
 import java.util.List;
-import java.util.Map;
 import java.util.Set;
 import javax.swing.AbstractAction;
 import javax.swing.ImageIcon;
 import javax.swing.JFrame;
         editFactureFrame.setState(JFrame.NORMAL);
         editFactureFrame.setVisible(true);
+    }
     @Override
-    protected Map<String, CustomEditorProvider> _getDefaultCustomEditorProvider(final Configuration configuration, final SQLRowAccessor sqlRow, final String sessionSecurityToken)
+    public List<CustomRowEditor> getCustomRowEditors(Configuration configuration, String sessionToken) {
-            throws IllegalArgumentException {
-        final Map<String, CustomEditorProvider> map = super._getDefaultCustomEditorProvider(configuration, sqlRow, sessionSecurityToken);
+        List<CustomRowEditor> map = super.getCustomRowEditors(configuration, sessionToken);
-        map.put("sales.quote.items.list", new CustomEditorProvider() {
+        map.add(new CustomRowEditor("sales.quote.items.list") {
             @Override
-            public LightUIElement createUIElement(final String id) {
+            public LightUIElement createUIElement() {
                 final ColumnSpec c1 = new ColumnSpec("sales.quote.item.style", StringWithId.class, "Style", new StringWithId(2, "Normal"), true, new LightUIComboBox("sales.quote.item.style"));
                 final ColumnSpec c2 = new ColumnSpec("sales.quote.item.code", String.class, "Code", "", true, new LightUITextField("sales.quote.item.code"));
                 final ColumnSpec c3 = new ColumnSpec("sales.quote.item.label", String.class, "Nom", "", true, new LightUITextField("sales.quote.item.name"));
                 final ColumnSpec c4 = new ColumnSpec("sales.quote.item.description", String.class, "Descriptif", "", true, new LightUITextField("sales.quote.item.description"));
                 final ColumnSpec c5 = new ColumnSpec("sales.quote.item.purchase.unit.price", BigDecimal.class, "P.U. Achat HT", new BigDecimal(0), true,
+                    }
+                }
                 final ColumnsSpec cSpec = new ColumnsSpec(lId, columnsSpec, possibleColumnIds, null);
                 cSpec.setAllowMove(true);
                 cSpec.setAllowResize(true);
-                final RowSelectionSpec selectionSpec = new RowSelectionSpec(id);
+                final RowSelectionSpec selectionSpec = new RowSelectionSpec(getItemId());
-                final TableSpec tSpec = new TableSpec(id, selectionSpec, cSpec);
+                final TableSpec tSpec = new TableSpec(getItemId(), selectionSpec, cSpec);
                 tSpec.setColumns(cSpec);
-                if (sqlRow != null) {
-                    // send: id,value
-                    final SQLElement elem = configuration.getDirectory().getElement("DEVIS_ELEMENT");
-                    final SQLTable table = elem.getTable();
-                    final List<String> fieldsToFetch = new ArrayList<>();
-                    for (ColumnSpec cs : columnsSpec) {
-                        String colId = cs.getId();
+                String id = getItemId();
-                        SQLField f = configuration.getFieldMapper().getSQLFieldForItem(colId);
-                        if (f != null) {
-                            fieldsToFetch.add(f.getName());
-                        } else {
-                            throw new IllegalStateException("No field in " + table + " for column id " + colId);
-                        }
-                    }
-                    final Where where = new Where(table.getField("ID_DEVIS"), "=", sqlRow.getID());
-                    final ListSQLRequest req = elem.createListRequest(fieldsToFetch, where, configuration.getShowAs());
-                    List<SQLRowValues> fetchedRows = req.getValues();
-                    List<Row> rows = new ArrayList<>();
-                    for (final SQLRowValues vals : fetchedRows) {
-                        Row r = new Row(vals.getID(), columnsSpec.size());
-                        List<Object> values = new ArrayList<>();
-                        for (ColumnSpec cs : columnsSpec) {
-                            String colId = cs.getId();
-                            SQLField f = configuration.getFieldMapper().getSQLFieldForItem(colId);
-                            if (f != null) {
-                                Object object = vals.getObject(f.getName());
-                                if (object instanceof SQLRowValues) {
-                                    SQLRowValues sqlRowValues = (SQLRowValues) object;
-                                    long rowId = sqlRowValues.getIDNumber().longValue();
-                                    List<SQLField> fieldsToExpand = configuration.getShowAs().getFieldExpand(sqlRowValues.getTable());
-                                    final StringBuilder b = new StringBuilder();
-                                    for (SQLField sqlField : fieldsToExpand) {
-                                        b.append(sqlRowValues.getObject(sqlField.getName()).toString());
-                                        b.append(' ');
-                                    }
-                                    object = new StringWithId(rowId, b.toString().trim());
-                                }
-                                values.add(object);
-                            } else {
-                                throw new IllegalStateException("No field in " + table + " for column id " + colId);
-                            }
-                        }
-                        r.setValues(values);
-                        rows.add(r);
-                    }
-                    TableContent tableContent = new TableContent();
-                    tableContent.setRows(rows);
-                    // tableContent.setSpec(new RowSpec());
-                    tSpec.setContent(tableContent);
-                }
                 final LightUITable eList = new LightUITable(id);
                 eList.setTableSpec(tSpec);
                 LightUIPanel panel = new LightUIPanel("sales.quote.items.list");
                 panel.setGridWidth(1);
                 //
                 panel.addChild(listLine);
                 return panel;
+            }
+            @Override
+            public void fillFrom(LightUIElement uiElement, SQLRowAccessor sqlRow) {
+                LightUIPanel p = (LightUIPanel) uiElement;
+                LightUITable ltable = p.getFirstChild(LightUITable.class);
+                TableSpec tSpec = ltable.getTableSpec();
+                ColumnsSpec columnsSpec = tSpec.getColumns();
+                // send: id,value
+                final SQLElement elem = configuration.getDirectory().getElement("DEVIS_ELEMENT");
+                final SQLTable table = elem.getTable();
+                final List<String> fieldsToFetch = new ArrayList<>();
+                for (ColumnSpec cs : columnsSpec.getColumns()) {
+                    String colId = cs.getId();
+                    SQLField f = configuration.getFieldMapper().getSQLFieldForItem(colId);
+                    if (f != null) {
+                        fieldsToFetch.add(f.getName());
+                    } else {
+                        throw new IllegalStateException("No field in " + table + " for column id " + colId);
+                    }
+                }
+                final Where where = new Where(table.getField("ID_DEVIS"), "=", sqlRow.getID());
+                final ListSQLRequest req = elem.createListRequest(fieldsToFetch, where, configuration.getShowAs());
+                List<SQLRowValues> fetchedRows = req.getValues();
+                List<Row> rows = new ArrayList<>();
+                for (final SQLRowValues vals : fetchedRows) {
+                    Row r = new Row(vals.getID(), columnsSpec.getColumns().size());
+                    List<Object> values = new ArrayList<>();
+                    for (ColumnSpec cs : columnsSpec.getColumns()) {
+                        String colId = cs.getId();
+                        SQLField f = configuration.getFieldMapper().getSQLFieldForItem(colId);
+                        if (f != null) {
+                            Object object = vals.getObject(f.getName());
+                            if (object instanceof SQLRowValues) {
+                                SQLRowValues sqlRowValues = (SQLRowValues) object;
+                                long rowId = sqlRowValues.getIDNumber().longValue();
+                                List<SQLField> fieldsToExpand = configuration.getShowAs().getFieldExpand(sqlRowValues.getTable());
+                                final StringBuilder b = new StringBuilder();
+                                for (SQLField sqlField : fieldsToExpand) {
+                                    b.append(sqlRowValues.getObject(sqlField.getName()).toString());
+                                    b.append(' ');
+                                }
+                                object = new StringWithId(rowId, b.toString().trim());
+                            }
+                            values.add(object);
+                        } else {
+                            throw new IllegalStateException("No field in " + table + " for column id " + colId);
+                        }
+                    }
+                    r.setValues(values);
+                    rows.add(r);
+                }
+                TableContent tableContent = new TableContent();
+                tableContent.setRows(rows);
+                tSpec.setContent(tableContent);
+            }
+            @Override
+            public void store(LightUIElement uiElement, SQLRowValues row) {
+                // TODO Auto-generated method stub
+            }
         });
         return map;
+    }

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

svn://code.openconcerto.org/openconcerto

(root)/trunk/OpenConcerto/src/org/openconcerto/erp/core/sales/quote/element/DevisSQLElement.java - Rev 156 → 174