# HG changeset patch
# User Torsten Irländer <torsten.irlaender@intevation.de>
# Date 1367939340 -7200
# Node ID 0a4674f17bcb2ff73107f7ae58df63d1a96b1a0f
# Parent  4caf4c8c694a14944f8350e34247ac14f86b6b99
Added more fields to the overview and set correct reference in on the edit
page.

diff -r 4caf4c8c694a -r 0a4674f17bcb app/view/proben/Edit.js
--- a/app/view/proben/Edit.js	Tue May 07 17:08:08 2013 +0200
+++ b/app/view/proben/Edit.js	Tue May 07 17:09:00 2013 +0200
@@ -23,17 +23,17 @@
                         items: [
                             {
                                 xtype: 'textfield',
-                                name: 'x1',
+                                name: 'mstId',
                                 fieldLabel: 'Messstelle'
                             },
                             {
                                 xtype: 'textfield',
-                                name: 'x2',
+                                name: 'hauptprobenNr',
                                 fieldLabel: 'Hauptprobennr.'
                             },
                             {
                                 xtype: 'textfield',
-                                name: 'x3',
+                                name: 'probeId',
                                 fieldLabel: 'Probe-ID'
                             },
                             {
@@ -54,12 +54,12 @@
                                     },
                                     {
                                         xtype: 'textfield',
-                                        name: 'x6',
+                                        name: 'test',
                                         fieldLabel: 'Testdatensatz'
                                     },
                                     {
                                         xtype: 'textfield',
-                                        name: 'x7',
+                                        name: 'probenartId',
                                         fieldLabel: 'Probenart'
                                     },
                                     {
@@ -74,7 +74,7 @@
                                     },
                                     {
                                         xtype: 'textfield',
-                                        name: 'x10',
+                                        name: 'probenartId',
                                         fieldLabel: 'Probennehmer'
                                     },
                                     {
@@ -96,17 +96,17 @@
                         items: [
                                 {
                                     xtype: 'textfield',
-                                    name: 'x12',
+                                    name: 'umwId',
                                     fieldLabel: 'Umweltbereich'
                                 },
                                 {
                                     xtype: 'textfield',
-                                    name: 'x13',
+                                    name: 'media',
                                     fieldLabel: 'Medienbezeichnung'
                                 },
                                 {
                                     xtype: 'textfield',
-                                    name: 'x14',
+                                    name: 'mediaDesk',
                                     fieldLabel: 'Deskriptoren'
                                 },
                                 {
@@ -130,19 +130,19 @@
                         items: [
                             {
                                 fieldLabel: 'Probennahme Beginn',
-                                name: 'z1'
+                                name: 'probeentnahmeBeginn'
                             },
                             {
                                 fieldLabel: 'Probennahme Ende',
-                                name: 'z2'
+                                name: 'probeentnahmeEnde'
                             },
                             {
                                 fieldLabel: 'Sollzeit Von',
-                                name: 'z3'
+                                name: 'solldatumBeginn'
                             },
                             {
                                 fieldLabel: 'Sollzeit Bis',
-                                name: 'z4'
+                                name: 'solldatumEnde'
                             },
                             {
                                 fieldLabel: 'Ursprungszeit',
@@ -369,3 +369,4 @@
         return fields;
     }
 });
+
diff -r 4caf4c8c694a -r 0a4674f17bcb app/view/proben/List.js
--- a/app/view/proben/List.js	Tue May 07 17:08:08 2013 +0200
+++ b/app/view/proben/List.js	Tue May 07 17:09:00 2013 +0200
@@ -5,8 +5,16 @@
 
     initComponent: function() {
         this.columns = [
-            {header: 'Datenbasis',  dataIndex: 'datenbasisId',  flex: 1},
-            {header: 'ProbeID', dataIndex: 'probeId', flex: 1}
+            {header: 'Datenbasis',  dataIndex: 'datenbasisId', width: 70},
+            {header: 'MLP',  dataIndex: 'mlpId', width: 50},
+            {header: 'UWB',  dataIndex: 'umwId', width: 50},
+            {header: 'HPNR',  dataIndex: 'hauptprobenNr'},
+            {header: 'NPNR',  dataIndex: '', width: 50},
+            {header: 'E.Gemeinde',  dataIndex: '', flex: 1},
+            {header: 'Ursprungsgemeinde',  dataIndex: '', flex: 1},
+            {header: 'ProbeID', dataIndex: 'probeId'},
+            {header: 'OZB', dataIndex: '', width: 50},
+            {header: 'MST', dataIndex: 'mstId', width: 50}
         ];
         this.callParent(arguments);
     }