Mercurial > lada > lada-client
changeset 538:eef1ff9f2bd2
Merge
author | Roland Geider <roland.geider@intevation.de> |
---|---|
date | Wed, 17 Dec 2014 15:42:25 +0100 |
parents | a12c9c97d3cb (diff) 7fb335bf6799 (current diff) |
children | 31a770c6a9a9 |
files | app/view/kommentare/List.js app/view/messungen/List.js app/view/messwerte/List.js app/view/zusatzwerte/List.js |
diffstat | 8 files changed, 58 insertions(+), 21 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controller/Kommentare.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/controller/Kommentare.js Wed Dec 17 15:42:25 2014 +0100 @@ -30,9 +30,9 @@ addListeners: function() { this.control({ - 'kommentarelist': { - itemdblclick: this.editItem - }, + //'kommentarelist': { + // itemdblclick: this.editItem + //}, 'kommentarelist toolbar button[action=add]': { click: this.addItem },
--- a/app/controller/Sql.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/controller/Sql.js Wed Dec 17 15:42:25 2014 +0100 @@ -59,7 +59,7 @@ selectSql: function(element, record) { var result = Ext.getCmp('result'); var filters = Ext.getCmp('queryfilters'); - //var sqlquery = Ext.getCmp('sqlquery'); + var columns = Ext.getCmp('results'); var sqldesc = Ext.getCmp('sqldesc'); var buttons = Ext.getCmp('SearchBtnPanel'); var displayFields = record[0].data.results; @@ -67,7 +67,11 @@ this.reset(); - //sqlquery.setValue(record[0].data.sql); + columnString = []; + for (var i = 0; i < displayFields.length; i++) { + columnString.push(displayFields[i].header); + } + columns.setValue(columnString.join(', ')); sqldesc.setValue(record[0].data.description); // Setup Columns of the probenlist
--- a/app/controller/Zusatzwerte.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/controller/Zusatzwerte.js Wed Dec 17 15:42:25 2014 +0100 @@ -22,9 +22,9 @@ addListeners: function() { this.control({ - 'zusatzwertelist': { - itemdblclick: this.editItem - }, + //'zusatzwertelist': { + // itemdblclick: this.editItem + //}, 'zusatzwertelist toolbar button[action=add]': { click: this.addItem },
--- a/app/view/kommentare/List.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/view/kommentare/List.js Wed Dec 17 15:42:25 2014 +0100 @@ -29,6 +29,11 @@ probeId: null, initComponent: function() { + var rowEditing = Ext.create('Ext.grid.plugin.RowEditing', { + clicksToMoveEditor: 1, + autoCancel: false + }); + this.plugins = [rowEditing]; this.dockedItems = [{ xtype: 'toolbar', dock: 'bottom', @@ -45,14 +50,26 @@ }]; this.columns = [{ header: 'Erzeuger', - dataIndex: 'erzeuger' + dataIndex: 'erzeuger', + editor: { + allowBlank: false, + } }, { header: 'Datum', - dataIndex: 'datum' + dataIndex: 'datum', + editor: { + xtype: 'datefield', + allowBlank: false, + format: 'd.m.Y', + maxValue: Ext.Date.format(new Date(), 'd.m.Y') + } }, { header: 'Text', dataIndex: 'text', - flex: 1 + flex: 1, + editor: { + allowBlank: false, + } }]; this.callParent(arguments); }
--- a/app/view/messungen/List.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/view/messungen/List.js Wed Dec 17 15:42:25 2014 +0100 @@ -97,10 +97,6 @@ return 'unbekannt'; } return sstore.last().get('status'); - }, - editor: { - xtype: 'numberfield', - allowBlank: false } }, { header: 'OK-Flag',
--- a/app/view/messwerte/List.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/view/messwerte/List.js Wed Dec 17 15:42:25 2014 +0100 @@ -53,6 +53,7 @@ header: '<NWG', dataIndex: 'messwertNwg', editor: { + xtype: 'nwg', allowBlank: false } }, {
--- a/app/view/search/List.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/view/search/List.js Wed Dec 17 15:42:25 2014 +0100 @@ -60,9 +60,9 @@ shrinkWrap: 3, value: '-/-' }, { - id: 'sqlquery', + id: 'results', xtype: 'displayfield', - fieldLabel: 'Abfrage', + fieldLabel: 'Spalten', value: '-/-' }] }];
--- a/app/view/zusatzwerte/List.js Wed Dec 17 11:34:43 2014 +0100 +++ b/app/view/zusatzwerte/List.js Wed Dec 17 15:42:25 2014 +0100 @@ -26,6 +26,11 @@ probeId: null, initComponent: function() { + var rowEditing = Ext.create('Ext.grid.plugin.RowEditing', { + clicksToMoveEditor: 1, + autoCancel: false + }); + this.plugins = [rowEditing]; this.dockedItems = [{ xtype: 'toolbar', dock: 'bottom', @@ -42,7 +47,11 @@ }]; this.columns = [{ header: 'PZW-ID', - dataIndex: 'id' + dataIndex: 'id', + editor: { + xtype: 'numberfield', + allowBlank: false + } }, { header: 'PZW-Größe', dataIndex: 'pzsId', @@ -51,7 +60,10 @@ var record = store.getById(value); return record.get('beschreibung'); }, - flex: 1 + flex: 1, + editor: { + xtype: 'probenzusatzwert' + } }, { header: 'Messwert', dataIndex: 'id', @@ -67,7 +79,10 @@ } }, { header: 'rel. Unsich.[%]', - dataIndex: 'messfehler' + dataIndex: 'messfehler', + editor: { + allowBlank: false + } }, { header: 'Maßeinheit', dataIndex: 'pzsId', @@ -77,7 +92,11 @@ var mehId = zstore.getById(value).get('mehId'); var record = mstore.findRecord('id', mehId); return record.get('einheit'); - } + }/*, + editor: { + xtype: 'messeinheit', + allowBlank: false + }*/ }]; this.callParent(arguments); }