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

476 Commits

Author SHA1 Message Date
shale
07e08c283a [Search] Partway works 
The search function now returns actual
objects are results. They may not be the
correct results though.
 2015-07-14 09:36:58 -07:00
shale
89d0ea6506 [Search] Fixed uninitialized array bug 2015-07-14 09:17:14 -07:00
shale
75ce5cd0e9 [Search] Changed variable names 
Because of the async funtion, changed
variable names in serach2 to make more clear.
 2015-07-13 17:05:23 -07:00
shale
b994b2a862 [Search] Style 2015-07-13 16:57:27 -07:00
shale
3cb0b41b22 [Search] Poking around EasticSearch 
Sucessfully queries elasticsearch, but displaying the
results poses problems because of asych things.
 2015-07-13 16:53:48 -07:00
shale
5980575918 [Search] Fixed results display problem 
Fixed problem with search results not
properly being displayed in the search
view. (Checked that things were defined
before calling them.)
 2015-07-13 11:14:02 -07:00
shale
409d12aa75 [Search] Created QueryService 
Created a query service which handles the
creation of the searchable list of items.
This has partially broken the search view.
 2015-07-13 10:34:06 -07:00
shale
03c0678cbe [Search] Syle modifications 
Changed 'i += 1' in for loops to 'i++'
 2015-07-10 16:54:42 -07:00
shale
04257aedae [Search] Gets user input 
Now sucessfully gets user input for the
search term.
 2015-07-10 16:52:00 -07:00
shale
33b30f7583 [Search] Removed unnecissary variable 
Removed $scope.items, because it was unnecissary.
 2015-07-10 15:16:50 -07:00
shale
8eda495aa7 [Search] Results without folders 
Folders are now no longer included in
the results list.
 2015-07-10 15:06:19 -07:00
shale
a337e04fae [Search] Removed unnecessary file 
Removed search-item.html, as it was the same as
grid-item.html. Now search.html uses grid-item.html.
 2015-07-10 14:51:18 -07:00
shale
2e7f23a766 [Search] Results list displayed 
After searching, a results list is displayed.
The list is composed of grid-items.
 2015-07-10 14:48:15 -07:00
shale
6d1cb85a07 [Search] Not case sensitive 
Search is no longer case sensitive.
 2015-07-10 14:20:04 -07:00
shale
b5756d2b99 [Search] Items list updating 
The search results now updates the items
list when called to make sure that it gets
all of the recently added items.
 2015-07-10 12:53:12 -07:00
shale
efba0f0236 [Search] Search results by name 
doSearch() does search by getting each
object's name. Still buggy.
 2015-07-10 12:44:07 -07:00
shale
4e39c4f900 [Search] Finds root folder 
The search controller will now search from
the root folder (My Items) even when the view
is initiated from a folder inside of the tree.
 2015-07-10 10:32:58 -07:00
shale
e339ee1dd1 [Search] Asynchronous recursion 
The list creation now sucessfully goes 1 level
deep into the tree for objects. Still needs
more work to delve into subfolders.
 2015-07-09 14:40:52 -07:00
shale
94b306e129 [Search] Listify filetree 
SearchController now attempts to convert the filetree
into a list format. Still needs to be modified to be
asynchronous.
 2015-07-09 11:16:55 -07:00
shale
32eaf3893a [Search] Display search items 
The search view now very rudimentarily displays
some 'search-item's.
 2015-07-08 16:20:12 -07:00
shale
845b9a2faa [Search] Fixed comments 2015-07-08 15:34:09 -07:00
shale
5870248617 [Search] Search framework 
Created a basic framework for a search
view. It consists of a search bar and
a results list.
 2015-07-08 15:32:20 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner 
WTD-1404
WTD-1376
 2015-06-30 09:27:56 -07:00
Victor Woeltjen
5f80fcabc6 [Imagery] Clear background image 
Clear background image on change, WTD-1407.
 2015-06-29 18:49:36 -07:00
Victor Woeltjen
397a545482 [Plot] Expand range to give margin for points 
Expand range to give some margin for points near the edge,
WTD-1406.
 2015-06-29 18:08:03 -07:00
Victor Woeltjen
fa8095d5bc Merge branch 'open-master' into open1317limits2 
WTD-1405

Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
 2015-06-29 17:30:33 -07:00
Victor Woeltjen
0b4aa730f4 Merge pull request #30 from slhale/open26 
[Events] Create tests for real time version
 2015-06-29 15:42:33 -07:00
