[Lada-commits] [PATCH 5 of 5] Merge
Wald Commits
scm-commit at wald.intevation.org
Wed Dec 17 15:42:32 CET 2014
# HG changeset patch
# User Roland Geider <roland.geider at intevation.de>
# Date 1418827345 -3600
# Node ID eef1ff9f2bd2d002994d25b56188dc13599891e9
# Parent a12c9c97d3cb24663aba26c8929ba65417c11aed
# Parent 7fb335bf6799cb2711de87bc8823914467a67814
Merge
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/model/StaMessmethode.js
--- a/app/model/StaMessmethode.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/model/StaMessmethode.js Wed Dec 17 15:42:25 2014 +0100
@@ -24,6 +24,13 @@
name: 'beschreibung'
}, {
name: 'messmethode'
+ }, {
+ name: 'display',
+ persist: false,
+ convert: function(value, record) {
+ return record.get('id') + ' - ' + record.get('messmethode');
+ }
+
}],
idProperty: 'id',
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/kommentare/List.js
--- a/app/view/kommentare/List.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/kommentare/List.js Wed Dec 17 15:42:25 2014 +0100
@@ -23,7 +23,7 @@
emptyText: 'Keine Kommentaregefunden.',
// minHeight and deferEmptyText are needed to be able to show the
// emptyText message.
- minHeight: 35,
+ minHeight: 65,
deferEmptyText: false
},
probeId: null,
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/messungen/List.js
--- a/app/view/messungen/List.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/messungen/List.js Wed Dec 17 15:42:25 2014 +0100
@@ -19,7 +19,7 @@
emptyText: 'Keine Messungen gefunden.',
// minHeight and deferEmptyText are needed to be able to show the
// emptyText message.
- minHeight: 35,
+ minHeight: 65,
deferEmptyText: false
},
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/messwerte/List.js
--- a/app/view/messwerte/List.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/messwerte/List.js Wed Dec 17 15:42:25 2014 +0100
@@ -19,7 +19,7 @@
emptyText: 'Keine Messwerte gefunden.',
// minHeight and deferEmptyText are needed to be able to show the
// emptyText message.
- minHeight: 35,
+ minHeight: 65,
deferEmptyText: false
},
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/mkommentare/List.js
--- a/app/view/mkommentare/List.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/mkommentare/List.js Wed Dec 17 15:42:25 2014 +0100
@@ -19,7 +19,7 @@
emptyText: 'Keine Kommentare gefunden.',
// minHeight and deferEmptyText are needed to be able to show the
// emptyText message.
- minHeight: 35,
+ minHeight: 65,
deferEmptyText: false
},
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/orte/List.js
--- a/app/view/orte/List.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/orte/List.js Wed Dec 17 15:42:25 2014 +0100
@@ -18,7 +18,7 @@
emptyText: 'Keine Orte gefunden.',
// minHeight and deferEmptyText are needed to be able to show the
// emptyText message.
- minHeight: 35,
+ minHeight: 65,
deferEmptyText: false
},
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/status/List.js
--- a/app/view/status/List.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/status/List.js Wed Dec 17 15:42:25 2014 +0100
@@ -19,7 +19,7 @@
emptyText: 'Keine Statusangaben gefunden.',
// minHeight and deferEmptyText are needed to be able to show the
// emptyText message.
- minHeight: 35,
+ minHeight: 65,
deferEmptyText: false
},
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/widgets/Messmethode.js
--- a/app/view/widgets/Messmethode.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/widgets/Messmethode.js Wed Dec 17 15:42:25 2014 +0100
@@ -13,17 +13,15 @@
extend: 'Ext.form.ComboBox',
alias: 'widget.messmethode',
store: 'StaMessmethoden',
- displayField: 'messmethode',
+ displayField: 'display',
valueField: 'id',
emptyText: 'Wählen Sie eine Messmethode',
// Enable filtering of comboboxes
autoSelect: false,
queryMode: 'local',
triggerAction: 'all',
- typeAhead: false,
+ typeAhead: true,
minChars: 0,
- tpl: '<tpl for="."><div class="x-combo-list-item x-boundlist-item" >' +
- '{id} - {messmethode}</div></tpl>',
initComponent: function() {
this.store = Ext.data.StoreManager.get('staMessmethoden');
diff -r a12c9c97d3cb -r eef1ff9f2bd2 app/view/zusatzwerte/List.js
--- a/app/view/zusatzwerte/List.js Wed Dec 17 15:41:35 2014 +0100
+++ b/app/view/zusatzwerte/List.js Wed Dec 17 15:42:25 2014 +0100
@@ -19,7 +19,7 @@
emptyText: 'Keine Zusatzwerte gefunden.',
// minHeight and deferEmptyText are needed to be able to show the
// emptyText message.
- minHeight: 35,
+ minHeight: 65,
deferEmptyText: false
},
diff -r a12c9c97d3cb -r eef1ff9f2bd2 server/rest/messung
--- a/server/rest/messung Wed Dec 17 15:41:35 2014 +0100
+++ b/server/rest/messung Wed Dec 17 15:42:25 2014 +0100
@@ -6,7 +6,7 @@
"messungsIdAlt":"1",
"probeId":7581036,
"probeIdAlt":"000007589786X",
- "mmtId":"G1",
+ "mmtId":"GI",
"nebenprobenNr":"01G1",
"messdauer":73929,
"messzeitpunkt":1329139620000,
@@ -18,7 +18,7 @@
"messungsIdAlt":"2",
"probeId":7581036,
"probeIdAlt":"000007589787X",
- "mmtId":"G1",
+ "mmtId":"A2",
"nebenprobenNr":"01G1",
"messdauer":70898,
"messzeitpunkt":1333483200000,
@@ -30,7 +30,7 @@
"messungsIdAlt":"3",
"probeId":7581036,
"probeIdAlt":"000007589792X",
- "mmtId":"G1",
+ "mmtId":"GI",
"nebenprobenNr":"01G1",
"messdauer":42474,
"messzeitpunkt":1339609680000,
@@ -42,7 +42,7 @@
"messungsIdAlt":"4",
"probeId":7581036,
"probeIdAlt":"000007589799X",
- "mmtId":"G1",
+ "mmtId":"GI",
"nebenprobenNr":"01G1",
"messdauer":64222,
"messzeitpunkt":1333453560000,
diff -r a12c9c97d3cb -r eef1ff9f2bd2 server/rest/sta_messstelle
--- a/server/rest/sta_messstelle Wed Dec 17 15:41:35 2014 +0100
+++ b/server/rest/sta_messstelle Wed Dec 17 15:42:25 2014 +0100
@@ -2,7 +2,7 @@
"success":true,
"message":"200",
"data":[{
- "id":"03050",
+ "id":"06010",
"netzbetreiberId":"03",
"beschreibung":"Nds. Landesamt f. Verbraucherschutz und Lebensmittelsicherh., - Veterinärinstitut Hannover, Eintrachtweg 17, 30173 Hannover",
"messStelle":"nslm61",
More information about the Lada-commits
mailing list