Mercurial > lada > lada-client
changeset 718:7f11b75e0188
Trailing Commas, editable: false for Umwelt und Messstelle widget
| author | Dustin Demuth <dustin@intevation.de> |
|---|---|
| date | Wed, 15 Apr 2015 12:13:57 +0200 |
| parents | f124d24c8ade |
| children | 5e91a740aff8 |
| files | app/controller/form/Location.js app/view/form/Messung.js app/view/form/Probe.js app/view/grid/MKommentar.js app/view/grid/Messwert.js app/view/grid/Probenzusatzwert.js app/view/widget/Messstelle.js app/view/widget/Umwelt.js |
| diffstat | 8 files changed, 21 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controller/form/Location.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/controller/form/Location.js Wed Apr 15 12:13:57 2015 +0200 @@ -24,7 +24,7 @@ change: this.updateFeatureLatitude }, 'locationform numberfield[name=longitude]': { - change: this.updateFeatureLongitude, + change: this.updateFeatureLongitude } }); },
--- a/app/view/form/Messung.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/view/form/Messung.js Wed Apr 15 12:13:57 2015 +0200 @@ -71,21 +71,21 @@ margin: '0, 10, 5, 0', fieldLabel: 'Nebenprobennr.', width: 300, - labelWidth: 100, + labelWidth: 100 }, { xtype: 'messmethode', name: 'mmtId', margin: '0, 10, 5, 0', fieldLabel: 'Messmethode', width: 300, - labelWidth: 100, + labelWidth: 100 }, { xtype: 'datetime', name: 'messzeitpunkt', margin: '0, 10, 5, 0', fieldLabel: 'Messzeitpunkt', width: 300, - labelWidth: 100, + labelWidth: 100 }, { xtype: 'numberfield', allowDecimals: false, @@ -97,21 +97,21 @@ margin: '0, 10, 5, 0', fieldLabel: 'Messdauer', width: 300, - labelWidth: 100, + labelWidth: 100 }, { xtype: 'chkbox', name: 'fertig', margin: '0, 10, 5, 0', fieldLabel: 'Fertig', width: 300, - labelWidth: 100, + labelWidth: 100 }, { xtype: 'chkbox', name: 'geplant', margin: '0, 10, 5, 0', fieldLabel: 'Geplant', width: 300, - labelWidth: 100, + labelWidth: 100 }] }] }];
--- a/app/view/form/Probe.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/view/form/Probe.js Wed Apr 15 12:13:57 2015 +0200 @@ -108,20 +108,20 @@ name: 'datenbasisId', fieldLabel: 'Datenbasis', anchor: '100%', - labelWidth: 105, + labelWidth: 105 }, { xtype: 'betriebsart', name: 'baId', fieldLabel: 'Betriebsart', anchor: '100%', - labelWidth: 105, + labelWidth: 105 }, { xtype: 'testdatensatz', name: 'test', fieldLabel: 'Testdatensatz', anchor: '100%', labelWidth: 105, - allowBlank: false, + allowBlank: false }, { xtype: 'probenart', editable: false, @@ -129,14 +129,14 @@ fieldLabel: 'Probenart', anchor: '100%', labelWidth: 105, - allowBlank: false, + allowBlank: false }, { xtype: 'numberfield', allowDecimals: false, name: 'probeNehmerId', fieldLabel: 'Probennehmer', anchor: '100%', - labelWidth: 105, + labelWidth: 105 }, { xtype: 'netzbetreiber', name: 'netzbetreiberId', @@ -144,13 +144,13 @@ fieldLabel: 'Netzbetreiber', anchor: '100%', labelWidth: 105, - allowBlank: false, + allowBlank: false }, { xtype: 'tfield', name: 'x11', fieldLabel: 'Datensatzerzeuger', anchor: '100%', - labelWidth: 105, + labelWidth: 105 }] }] }] @@ -385,7 +385,7 @@ fieldLabel: 'S' + i, name: 's' + i, labelWidth: 25, - margin: '0, 10, 5, 0', + margin: '0, 10, 5, 0' }; } return fields;
--- a/app/view/grid/MKommentar.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/view/grid/MKommentar.js Wed Apr 15 12:13:57 2015 +0200 @@ -72,7 +72,7 @@ displayField: 'messStelle', valueField: 'id', allowBlank: false, - editable: false, + editable: false } }, { header: 'Datum',
--- a/app/view/grid/Messwert.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/view/grid/Messwert.js Wed Apr 15 12:13:57 2015 +0200 @@ -95,7 +95,7 @@ allowBlank: false, maxLength: 10, allowExponential: false, - enforceMaxLength: true, + enforceMaxLength: true } }, { header: 'Messeinheit', @@ -136,7 +136,7 @@ allowBlank: false, maxLength: 10, allowExponential: false, - enforceMaxLength: true, + enforceMaxLength: true } }, { header: 'Grenzwertüberschreitung',
--- a/app/view/grid/Probenzusatzwert.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/view/grid/Probenzusatzwert.js Wed Apr 15 12:13:57 2015 +0200 @@ -64,7 +64,7 @@ this.columns = [{ header: 'PZW-ID', dataIndex: 'id', - flex: 1, + flex: 1 }, { header: 'PZW-Größe', dataIndex: 'pzsId',
--- a/app/view/widget/Messstelle.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/view/widget/Messstelle.js Wed Apr 15 12:13:57 2015 +0200 @@ -15,6 +15,7 @@ store: 'Messstellen', displayField: 'messStelle', valueField: 'id', + editable: this.editable || false, emptyText: 'Wählen Sie eine Messstelle', // Enable filtering of comboboxes autoSelect: false,
--- a/app/view/widget/Umwelt.js Mon Apr 13 16:22:34 2015 +0200 +++ b/app/view/widget/Umwelt.js Wed Apr 15 12:13:57 2015 +0200 @@ -15,6 +15,7 @@ store: 'Umwelt', displayField: 'id', valueField: 'id', + editable: this.editable || false, emptyText: 'Wählen Sie einen Umweltbereich', // Enable filtering of comboboxes autoSelect: false,