ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 01:18:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
6,627 Commits 988 Branches 212 Tags 191 MiB
257a8e2e2d
Commit Graph

227 Commits

Author SHA1 Message Date
Victor Woeltjen
4f0e3fdf85 [Timeline] Test zoom controller's width 2016-05-31 16:21:40 -07:00
Victor Woeltjen
be9f56107c [Timeline] Remove obsolete test cases 2016-05-31 16:15:57 -07:00
Victor Woeltjen
787f3815df [Timeline] Expose width from ZoomController 
...and ensure that the width exposed is not excessively
large; fixes #981
 2016-05-31 16:12:49 -07:00
Victor Woeltjen
35d7d9b380 [Timeline] Remove width method 
...from TimelineController. Will replace with a more straightforward
call to the zoom controller that uses the exposed end time instead,
to address #981.
 2016-05-31 16:05:06 -07:00
Andrew Henry
8f9308de01 Merge pull request #962 from nasa/csv-export-update-751 
[Timeline] Updates to CSV Export
 2016-05-27 14:55:59 -07:00
Victor Woeltjen
dade6b2254 [Timeline] Use positive logic for clarity 
https://github.com/nasa/openmct/pull/962#discussion_r64678013
 2016-05-26 12:12:52 -07:00
Victor Woeltjen
e9cac6eff3 [Timeline] Add JSDoc for new parameter 
https://github.com/nasa/openmct/pull/962#discussion_r64677520
 2016-05-26 12:12:52 -07:00
Victor Woeltjen
5689279954 [Timeline] Add JSDoc for idMap 
https://github.com/nasa/openmct/pull/962#discussion_r64676750
https://github.com/nasa/openmct/pull/962#discussion_r64677198
 2016-05-26 11:53:16 -07:00
Victor Woeltjen
04112956cf Merge pull request #964 from nasa/open913 
R&I open913: various Timeline fixes
 2016-05-26 11:47:06 -07:00
Charles Hacskaylo
33c208d8fe [Frontend] Timeline Gantt bar mods to allow small min-width 
open #965
- CSS adjusted to handle min-width of 2px and better
approach to ellipsizing text;
- Angular ng-class added to hide icon and title if
width less than a value;
- Rounded corners on bars removed;
 2016-05-25 20:52:36 -07:00
Charles Hacskaylo
c557fb6cd5 [Frontend] Cursor properties modified 
open #768
 2016-05-25 19:39:56 -07:00
Charles Hacskaylo
bde2bc7709 [Frontend] Bottom of holder divs adjusted 
open #913
 2016-05-25 19:28:28 -07:00
Andrew Henry
5fe759aa91 Merge pull request #955 from nasa/timeline-zoom-936 
[Timeline] Improve zoom behaviors
 2016-05-25 16:58:20 -07:00
Victor Woeltjen
a5b7badb95 [Timeline] Remove obsolete arguments 
https://github.com/nasa/openmct/pull/955/files#r64668507
 2016-05-25 16:08:28 -07:00
Victor Woeltjen
f9fd97230f [Timeline] Satisfy JSHint 2016-05-25 12:37:03 -07:00
Victor Woeltjen
73b922facf [Timeline] Update specs for indexes instead of ids 2016-05-25 12:32:44 -07:00
Victor Woeltjen
ba0d9a186b [Timeline] Account for new argument in spec 2016-05-25 12:26:47 -07:00
Victor Woeltjen
80f5cb756d [Timeline] Account for new argument in spec 2016-05-25 12:25:58 -07:00
Victor Woeltjen
d7f566088f [Timeline] Update spec to include logging 2016-05-25 12:25:02 -07:00
Victor Woeltjen
a3bcaea7f9 [Timeline] Show units in utilization headers 2016-05-25 12:21:58 -07:00
Victor Woeltjen
23c71b7218 [Timeline] Include units for utilizations 2016-05-25 12:12:11 -07:00
Victor Woeltjen
463f7ccf65 [Timeline] Use indexes instead of UUIDs 2016-05-25 12:07:35 -07:00
Victor Woeltjen
87fe407739 Merge branch 'master' into csv-export-update-751 2016-05-25 12:00:43 -07:00
Victor Woeltjen
952f95aa4c [Timeline] Update failing specs 2016-05-25 11:33:51 -07:00
Victor Woeltjen
0a75a5be1f [Timeline] Add minimal test case 2016-05-25 11:28:00 -07:00
Victor Woeltjen
70b593e28a [Timeline] Watch for configuration object 
...to address #908 in a manner which does not cause #957
 2016-05-25 11:22:22 -07:00
