ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-22 22:42:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,568 Commits 989 Branches 212 Tags 191 MiB
c0ed19fd92
Commit Graph

2279 Commits

Author SHA1 Message Date
Victor Woeltjen
c0fda5b572 [Time Conductor] Add JSDoc 
Add typedefs relevant to the date aggregator; in particular,
document properties used to determine how to format timestamps
associated with a telemetry point.
 2015-10-22 12:41:46 -07:00
Victor Woeltjen
950578f09b [Time Conductor] Hide datetime pickers for non-UTC domains 2015-10-22 12:20:15 -07:00
Victor Woeltjen
117470068a [Time Conductor] Use dateService from TimeRangeController 2015-10-22 12:17:08 -07:00
Victor Woeltjen
0d47b7c47d [Time Conductor] Expose dateService in bundle definition 2015-10-22 12:10:12 -07:00
Victor Woeltjen
c882b2d4c3 [Time Conductor] Implement date provider 
Implement UTCDateProvider sufficient to pass spec.
 2015-10-22 12:08:34 -07:00
Victor Woeltjen
794231143e [Time Conductor] Add spec for UTCDateProvider 
Add test cases for UTCDateProvider, which will provide default
date/time formatting/parsing.
 2015-10-22 11:55:38 -07:00
Victor Woeltjen
6b42d3bf4b [Time Conductor] Test DateAggregator 2015-10-22 11:54:46 -07:00
Victor Woeltjen
1c5101eca6 [Time Conductor] Add DateAggregator 
Add DateAggregator, to allow composite services to expose
different ways of parsing/formatting dates.
nasa/openmctweb#182.
 2015-10-22 11:30:57 -07:00
Victor Woeltjen
dbebf08500 [Time Controller] Add test cases 
...to verify behavior on text entry of dates.
 2015-10-21 15:38:58 -07:00
Victor Woeltjen
847c356063 [Time Controller] Change color when input is invalid 
nasa/openmctweb#181
 2015-10-21 15:26:42 -07:00
Victor Woeltjen
06bcd28558 [Time Controller] Keep inputs in sync 
Keep inputs in sync with displayed data in time controller,
without overwriting user-entered text. nasa/openmctweb#181
 2015-10-21 15:22:00 -07:00
Victor Woeltjen
f88e8ebb51 [Time Controller] Update model state for text entry 2015-10-21 15:08:44 -07:00
Victor Woeltjen
6d2b2fd81e [Time Controller] Parse user-entered timestamps 
nasa/openmctweb#181.
 2015-10-21 14:46:12 -07:00
Victor Woeltjen
608800ae63 Merge remote-tracking branch 'github/master' into open181 
Conflicts:
	platform/commonUI/general/res/templates/controls/time-controller.html
 2015-10-21 14:40:42 -07:00
Victor Woeltjen
07818b0a6d [Time Controller] Show bounds in a text field 
Show bounds in a text field to allow user editing; supports manual
editing of time controller bounds, nasa/openmctweb#181.
 2015-10-21 14:35:18 -07:00
Pete Richards
496cf85b7e [JSDoc] Correct mistake 2015-10-21 09:46:32 -07:00
Pete Richards
833f57e284 [Search] Don't block UI between requests 
Timeout subsequent calls to keepIndexing at the end of a
indexRequest, so that UI operations are not blocked.
 2015-10-21 07:51:53 -07:00
Pete Richards
9a63e99710 [Search] Add spec for ElasticSearchProvider 
Add spec coverage for ElasticSearchProvider.  Also remove
unneeded guards for max number of results, as the aggregator
will always provide a max number of results.
 2015-10-20 16:01:42 -07:00
Pete Richards
77d81f899b [Style] JSLint compliance 2015-10-20 15:33:56 -07:00
Pete Richards
fe3263fdfe [Search] Remove invalid specs 2015-10-20 15:27:46 -07:00
Pete Richards
ce42429fbd [Search] expose constants, add fudge factor 
The SearchAggregator exposes it's constants to add stability to
tests.

It also has a fudge factor which increaases the number of results
it requests from providers to better support pagination when using
client side filtering.
 2015-10-20 15:17:15 -07:00
