[Lada-commits] [PATCH 1 of 2] Completed Messwertelist

[Wald Commits]

# HG changeset patch
# User Torsten Irländer <torsten.irlaender at intevation.de>
# Date 1372943461 -7200
# Node ID 062aa9001eb64847c11723e5b790322271ff17a8
# Parent  133df8f75a12038810ed46a9766085d7489c3dd3
Completed Messwertelist

diff -r 133df8f75a12 -r 062aa9001eb6 app/controller/Messungen.js
--- a/app/controller/Messungen.js	Thu Jul 04 12:21:51 2013 +0200
+++ b/app/controller/Messungen.js	Thu Jul 04 15:11:01 2013 +0200
@@ -7,7 +7,8 @@
         'Messungen',
         'Messwerte',
         'MKommentare',
-        'Status'
+        'Status',
+        'Messgroessen'
     ],
     init: function() {
         console.log('Initialising the Messungen controller');
diff -r 133df8f75a12 -r 062aa9001eb6 app/view/messungen/CreateForm.js
--- a/app/view/messungen/CreateForm.js	Thu Jul 04 12:21:51 2013 +0200
+++ b/app/view/messungen/CreateForm.js	Thu Jul 04 15:11:01 2013 +0200
@@ -3,7 +3,10 @@
     model: 'Lada.model.Messung',
     requires: [
         'Lada.view.widgets.Messmethode',
-        'Lada.view.mkommentare.List'
+        'Lada.view.widgets.Testdatensatz',
+        'Lada.view.mkommentare.List',
+        'Lada.view.status.List',
+        'Lada.view.messwerte.List'
     ],
     initComponent: function() {
         this.items = [
@@ -28,15 +31,43 @@
                 fieldLabel: 'Messdauer'
             },
             {
-                xtype: 'textfield',
+                xtype: 'testdatensatz',
                 name: 'fertig',
                 fieldLabel: 'Fertig'
             },
             {
-                xtype: 'textfield',
+                xtype: 'testdatensatz',
                 name: 'geplant',
                 fieldLabel: 'Geplant'
             },
+            // Messwerte
+            {
+                xtype: 'fieldset',
+                title: 'Messwerte',
+                collapsible: true,
+                collapsed: false,
+                padding: '10 10',
+                items: [
+                    {
+                        xtype: 'messwertelist',
+                        parentId: this.modelId
+                    }
+                ]
+            },
+            // Status
+            {
+                xtype: 'fieldset',
+                title: 'Messungsstatus',
+                collapsible: true,
+                collapsed: false,
+                padding: '10 10',
+                items: [
+                    {
+                        xtype: 'statuslist',
+                        parentId: this.modelId
+                    }
+                ]
+            },
             // Messungskommentare
             {
                 xtype: 'fieldset',