Victor Woeltjen
bb4f1ce7cd [Timeline] Include utilization columns 2016-05-25 10:52:25 -07:00
Victor Woeltjen
0cc2ba7595 [Timeline] Import UtilizationColumn 2016-05-25 10:38:00 -07:00
Victor Woeltjen
8162429106 [Timeline] Pass in resources extensions 2016-05-25 10:37:01 -07:00
Victor Woeltjen
ed519d89d7 [Timeline] Log errors during CSV export 
#751
 2016-05-25 10:35:29 -07:00
Victor Woeltjen
0e4f6185b8 Merge branch 'master' into csv-export-update-751 
Conflicts:
	platform/features/timeline/bundle.js
 2016-05-25 10:29:56 -07:00
Victor Woeltjen
00534f8af7 [Timeline] Account for tick size 
Account for tick size in duration reported by TimelineZoomController,
to avoid tick marks being cut off prematurely due to changes for
#936
 2016-05-24 13:02:30 -07:00
Victor Woeltjen
3795570938 [Timeline] Rename shadowing variable 2016-05-24 12:45:25 -07:00
Victor Woeltjen
362248a02e [Timeline] Run gulp fixstyle 2016-05-24 12:37:10 -07:00
Victor Woeltjen
16d20eabd2 [Timeline] Simplify method 2016-05-24 12:33:47 -07:00
Victor Woeltjen
eb5566f041 [Timeline] Add tests for timeline zoom changes 2016-05-24 12:33:19 -07:00
Victor Woeltjen
757da1dff4 [Timeline] Remove obsolete test cases 2016-05-24 11:54:49 -07:00
Victor Woeltjen
85432af187 [Timeline] Don't store zoom configuration 
https://github.com/nasa/openmct/issues/936#issuecomment-221343620
 2016-05-24 11:53:27 -07:00
Victor Woeltjen
9a5209f7c2 [Timeline] Add zoom-to-fit button 2016-05-23 16:06:10 -07:00
Victor Woeltjen
0818a7cda0 [Timeline] Increase maximum zoom level 
#936
 2016-05-23 15:36:26 -07:00
Victor Woeltjen
f35947361c [Timeline] Remain centered during zoom 
#936
 2016-05-23 15:32:48 -07:00
Victor Woeltjen
264896c264 Merge branch 'master' into persist-on-mutation-825 
Conflicts:
	platform/commonUI/edit/src/actions/RemoveAction.js
	platform/commonUI/edit/test/actions/EditAndComposeActionSpec.js
	platform/commonUI/edit/test/actions/RemoveActionSpec.js
	platform/entanglement/src/services/LinkService.js
	platform/features/timeline/src/controllers/drag/TimelineDragHandler.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDecorator.js
	platform/features/timeline/test/controllers/drag/TimelineDragHandlerSpec.js
	platform/features/timeline/test/controllers/swimlane/TimelineSwimlaneDropHandlerSpec.js
 2016-05-20 14:26:39 -07:00
Andrew Henry
25a2321578 Merge pull request #927 from nasa/jscs-rebase-142 
[Code Style] Enforce code style
 2016-05-20 14:03:27 -07:00
Victor Woeltjen
ad5691142e [Code Style] Rename shadowing variables 2016-05-20 13:05:32 -07:00
Victor Woeltjen
b5229d7786 [Timeline] Commit changes on toggle 
#908
 2016-05-19 15:06:06 -07:00
Victor Woeltjen
3905171457 [Persistence] Don't expect persist calls in spec 2016-05-19 11:48:16 -07:00
Victor Woeltjen
1e03f22086 [Persistence] Don't expect persist calls in spec 2016-05-19 11:46:50 -07:00
Victor Woeltjen
360fdeaec8 [Persistence] Don't expect persist calls in spec 2016-05-19 11:44:26 -07:00
Victor Woeltjen
d5914dfde9 [Persistence] Remove caching of persistence capability 
...as this no longer needs to be invoked directly.
 2016-05-19 11:42:58 -07:00
