Pete Richards
9523c918fb
Merge remote-tracking branch 'github-open/open182' into open-master
2015-11-03 15:52:14 -08:00
Victor Woeltjen
cecc52f0a9
[Time Conductor] Update formatService usages
...
...to remove checks for unknown formats.
2015-11-02 12:28:46 -08:00
Charles Hacskaylo
485e6a9de1
[wtf] Merge open155 > github/master
...
open #155
open #186
WTF yet again getting merge conflicts when remerging open155;
2015-10-30 16:24:20 -07:00
Charles Hacskaylo
1e6731e6f2
Merge open155 > github/master
...
open155
open186
Trying a third time to resolve conflicts between open155 and master;
2015-10-30 16:20:57 -07:00
Victor Woeltjen
796d6b800a
[Time Conductor] Add JSDoc for params
2015-10-30 14:08:11 -07:00
Victor Woeltjen
b12bb55495
[Time Conductor] Update text on format change
...
...in a date-time field.
2015-10-30 13:57:21 -07:00
Victor Woeltjen
f42498ab60
[Time Conductor] Update specs
...
...to reflect changes to how unspecified versus unknown formats
are handled.
2015-10-30 13:53:33 -07:00
Victor Woeltjen
7f571415dc
[Time Conductor] Change format handling
...
Use default format when no format is specified, and throw an
error when a specified format is unrecognized, from both
date-time field controller and time range controller.
2015-10-30 13:28:01 -07:00
Victor Woeltjen
9e8152719f
[Time Conductor] Add spec
...
Add spec for DateTimeFieldController, bringing over test cases
removed from TimeRangeController.
2015-10-27 17:12:03 -07:00
Victor Woeltjen
8ba112498b
[Time Conductor] Add test case for formats
...
Add test case to TimeRangeController to reflect that it responds
to changes in format selection.
2015-10-27 15:57:44 -07:00
Victor Woeltjen
44fc9423df
Merge branch 'open-master' into open182
...
Merge in latest from master branch into topic branch
for nasa/openmctweb#182
2015-10-27 15:54:18 -07:00
Victor Woeltjen
920c83771d
[Time Conductor] Update spec
...
...for TimeRangeController to reflect separation of date-time
inputs into a separate control.
Additionally, removed unused function.
2015-10-27 14:06:02 -07:00
Victor Woeltjen
9dce3a04cc
[Time Conductor] Remove obsolete code
...
Remove code related to handling text input from TimeRangeController;
moved into DateTimeFieldController.
2015-10-27 13:07:58 -07:00
Victor Woeltjen
18cdaf1b53
[Time Conductor] Fix extension definition
...
For date time field controller; refer to correct implementation.
2015-10-27 13:03:04 -07:00
Victor Woeltjen
e5d4376f06
[Time Conductor] Use date time field
...
...from template for time controller.
2015-10-27 13:01:27 -07:00
Victor Woeltjen
6784c6567b
[Time Conductor] Add date-time field
...
Add mct-control which includes both the date-time picker and
its corresponding text entry area, per code review feedback
from nasa/openmctweb#204 .
2015-10-27 13:00:42 -07:00
Victor Woeltjen
71618ce4b9
[Time Conductor] Hide date-picker for non-UTC formats
2015-10-27 12:40:14 -07:00
Charles Hacskaylo
5d5425db04
[Frontend] Finessing and verifying CSS
...
vista#54
Verified against fixed position and scrolling views
using SineWave generator;
font-size of glyph tweaked;
2015-10-27 11:50:16 -07:00
Charles Hacskaylo
a8856c0612
[Frontend] Platform-specific mods to limits
...
vista#54
Refactor limits into multiple classes, separating
upr/lwr from red/yellow;
Modded SineWaveLimitCapability accordingly;
Normalized upr/lwr glyphs;
(cherry picked from commit a26d71b)
2015-10-27 11:43:28 -07:00
Victor Woeltjen
82b321b3f9
[Time Conductor] Update displayed text when format changes
2015-10-27 10:28:32 -07:00
Victor Woeltjen
aa23d358cc
[Time Conductor] Use formatService instead of timeService
2015-10-26 10:03:49 -07:00
Henry
789b640b9b
Refactored dismiss and minimize out of NotificationService and on to returned Notification type
2015-10-23 16:28:42 -07:00
Henry
e3ef68bc6f
Fixed jslint errors
2015-10-22 16:41:09 -07:00
Henry
83276d70d3
Removed MessageSeverity enum and MessageController
2015-10-22 16:29:10 -07:00
Victor Woeltjen
111b3bac09
[Time Conductor] Remove dateService
...
Replaced by timeService
2015-10-22 16:27:21 -07:00
Victor Woeltjen
b4dd95490c
[Time Conductor] Don't treat defaults as invalid
2015-10-22 16:07:21 -07:00
Victor Woeltjen
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
Victor Woeltjen
a154c9c870
[Time Conductor] Use timeService from control
2015-10-22 15:51:12 -07:00
Henry
109ae3323d
Added jsdoc and moved MessageController to dialogs from notifications
2015-10-22 15:10:53 -07:00
Henry
0053989de8
renamed dialog and notification 'actions' to 'options'
2015-10-22 14:14:21 -07:00
Victor Woeltjen
4ff03b081d
[Time Conductor] Suppress date picker for non-UTC time systems
2015-10-22 13:08:37 -07:00
Victor Woeltjen
e8d7093eb5
[Time Conductor] Use time systems from time conductor
2015-10-22 13:07:04 -07:00
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
Charles Hacskaylo
fb0ce1eca8
[Frontend] New .loading class
...
open #190
Removed old .loading styles previously
commented out;
2015-10-19 11:13:50 -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
Henry
f08725b6a2
Fixed jshint errors
2015-10-14 16:22:11 -07:00