Mercurial > lada > lada-client
changeset 539:31a770c6a9a9
Merge
| author | Roland Geider <roland.geider@intevation.de> |
|---|---|
| date | Wed, 17 Dec 2014 15:42:55 +0100 |
| parents | 6301d3210a9f (diff) eef1ff9f2bd2 (current diff) |
| children | 99e738c17b81 |
| files | |
| diffstat | 3 files changed, 28 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/app/view/proben/Create.js Wed Dec 17 15:42:25 2014 +0100 +++ b/app/view/proben/Create.js Wed Dec 17 15:42:55 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 Wed Dec 17 15:42:25 2014 +0100 +++ b/app/view/proben/CreateForm.js Wed Dec 17 15:42:55 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 Wed Dec 17 15:42:25 2014 +0100 +++ b/app/view/proben/EditForm.js Wed Dec 17 15:42:55 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: {