# HG changeset patch
# User Torsten Irländer <torsten.irlaender@intevation.de>
# Date 1372847256 -7200
# Node ID 237a4efe715ab619d0963e4cc88fbce0274acdb0
# Parent  dcb40a53ade24b304d880ca0c5986041f806a18c
Enabled loading Messungen.

diff -r dcb40a53ade2 -r 237a4efe715a app.js
--- a/app.js	Wed Jul 03 10:15:59 2013 +0200
+++ b/app.js	Wed Jul 03 12:27:36 2013 +0200
@@ -30,9 +30,8 @@
         'Proben',
         'Zusatzwerte',
         'Kommentare',
-        'Orte'
-        //'Sql',
-        //'Messungen'
+        'Orte',
+        'Messungen'
     ]
 });
 
diff -r dcb40a53ade2 -r 237a4efe715a app/controller/Messungen.js
--- a/app/controller/Messungen.js	Wed Jul 03 10:15:59 2013 +0200
+++ b/app/controller/Messungen.js	Wed Jul 03 12:27:36 2013 +0200
@@ -1,10 +1,7 @@
 Ext.define('Lada.controller.Messungen', {
     extend: 'Ext.app.Controller',
-    views: [
-        'messungen.List',
-        'messungen.Create'
-    ],
     stores: [
+        'Messungen'
     ],
     models: [
         'Zusatzwert'
diff -r dcb40a53ade2 -r 237a4efe715a app/controller/Proben.js
--- a/app/controller/Proben.js	Wed Jul 03 10:15:59 2013 +0200
+++ b/app/controller/Proben.js	Wed Jul 03 12:27:36 2013 +0200
@@ -9,8 +9,8 @@
         'Zusatzwerte',
         'Probenzusatzwerte',
         'Kommentare',
-        'Orte'
-    //    'Messungen',
+        'Orte',
+        'Messungen'
     ],
     init: function() {
         console.log('Initialising the Proben controller');
@@ -65,6 +65,13 @@
                 probeId: id
             }
         });
+        // Load Orte
+        var mstore = this.getMessungenStore();
+        mstore.load({
+            params: {
+                probeId: id
+            }
+        });
         console.log("Loaded Probe with ID " + record.getId()); //outputs ID
     },
     createSuccess: function(form, record, operation) {
diff -r dcb40a53ade2 -r 237a4efe715a app/model/Messung.js
--- a/app/model/Messung.js	Wed Jul 03 10:15:59 2013 +0200
+++ b/app/model/Messung.js	Wed Jul 03 12:27:36 2013 +0200
@@ -1,10 +1,7 @@
 Ext.define('Lada.model.Messung', {
     extend: 'Ext.data.Model',
         fields: [
-        {name: "id"},
-        {name: "messungsId", mapping: "id.messungsId"},
-        {name: "convertedId", convert: buildId},
-        {name: "lprobeId"},
+        {name: "probeId"},
         {name: "mmtId"},
         {name: "nebenprobenNr"},
         {name: "messdauer"},