diff app/view/grid/Messung.js @ 636:f4f76fc04e28

merged.
author Raimund Renkert <raimund.renkert@intevation.de>
date Mon, 16 Mar 2015 17:32:15 +0100
parents 6742ae5f35dc
children 69cb367c0a63
line wrap: on
line diff
--- a/app/view/grid/Messung.js	Mon Mar 16 17:31:41 2015 +0100
+++ b/app/view/grid/Messung.js	Mon Mar 16 17:32:15 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',

http://lada.wald.intevation.org