Mercurial > lada > lada-client
changeset 1176:84989f900e59
Merge
| author | Evi Huber <ehuber@bfs.de> |
|---|---|
| date | Mon, 11 Jul 2016 10:31:33 +0200 |
| parents | 5e3d4136ecfb (diff) bdc1f9bfd930 (current diff) |
| children | d2724c1642d7 |
| files | |
| diffstat | 5 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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'
--- 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.';
--- 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.');
--- 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();