Pete Richards
76151d09a0 [Search] use service for filters, add spec 
Add a spec for the SearchController, and use the SearchService to
execute filters by supplying a filterPredicate.
 2015-10-20 15:17:15 -07:00
Pete Richards
ec7e6cc5b4 [Search] Update spec for Generic Search Worker 2015-10-20 15:17:14 -07:00
Pete Richards
1ddce48f7e [Search] Specs for GenericSearchProvider 
Write specs for GenericSearchProvider and resolve some implementation
bugs they uncovered.
 2015-10-20 15:17:14 -07:00
Pete Richards
98b5ff3c77 [Search] Decrement number of pending requests 2015-10-20 15:17:14 -07:00
Pete Richards
14094a48fc [Search] Remove old specs in prep for rewrite 
Remove old specs in prep for rewrite.
 2015-10-20 15:16:54 -07:00
Victor Woeltjen
8e2a2eeba5 [Entanglement] Add license headers 
...per code review feedback from nasa/openmctweb#175
 2015-10-19 12:08:49 -07:00
Charles Hacskaylo
fb0ce1eca8 [Frontend] New .loading class 
open #190
Removed old .loading styles previously
commented out;
 2015-10-19 11:13:50 -07:00
Pete Richards
0f63e4dde9 [Tests] Rewrite search aggregator specs 2015-10-16 17:06:23 -07:00
Pete Richards
12efb47be7 [Search] Remove timeouts and timestamps 
Remove timeouts and timestamps which were not effectively doing anything.
 2015-10-16 16:09:51 -07:00
Pete Richards
a2fce8e56c [Search] Rewrite elasticsearch provider with prototype 
Rewrite the elasticsearch provider to use prototypes and clean up the implementation.

Now returns a modelResults object to keep it in line with the general search
provider.
 2015-10-16 16:05:31 -07:00
Pete Richards
78e5c0143b [Search] Overhaul generic search provider 
Rewrite the generic search provider to use prototypes.  Increase performance
by utilizing the model service instead of the object service, and use a
simplified method of request queueing.
 2015-10-16 15:30:14 -07:00
Pete Richards
099591ad2e [Search] Aggregator returns objects, providers return models 
Search providers return search results as models for domain objects, as the
actual number of max results is enforced by the aggregator, and because the
individual providers store and return the models for their objects already.

This lowers the amount of resources consumed instantiating domain objects, and
also allows the individual search providers to implement function-based
filtering on domain object models, which is beneficial as it allows the search
filtering in the search controller to be done before paginating of results.
 2015-10-16 15:26:04 -07:00
Pete Richards
b5505f372f [Search] Generic Worker Performance Tweaks 
The generic search worker now does indexing work during the index operation,
ensuring that queries do not have to do extraneous or repeat calculations.

Change the return format slightly and fixed a bug in the GenericSearchProvider
which caused more objects than intended to be returned from the provider.
 2015-10-16 12:39:41 -07:00
Pete Richards
9ad860babd [Search] Rewrite search controller, tidy 
Rewrite the search controller, making numerous changes and using prototypical
style.

First, the search controller immediately hides previous results when a new
search is started.  Secondly, the search controller ensures that search results
displayed match the currently entered query, preventing race conditions.  Finally,
the search controller uses a poor filtering option that means it may not display
all results.
 2015-10-16 12:34:47 -07:00
Charles Hacskaylo
d7bd793bf3 [Frontend] New .loading class 
open #190
CSS for revised .loading class;
Commented out/removed old .loading styles;
Theme constants for loading colors added
to theme files;
 2015-10-15 16:23:42 -07:00
Charles Hacskaylo
9cc0c0b06f [Frontend] Polishing of styles for time-controller 
open #179
open #180
Font-size normalized for time-controller and domain selector;
Layout of object-holder and time-controller fixed;
 2015-10-14 10:25:05 -07:00
Pete Richards
c703714cb3 Merge remote-tracking branch 'github-open/open115b' into open-master 2015-10-09 13:50:27 -07:00
Victor Woeltjen
b48a07cd3e Merge pull request #168 from nasa/mct80 
[Plot] Dates show 1970 when there is no data
 2015-10-09 13:40:04 -07:00