Victor Woeltjen
d3f2a24267 Merge branch 'master' into persist-on-mutation-825 
Conflicts:
	platform/core/src/capabilities/PersistenceCapability.js
	platform/features/timeline/src/controllers/swimlane/TimelineSwimlaneDropHandler.js
 2016-05-19 11:41:08 -07:00
Victor Woeltjen
f9631ff4c5 [Code Style] Fix style missed by gulp fixstyle 
...and remove an unnecessary comment, too.
 2016-05-19 11:29:41 -07:00
Victor Woeltjen
fa77139077 [Code Style] Run gulp fixstyle 
...to apply code style settings from #142.
 2016-05-19 11:29:13 -07:00
Henry
44f4a82fa1 Resolved merge conflicts 2016-05-12 16:14:31 -07:00
Henry
836b5db8cf Reviewed edit mode checking 2016-05-12 16:11:57 -07:00
Henry
d00e13e4ee Resolved merge conflicts 2016-05-12 16:09:53 -07:00
Henry
433dd87e51 Resolved merge conflicts 2016-05-12 16:07:39 -07:00
Henry
cf9eb3f602 Resolved Merge conflicts, removed previously deleted files 2016-05-12 16:05:27 -07:00
Charles Hacskaylo
a58fe1f81c [Frontend] Modified .tick-labels in Timelines 
open #909
- Changed markup to not use plot .tick-label class;
- Changed CSS accordingly;
- Fixed alignment (clipped bottom value) by
refactoring to use flex-box layout for tick labels;
 2016-05-10 20:41:52 -07:00
Victor Woeltjen
f85ac79b4a [Persistence] Remove persistence usage from TimelineSwimlaneDropHandler 2016-04-29 11:53:15 -07:00
Victor Woeltjen
bea9f22a0c [Persistence] Remove persistence usage from TimelineSwimlaneDecorator 2016-04-29 11:51:21 -07:00
Victor Woeltjen
3f330dccf1 [Persistence] Remove persistence usage from TimelineDragHandler 2016-04-29 11:50:02 -07:00
Victor Woeltjen
f16a107105 [Timeline] Inject resources into CSV action 2016-04-15 08:51:22 -07:00
Victor Woeltjen
f683ca44a2 [Timeline] Read resource utilizations during CSV export 2016-04-15 08:45:42 -07:00
Victor Woeltjen
546cde56a8 [Timeline] Expose internal resource utilization 
...to allow this to be exported for CSV, #751
 2016-04-15 08:32:34 -07:00
Victor Woeltjen
5088453712 [Build] Remove use strict, global 
Remove usages of use strict and global declarations that are
no longer necessary with JSHint configuration, from files
added/changed since #724
 2016-04-08 16:11:12 -07:00
