Commit Graph

795 Commits

Author SHA1 Message Date
b383921f2a [Timeline] Export start/end to CSV 2016-03-07 16:00:13 -08:00
b7a44a7557 Merge branch 'master' into warp135b 2016-03-07 15:21:28 -08:00
f653362247 Fixed issue with non-named columns 2016-03-03 10:12:25 -08:00
b63b7b1e5d [Tables] #670 Addressed issues from code review 2016-03-03 09:26:12 -08:00
55e00baeaf [Table] #670 Addressed comments from code review 2016-03-02 21:40:56 -08:00
b9a7ee423a Merge branch 'master' into open670_master 2016-03-01 12:56:08 -08:00
d176797307 [Style] Add missing semicolon 2016-03-01 10:59:23 -08:00
96d9f8c194 [Templates] load plot templates with require
Load templates with requirejs.

https://github.com/nasa/openmctweb/issues/673
2016-03-01 10:52:07 -08:00
748673f99b Merge branch 'master' into open638_rebase 2016-03-01 10:48:53 -08:00
721557b814 [Templates] Exercise selection method
...add to TimelineSwimlanePopulator to reflect changes to
time at which selection object may become available as
a consequence to changes in the way templates are normally
loaded. #673
2016-02-26 16:29:06 -08:00
70ed16491a [Templates] Change watch order
...to work around order-sensitive test case
2016-02-26 16:26:31 -08:00
3a6e0be2d7 [Templates] Update FixedController spec
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
2016-02-26 16:19:14 -08:00
fe419714f5 [Templates] Check for availability of timespan
...as ordering changes due to change from templateUrl to template
may mean this is not available when first initialized.
2016-02-26 15:50:07 -08:00
f3fd2e67fc [Templates] Watch for selection object
...from Timeline, to ensure toolbar appears etc.
Reflects changes to ordering triggered by use of
template instead of templateUrl
2016-02-26 15:49:21 -08:00
931fa77cbe [Templates] Handle deferred selection availability
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
2016-02-26 15:37:19 -08:00
19b442cc0b [Templates] Require data table templates
...via text plugin
2016-02-26 15:02:04 -08:00
bf1fa0ac4c [Templates] Include templates using text plugin
Resolves #673
2016-02-26 13:07:50 -08:00
f04c3692c1 [Table] #670 Name column only prepended if multiple objects 2016-02-26 11:22:16 -08:00
ffa497f22f [Table] #670 Added new view type 'table' 2016-02-26 11:09:51 -08:00
aabeb72203 [Plots] #638 Fixed failing test 2016-02-23 15:22:21 -08:00
fcdf89a4ee Merge branch 'master' into open638_rebase 2016-02-23 10:56:13 -08:00
9b3c8dce25 [SCSS] Remove old references to compass
Remove any old references to compass.

https://github.com/nasa/openmctweb/issues/698
2016-02-22 18:22:44 -08:00
0a71835687 [Build] Switch compass to bourbon
Change mixin library to bourbon.  Significantly reduces sass build time.

https://github.com/nasa/openmctweb/issues/698
2016-02-22 18:02:16 -08:00
ed09214f59 [Build] Save stylesheets to proper location
Updates the stylesheet task to output CSS in the correct locations. Remove
config.rb for running compass manually, and remove compiled css files from
project.  Add a .gitignore to ensure they don't get included accidentally.

Add a gulp task for running the development server and watching for scss
changes at the same time.

resolves https://github.com/nasa/openmctweb/issues/238
2016-02-19 13:26:20 -08:00
7d0de68db9 [Plot] #638 Changed plot series to an array 2016-02-10 20:27:04 -08:00
5306e96374 Merge pull request #668 from nasa/open659
[New Edit Mode] #659 Fix to timelines
2016-02-10 17:02:28 -08:00
10e0acddb3 [New Edit Mode] #659 Fix to prevent multi-composition with same object, fix to prevent composition of object with self 2016-02-10 16:43:08 -08:00
ceee7e0da9 [Frontend] Fixed CSS issue with Timeline label elements
open #659
CSS for .rep-object-label modified; Added CSS class
to tabular-swimlane-cols-tree.html markup;
Also cleaned up .s-status-pending styles for related
label elements;
2016-02-10 16:38:39 -08:00
24c750b41e [Plot] Fixed jsLint, removed onchange
Removed ngChange from mct-control

Removed ng-change
2016-02-09 21:19:47 -08:00
ab1c79f25d [Plot] Switched to $watchCollection on form model 2016-02-09 20:52:47 -08:00
645bd5743f [Plots] #638 Addressing feedback from code review
[Plots] #638 Fixing failing tests

[Plot] Changed PlotOptionsController to prototype form

Fixed spacing

Fixed jslint issue
2016-02-08 23:36:45 -08:00
273cf1c14f [Timeline] Fix columns exported 2016-02-08 18:07:03 -08:00
be031285b9 Added form-level change event 2016-02-08 17:46:21 -08:00
b42ccebd5a [Timeline] Fix imports, dependencies
Fix imports and dependencies needed by Export Timeline as CSV
2016-02-08 17:42:26 -08:00
a444fc01ad [Timeline] Fix column module definitions 2016-02-08 17:34:10 -08:00
a126e43286 [Timelines] Handle columns during CSV export 2016-02-08 16:11:00 -08:00
4adb075a2b [Timelines] Separate out timeline traversal
...from rest of CSV export.
2016-02-08 13:59:34 -08:00
d8b1e570d9 [CSV Export] Begin implementing
Begin implementing initial step, wherein timelines composition
is traversed to build up a list of objects to export.
2016-02-08 13:36:25 -08:00
5033e2cdbb [Timeline] Begin adding Export as CSV
Sketch in solution for
https://developer.nasa.gov/mct/warp/issues/135
2016-02-08 13:04:41 -08:00
0a5097a945 Merge pull request #642 from nasa/open460
[Build] Move to npm-based build
2016-02-08 12:21:01 -08:00
b0e4947bf0 Merge pull request #500 from nasa/open480
[New Edit Mode] Adding sub objects to Timelines
2016-02-08 11:59:54 -08:00
9371fcbc4c [Plot] #638 Added a new plot options example bundle and rebased
Fixed jsdoc

Fixed incorrect memberof declaration

Corrected memberof statement
2016-02-04 15:17:07 -08:00
abf5f22155 [Plots] #638 added onchange handling in order to synchronize forms with domain object model.
Fixed failing test

Added tests

jslint errors

Minor refactoring of layout bundle

revert layout/bundle.json
2016-02-04 14:26:21 -08:00
371669fbce [Frontend] Mods in progress to form layout
open #638
Major progress on form-row markup and CSS when
in Inspector 'part' context; General fixes cleanups
to custom checkbox/radio CSS;
2016-02-04 14:23:29 -08:00
68f3cd087d [Frontend] Mods in progress to form layout
open #638
In progress;
2016-02-04 14:23:29 -08:00
115ffe7963 [Frontend] Fixes to scrolling and layout in Inspector
open #638
In progress;
2016-02-04 14:23:29 -08:00
e3a0cae5fd [Plot] #638 Fleshing out form structures 2016-02-04 14:23:29 -08:00
6fb6761abf [Plots] #638 New plot display options 2016-02-04 14:23:28 -08:00
aebae27391 [Tests] Remove suite.json files
Remove obsolete suite.json files; #482
2016-02-02 09:35:50 -08:00
ddb5837145 Merge branch 'master' into open460 2016-01-29 11:44:38 -08:00