Pete Richards
8c29c8ed0e Merge remote-tracking branch 'github-open/open151' into open-master 2015-10-09 13:38:20 -07:00
Victor Woeltjen
5763511ec8 [Time Conductor] Update specs 
Update specs to reflect merge of latest from master into
topic branch for nasa/openmctweb#115, domain selector.
 2015-10-09 11:17:57 -07:00
Victor Woeltjen
2accf21518 [Time Conductor] Add missing semicolon 
...to pass code style checks.
 2015-10-09 11:08:02 -07:00
Victor Woeltjen
28c42fcd4c [Time Conductor] Fix merge issues 
Fix merge issues not addressed during conflict resolution.
 2015-10-09 11:06:41 -07:00
Victor Woeltjen
1efa97e6f5 Merge remote-tracking branch 'github/master' into open115b 
Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
 2015-10-09 10:32:43 -07:00
Victor Woeltjen
756f728865 Merge remote-tracking branch 'github/open1515' into open-master 2015-10-09 10:11:11 -07:00
Victor Woeltjen
d8276c532b Merge remote-tracking branch 'github/master' into open115b 
Merge in latest from master into topic branch for
nasa/openmctweb#115

Conflicts:
	platform/features/conductor/src/ConductorRepresenter.js
	platform/features/conductor/src/ConductorTelemetrySeries.js
	platform/features/conductor/src/TimeConductor.js
	platform/features/conductor/test/ConductorRepresenterSpec.js
	platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
 2015-10-09 10:04:15 -07:00
Pete Richards
fc0bfa77db Merge remote-tracking branch 'github-open/open141' into open141-integration 2015-10-09 09:52:35 -07:00
Pete Richards
12c6e53939 Merge remote-tracking branch 'github-open/open157' into open-master 2015-10-09 09:47:23 -07:00
Pete Richards
8093fcbda1 Merge remote-tracking branch 'github-open/open139c' into open-master 2015-10-09 09:42:22 -07:00
Victor Woeltjen
d902943552 [Time Conductor] Satisfy JSLint 
...in preparation to merge pull request nasa/openmctweb#162
 2015-10-09 09:36:57 -07:00
Victor Woeltjen
5f7c8ccadb Merge remote-tracking branch 'github/master' into open117b 2015-10-09 09:35:07 -07:00
Victor Woeltjen
520d17f9db [Time Conductor] Test span constraints 
Verify that inner and outer spans do not become zero when
user input might otherwise cause this.
 2015-10-09 09:29:01 -07:00
Victor Woeltjen
7532db5f49 [Time Conductor] Add test cases 
Add test cases to TimeRangeController; testing existing functionality
in the context of nasa/openmctweb#151
 2015-10-09 07:58:10 -07:00
Victor Woeltjen
ebd8fdeee3 [Time Conductor] Enforce inner minimums on outer changes 2015-10-09 07:32:46 -07:00
Victor Woeltjen
f738f84075 [Time Conductor] Enforce minimum outer span 2015-10-08 16:02:47 -07:00
Victor Woeltjen
cc19a0acba [Time Conductor] Enforce minimum inner span 
nasa/openmctweb#151.
 2015-10-08 15:51:23 -07:00
Victor Woeltjen
bf41d82a78 [Entanglement] Restore missing specs 
Restore specs which had been omitted from suite.json (but currently
succeed for the relevant scripts); done in the context of
nasa/openmctweb#147
 2015-10-06 16:50:35 -07:00
Victor Woeltjen
a4944717a1 [Location] Test getOriginal method 2015-10-06 16:47:37 -07:00
Victor Woeltjen
70bbd3cf97 [Entanglement] Add test cases for Go To Original 2015-10-06 16:37:37 -07:00
Victor Woeltjen
e3afaf0842 [Entanglement] Add Go To Original 
nasa/openmctweb#147
 2015-10-06 16:26:08 -07:00
Victor Woeltjen
60f2f9fb6c [Location] Add getOriginal method 
Add a getOriginal method to the location capability, to simplify
loading of original versions of objects. nasa/openmctweb#147
 2015-10-06 16:18:51 -07:00
