added support for bars with multiple fields in one message
This commit is contained in:
+19
-2
@@ -416,18 +416,35 @@ jsPlumb.ready(function() {
|
|||||||
for (var which=0; which<2; which++) {
|
for (var which=0; which<2; which++) {
|
||||||
if (which>0 && !item.lastnames) continue;
|
if (which>0 && !item.lastnames) continue;
|
||||||
var setvalues = which==0?values:lastvalues;
|
var setvalues = which==0?values:lastvalues;
|
||||||
for (var m=0; m<item.names.length; m++) {
|
var names = which>0 ? item.lastnames : item.names;
|
||||||
var mname = which==0?item.names[m]:item.lastnames[m];
|
if (!Array.isArray(names)) {
|
||||||
|
names = Array(names);
|
||||||
|
}
|
||||||
|
for (var m=0; m<names.length; m++) {
|
||||||
|
var mname = names[m];
|
||||||
var value = null;
|
var value = null;
|
||||||
if (mname && cmessages.hasOwnProperty(mname)) {
|
if (mname && cmessages.hasOwnProperty(mname)) {
|
||||||
var message = cmessages[mname];
|
var message = cmessages[mname];
|
||||||
if (circuit!='global' && !message.passive) needUris.push(circuit+'/'+mname);
|
if (circuit!='global' && !message.passive) needUris.push(circuit+'/'+mname);
|
||||||
var fields = circuit=='global'?message:(message?message.fields:null);
|
var fields = circuit=='global'?message:(message?message.fields:null);
|
||||||
|
if (names.length==1 && fields) {
|
||||||
|
for (var f in fields) {
|
||||||
|
var field = fields[f];
|
||||||
|
value = null;
|
||||||
|
if (field && field.hasOwnProperty('value')) {
|
||||||
|
value = field.value;
|
||||||
|
}
|
||||||
|
setvalues[setvalues.length] = value;
|
||||||
|
if (value>maxValue) maxValue = value;
|
||||||
|
}
|
||||||
|
continue;
|
||||||
|
} else {
|
||||||
var field = fields?fields[item.field]:null;
|
var field = fields?fields[item.field]:null;
|
||||||
if (field && field.hasOwnProperty('value')) {
|
if (field && field.hasOwnProperty('value')) {
|
||||||
value = field.value;
|
value = field.value;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
setvalues[setvalues.length] = value;
|
setvalues[setvalues.length] = value;
|
||||||
if (value>maxValue) maxValue = value;
|
if (value>maxValue) maxValue = value;
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user