Mercurial > lada > lada-client
changeset 533:6301d3210a9f
merged.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Wed, 17 Dec 2014 12:10:40 +0100 |
| parents | 91a1a88ee353 (diff) 8b4ec83ddca3 (current diff) |
| children | 31a770c6a9a9 |
| files | |
| diffstat | 14 files changed, 49 insertions(+), 39 deletions(-) [+] |
line wrap: on
line diff
--- a/app/model/StaMessmethode.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/model/StaMessmethode.js Wed Dec 17 12:10:40 2014 +0100 @@ -24,6 +24,13 @@ name: 'beschreibung' }, { name: 'messmethode' + }, { + name: 'display', + persist: false, + convert: function(value, record) { + return record.get('id') + ' - ' + record.get('messmethode'); + } + }], idProperty: 'id',
--- a/app/view/kommentare/List.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/kommentare/List.js Wed Dec 17 12:10:40 2014 +0100 @@ -23,7 +23,7 @@ emptyText: 'Keine Kommentaregefunden.', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. - minHeight: 35, + minHeight: 65, deferEmptyText: false }, probeId: null,
--- a/app/view/messungen/List.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/messungen/List.js Wed Dec 17 12:10:40 2014 +0100 @@ -19,7 +19,7 @@ emptyText: 'Keine Messungen gefunden.', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. - minHeight: 35, + minHeight: 65, deferEmptyText: false },
--- a/app/view/messwerte/List.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/messwerte/List.js Wed Dec 17 12:10:40 2014 +0100 @@ -19,7 +19,7 @@ emptyText: 'Keine Messwerte gefunden.', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. - minHeight: 35, + minHeight: 65, deferEmptyText: false },
--- a/app/view/mkommentare/List.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/mkommentare/List.js Wed Dec 17 12:10:40 2014 +0100 @@ -19,7 +19,7 @@ emptyText: 'Keine Kommentare gefunden.', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. - minHeight: 35, + minHeight: 65, deferEmptyText: false },
--- a/app/view/orte/List.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/orte/List.js Wed Dec 17 12:10:40 2014 +0100 @@ -18,7 +18,7 @@ emptyText: 'Keine Orte gefunden.', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. - minHeight: 35, + minHeight: 65, deferEmptyText: false },
--- a/app/view/proben/Create.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/proben/Create.js Wed Dec 17 12:10:40 2014 +0100 @@ -17,9 +17,8 @@ 'Lada.view.proben.CreateForm' ], - title: 'Maske für §3-Proben', + title: 'Neue §3-Probe', autoShow: true, - autoScroll: true, modal: true, layout: 'fit',
--- a/app/view/proben/CreateForm.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/proben/CreateForm.js Wed Dec 17 12:10:40 2014 +0100 @@ -29,7 +29,7 @@ xtype: 'fieldset', title: 'Probenangaben', defaults: { - labelWidth: 150 + labelWidth: 160 }, items: [{ layout: 'hbox', @@ -41,11 +41,13 @@ items: [{ xtype: 'mst', name: 'mstId', + labelWidth: 125, fieldLabel: 'Messstelle', allowBlank: false }, { xtype: 'textfield', name: 'hauptprobenNr', + labelWidth: 125, maxLength: 20, fieldLabel: 'Hauptprobennr.' }] @@ -99,9 +101,6 @@ // Medium xtype: 'fieldset', title: 'Medium', - defaults: { - labelWidth: 150 - }, items: [{ border: 0, layout: { @@ -112,16 +111,19 @@ xtype: 'uwb', name: 'umwId', fieldLabel: 'Umweltbereich', + labelWidth: 125, allowBlank: false }, { xtype: 'textfield', maxLength: 100, name: 'media', + labelWidth: 125, fieldLabel: 'Medienbezeichnung' }, { xtype: 'textfield', maxLength: 100, name: 'mediaDesk', + labelWidth: 125, fieldLabel: 'Deskriptoren' }, { xtype: 'fieldset', @@ -141,25 +143,30 @@ xtype: 'fieldset', title: 'Zeit', defaultType: 'datetime', - defaults: { - labelWidth: 150 - }, layout: { type: 'table', columns: 2 }, items: [{ fieldLabel: 'Probennahme Beginn', - name: 'probeentnahmeBeginn' + name: 'probeentnahmeBeginn', + margin: '0, 10, 5, 0', + labelWidth: 125 }, { fieldLabel: 'Sollzeit Von', - name: 'solldatumBeginn' + name: 'solldatumBeginn', + margin: '0, 10, 5, 0', + labelWidth: 100 }, { fieldLabel: 'Probennahme Ende', - name: 'probeentnahmeEnde' + name: 'probeentnahmeEnde', + margin: '0, 10, 5, 0', + labelWidth: 125 }, { fieldLabel: 'Sollzeit Bis', - name: 'solldatumEnde' + name: 'solldatumEnde', + margin: '0, 10, 5, 0', + labelWidth: 100 }] }]; this.callParent(arguments);
--- a/app/view/proben/EditForm.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/proben/EditForm.js Wed Dec 17 12:10:40 2014 +0100 @@ -67,12 +67,13 @@ border: 0, items: [{ border: 0, - width: '43%', + width: '47%', minWidth: 290, items: [{ xtype: 'mst', name: 'mstId', fieldLabel: 'Messstelle', + labelWidth: 135, allowBlank: false, listeners: { dirtychange: { @@ -85,6 +86,7 @@ name: 'hauptprobenNr', maxLength: 20, fieldLabel: 'Hauptprobennr.', + labelWidth: 135, listeners: { dirtychange: { fn: this.updateOnChange, @@ -94,7 +96,7 @@ }] }, { border: 0, - width: '52%', + width: '50%', minWidth: 300, items: [{ xtype: 'fieldset', @@ -197,7 +199,7 @@ items: [{ xtype: 'textfield', name: 'media', - labelWidth: 110, + labelWidth: 125, fieldLabel: 'Medienbezeichnung', listeners: { dirtychange: { @@ -209,7 +211,7 @@ xtype: 'textfield', maxLength: 100, name: 'mediaDesk', - labelWidth: 110, + labelWidth: 125, fieldLabel: 'Deskriptoren', listeners: { dirtychange: { @@ -221,7 +223,7 @@ xtype: 'uwb', name: 'umwId', fieldLabel: 'Umweltbereich', - labelWidth: 110, + labelWidth: 125, allowBlank: false, listeners: { dirtychange: { @@ -253,9 +255,6 @@ xtype: 'fieldset', title: 'Zeit', defaultType: 'datetime', - defaults: { - labelWidth: 150 - }, layout: { type: 'table', columns: 2 @@ -263,7 +262,7 @@ items: [{ fieldLabel: 'Probennahme Beginn', margin: '0, 10, 5, 0', - labelWidth: 130, + labelWidth: 125, name: 'probeentnahmeBeginn', listeners: { dirtychange: { @@ -285,7 +284,7 @@ }, { fieldLabel: 'Probennahme Ende', margin: '0, 10, 5, 0', - labelWidth: 130, + labelWidth: 125, name: 'probeentnahmeEnde', listeners: { dirtychange: {
--- a/app/view/status/List.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/status/List.js Wed Dec 17 12:10:40 2014 +0100 @@ -19,7 +19,7 @@ emptyText: 'Keine Statusangaben gefunden.', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. - minHeight: 35, + minHeight: 65, deferEmptyText: false },
--- a/app/view/widgets/Messmethode.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/widgets/Messmethode.js Wed Dec 17 12:10:40 2014 +0100 @@ -13,17 +13,15 @@ extend: 'Ext.form.ComboBox', alias: 'widget.messmethode', store: 'StaMessmethoden', - displayField: 'messmethode', + displayField: 'display', valueField: 'id', emptyText: 'Wählen Sie eine Messmethode', // Enable filtering of comboboxes autoSelect: false, queryMode: 'local', triggerAction: 'all', - typeAhead: false, + typeAhead: true, minChars: 0, - tpl: '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >' + - '{id} - {messmethode}</div></tpl>', initComponent: function() { this.store = Ext.data.StoreManager.get('staMessmethoden');
--- a/app/view/zusatzwerte/List.js Tue Dec 16 18:28:58 2014 +0100 +++ b/app/view/zusatzwerte/List.js Wed Dec 17 12:10:40 2014 +0100 @@ -19,7 +19,7 @@ emptyText: 'Keine Zusatzwerte gefunden.', // minHeight and deferEmptyText are needed to be able to show the // emptyText message. - minHeight: 35, + minHeight: 65, deferEmptyText: false },
--- a/server/rest/messung Tue Dec 16 18:28:58 2014 +0100 +++ b/server/rest/messung Wed Dec 17 12:10:40 2014 +0100 @@ -6,7 +6,7 @@ "messungsIdAlt":"1", "probeId":7581036, "probeIdAlt":"000007589786X", - "mmtId":"G1", + "mmtId":"GI", "nebenprobenNr":"01G1", "messdauer":73929, "messzeitpunkt":1329139620000, @@ -18,7 +18,7 @@ "messungsIdAlt":"2", "probeId":7581036, "probeIdAlt":"000007589787X", - "mmtId":"G1", + "mmtId":"A2", "nebenprobenNr":"01G1", "messdauer":70898, "messzeitpunkt":1333483200000, @@ -30,7 +30,7 @@ "messungsIdAlt":"3", "probeId":7581036, "probeIdAlt":"000007589792X", - "mmtId":"G1", + "mmtId":"GI", "nebenprobenNr":"01G1", "messdauer":42474, "messzeitpunkt":1339609680000, @@ -42,7 +42,7 @@ "messungsIdAlt":"4", "probeId":7581036, "probeIdAlt":"000007589799X", - "mmtId":"G1", + "mmtId":"GI", "nebenprobenNr":"01G1", "messdauer":64222, "messzeitpunkt":1333453560000,
--- a/server/rest/sta_messstelle Tue Dec 16 18:28:58 2014 +0100 +++ b/server/rest/sta_messstelle Wed Dec 17 12:10:40 2014 +0100 @@ -2,7 +2,7 @@ "success":true, "message":"200", "data":[{ - "id":"03050", + "id":"06010", "netzbetreiberId":"03", "beschreibung":"Nds. Landesamt f. Verbraucherschutz und Lebensmittelsicherh., - Veterinärinstitut Hannover, Eintrachtweg 17, 30173 Hannover", "messStelle":"nslm61",