Victor Woeltjen
134b749bbf [Generic Search] Track pending indexes 
Track domain objects which have indexing operations pending,
to avoid redundantly indexing in cases where a broader
indexed check is insufficient.
 2015-10-05 10:11:38 -07:00
Victor Woeltjen
36d06e8b54 [Generic Search] Reduce flush interval 
Per discussion from nasa/openmctweb#141, minimize the
interval at which new objects get indexed, instead of
presuming requirements for CPU utilization.
 2015-10-05 10:06:55 -07:00
Victor Woeltjen
5520d90984 [Generic Search] Remove comments 
Per code review, nasa/openmctweb#165
 2015-10-05 09:57:46 -07:00
Victor Woeltjen
77b0086d18 [Generic Search] Use appropriate data structure 
Per code review, nasa/openmctweb#165
 2015-10-05 09:54:57 -07:00
Victor Woeltjen
146e948097 [Time Conductor] Remove telemetry series wrapper 
WTD-1515
 2015-10-02 16:47:13 -07:00
Victor Woeltjen
669b434c36 [Time Conductor] Test broadcast throttling 2015-10-02 16:38:32 -07:00
Victor Woeltjen
431c74ca49 [Time Conductor] Only update bounds when stable 2015-10-02 16:28:58 -07:00
Victor Woeltjen
cd0c0f77cc [Time Conductor] Throttle display bounds broadcasting 2015-10-02 16:20:31 -07:00
Victor Woeltjen
8cba321886 [Plot] Move throttling out of plot 
Move throttling associated with display bounds changes out
of Plot.
 2015-10-02 16:11:12 -07:00
Victor Woeltjen
dd83816035 [Time Conductor] Remove queryStart, queryEnd 
...per feedback from code review, nasa/openmctweb#104
 2015-10-02 16:08:44 -07:00
Victor Woeltjen
1ca2b769d9 [Common UI] Test popupService 2015-10-02 15:44:36 -07:00
Victor Woeltjen
a1d1261179 [Common UI] Test Popup 2015-10-02 14:58:20 -07:00
Victor Woeltjen
99048a4ee3 [Info Service] Update spec 
...to reflect usage of popupService.
 2015-10-02 14:49:27 -07:00
Victor Woeltjen
553b17fafe [Common UI] Update mct-popup spec 
...to reflect usage of popupService.
 2015-10-02 14:36:04 -07:00
Victor Woeltjen
c4aff95341 [Common UI] Add empty specs for popupService 2015-10-02 14:15:31 -07:00
Victor Woeltjen
13095b4135 [Context Menu] Update specs 
Update specs to reflect refactoring-out of popup elements
performed in the context of adding time conductor, WTD-1515.
 2015-10-02 14:14:34 -07:00
Victor Woeltjen
445f22ccb0 [Context Menu] Use popupService to display menus 2015-10-02 11:01:49 -07:00
Victor Woeltjen
1ad0bf337c [Common UI] Use popupService from mct-popup 2015-10-02 10:48:45 -07:00
Victor Woeltjen
73dc16d398 [Info Service] Render info bubble after positioning 
Render info bubble after positioning with the popupService,
to apply arrow classes appropriately.
 2015-10-02 10:21:42 -07:00
Victor Woeltjen
bebe53820f [Info Service] Choose arrow direction 2015-10-02 09:36:27 -07:00
Victor Woeltjen
dfe909d6b5 [Time Conductor] Show appropriate arrow 
...on info bubbles, when using bubbles shown via the
popupService.
 2015-10-01 16:59:12 -07:00
Henry
3cf62ded08 Plot axes do not show labels when no data 
Added semicolon

Added test for hasDomainData()

Added test for negative case on domain data check

Removed label test due to mocked telemetry formatter

Uncommented test commented by accident

Removed extra space
 2015-10-01 16:35:14 -07:00
Victor Woeltjen
6cbd3e5fae [Time Conductor] Use popupService from infoService 2015-10-01 16:25:33 -07:00
Victor Woeltjen
3050b265fb [Time Conductor] Expose popupService 2015-10-01 15:27:36 -07:00
Victor Woeltjen
5104a7990a [Time Conductor] Add popupService 
...to consolidate positioning of popups, based on
commonality between InfoService and MCTPopup.
nasa/openmctweb#104.
 2015-10-01 15:26:00 -07:00
