# HG changeset patch
# User Evi Huber <ehuber@bfs.de>
# Date 1468225893 -7200
# Node ID 84989f900e5943a2f991c4e02afa0efad616f59e
# Parent  5e3d4136ecfb98099ac04d9efd9b8a7cfd488d30# Parent  bdc1f9bfd93043f7cb1a0b4e2c36ea59e8660cd0
Merge

diff -r bdc1f9bfd930 -r 84989f900e59 app/view/form/Probe.js
--- a/app/view/form/Probe.js	Tue Jul 05 17:17:57 2016 +0200
+++ b/app/view/form/Probe.js	Mon Jul 11 10:31:33 2016 +0200
@@ -75,7 +75,14 @@
                 items: [{
                     layout: 'vbox',
                     border: 0,
-                    items: [{
+                        items: [{
+                             xtype: 'displayfield',
+                             name: 'probeIdAlt',
+                             fieldLabel: i18n.getMsg('probeId'),
+                             margin: '0, 5, 5, 5',
+                             labelWidth: 95,
+                             maxLength: 20
+                        },{
                             layout: {
                                 type: 'hbox',
                                 align: 'stretch'
diff -r bdc1f9bfd930 -r 84989f900e59 app/view/window/MessungCreate.js
--- a/app/view/window/MessungCreate.js	Tue Jul 05 17:17:57 2016 +0200
+++ b/app/view/window/MessungCreate.js	Mon Jul 11 10:31:33 2016 +0200
@@ -42,8 +42,8 @@
         var messstelle = Ext.data.StoreManager.get('messstellen')
             .getById(this.probe.get('mstId'));
 
-        this.title = 'Neue Messung zu Probe: '
-            + this.probe.get('probeIdAlt')
+        this.title = 'Neue Messung zu Probe - Hauptprobennr.: '
+            + this.probe.get('hauptprobenNr')
             + ' Mst: ' + messstelle.get('messStelle')
             + ' hinzufügen.';
 
diff -r bdc1f9bfd930 -r 84989f900e59 app/view/window/MessungEdit.js
--- a/app/view/window/MessungEdit.js	Tue Jul 05 17:17:57 2016 +0200
+++ b/app/view/window/MessungEdit.js	Mon Jul 11 10:31:33 2016 +0200
@@ -157,7 +157,7 @@
                 var messstelle = Ext.data.StoreManager.get('messstellen')
                     .getById(this.probe.get('mstId'));
                 this.setTitle('Messung: ' + this.record.get('nebenprobenNr')
-                              + '   zu Probe: ' + this.probe.get('probeIdAlt')
+                              + '   zu Probe - Hauptprobennr.: ' + this.probe.get('hauptprobenNr')
                               + ' Mst: ' + messstelle.get('messStelle')
                               + ' editieren.');
 
diff -r bdc1f9bfd930 -r 84989f900e59 app/view/window/ProbeEdit.js
--- a/app/view/window/ProbeEdit.js	Tue Jul 05 17:17:57 2016 +0200
+++ b/app/view/window/ProbeEdit.js	Mon Jul 11 10:31:33 2016 +0200
@@ -38,8 +38,6 @@
             this.callParent(arguments);
             return;
         }
-        var extendedTitle = this.record.get('probeId') ? this.record.get('probeId') : '';
-        this.title = '§3-Probe ' + extendedTitle;
         this.buttons = [{
             text: 'Schließen',
             scope: this,
@@ -139,6 +137,11 @@
                 var owner = this.record.get('owner');
                 var readonly = this.record.get('readonly');
 
+                var messstelle = Ext.data.StoreManager.get('messstellen')
+                                    .getById(this.record.get('mstId'));
+                this.setTitle('§3 Probe - Hauptprobennr.: ' + this.record.get('hauptprobenNr')
+                                     + ' Mst: ' + messstelle.get('messStelle'));
+
                 if (owner) {
                     //Always allow to Add Messungen.
                     me.enableAddMessungen();
diff -r bdc1f9bfd930 -r 84989f900e59 resources/i18n/Lada_de-DE.properties
--- a/resources/i18n/Lada_de-DE.properties	Tue Jul 05 17:17:57 2016 +0200
+++ b/resources/i18n/Lada_de-DE.properties	Mon Jul 11 10:31:33 2016 +0200
@@ -61,6 +61,7 @@
 name:Name
 mprId:Mpr-Id
 mstId:Messstelle
+probeId:ProbeId
 datenbasisId:Datenbasis
 baId:Messregime
 probeNehmerId:Probennehmer