6184 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Joel McKinnon	70b5c627ca	handle multiple inputs in telemetryCriterion	2020-02-24 16:48:27 -08:00
Joel McKinnon	f4f1d0387b	rendering correct number of input fields depending on operation and persisting values	2020-02-24 16:31:59 -08:00
Joel McKinnon	a1bf4a92e5	changed default input to array and clear downstream selection lists on change	2020-02-24 15:50:01 -08:00
Joshi	7d2256d70f	Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into conditionals-refactor	2020-02-24 15:44:07 -08:00
Joshi	5814d2a35e	Updates conditionManager.js to emit the output of the winning condition instead of the identifier of that condition	2020-02-24 15:43:03 -08:00
Joshi	6ab84c0bc3	Refactoring conditionals ... Move logic for conditions into conditionManager out of conditionCollection.vue	2020-02-24 15:05:33 -08:00
Joel McKinnon	a7fc9b3caa	filter comparison list based on field selected	2020-02-23 15:19:03 -08:00
Joel McKinnon	67f493f012	rebased with topic-conditionals and resolved conflict	2020-02-23 11:30:01 -08:00
Joel McKinnon	0686e6d38f	implimented clone criterion	2020-02-23 11:26:58 -08:00
Joel McKinnon	7fc825949c	remove criterion working	2020-02-23 11:26:58 -08:00
Joel McKinnon	2a9ccdcffd	added controls for remove and duplicate criteria	2020-02-23 11:26:58 -08:00
Joel McKinnon	6db78af69f	fixed condition name persistance	2020-02-23 09:58:32 -08:00
Joel McKinnon	038489256c	updated Condition.vue with modifications to ConditionEdit.vue and deleted ConditionEdit as it is no longer used	2020-02-23 09:06:37 -08:00
Joel McKinnon	53b785269b	wip: filtering select comparison	2020-02-21 06:43:16 -08:00
Joel McKinnon	007b14b5c9	added hid/show selects	2020-02-20 14:59:04 -08:00
Joel McKinnon	50b331c451	fixed condition clone	2020-02-20 14:45:30 -08:00
Joel McKinnon	44fc62e0ba	fix reordering	2020-02-20 14:17:15 -08:00
Shefali Joshi	2635f085f0	Merge pull request #2665 from nasa/add-criteria ... Add multiple criteria and persist inputs	2020-02-20 13:51:31 -08:00
Joel McKinnon	22161fce7f	implimented clone criterion	2020-02-20 12:44:50 -08:00
Joel McKinnon	386fc75047	remove criterion working	2020-02-20 12:23:18 -08:00
Joel McKinnon	fa6dd84945	added controls for remove and duplicate criteria	2020-02-20 07:23:38 -08:00
Joel McKinnon	d425bd564c	fixed merge conflicts	2020-02-19 13:29:14 -08:00
Joshi	93e3065b3e	Fixes subscription of telelemtry when new criteria is added to a condition	2020-02-19 12:51:24 -08:00
Joshi	0ad2d59924	Fixes tests	2020-02-19 12:51:15 -08:00
Joshi	f4468a8233	Fixing condition output	2020-02-18 16:04:14 -08:00
Joshi	dc08877bbb	Persists the condition domain object so that we can retrieve it with it's identifier in child components like condition.vue	2020-02-18 15:35:03 -08:00
Joel McKinnon	f08caa6135	addressed review comments	2020-02-18 12:40:33 -08:00
Joel McKinnon	ad7d029ce8	addressed review comments	2020-02-18 11:14:50 -08:00
Joel McKinnon	387912b4d3	WIP fixing telemetry subscribe	2020-02-18 11:05:54 -08:00
Joel McKinnon	53e0ed4d4a	refactored to address review comments	2020-02-14 15:23:15 -08:00
Joel McKinnon	11c205b5c4	addressed review comments	2020-02-14 14:46:14 -08:00
Joel McKinnon	4ede6351ec	addressed some review comments	2020-02-14 12:45:32 -08:00
Joel McKinnon	24bbcb466f	wip: fixing add criteria	2020-02-13 16:13:29 -08:00
Charles Hacskaylo	682601477c	Add glyphs (#2667) ... - icon-flag for use with VISTA Frame Accountability; - icon-conditional, and bg-icon-conditional for Conditionals;	2020-02-13 13:11:24 -08:00
Joel McKinnon	b6b5cfe403	fixed default state of output selector	2020-02-13 10:52:37 -08:00
Joel McKinnon	b6ce9c6ed7	trigger label and add divider	2020-02-12 15:58:17 -08:00
Joel McKinnon	6e5e8f0ce8	refactored setOutput	2020-02-12 13:31:55 -08:00
Joel McKinnon	2415d785cc	fixed set output field	2020-02-12 12:45:38 -08:00
Joel McKinnon	2b5d6beb84	resolved conflicts	2020-02-12 11:14:17 -08:00
Joel McKinnon	86316d8940	Add multiple criteria, set and persist inputs	2020-02-12 10:41:43 -08:00
Joel McKinnon	1f2b5ec5c8	WIP: separating criterion level logic to its own component	2020-02-11 10:28:59 -08:00
David Tsay	0a9d23d86f	Merge pull request #2633 from nasa/pane-persistence ... [Navigation Tree] save current state of navigation tree	2020-02-06 16:23:19 -08:00
David Tsay	379e37c881	Merge branch 'master' into pane-persistence	2020-02-06 16:17:59 -08:00
David Tsay	37ef269dce	Merge pull request #2611 from nasa/filters-fetch-bug-fix ... Check if filters are not equal before refetching	2020-02-06 16:16:12 -08:00
Joel McKinnon	8db6f8f633	criteria component WIP	2020-02-06 15:22:56 -08:00
Joel McKinnon	79557165a3	refactored condition and conditionEdit components into single component named condition	2020-02-06 11:53:31 -08:00
Joel McKinnon	ec1d4abde9	before Deep comments	2020-02-06 07:23:32 -08:00
Joshi	07c5e2800a	Merge branch 'topic-conditionals' of https://github.com/nasa/openmct into condition-clone	2020-02-04 15:19:11 -08:00
Joshi	79811d6662	Merge condition-ui branch into this.	2020-02-04 15:12:33 -08:00
Shefali Joshi	67919ece16	Merge pull request #2656 from nasa/condition-ui-redo ... Condition ui redo	2020-02-04 15:11:02 -08:00