Commit Graph

297 Commits

Author SHA1 Message Date
c6405c50df Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 10:00:21 -07:00
1961ba20c0 Fixing merge
Re-added the tests.
2015-06-25 09:59:52 -07:00
288692f57c Fixing merge
Re-added the event list controller.
2015-06-25 09:57:43 -07:00
a993ee6126 Fixing conflicts 2015-06-25 09:48:09 -07:00
163b210fbb [Events] Real-time telemetry version
Creating an additional event list which can handle real
time data, not historical data. #18.
2015-06-25 09:39:29 -07:00
f6298c162c [Events] Real-time telemetry version
Creating an additional event list which can handle real
time data, not historical data. #18.
2015-06-25 09:27:24 -07:00
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
d2fe71d82b [Events] Fixed tabs
Removed tabs from EventListController and replaced
with spaces. #18.
2015-06-24 17:08:03 -07:00
203de023d2 [Events] More general view policy
The Messages view policy now will allow any object
that has a telemetry type of string to have access
to the Messages view, not just Event List
Generators. (The test for this still does not work
though.) #18.
2015-06-24 17:05:14 -07:00
10e47e6f48 [Events] Fixed comments
Fixed comments to refer to event lists
correctly. #18.
2015-06-24 13:14:19 -07:00
adc4a1b828 [Events] Tweaked tests
Changed some test names to be more descriptive.
Moved the policy test to another folder.
Blanket coverage now works. #18.
2015-06-24 12:11:04 -07:00
fdfa35d1da [Frontend] New symbols font and CSS adjustments
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
2015-06-24 11:42:29 -07:00
ff8e6f40bb [Events] More style
Edited comments to clarify the sources of
files. #18.
2015-06-24 11:32:13 -07:00
e7ce0f2ded Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-24 11:26:52 -07:00
ebfb4cd055 [Events] Removed mct-data-table test
Removed the test for MCTDataTable because it
is a directive. #18.
2015-06-24 11:20:38 -07:00
86240a337f [Events] Controller and populator tests
Created tests for EventListController and
EventListPopulator. #18.
2015-06-24 11:17:30 -07:00
54cf5a2c59 [Events] Changed where row reversal happens
Changed where in the code the row are reveresd
(wrt scrolling lists) so that the most recent
messages are on the bottom. The rows are now in
the correct order from getRows, rather then
updateRows. #18.
2015-06-24 11:16:03 -07:00
e7598adcee [Events] View policy test
Created a test for the MessagesViewPolicy. #18.
2015-06-24 10:40:03 -07:00
ba1f86da25 [Events] Restricted when view avaliable
Created a new policy to only allow the Messages view
to be avaliable for Event Message Generators. #18.
2015-06-24 10:15:09 -07:00
f617a01a4d Ticket WTD-1315
Merge branch 'open-master' into open475
2015-06-24 09:56:08 -07:00
2a9aa7ee2f [Events] Beginning test setup
The files needed to write the tests are in place. #18.
2015-06-23 15:54:48 -07:00
567ccf0454 [Events] More style
Removed part of comment. #18.
2015-06-23 15:42:22 -07:00
5d2afac83b [Events] Window injected with Angular
Used  provided by angular to better follow
style guidelines, as well as for utility in testing
later. #18.
2015-06-23 15:40:12 -07:00
5da210d350 [Events] More style compliance
More small changes for style. #18.
2015-06-23 15:09:34 -07:00
7d3c2b7243 [Events] Style compliance
Made some small changes to keep up with
the style standards. #18.
2015-06-23 14:47:21 -07:00
c4006646f8 [Events] More generalized data format
Made the EventListController use domain and range types, rather
than severity, domain, and event message. This allows it to be
more generalized, which should be helpful with different data
formats later on. #18.
2015-06-23 14:21:11 -07:00
9609987562 [Events] Scrollbar moves with data
The scroll position now moves down when a new row is added
to the data table. This means that when the scroll position
is at the bottom, it will stay there, even with new updates
adding onto the botton. #18.
2015-06-23 13:33:09 -07:00
fdab799e5b [Events] Changed directive variables
Changed scrollDirection to ascendingScroll, which acts like
a boolean. Now there is proper communication between the
html and the directive itself. #18.
2015-06-23 12:40:50 -07:00
3337777fea [Events] Changed file structure
Changed file structure to include a separate
directives directory. #18.
2015-06-23 11:48:08 -07:00
a5d5fa0796 [Events] Table height detection
Created an mct-data-table directive. We are able to detect changes in
the height of the table now, which will be used to determine
any corresponding scrolling. #18.
2015-06-23 11:37:57 -07:00
7be7844824 [Events] Reversed viewing order
When viewing an event message generator new messages are now added to the
bottom of the display, rather than being added to the top and pushing
the other messages down by one. #18.
2015-06-22 13:40:55 -07:00
0feb3b0462 Merge branch 'open18' of https://github.com/slhale/openmctweb into open18 2015-06-22 12:37:15 -07:00
7493f76d06 Merge branch 'open-master' into open1313 2015-06-22 10:11:00 -07:00
5ca954deaf [Plot] Test fallback on webglcontextlost
Add test case to verify that fallback occurs when a
WebGL context is lost, WTD-475.
2015-06-19 16:14:49 -07:00
a82fea2166 Merge pull request #5 from nasa/open1202
[Plot] Improve plotting performance
2015-06-19 16:05:18 -07:00
b6fdf4d6ab [Plot] Fall back from WebGL on context loss
When a WebGL context is loss, fall back to displaying
plots using regular canvas 2d API. WTD-475.
2015-06-19 16:02:52 -07:00
dac44623ee [Plot] Begin adding WebGL fallback
Begin adding code to handle case where WebGL context
is lost, WTD-475.
2015-06-19 15:47:22 -07:00
ae7dae011b [Dev/Frontend] New example event generator and event view
WTD-1304
github open18
New example generator;
New temporary view: features/events;
Updated scss and css;
2015-06-19 15:29:06 -07:00
b879de1a33 Merge branch 'open-master' into open1182 2015-06-19 12:22:05 -07:00
8d80a2aee1 Merge branch 'open-master' into open1182 2015-06-18 18:23:19 -07:00
70e1a8ad9e [Frontend] Mods to layout element drag handles and editing behavior
WTD-951
layout.html:
Added classes to and removed inline styles from drag handles,
Removed edge handles, leaving corner handles in NW, SW and SE only;
Added hover classes to display corner handles while editing;
Modified z-indexing to allow view switcher to be accessed while editing;
2015-06-16 12:40:48 -07:00
a984e60ca5 [Frontend] Mods to layout element editing handles
WTD-951
In-progress checkin
2015-06-16 10:48:31 -07:00
f6eb9904ff Merge remote-tracking branch 'nasa/open839' into open839 2015-06-15 16:48:33 -07:00
d03cab21b2 Merge remote-tracking branch 'nasa/open949' into open839 2015-06-15 16:47:58 -07:00
d8a66b426f [Merge] Merging open-master in; resolved conflicts 2015-06-15 16:47:23 -07:00
6e7203a49f [Merge] Cherrypick 2 from warp1220
WTD-1220
2015-06-15 15:45:40 -07:00
5193c62233 [Merge] Cherrypick 1 from warp1220
WTD-1220
2015-06-15 15:44:09 -07:00
7c7b79e151 [Config] Changed priority from mandatory to preferred
WTD-949
2015-06-12 19:00:55 -07:00
8f153d4e75 [Fronted] Significant refactoring of mixins for containers and buttons
WTD-839
Removal of 'icon-btn' class from *.html;
Cleanup of markup in switcher.html;
'name' span is now hidden when switcher is within frame;
Commented out unused css classes in _controls.scss,
Normalization of markup in object header when in main view and framed objects;
Icon sizing fixed in menus and switcher control;
Tightened up spacing in menus;
2015-06-12 11:44:09 -07:00
af0c2e7827 [Fronted] Significant refactoring of mixins for containers and buttons
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Cleanup of markup to remove 'icon' class from invoke-menu elements;
2015-06-12 10:00:51 -07:00