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
This commit is contained in:
Victor Woeltjen
@@ -21,6 +21,7 @@
|
||||
*****************************************************************************/
|
||||
|
||||
define([
|
||||
"./src/actions/ExportTimelineAsCSVAction",
|
||||
"./src/controllers/TimelineController",
|
||||
"./src/controllers/TimelineGraphController",
|
||||
"./src/controllers/TimelineDateTimeController",
|
||||
@@ -49,6 +50,7 @@ define([
|
||||
"text!./res/templates/controls/datetime.html",
|
||||
'legacyRegistry'
|
||||
], function (
|
||||
ExportTimelineAsCSVAction,
|
||||
TimelineController,
|
||||
TimelineGraphController,
|
||||
TimelineDateTimeController,
|
||||
@@ -83,6 +85,15 @@ define([
|
||||
"description": "Resources, templates, CSS, and code for Timelines.",
|
||||
"resources": "res",
|
||||
"extensions": {
|
||||
"actions": [
|
||||
{
|
||||
"key": "timeline.export",
|
||||
"name": "Export Timeline as CSV",
|
||||
"category": "contextual",
|
||||
"implementation": ExportTimelineAsCSVAction,
|
||||
"depends": [ "exportService", "notificationService" ]
|
||||
}
|
||||
],
|
||||
"constants": [
|
||||
{
|
||||
"key": "TIMELINE_MINIMUM_DURATION",
|
||||
@@ -126,8 +137,9 @@ define([
|
||||
{
|
||||
"key": "timeline",
|
||||
"name": "Timeline",
|
||||
"glyph": "S",
|
||||
"description": "A container for arranging Timelines and Activities in time.",
|
||||
"glyph": "\u0053",
|
||||
"description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.",
|
||||
"priority": 502,
|
||||
"features": [
|
||||
"creation"
|
||||
],
|
||||
@@ -159,20 +171,24 @@ define([
|
||||
}
|
||||
],
|
||||
"model": {
|
||||
"composition": []
|
||||
"composition": [],
|
||||
"start": {
|
||||
"timestamp": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"key": "activity",
|
||||
"name": "Activity",
|
||||
"glyph": "a",
|
||||
"glyph": "\u0061",
|
||||
"features": [
|
||||
"creation"
|
||||
],
|
||||
"contains": [
|
||||
"activity"
|
||||
],
|
||||
"description": "An action that takes place in time. You can define a start time and duration. Activities can be nested within other Activities, or within Timelines.",
|
||||
"description": "An event or process that starts and ends at a discrete datetime. Activities can be nested in other Activities, and can be added to Timelines. Activity Modes can be added to an Activity to define its resource utilization over time.",
|
||||
"priority": 501,
|
||||
"properties": [
|
||||
{
|
||||
"name": "Start date/time",
|
||||
@@ -198,17 +214,24 @@ define([
|
||||
"composition": [],
|
||||
"relationships": {
|
||||
"modes": []
|
||||
},
|
||||
"start": {
|
||||
"timestamp": 0
|
||||
},
|
||||
"duration": {
|
||||
"timestamp": 0
|
||||
}
|
||||
}
|
||||
},
|
||||
{
|
||||
"key": "mode",
|
||||
"name": "Activity Mode",
|
||||
"glyph": "A",
|
||||
"glyph": "\u0041",
|
||||
"features": [
|
||||
"creation"
|
||||
],
|
||||
"description": "Define resource utilizations over time, then apply to an Activity.",
|
||||
"description": "When a sub-system utilizes Power or Communications resources over time, you can define those values in an Activity Mode. Activity Modes can then be linked to Activities to allow resource utilization graphing and estimating in a Timeline.",
|
||||
"priority": 500,
|
||||
"model": {
|
||||
"resources": {
|
||||
"comms": 0,
|
||||
@@ -243,7 +266,7 @@ define([
|
||||
{
|
||||
"key": "values",
|
||||
"name": "Values",
|
||||
"glyph": "A",
|
||||
"glyph": "\u0041",
|
||||
"template": valuesTemplate,
|
||||
"type": "mode",
|
||||
"uses": [
|
||||
@@ -254,9 +277,9 @@ define([
|
||||
{
|
||||
"key": "timeline",
|
||||
"name": "Timeline",
|
||||
"glyph": "S",
|
||||
"glyph": "\u0053",
|
||||
"type": "timeline",
|
||||
"description": "A timeline view of Timelines and Activities.",
|
||||
"description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.",
|
||||
"template": timelineTemplate,
|
||||
"editable": true,
|
||||
"toolbar": {
|
||||
@@ -265,18 +288,18 @@ define([
|
||||
"items": [
|
||||
{
|
||||
"method": "add",
|
||||
"glyph": "+",
|
||||
"glyph": "\u002b",
|
||||
"control": "menu-button",
|
||||
"text": "Add",
|
||||
"options": [
|
||||
{
|
||||
"name": "Timeline",
|
||||
"glyph": "S",
|
||||
"glyph": "\u0053",
|
||||
"key": "timeline"
|
||||
},
|
||||
{
|
||||
"name": "Activity",
|
||||
"glyph": "a",
|
||||
"glyph": "\u0061",
|
||||
"key": "activity"
|
||||
}
|
||||
]
|
||||
@@ -286,37 +309,39 @@ define([
|
||||
{
|
||||
"items": [
|
||||
{
|
||||
"glyph": "é",
|
||||
"description": "Graph resource utilization",
|
||||
"glyph": "\u00e9",
|
||||
"description": "Graph Resource Utilization",
|
||||
"control": "button",
|
||||
"method": "toggleGraph"
|
||||
},
|
||||
{
|
||||
"glyph": "A",
|
||||
"glyph": "\u0041",
|
||||
"control": "dialog-button",
|
||||
"description": "Apply Activity Modes...",
|
||||
"title": "Apply Activity Modes",
|
||||
"dialog": {
|
||||
"control": "selector",
|
||||
"name": "Modes",
|
||||
"type": "mode"
|
||||
"type": "mode",
|
||||
"layout": "controls-under"
|
||||
},
|
||||
"property": "modes"
|
||||
},
|
||||
{
|
||||
"glyph": "è",
|
||||
"glyph": "\u00e8",
|
||||
"description": "Edit Activity Link",
|
||||
"title": "Activity Link",
|
||||
"control": "dialog-button",
|
||||
"dialog": {
|
||||
"control": "textfield",
|
||||
"name": "Link",
|
||||
"pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$"
|
||||
"pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
|
||||
"cssclass": "l-input-lg"
|
||||
},
|
||||
"property": "link"
|
||||
},
|
||||
{
|
||||
"glyph": "G",
|
||||
"glyph": "\u0047",
|
||||
"description": "Edit Properties...",
|
||||
"control": "button",
|
||||
"method": "properties"
|
||||
@@ -327,9 +352,9 @@ define([
|
||||
"items": [
|
||||
{
|
||||
"method": "remove",
|
||||
"description": "Remove item",
|
||||
"description": "Remove Item",
|
||||
"control": "button",
|
||||
"glyph": "Z"
|
||||
"glyph": "\u005a"
|
||||
}
|
||||
]
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user