Improve returnValue handling
This commit is contained in:
@@ -25,7 +25,13 @@ class Equipment {
|
|||||||
} else if (items[valueItemName]['state'] == 'NULL') { // Return default value if item state is null
|
} else if (items[valueItemName]['state'] == 'NULL') { // Return default value if item state is null
|
||||||
console.warn('Item ' + valueItemName + ' is unset')
|
console.warn('Item ' + valueItemName + ' is unset')
|
||||||
} else { // Return value from item
|
} else { // Return value from item
|
||||||
returnValue = items[valueItemName]['state'];
|
if (items[valueItemName].quantityState == null && items[valueItemName].numericState == null) {
|
||||||
|
returnValue = items[valueItemName]['state'];
|
||||||
|
} else if (items[valueItemName].quantityState == null) {
|
||||||
|
returnValue = items[valueItemName]['numericState']
|
||||||
|
} else {
|
||||||
|
returnValue = items[valueItemName].quantityState;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
console.debug('Return value ' + valueName + ' for ' + this.name + ': ' + returnValue);
|
console.debug('Return value ' + valueName + ' for ' + this.name + ': ' + returnValue);
|
||||||
|
|||||||
Reference in New Issue
Block a user