Victor Woeltjen
571beb8df2 [Time Conductor] Add JSDoc to mct-popup 
Based on feedback from code review; WTD-1515
 2015-10-01 14:34:52 -07:00
Victor Woeltjen
bea5002752 [Search] Add test cases 
Add test cases related to throttled loading of domain
objects to index, nasa/openmctweb#141.
 2015-09-30 17:23:52 -07:00
Victor Woeltjen
d04c5e6858 [Search] Update GenericSearch spec 
nasa/openmctweb#141.
 2015-09-30 17:08:47 -07:00
Victor Woeltjen
0d1f3bf87a [Throttle] Update spec 
Conflicts:
	platform/features/layout/test/FixedControllerSpec.js
 2015-09-30 15:48:17 -07:00
Victor Woeltjen
b632926d8e [Search] Fix mutation.listen 
Update mutation.listen to match previous variable
names changes related to nasa/openmctweb#141.
 2015-09-30 13:09:55 -07:00
Victor Woeltjen
78f3f8367e [Search] Vary batch size 
When indexing for generic search, issue new batches of
requests as individual requests finish (instead of waiting
for whole batches to finish) varying size to keep the
number of outstanding requests below some maximum.

nasa/openmctweb#141
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
85ac4a9a32 [Search] Log indexing time 
...to aid in tuning of generic search parameters.
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
ef527df381 [Time Conductor] Fix throttle bug 
Fix a timing/ordering issue in throttle which
allowed some throttled invocations to be ignored.
WTD-1515
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
c2868a4573 [Time Conductor] Allow arguments for throttled functions 
WTD-1515. Ensures that bounds passed in from
the time controller get appropriately captured.
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
77c66053f3 [Search] Change indexing approach 
Change indexing approach to more carefully control the
rate at which objects are loaded to be indexed, to improve
performance. nasa/openmctweb#141.
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
2979ee90a3 Revert "[Search] Don't trigger digest cycles while indexing" 
This reverts commit 4b8a5ac0b257737ee33effc966816afca6c11b94.
Performance measurements indicates this is harmful for performance,
although this is not well-explained.
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
77c399f2a2 [Search] Don't trigger digest cycles while indexing 
Avoid triggering digest cycles while indexing;
remove extra call to $timeout
 2015-09-29 18:37:44 -07:00
Victor Woeltjen
fe8543158e [Search] Fix reindexing 
Flag domain objects as non-indexed on mutation to ensure
reindexing. Done in the context of nasa/openmctweb#141.
 2015-09-29 18:37:44 -07:00
Henry
a4f3e0d776 Plot domain labels showing 1970 if no data 2015-09-29 15:28:55 -07:00
Victor Woeltjen
866c8882ca [Search] Listen on a global mutation topic 
Listen on a global mutation topic to remove the need to retain
listeners per domain object.
 2015-09-29 11:50:30 -07:00
Victor Woeltjen
ad7d3d642e [Search] Move reindex function 
Move function used to listen for mutation changes (to trigger
reindexing) up in scope, to avoid retaining references to
domain objects via closure. nasa/openmctweb#141

Also, includes misc. whitespace normalization (provided by
code editor.)
 2015-09-29 10:54:20 -07:00
Charles Hacskaylo
333f7cb848 [Frontend] Time controller-related styling 
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
 2015-09-29 08:43:34 -07:00
Victor Woeltjen
f198c281bc [Mobile] Suppress Create button on mobile 
nasa/openmctweb#157
 2015-09-28 15:57:55 -07:00
