7bd0e279b0
Merge remote-tracking branch 'github/master' into open182
...
Merge latest from master branch into topic branch for
nasa/openmctweb#182
2015-10-27 11:49:36 -07:00
82b321b3f9
[Time Conductor] Update displayed text when format changes
2015-10-27 10:28:32 -07:00
aa23d358cc
[Time Conductor] Use formatService instead of timeService
2015-10-26 10:03:49 -07:00
3d996ac466
[RequireJS] Specify path for uuid
...
Specify path for uuid, making it available for any code that would require it,
without that code needing to know the path to it.
Fixes https://github.com/nasa/openmctweb/issues/211 .
2015-10-23 16:32:05 -07:00
111b3bac09
[Time Conductor] Remove dateService
...
Replaced by timeService
2015-10-22 16:27:21 -07:00
b4dd95490c
[Time Conductor] Don't treat defaults as invalid
2015-10-22 16:07:21 -07:00
16e4c32709
[Time Conductor] Remove now dependency, fix domain switch
...
Remove dependency on now (current time can be retrieved via
timeService); fix domain-switching behavior such that changes
to time systems are reflected in changes to default bounds.
2015-10-22 16:05:09 -07:00
a154c9c870
[Time Conductor] Use timeService from control
2015-10-22 15:51:12 -07:00
4ff03b081d
[Time Conductor] Suppress date picker for non-UTC time systems
2015-10-22 13:08:37 -07:00
e8d7093eb5
[Time Conductor] Use time systems from time conductor
2015-10-22 13:07:04 -07:00
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
950578f09b
[Time Conductor] Hide datetime pickers for non-UTC domains
2015-10-22 12:20:15 -07:00
117470068a
[Time Conductor] Use dateService from TimeRangeController
2015-10-22 12:17:08 -07:00
0d47b7c47d
[Time Conductor] Expose dateService in bundle definition
2015-10-22 12:10:12 -07:00
c882b2d4c3
[Time Conductor] Implement date provider
...
Implement UTCDateProvider sufficient to pass spec.
2015-10-22 12:08:34 -07:00
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
6b42d3bf4b
[Time Conductor] Test DateAggregator
2015-10-22 11:54:46 -07:00
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
dbebf08500
[Time Controller] Add test cases
...
...to verify behavior on text entry of dates.
2015-10-21 15:38:58 -07:00
847c356063
[Time Controller] Change color when input is invalid
...
nasa/openmctweb#181
2015-10-21 15:26:42 -07:00
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
f88e8ebb51
[Time Controller] Update model state for text entry
2015-10-21 15:08:44 -07:00
6d2b2fd81e
[Time Controller] Parse user-entered timestamps
...
nasa/openmctweb#181 .
2015-10-21 14:46:12 -07:00
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
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
fb0ce1eca8
[Frontend] New .loading class
...
open #190
Removed old .loading styles previously
commented out;
2015-10-19 11:13:50 -07:00
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
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
8c29c8ed0e
Merge remote-tracking branch 'github-open/open151' into open-master
2015-10-09 13:38:20 -07:00
756f728865
Merge remote-tracking branch 'github/open1515' into open-master
2015-10-09 10:11:11 -07:00
12c6e53939
Merge remote-tracking branch 'github-open/open157' into open-master
2015-10-09 09:47:23 -07:00
d902943552
[Time Conductor] Satisfy JSLint
...
...in preparation to merge pull request nasa/openmctweb#162
2015-10-09 09:36:57 -07:00
5f7c8ccadb
Merge remote-tracking branch 'github/master' into open117b
2015-10-09 09:35:07 -07:00
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
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
ebd8fdeee3
[Time Conductor] Enforce inner minimums on outer changes
2015-10-09 07:32:46 -07:00
f738f84075
[Time Conductor] Enforce minimum outer span
2015-10-08 16:02:47 -07:00
cc19a0acba
[Time Conductor] Enforce minimum inner span
...
nasa/openmctweb#151 .
2015-10-08 15:51:23 -07:00
1ca2b769d9
[Common UI] Test popupService
2015-10-02 15:44:36 -07:00
a1d1261179
[Common UI] Test Popup
2015-10-02 14:58:20 -07:00
99048a4ee3
[Info Service] Update spec
...
...to reflect usage of popupService.
2015-10-02 14:49:27 -07:00
553b17fafe
[Common UI] Update mct-popup spec
...
...to reflect usage of popupService.
2015-10-02 14:36:04 -07:00
c4aff95341
[Common UI] Add empty specs for popupService
2015-10-02 14:15:31 -07:00
1ad0bf337c
[Common UI] Use popupService from mct-popup
2015-10-02 10:48:45 -07:00
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
bebe53820f
[Info Service] Choose arrow direction
2015-10-02 09:36:27 -07:00
dfe909d6b5
[Time Conductor] Show appropriate arrow
...
...on info bubbles, when using bubbles shown via the
popupService.
2015-10-01 16:59:12 -07:00
6cbd3e5fae
[Time Conductor] Use popupService from infoService
2015-10-01 16:25:33 -07:00
3050b265fb
[Time Conductor] Expose popupService
2015-10-01 15:27:36 -07:00
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