Joshi
efb3c2b71e
Merge branch 'condition-ui' of https://github.com/nasa/openmct into set-criteria-options
2020-01-23 15:54:24 -08:00
Joshi
862ea6986f
Set criteria options on condition edit
2020-01-23 15:51:08 -08:00
Joshi
23aaada79d
Evaluate telemetry criterion results and display the output of conditions accordingly
2020-01-23 12:08:28 -08:00
Joel McKinnon
9e4458db10
fix merge conflicts
2020-01-23 10:28:59 -08:00
Joel McKinnon
a8da06033c
condition view with highlighting of current condition, add/remove condition, change name, output and persist
2020-01-23 10:24:53 -08:00
Joshi
0bf3597147
Display the current output based on the first condition that has evaluated to true.
...
Fix remove condition
2020-01-22 21:35:22 -08:00
Joshi
cfd9730055
Adds missing updated method
...
Adds definition property to CurrentOutput
2020-01-22 13:45:32 -08:00
Joshi
e88ead30dc
Merge branch 'condition-from-identifier' of https://github.com/nasa/openmct into conditionSet-ui-merge
2020-01-22 13:39:08 -08:00
Joshi
67b24ce846
Persist conditionCollection to the conditionSet
...
Populate persisted operation
2020-01-22 13:29:01 -08:00
Joel McKinnon
709c3fff65
no current output rendered
2020-01-22 13:15:44 -08:00
Joshi
ab6e87ae6b
Updates to operation show up in conditionclass
2020-01-22 13:01:23 -08:00
Joshi
cdb7066bed
Moves condition class initialization to conditionEdit component
...
sets correct condition output in condition edit component
2020-01-22 12:07:14 -08:00
Joel McKinnon
73d0507f1f
persist name change
2020-01-22 11:15:49 -08:00
Joel McKinnon
4d263bcf32
added persist for remove
2020-01-22 08:53:25 -08:00
Joel McKinnon
2d8f61172d
fixed remove
2020-01-22 08:17:03 -08:00
Joel McKinnon
621c1dc11e
renders current output section
2020-01-21 16:00:21 -08:00
Joel McKinnon
dd136a5ff4
WIP: set current condition
2020-01-21 13:37:36 -08:00
Joshi
8fc785bbd6
Merge branch 'condition-class' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-21 10:18:51 -08:00
Joshi
82be503f4f
Fix broken rendering
2020-01-17 13:00:41 -08:00
Joshi
7feb933519
Fix errors after converting conditionCollection to persist identifiers only
2020-01-17 11:26:46 -08:00
Joshi
e806e5a293
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-17 11:04:41 -08:00
Joshi
770951c6da
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class
2020-01-17 11:02:27 -08:00
Joshi
7b7c7b528a
1. Persist the condition domain object — done
...
2. Persist the condition identifier only in configuration.conditionCollection array, not the domain object — done
3. WIP - Retrieve the condition domain object and instantiate the condition classes on load
2020-01-16 16:11:23 -08:00
Shefali Joshi
a554aa20f8
Addresses code review comments ( #2624 )
...
* Addresses code review comments
- Change copyright to 2020
- Fix class parameters, tests
* Fixes this for initilize function
2020-01-16 15:56:58 -08:00
Joshi
ff1ef1f184
fixes typo
2020-01-16 15:48:40 -08:00
Joshi
bf1efaf912
Merge branch 'condition-class' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-16 15:47:34 -08:00
Joshi
ff2bc41317
Merge branch 'telemetry-criterion' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-16 15:47:04 -08:00
Joshi
bdaf8aff15
Merge branch 'condition-view' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-16 15:46:28 -08:00
Joshi
1dc4f9f6bb
Fixes this for the handleConditionUpdated function
2020-01-16 15:44:59 -08:00
Joshi
d6320f5da1
Fixes this for initilize function
2020-01-16 15:43:33 -08:00
Joshi
276be5e857
Merge branch 'condition-class' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-16 15:36:29 -08:00
Joshi
3101e77ecc
Merge branch 'telemetry-criterion' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-16 15:34:53 -08:00
Joshi
ab6dae16f1
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-16 15:32:40 -08:00
Joshi
36222d79c6
Updates copyright, jsdocs, small refactor
2020-01-16 15:30:49 -08:00
Joel McKinnon
08656a6674
persist output string selection
2020-01-16 15:29:07 -08:00
Joshi
8034317796
Merge branch 'telemetry-criterion' of https://github.com/nasa/openmct into condition-class
2020-01-16 15:08:15 -08:00
Joshi
a59f3a550e
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-class
2020-01-16 15:07:57 -08:00
Joshi
415b967c0b
Addresses code review comments
...
- Change copyright to 2020
- Fix class parameters, tests
2020-01-16 15:03:14 -08:00
Joel McKinnon
642499d519
added string output field
2020-01-16 09:56:17 -08:00
Joel McKinnon
fa0a54eee7
css fixes and add any/all control
2020-01-16 09:13:43 -08:00
Joel McKinnon
82f175f6c7
fixed style issues and added default select labels
2020-01-15 17:59:51 -08:00
Shefali Joshi
8df549e8d9
Addresses comments from PR: https://github.com/nasa/openmct/pull/2621 ( #2623 )
...
* Addresses comments from PR: https://github.com/nasa/openmct/pull/2621
* Fixes import path.
2020-01-15 15:39:31 -08:00
Joshi
9fd720777b
Merge branch 'conditionSet-view' of https://github.com/nasa/openmct into conditionSet-with-classes
2020-01-15 11:28:18 -08:00
Joshi
4c68c725b1
Adding telemetry options to ConditionEdit
2020-01-15 10:51:45 -08:00
Joel McKinnon
06a5207c6d
deriving current output from current (blue) condition output and persisting
2020-01-14 17:07:32 -08:00
Joel McKinnon
78b885c508
using current condition output for current output label
2020-01-14 13:44:19 -08:00
Joshi
a18a3b6099
Adds telemetry objects on composition add
2020-01-14 13:32:13 -08:00
Joel McKinnon
68949e070c
Merge pull request #2621 from nasa/conditionSet-telemetry
...
Updates conditionSet composition policy to allow only telemetry since…
2020-01-14 11:04:46 -08:00
Joshi
654333dabe
Removes fdescribe
2020-01-14 10:59:11 -08:00
Joshi
81b8a76f1b
(WIP) Fixes cyclic error while saving conditionCollection
2020-01-14 10:57:00 -08:00