Victor Woeltjen
5e44bfc6c7 Merge branch 'master' into open671 
Conflicts:
	main.js
	platform/commonUI/edit/src/policies/EditableMovePolicy.js
	platform/commonUI/general/src/directives/MCTTree.js
	platform/commonUI/general/src/ui/ToggleView.js
	platform/core/src/actions/ActionCapability.js
	platform/core/test/models/CachingModelDecoratorSpec.js
	platform/core/test/services/InstantiateSpec.js
	platform/features/events/bundle.js
	platform/features/events/src/DomainColumn.js
	platform/features/events/src/EventListController.js
	platform/features/events/src/EventListPopulator.js
	platform/features/events/src/RangeColumn.js
	platform/features/events/src/directives/MCTDataTable.js
	platform/features/events/src/policies/MessagesViewPolicy.js
	platform/features/events/test/DomainColumnSpec.js
	platform/features/events/test/EventListControllerSpec.js
	platform/features/events/test/EventListPopulatorSpec.js
	platform/features/events/test/RangeColumnSpec.js
	platform/features/events/test/policies/MessagesViewPolicySpec.js
	platform/features/rtevents/bundle.js
	platform/features/rtevents/src/DomainColumn.js
	platform/features/rtevents/src/RTEventListController.js
	platform/features/rtevents/src/RangeColumn.js
	platform/features/rtevents/src/directives/MCTRTDataTable.js
	platform/features/rtevents/src/policies/RTMessagesViewPolicy.js
	platform/features/rtevents/test/DomainColumnSpec.js
	platform/features/rtevents/test/RTEventListControllerSpec.js
	platform/features/rtevents/test/RangeColumnSpec.js
	platform/features/rtevents/test/policies/RTMessagesViewPolicySpec.js
	platform/features/rtscrolling/bundle.js
	platform/features/rtscrolling/src/DomainColumn.js
	platform/features/rtscrolling/src/NameColumn.js
	platform/features/rtscrolling/src/RTScrollingListController.js
	platform/features/rtscrolling/src/RangeColumn.js
	platform/features/scrolling/src/DomainColumn.js
	platform/features/scrolling/src/RangeColumn.js
	platform/features/scrolling/src/ScrollingListController.js
	platform/features/scrolling/src/ScrollingListPopulator.js
	platform/features/scrolling/test/DomainColumnSpec.js
	platform/features/scrolling/test/RangeColumnSpec.js
	platform/features/scrolling/test/ScrollingListControllerSpec.js
	platform/features/scrolling/test/ScrollingListPopulatorSpec.js
	platform/features/table/src/directives/MCTTable.js
	platform/features/table/test/controllers/TelemetryTableControllerSpec.js
	platform/representation/src/gestures/DropGesture.js
	platform/telemetry/src/TelemetryFormatter.js
	test-main.js
 2016-04-08 16:08:19 -07:00
Pete Richards
c591ade479 Merge remote-tracking branch 'origin/781' 2016-04-06 10:35:40 -07:00
Pete Richards
5b98da6681 Merge pull request #807 from nasa/timeline-model-717 
[Timeline] Add default values to model
 2016-04-01 10:10:15 -07:00
Victor Woeltjen
06c6832676 [Timeline] Add default values to model 
Add default values to model, such that editing which occurs
before user supplies these properties does not cause errors
to occur. Directly addresses #717, indirectly addresses
remaining errant behavior associated with #790.
 2016-03-31 15:46:56 -07:00
Victor Woeltjen
4441e88769 Merge pull request #803 from nasa/drag-drop-688 
[Firefox] Invoke preventDefault on drop
 2016-03-31 11:02:26 -07:00
Victor Woeltjen
254a944d7a [Firefox] Invoke preventDefault on drop 
...such that Firefox does not try to treat drop as a new URL
to navigate to. Addresses #688 and #527
 2016-03-31 10:34:24 -07:00
Victor Woeltjen
530b940a64 [Timeline] Fix reordering 
Fix reordering behavior when dragging-and-dropping within timelines;
addresses #789.
 2016-03-29 19:46:30 -07:00
Pete Richards
cbea842c8b Merge branch 'timeline-highlight-767' 2016-03-24 13:33:56 -07:00
Pete Richards
cc5d14deec Merge branch '755a' 2016-03-24 13:21:59 -07:00
Pete Richards
4c5217d646 [Style] Standardize indentation 2016-03-24 13:20:49 -07:00
Pete Richards
5e54b193ca [Style] remove unnecessary parenthesis 
See comment https://github.com/nasa/openmct/pull/782/files#r57380540
 2016-03-24 13:14:53 -07:00
Charles Hacskaylo
88784d37fd [Frontend] Added priority 
#787
 2016-03-24 12:05:10 -07:00
Andrew Henry
700e605bbd Merge pull request #775 from nasa/timeline-drag-drop-679 
[Timeline] Move (instead of link) when dragging and dropping within a timeline
 2016-03-23 20:00:48 -07:00
Charles Hacskaylo
7da1a4b2a3 [Frontend] Updated glyph defs and descriptions 
#781
#187
Converted many glyph char defs to
their JSON unicode equivalents;
Updated descriptions for many domain
objects;
 2016-03-23 19:04:32 -07:00
Victor Woeltjen
c13231b8e8 [Timeline] Remove NULL_ACTION, clarify logic 
Per code review feedback,
https://github.com/nasa/openmct/pull/775/files#r57229759
 2016-03-23 15:34:05 -07:00