Charles Hacskaylo
23de3917bb [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Animation added to .knob and .range;
 2015-09-27 16:24:43 -07:00
Charles Hacskaylo
badaca53d3 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Significant mods to slider scss;
Added toi-line element and hover styles;
 2015-09-25 18:12:36 -07:00
Victor Woeltjen
00ac249ee2 [Time Conductor] Position domain selector 
nasa/openmtweb#115
 2015-09-25 16:06:11 -07:00
Victor Woeltjen
00aa6821d1 Merge remote-tracking branch 'github/open117' into open115b 2015-09-25 15:31:27 -07:00
Charles Hacskaylo
e33485ec59 [Frontend] Time controller-related styling (CP > open117) 
open #1515
open #117
Further refinements to slider knob and range look;
(cherry picked from commit 63a1239)
 2015-09-25 13:57:57 -07:00
Charles Hacskaylo
afb1202865 [Frontend] Time controller-related styling (CP > open117) 
open #1515
open #117
Layout styling in datetime picker;
Modded picker to hide time selects area
when time options are null;
(cherry picked from commit 6721093)
 2015-09-25 13:57:43 -07:00
Victor Woeltjen
f5a4a370f9 [Persistence] Add persisted timestamp 
...to any domain object models loaded from persistence
which do not have one. The presence of this timestamp
is necessary for the persistence capability to determine
whether an object should be created or updated when a
request to persist is made. nasa/openmctweb#139.
 2015-09-25 11:47:59 -07:00
Victor Woeltjen
2848a8458b [Time Conductor] Avoid exception 
Avoid exception when trying to generate a single datum in
cases where there is no data yet available.
 2015-09-25 11:05:18 -07:00
Victor Woeltjen
cbaf45afe9 [Time Conductor] Update specs 
nasa/openmctweb#115
 2015-09-25 10:40:19 -07:00
Charles Hacskaylo
7a677062e4 [Frontend] Time controller-related styling (CP > open117) 
open #1515
open #117
Fixing selects;
Tweaks to constants and mixins to better
handle button dropshadowing across
themes;
(cherry picked from commit 3e34d06)
 2015-09-25 09:50:36 -07:00
Charles Hacskaylo
a7153f320f [Frontend] Time controller-related styling (CP > open117) 
open #1515
open #117
Fixing selects;
Minor tweak to normalize espresso/.../mixins.scss;
(cherry picked from commit 2866d56)
 2015-09-25 09:50:02 -07:00
Charles Hacskaylo
b3da6edd0c [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Significant new vals added to constants files
for datetime picker/calendar;
Styling for calendar, hover and selected states;
Modded DateTimePickerController.js and markup
to allow selection of out-of-month cells;
 2015-09-24 18:36:56 -07:00
Victor Woeltjen
ff1fd26efc [Time Conductor] Change method name 
Prefer simpler method names for public API.
 2015-09-24 17:09:06 -07:00
Victor Woeltjen
4ced6c44a6 [Time Conductor] Ignore empty series 
...when updating Fixed Position view.
 2015-09-24 17:01:50 -07:00
Charles Hacskaylo
67f627b51f [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Commit prior to redoing markup of picker to use flex instead of table;
Styling in picker; tabular styles fixed somewhat;
 2015-09-24 16:42:45 -07:00
Charles Hacskaylo
1d83516982 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Significant re-org in menus.scss continued:
Refactored s-menu to s-menu-btn;
moved look-related style def's into .s-menu;
.menu now extends .s-menu;
 2015-09-24 15:38:52 -07:00
Charles Hacskaylo
9e64dfe3b9 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Tweaks to tick spacing;
 2015-09-24 14:31:26 -07:00
Charles Hacskaylo
09f5fa42ab Merge branch 'open1515' of https://github.com/nasa/openmctweb into open117 2015-09-24 14:21:38 -07:00
Charles Hacskaylo
54a077a4e2 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Tweak to mixin "test";
 2015-09-24 14:20:25 -07:00
Victor Woeltjen
cc6b6538d5 Merge branch 'open1515' into open115 2015-09-24 12:19:08 -07:00
Victor Woeltjen
0c7de98195 [Time Conductor] Use active domain in binary search 2015-09-24 12:18:47 -07:00
Charles Hacskaylo
404d1e7801 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Begin work on styling the datetime picker;
 2015-09-24 11:29:28 -07:00
Victor Woeltjen
1214a32c26 [Common UI] Avoid apply-in-a-digest 
Don't invoke  from mct-resize when first observing
an element's size during linking; observed issue in the
context of adding domain selector to time conductor.
 2015-09-24 11:20:07 -07:00
Victor Woeltjen
6bd8e7a47c Merge remote-tracking branch 'github/master' into open1515 2015-09-24 11:17:13 -07:00
Charles Hacskaylo
825d93cee3 [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Changed slider elements layout from relative to
absolute positioning;
Refined layout in input-holder;
Tweaks to hover classes;
 2015-09-24 10:34:32 -07:00
Charles Hacskaylo
9f7dc1da9b [Frontend] Time Controller Markup and Styling 
open #1515
open #117
Styling for boundary inputs and
slider;
 2015-09-23 18:59:36 -07:00
Victor Woeltjen
3d8aec2d01 [Time Conductor] Pass domain with events 2015-09-23 17:26:56 -07:00
Victor Woeltjen
928e31b548 [Common UI] Avoid apply-in-a-digest 
Don't invoke  from mct-resize when first observing
an element's size during linking; observed issue in the
context of adding domain selector to time conductor.
 2015-09-23 17:22:32 -07:00
Victor Woeltjen
f182d1f2c4 [Time Conductor] Include domain selection in requests 
...as well as use as default in a telemetry series.
 2015-09-23 17:14:40 -07:00
Victor Woeltjen
d238b669a5 [Time Conductor] Show domain options 2015-09-23 17:09:38 -07:00
Victor Woeltjen
5d5a7c26c5 [Time Conductor] Maintain domain state 
Maintain domain state in the time conductor; add a default list of
domains to choose from.
 2015-09-23 16:53:12 -07:00
Victor Woeltjen
0260e6fff4 Merge branch 'open1515' into open115 2015-09-23 16:05:09 -07:00
Charles Hacskaylo
9811443c71 Merge branch 'master' into open117 2015-09-23 15:54:48 -07:00
Pete Richards
6ce4ce6ada Merge remote-tracking branch 'github-open/open139-1' into open-master 2015-09-23 13:51:55 -07:00
Pete Richards
70bc17c79f Merge remote-tracking branch 'github-open/open97' into open-master 2015-09-23 13:44:48 -07:00
Victor Woeltjen
056b0c8c5b [Fixed Position] Use spaces instead of tabs 
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
 2015-09-23 12:59:04 -07:00
Victor Woeltjen
fa60d62039 [Entanglement] Simplify test case 
...per review feedback from nasa/openmctweb#98
 2015-09-23 12:49:04 -07:00
Victor Woeltjen
082122ddec [Entanglement] Move policyService.allow.andReturn 
...to locations where the specified return value
can be more closely correlated to the relevant
test cases. nasa/openmctweb#98
 2015-09-23 12:46:23 -07:00
Victor Woeltjen
6dbccd5000 [Entanglement] Update test cases around error-throwing 
...per code review feedback, nasa/openmctweb#97
 2015-09-23 12:43:03 -07:00
Victor Woeltjen
dbe1875e70 [Themes] Resolve conflicts 
Resolve conflicts in preparation for merge, nasa/openmctweb#118
 2015-09-22 16:12:44 -07:00
Victor Woeltjen
97892869ae [Entanglement] Move composition check up 
Move check for composition up higher in the sequence of
if-blocks in the validation step of linking; remove
fallback to [] for undefined composition, which is no
longer necessary as a consequence of this.

nasa/openmctweb#98
 2015-09-22 15:53:27 -07:00
Victor Woeltjen
8db334e45b Revert "[LinkService] Reorder/refactor validation" 
This reverts commit c17269ba8b.
 2015-09-22 15:51:15 -07:00
Victor Woeltjen
4743833f7c [Entanglement] Verify revalidation 
Verify that move/copy/link revalidate when performed and
throw errors when moving/copying/linking would be invalid.
nasa/openmctweb#98
 2015-09-22 15:49:22 -07:00
Victor Woeltjen
6996883b85 [Entanglement] Update specs 
Update specs for move/copy/link services to account
for re-validation at time an action is performed.
nasa/openmctweb#98
 2015-09-22 15:42:39 -07:00
Victor Woeltjen
119403e71c [Entanglement] Throw errors if validation is skipped 
...per feedback from nasa/openmctweb#98
 2015-09-22 14:39:15 -07:00
Victor Woeltjen
ff24f06475 [Entanglement] Add JSDoc 
...per feedback from nasa/openmctweb#98
 2015-09-22 14:10:06 -07:00