# HG changeset patch
# User Dustin Demuth <dustin@intevation.de>
# Date 1426506006 -3600
# Node ID e3cdc36cbcaeaaf546ad104d089a7f8db3cf8ecb
# Parent  6742ae5f35dcc434c785d212539f2a65a8bfb53f# Parent  ee92e352be205dfb6ee464b8349c4004e3f0d9ed
merged

diff -r ee92e352be20 -r e3cdc36cbcae app/view/form/Probe.js
--- a/app/view/form/Probe.js	Mon Mar 16 12:11:34 2015 +0100
+++ b/app/view/form/Probe.js	Mon Mar 16 12:40:06 2015 +0100
@@ -95,6 +95,7 @@
                         border: 0,
                         width: '50%',
                         minWidth: 300,
+                        margin: '0, 1, 0, 0',
                         items: [{
                             xtype: 'fset',
                             title: 'Erweiterte Angaben',
@@ -105,43 +106,50 @@
                                 editable: false,
                                 name: 'datenbasisId',
                                 fieldLabel: 'Datenbasis',
-                                labelWidth: 100,
+                                anchor: '100%',
+                                labelWidth: 105,
                             }, {
                                 xtype: 'betriebsart',
                                 name: 'baId',
                                 fieldLabel: 'Betriebsart',
-                                labelWidth: 100,
+                                anchor: '100%',
+                                labelWidth: 105,
                             }, {
                                 xtype: 'testdatensatz',
                                 name: 'test',
                                 fieldLabel: 'Testdatensatz',
-                                labelWidth: 100,
+                                anchor: '100%',
+                                labelWidth: 105,
                                 allowBlank: false,
                             }, {
                                 xtype: 'probenart',
                                 editable: false,
                                 name: 'probenartId',
                                 fieldLabel: 'Probenart',
-                                labelWidth: 100,
+                                anchor: '100%',
+                                labelWidth: 105,
                                 allowBlank: false,
                             }, {
                                 xtype: 'numberfield',
                                 allowDecimals: false,
                                 name: 'probeNehmerId',
                                 fieldLabel: 'Probennehmer',
-                                labelWidth: 100,
+                                anchor: '100%',
+                                labelWidth: 105,
                             }, {
                                 xtype: 'netzbetreiber',
                                 name: 'netzbetreiberId',
                                 editable: false,
                                 fieldLabel: 'Netzbetreiber',
-                                labelWidth: 100,
+                                anchor: '100%',
+                                labelWidth: 105,
                                 allowBlank: false,
                             }, {
                                 xtype: 'tfield',
                                 name: 'x11',
                                 fieldLabel: 'Datensatzerzeuger',
-                                labelWidth: 100,
+                                anchor: '100%',
+                                labelWidth: 105,
                             }]
                         }]
                     }]