Victor Woeltjen
dd053f7e6e [Timeline] Invoke $apply from mct-swimlane-drop 
...and add some checks to ensure this is necessary, to avoid
triggering a ton of digest cycles while dragging.
 2016-03-22 17:16:41 -07:00
Victor Woeltjen
cb655d486b [Timeline] Test reordering within parent 2016-03-22 17:06:58 -07:00
Victor Woeltjen
3c52ceb71a [Timeline] Remove unused function 
Removal of domain objects is handled by using the move action.
 2016-03-22 17:01:45 -07:00
Victor Woeltjen
b2337dea97 [Timeline] Update failing specs 
...and remove obsolete test case for handling drops in a timeline
 2016-03-22 16:59:09 -07:00
Victor Woeltjen
dea6554e04 [Timeline] Allow drops from tree 
Don't assume that all drops will be dropped swimlanes.
 2016-03-22 12:26:01 -07:00
Henry
e5544615cc [Timelines] #715 Added a check to prevent mutation when modes are unchanged 2016-03-21 17:01:38 -07:00
Victor Woeltjen
e0a69744e5 [Timeline] Deinline null action 
...used for cases when no action is needed for timeline move
(and ids will just be reordered.)
 2016-03-21 11:53:10 -07:00
Victor Woeltjen
e7a6c34bcc [Timeline] Handle drops for reordering 
...as these would be disallowed by Move, normally.
 2016-03-21 11:51:51 -07:00
Victor Woeltjen
7f3ac4077c [Timeline] Drop to correct targets 2016-03-21 11:43:02 -07:00
Victor Woeltjen
5034e88656 [Timeline] Use move action on drag-drop 
...to avoid creating links when desired behavior is a move,
#679.
 2016-03-21 11:18:18 -07:00
Charles Hacskaylo
aa48044345 [Frontend] Form styling 
#772
Added ".l-controls-under" styling to allow
channel-selector layout;
Added new hint color constants and refined
style defs;
 2016-03-21 11:13:43 -07:00
Charles Hacskaylo
90c82f6ef2 [Frontend] Timeline tooltip and field input tweaks 
#750
Refined tooltip for Resource Graphing;
Increased size of Activity Link input field;
 2016-03-21 10:08:59 -07:00
Charles Hacskaylo
5e6fe16b93 [Frontend] Adding tooltips 
#750
 2016-03-17 16:21:04 -07:00
Charles Hacskaylo
f0ca6fdfdb [Frontend] Added tooltips 
#750
Added tooltips to Timeline header elements;
 2016-03-17 15:10:42 -07:00
Charles Hacskaylo
471b57f47c [Frontend] CSS tweaks 
#750
Moved l-plot-resource cursor: pointer
to a more specific selector;
Added user-select: none to l-header;
Fixed s-status-editing styling so
that tabular labels only appear draggable
while editing;
 2016-03-16 18:19:44 -07:00
Charles Hacskaylo
9c775c6715 [Frontend] Changed cursor property 
#755
Changed s-timeline-gantt.mid to
use cursor: move instead of
ew-resize; Need to verify on Linux;
 2016-03-16 17:36:07 -07:00
Victor Woeltjen
f2c040367b [Timeline] Rename TimelineCSVExporter 
...to TimelineColumnizer, clarifying its role/responsibilities in the
context of the CSV export task;
https://github.com/nasa/openmctweb/pull/728#discussion_r56031331
 2016-03-14 12:00:31 -07:00
Victor Woeltjen
0ff360ced3 [Timelines] Remove excessive ternaries 
...to improve readability of logic to determine which columns
are needed for a given group of domain objects for CSV export,
as requested during code review,
https://github.com/nasa/openmctweb/pull/728#discussion_r55910477
 2016-03-14 11:53:28 -07:00
Victor Woeltjen
406a31889e [Timeline] Add specs for remaining columns 2016-03-08 12:34:08 -08:00
Victor Woeltjen
9e4e3e9c43 [Timeline] Add JSDoc 
Add JSDoc to classes implemented Export Timeline as CSV
 2016-03-08 11:59:53 -08:00