Shefali Joshi
|
768df84f10
|
Merge pull request #2711 from nasa/condition-output-persistance2
Added persistance for changes to output selector
|
2020-03-02 13:56:31 -08:00 |
|
Joel McKinnon
|
f8b3899bb9
|
addressed review comments and lint errors
|
2020-03-02 12:30:28 -08:00 |
|
Shefali Joshi
|
3b046db4f8
|
Merge pull request #2695 from nasa/firefox-drag-fix
Add setData on dragStart for FF support
|
2020-03-02 11:57:45 -08:00 |
|
Joel McKinnon
|
97f829da9f
|
added dragstop listener and dragStop method
|
2020-03-02 11:46:16 -08:00 |
|
Shefali Joshi
|
fb1eed1982
|
Merge pull request #2706 from nasa/current-output-refactor
Refactored CurrentOutput component into ConditionSet
|
2020-03-02 11:28:51 -08:00 |
|
Joel McKinnon
|
fa83b4867c
|
removed extra div
|
2020-03-02 06:17:27 -08:00 |
|
Joel McKinnon
|
47d4fc9103
|
removed CurrentOutput component
|
2020-02-28 15:32:40 -08:00 |
|
Joel McKinnon
|
71424dcf8d
|
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into firefox-drag-fix
|
2020-02-28 14:39:02 -08:00 |
|
Shefali Joshi
|
16a0bf9d6c
|
Merge pull request #2703 from nasa/criterion-multi-input
Criterion multiple input fields
|
2020-02-28 14:07:40 -08:00 |
|
Joel McKinnon
|
5498ba8e1e
|
changed computeResults
|
2020-02-28 13:51:46 -08:00 |
|
Joel McKinnon
|
83d08ae369
|
resolve merge conflicts
|
2020-02-28 12:17:12 -08:00 |
|
Joel McKinnon
|
39bf601ee1
|
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into firefox-drag-fix
|
2020-02-28 11:43:17 -08:00 |
|
Joel McKinnon
|
cfafecdd64
|
Merge pull request #2685 from nasa/conditionals-refactor
Conditionals refactor
|
2020-02-28 11:35:09 -08:00 |
|
Joshi
|
ba780981a5
|
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor
|
2020-02-28 11:09:41 -08:00 |
|
Shefali Joshi
|
ac13bc5850
|
Merge pull request #2688 from nasa/condition-trigger
Condition Any/All criteria match enabled
|
2020-02-28 10:53:02 -08:00 |
|
Joshi
|
e526626e09
|
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-trigger
|
2020-02-28 10:49:56 -08:00 |
|
Joel McKinnon
|
564be6f8ba
|
Merge branch 'condition-trigger' of https://github.com/nasa/openmct into condition-trigger
|
2020-02-28 10:05:11 -08:00 |
|
Joel McKinnon
|
371a7d3a3e
|
removed disabled inputs with no telemetry
|
2020-02-28 10:04:10 -08:00 |
|
Joel McKinnon
|
8539d60562
|
enable trigger
|
2020-02-28 10:01:37 -08:00 |
|
Joel McKinnon
|
d333fd5822
|
disabled add or edit condition set without telemetry
|
2020-02-28 10:01:37 -08:00 |
|
Joshi
|
364191eddc
|
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor
|
2020-02-28 09:57:00 -08:00 |
|
Shefali Joshi
|
28255dce01
|
Merge pull request #2687 from nasa/remove-criteria
Added controls for remove and duplicate criteria
|
2020-02-28 09:53:53 -08:00 |
|
Joshi
|
c9419d3e2d
|
Fix for when input is not an array. This will be handled differently in an upcoming code change.
|
2020-02-28 09:47:58 -08:00 |
|
Joel McKinnon
|
b386275330
|
removed disabled inputs with no telemetry
|
2020-02-28 08:55:59 -08:00 |
|
Joel McKinnon
|
d2a45e46f1
|
modified getOperationFormat
|
2020-02-28 08:37:20 -08:00 |
|
Joel McKinnon
|
1a409afb03
|
wip: addressing review comments
|
2020-02-27 16:32:38 -08:00 |
|
Joel McKinnon
|
e57c18fd69
|
removed unused isDefault prop
|
2020-02-27 14:55:52 -08:00 |
|
Joel McKinnon
|
3aec9ec6ff
|
add setData on dragStart for FF support
|
2020-02-27 14:36:21 -08:00 |
|
Joshi
|
2609a41ee8
|
Addresses comments
Removes console log statements
Fixes import paths
|
2020-02-27 11:21:40 -08:00 |
|
Joshi
|
b8dc5acf00
|
Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor
|
2020-02-27 11:19:35 -08:00 |
|
Joel McKinnon
|
467c57b7c6
|
Merge branch 'criterion-multi-input' of https://github.com/nasa/openmct into criterion-multi-input
|
2020-02-26 12:32:21 -08:00 |
|
Joel McKinnon
|
a51c0d5139
|
addressed review comments
|
2020-02-26 12:31:37 -08:00 |
|
Joel McKinnon
|
d46310ca7d
|
handle multiple inputs in telemetryCriterion
|
2020-02-26 12:31:37 -08:00 |
|
Joel McKinnon
|
8f87cc78e8
|
rendering correct number of input fields depending on operation and persisting values
|
2020-02-26 12:31:37 -08:00 |
|
Joel McKinnon
|
ee6e0f310e
|
changed default input to array and clear downstream selection lists on change
|
2020-02-26 12:31:37 -08:00 |
|
Joel McKinnon
|
f328a1078e
|
filter comparison list based on field selected
|
2020-02-26 12:31:37 -08:00 |
|
Joel McKinnon
|
b4cf81a0ef
|
wip: filtering select comparison
|
2020-02-26 12:31:37 -08:00 |
|
Joel McKinnon
|
1b9b7e2345
|
added hid/show selects
|
2020-02-26 12:31:37 -08:00 |
|
Joel McKinnon
|
cda97d142a
|
Merge branch 'condition-trigger' of https://github.com/nasa/openmct into condition-trigger
|
2020-02-26 12:23:03 -08:00 |
|
Joel McKinnon
|
858199e396
|
enable trigger
|
2020-02-26 12:22:29 -08:00 |
|
Joel McKinnon
|
f504a335af
|
disabled add or edit condition set without telemetry
|
2020-02-26 12:22:29 -08:00 |
|
Joel McKinnon
|
463ec47af6
|
changed classname of controls div
|
2020-02-26 12:21:53 -08:00 |
|
Joel McKinnon
|
ec4d121a98
|
changed classname of controls div
|
2020-02-26 11:59:04 -08:00 |
|
Joel McKinnon
|
fea6d2df96
|
Merge branch 'remove-criteria' of https://github.com/nasa/openmct into remove-criteria
|
2020-02-26 11:53:09 -08:00 |
|
Joel McKinnon
|
598d2b31e9
|
remove criterion working
|
2020-02-26 11:51:41 -08:00 |
|
Joel McKinnon
|
25e28ab97c
|
added controls for remove and duplicate criteria
|
2020-02-26 11:49:17 -08:00 |
|
Joel McKinnon
|
43056c4068
|
implimented clone criterion
|
2020-02-26 11:42:06 -08:00 |
|
Joel McKinnon
|
614206b10c
|
remove criterion working
|
2020-02-26 11:42:06 -08:00 |
|
Joel McKinnon
|
30a493d038
|
resolved merge conflict
|
2020-02-26 11:40:52 -08:00 |
|
Shefali Joshi
|
96e433beaa
|
Merge pull request #2677 from nasa/condition-clone-name
Condition clone name persistance
|
2020-02-26 11:32:48 -08:00 |
|