Victor Woeltjen
87f982b03e Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5 Merge branch 'open1233' into open-master 2015-06-29 15:09:40 -07:00
larkin
cc64412d78 Merge remote-tracking branch 'origin/open1344' into open-1348 2015-06-29 14:58:27 -07:00
larkin
52cf918d08 Merge remote-tracking branch 'origin/open1317' into open-1346 2015-06-29 14:44:24 -07:00
Sarah Hale
2ab3932ce1 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 14:43:19 -07:00
Sarah Hale
f816b5018a [Events] Style 
Removed unused variables. #26.
 2015-06-29 13:15:56 -07:00
Victor Woeltjen
ebbac233aa Merge branch 'open1373' into open-master 2015-06-29 13:15:43 -07:00
Sarah Hale
b91b197f5b [Events] Comments 
Removed todo comment. #26.
 2015-06-29 13:14:51 -07:00
Sarah Hale
14694c675b [Events] All tests work 
All of the tests for the RT Events are working. #26.
 2015-06-29 13:13:05 -07:00
Sarah Hale
56c3e72d32 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 13:10:46 -07:00
Sarah Hale
6616dedf63 [Events] Controller test correction 
Test for the RT Event List controller now
actually works. #26.
 2015-06-29 13:09:15 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338 
Resolve merge conflicts due to whitespace changes.
 2015-06-29 12:08:16 -07:00
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -07:00
Sarah Hale
4c6b3c7a13 [Events] Policy test correction 
The view policy test for real time Messages
actually now works. #26.
 2015-06-29 09:56:59 -07:00
Sarah Hale
d120c8b139 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 09:10:23 -07:00
Victor Woeltjen
762f4d59fc [Layout] Disallow folders 
Disallow layouts in folders, WTD-1373.
 2015-06-27 12:43:32 -07:00
Sarah Hale
4e03d7b29b [Events] RT Messages policy test 
The view policy test for real time Messages
now works. #26.
 2015-06-26 15:17:17 -07:00
larkin
d729cfcd3e Merge remote-tracking branch 'origin/open1329' into open1343 2015-06-26 15:13:21 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Sarah Hale
41e75d7494 [Events] EventListController test 
Test for the Event List controller now works. #26.
 2015-06-26 14:59:04 -07:00
Sarah Hale
95f9d783d3 [Events] Column tests working 
Tests for the domain and range columns now work
for the real time event list. #26.
 2015-06-26 14:23:41 -07:00
Victor Woeltjen
286ac5628b [Drag-Drop] Check for default prevented correctly 
Check for defaultPrevented property instead of trying
to check nonexistent method isDefaultPrevented(); for
WTD-1354 in the context of WTD-1233.
 2015-06-26 11:53:45 -07:00
Victor Woeltjen
f681d07643 Merge branch 'open-master' into open1233 2015-06-26 11:50:48 -07:00
Sarah Hale
750d3f473e [Events] Starting tests 
Starting to write tests for the real
time messages view. #26.
 2015-06-25 15:04:53 -07:00
Sarah Hale
bf8b0bae03 Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 14:51:18 -07:00
Sarah Hale
42361aff25 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-25 14:50:32 -07:00
Sarah Hale
c98a381a42 [Events] Created RT Messages 
Created a real-time version of the Messages view called
RT Messages.
Additionally, fixed the MessagesViewPolicy test. #18.
 2015-06-25 14:36:14 -07:00
Victor Woeltjen
510597a51a [Scrolling List] Show limits in RT scrolling list 
Show limits in a real-time scrolling list view,
WTD-1317.
 2015-06-25 12:56:22 -07:00
Victor Woeltjen
dddc2f976e Merge branch 'open1223' into open1317limits 
Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
 2015-06-25 12:48:02 -07:00