diff -r ee92e352be20 -r e3cdc36cbcae app/view/grid/MKommentar.js
--- a/app/view/grid/MKommentar.js	Mon Mar 16 12:11:34 2015 +0100
+++ b/app/view/grid/MKommentar.js	Mon Mar 16 12:40:06 2015 +0100
@@ -61,11 +61,13 @@
         }, {
             header: 'Datum',
             dataIndex: 'datum',
+            xtype: 'datecolumn',
+            format: 'd.m.Y H:i',
             editor: {
                 xtype: 'datefield',
                 allowBlank: false,
-                format: 'd.m.Y',
-                maxValue: Ext.Date.format(new Date(), 'd.m.Y')
+                format: 'd.m.Y H:i',
+                maxValue: Ext.Date.format(new Date(), 'd.m.Y H:i')
             }
         }, {
             header: 'Text',
diff -r ee92e352be20 -r e3cdc36cbcae app/view/grid/Messung.js
--- a/app/view/grid/Messung.js	Mon Mar 16 12:11:34 2015 +0100
+++ b/app/view/grid/Messung.js	Mon Mar 16 12:40:06 2015 +0100
@@ -65,14 +65,16 @@
         }, {
             header: 'Messzeit',
             dataIndex: 'messzeitpunkt',
+            xtype: 'datecolumn',
+            format: 'd.m.Y H:i',
             flex: 2,
             editor: {
                 xtype: 'datefield',
                 allowBlank: false,
-                format: 'd.m.Y',
+                format: 'd.m.Y H:i',
                 // minValue: '01.01.2001', //todo: gibt es das?
                 // minText: 'Das Datum der Messung darf nicht vor dem 01.01.2001 liegen.',
-                maxValue: Ext.Date.format(new Date(), 'd.m.Y')
+                maxValue: Ext.Date.format(new Date(), 'd.m.Y H:i')
             }
         }, {
             header: 'Status',
diff -r ee92e352be20 -r e3cdc36cbcae app/view/grid/Messwert.js
--- a/app/view/grid/Messwert.js	Mon Mar 16 12:11:34 2015 +0100
+++ b/app/view/grid/Messwert.js	Mon Mar 16 12:40:06 2015 +0100
@@ -72,6 +72,7 @@
         }, {
             header: 'Messwert',
             dataIndex: 'messwert',
+            xtype: 'numbercolumn',
             width: 80,
             editor: {
                 xtype: 'numberfield',
@@ -97,15 +98,18 @@
             }
         }, {
             header: '&lt;NWG',
+            xtype: 'numbercolumn',
             width: 60,
             dataIndex: 'messwertNwg'
         }, {
             header: 'Nachweisgrenze',
+            xtype: 'numbercolumn',
             width: 110,
             dataIndex: 'nwgZuMesswert'
         }, {
             header: 'Messfehler',
             dataIndex: 'messfehler',
+            xtype: 'numbercolumn',
             width: 80,
             editor: {
                 xtype: 'numberfield',
diff -r ee92e352be20 -r e3cdc36cbcae app/view/grid/Probenzusatzwert.js
--- a/app/view/grid/Probenzusatzwert.js	Mon Mar 16 12:11:34 2015 +0100
+++ b/app/view/grid/Probenzusatzwert.js	Mon Mar 16 12:40:06 2015 +0100
@@ -49,11 +49,11 @@
         this.columns = [{
             header: 'PZW-ID',
             dataIndex: 'id',
-            width: 70
+            flex: 1,
         }, {
             header: 'PZW-Größe',
             dataIndex: 'pzsId',
-            flex: 1,
+            flex: 3,
             renderer: function(value) {
                 if (!value || value === '') {
                     return '';
@@ -72,21 +72,16 @@
         }, {
             header: 'Messwert',
             dataIndex: 'messwertPzs',
-            width: 80,
-            renderer: function(value, meta, record) {
-                var nwg = record.get('nwgZuMesswert');
-                if (value < nwg) {
-                    return '<' + value;
-                }
-                return value;
-            },
+            xtype: 'numbercolumn',
+            flex: 1,
             editor: {
+                xtype: 'numberfield',
                 allowBlank: false
             }
         }, {
             header: 'Maßeinheit',
             dataIndex: 'pzsId',
-            width: 80,
+            flex: 1,
             renderer: function(value) {
                 if (!value || value === '') {
                     return '';
@@ -100,16 +95,34 @@
         }, {
             header: 'Nachweisgrenze',
             dataIndex: 'nwgZuMesswert',
-            width: 110,
+            xtype: 'numbercolumn',
+            format: '0',
+            flex: 1,
             editor: {
+                xtype: 'numberfield',
                 allowBlank: false
             }
         }, {
             header: 'rel. Unsich.[%]',
             dataIndex: 'messfehler',
+            xtype: 'numbercolumn',
+            format: '0',
+            flex: 1,
             editor: {
+                xtype: 'numberfield',
                 allowBlank: false
             }
+        }, {
+            header: '< NWG',
+            flex: 1,
+            renderer: function(value, meta, record) {
+                var nwg = record.get('nwgZuMesswert');
+                var mw = record.get('messwertPzs');
+                if ( mw < nwg) {
+                    return 'MW < NWG';
+                }
+                return '';
+            }
         }];
         this.initData();
         this.callParent(arguments);