ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-02-24 18:50:47 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

pass timestamp datum through to ConditionManager

Browse Source
This commit is contained in:
David Tsay 2020-03-03 14:37:11 -08:00
parent b8b838f490
commit 4c4b587d9c
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/plugins/condition/Condition.js
View File

@ -191,15 +191,12 @@ export default class ConditionClass extends EventEmitter {
handleCriterionResult(eventData) { handleCriterionResult(eventData) {
const id = eventData.id; const id = eventData.id;
const conditionData = eventData.data;
if (this.findCriterion(id)) { if (this.findCriterion(id)) {
this.criteriaResults[id] = eventData.data.result; this.criteriaResults[id] = eventData.data.result;
} }
this.handleConditionUpdated(); this.handleConditionUpdated(eventData.data);
// conditionData.result = computeCondition(this.criteriaResults, this.trigger === TRIGGER.ALL);
// this.emitEvent('conditionResultUpdated', conditionData);
} }
subscribe() { subscribe() {
@ -209,10 +206,12 @@ export default class ConditionClass extends EventEmitter {
}) })
} }
handleConditionUpdated() { handleConditionUpdated(datum) {
// trigger an updated event so that consumers can react accordingly // trigger an updated event so that consumers can react accordingly
this.evaluate(); this.evaluate();
this.emitEvent('conditionResultUpdated', {result: this.result}); this.emitEvent('conditionResultUpdated',
Object.assign({}, datum, { result: this.result })
);
} }
getCriteria() { getCriteria() {