Victor Woeltjen
e17b6c5a92 Merge branch 'open-master' into open1317limits 2015-06-25 12:45:03 -07:00
Victor Woeltjen
bd5ba48270 Merge remote-tracking branch 'github/master' into open-master 2015-06-25 12:05:34 -07:00
Victor Woeltjen
3df12788f9 Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 11:53:13 -07:00
Charles Hacskaylo
685e384858 [Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection 
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
 2015-06-25 11:46:15 -07:00
Victor Woeltjen
61fe77cc17 [Drag-Drop] Add test cases 
Add test cases for avoiding redundant drop handling,
WTD-1233.
 2015-06-25 11:35:18 -07:00
Victor Woeltjen
6f3d6ec12f [Drag-Drop] Prevent redundant drops 
Mark default as prevented and check for prevention of
default when handling mctDrop events (which allow
views to follow up on drop gestures by positioning
objects within themselves) avoiding redundant drops
into embedded views. WTD-1233.
 2015-06-25 11:27:58 -07:00
larkin
a3f3f5bb27 Merge remote-tracking branch 'origin/open1170' into open-1318 2015-06-25 11:06:44 -07:00
Victor Woeltjen
482f355a08 [Fixed Controller] Stop tracking bounds 
Stop tracking size of a fixed position view; no longer
necessary now that background grid is handled by CSS.
Change made in the context of WTD-1344.
 2015-06-25 11:00:15 -07:00
Victor Woeltjen
9e55befb2a [Fixed Controller] Add test cases 
Add test cases for updating position of elements in
a fixed position view, WTD-1344.
 2015-06-25 10:58:01 -07:00
Victor Woeltjen
4279c9e4bf [Fixed Position] Remove obsolete cell styles 
Remove obsolete cell style calculations; background
grid is handled by CSS now. Changed in the context of
WTD-1344.
 2015-06-25 10:48:49 -07:00
Victor Woeltjen
791504584d [Fixed Position] Update positions when grid size changes 
Update positions of elements in a fixed position
view when grid size changes (e.g. when switching
from one domain object to another.) WTD-1344.
 2015-06-25 10:45:50 -07:00
Victor Woeltjen
70f5a001ee Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 10:06:18 -07:00
Sarah Hale
c6405c50df Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 10:00:21 -07:00
Sarah Hale
1961ba20c0 Fixing merge 
Re-added the tests.
 2015-06-25 09:59:52 -07:00
Sarah Hale
288692f57c Fixing merge 
Re-added the event list controller.
 2015-06-25 09:57:43 -07:00
Sarah Hale
a993ee6126 Fixing conflicts 2015-06-25 09:48:09 -07:00
Sarah Hale
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
Sarah Hale
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
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
Victor Woeltjen
40957b1c29 [Scrolling List] Enforce row count 
WTD-1317
 2015-06-25 08:50:44 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
Victor Woeltjen
a7c09f8c79 [Scrolling List] Add realtime scrolling list 
Add realtime scrolling list view, for compatibility
with realtime-only data. WTD-1317.
 2015-06-24 18:10:59 -07:00
Sarah Hale
d2fe71d82b [Events] Fixed tabs 
Removed tabs from EventListController and replaced
with spaces. #18.
 2015-06-24 17:08:03 -07:00
Sarah Hale
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
Sarah Hale
10e47e6f48 [Events] Fixed comments 
Fixed comments to refer to event lists
correctly. #18.
 2015-06-24 13:14:19 -07:00
Victor Woeltjen
bcfe80fbdc [Plot] Handle changes to telemetry objects 
Handle changes to the set of visible telemetry objects
in a plot; addresses WTD-619, which is related to WTD-1329.
 2015-06-24 12:54:49 -07:00
Sarah Hale
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
Charles Hacskaylo
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
Sarah Hale
ff8e6f40bb [Events] More style 
Edited comments to clarify the sources of
files. #18.
 2015-06-24 11:32:13 -07:00
Sarah Hale
e7ce0f2ded Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-24 11:26:52 -07:00
Sarah Hale
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
Sarah Hale
86240a337f [Events] Controller and populator tests 
Created tests for EventListController and
EventListPopulator. #18.
 2015-06-24 11:17:30 -07:00
Sarah Hale
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
Sarah Hale
e7598adcee [Events] View policy test 
Created a test for the MessagesViewPolicy. #18.
 2015-06-24 10:40:03 -07:00
Sarah Hale
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
Sanderfer
f617a01a4d Ticket WTD-1315 
Merge branch 'open-master' into open475
 2015-06-24 09:56:08 -07:00
Sarah Hale
2a9aa7ee2f [Events] Beginning test setup 
The files needed to write the tests are in place. #18.
 2015-06-23 15:54:48 -07:00
Sarah Hale
567ccf0454 [Events] More style 
Removed part of comment. #18.
 2015-06-23 15:42:22 -07:00
Sarah Hale
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
Sarah Hale
5da210d350 [Events] More style compliance 
More small changes for style. #18.
 2015-06-23 15:09:34 -07:00
Sarah Hale
7d3c2b7243 [Events] Style compliance 
Made some small changes to keep up with
the style standards. #18.
 2015-06-23 14:47:21 -07:00
Victor Woeltjen
d1dc2da4c8 [Plot] Remove unused function 
Remove unused function related to enforcing fixed duration
in plots, WTD-1273.
 2015-06-23 14:40:32 -07:00
Sarah Hale
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
Victor Woeltjen
d6a31dcef3 [Plot] Update failing specs 
Update failing specs for changes related to fixed duration
plots, WTD-1273.
 2015-06-23 14:17:28 -07:00