Skip to content
Snippets Groups Projects
Commit 545d3adf authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

Task #10241: added eventcontroller which show the events in a log like window below the gantt chart

parent c14b5f85
No related branches found
No related tags found
No related merge requests found
......@@ -5480,6 +5480,7 @@ SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/app.js -text
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/chartresourceusagecontroller.js -text
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/cleanupcontroller.js -text
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/datacontroller.js -text
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/eventgridcontroller.js -text
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttprojectcontroller.js -text
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/ganttresourcecontroller.js -text
SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js -text
......
......@@ -37,6 +37,7 @@ set(app_files
static/app/controllers/datacontroller.js
static/app/controllers/cleanupcontroller.js
static/app/controllers/gridcontroller.js
static/app/controllers/eventgridcontroller.js
static/app/controllers/ganttresourcecontroller.js
static/app/controllers/chartresourceusagecontroller.js
static/app/controllers/ganttprojectcontroller.js
......
......@@ -7,6 +7,7 @@ var app = angular.module('raeApp',
'GanttProjectControllerMod',
'ChartResourceUsageControllerMod',
'GridControllerMod',
'EventGridControllerMod',
'ui.layout',
'ui.bootstrap',
'ui.bootstrap.tabs',
......
// $Id: controller.js 32761 2015-11-02 11:50:21Z schaap $
var eventGridControllerMod = angular.module('EventGridControllerMod', ['ui.grid',
'ui.grid.resizeColumns',
'ui.grid.autoResize']);
eventGridControllerMod.controller('EventGridController', ['$scope', 'dataService', 'uiGridConstants', function($scope, dataService, uiGridConstants) {
var self = this;
$scope.dataService = dataService;
$scope.columns = [
{ field: 'timestamp',
displayName: 'Timestamp',
width: '120',
type: 'date',
enableCellEdit: false,
enableCellEditOnFocus: false,
cellTemplate:'<div style=\'text-align:center; padding-top:5px;\'>{{row.entity[col.field] | date:\'yyyy-MM-dd HH:mm:ss\'}}</div>',
sort: { direction: uiGridConstants.ASC }
},
{ field: 'message',
displayName: 'Message',
enableCellEdit: false,
width: '*',
minWidth: '100',
}];
$scope.gridOptions = {
enableGridMenu: false,
enableSorting: true,
enableFiltering: true,
enableCellEdit: false,
enableColumnResize: true,
enableHorizontalScrollbar: uiGridConstants.scrollbars.NEVER,
enableRowSelection: false,
enableRowHeaderSelection: false,
enableFullRowSelection: false,
modifierKeysToMultiSelect: false,
multiSelect:false,
enableSelectionBatchEvent:false,
gridMenuShowHideColumns: false,
columnDefs: $scope.columns,
data: dataService.events,
rowTemplate: "<div ng-repeat=\"(colRenderIndex, col) in colContainer.renderedColumns track by col.uid\" ui-grid-one-bind-id-grid=\"rowRenderIndex + '-' + col.uid + '-cell'\" class=\"ui-grid-cell\" ng-class=\"{ 'ui-grid-row-header-cell': col.isRowHeader }\" role=\"{{col.isRowHeader ? 'rowheader' : 'gridcell'}}\" ui-grid-cell></div>"
};
}]);
......@@ -43,6 +43,7 @@
<script src="/static/app/controllers/datacontroller.js"></script>
<script src="/static/app/controllers/cleanupcontroller.js"></script>
<script src="/static/app/controllers/gridcontroller.js"></script>
<script src="/static/app/controllers/eventgridcontroller.js"></script>
<script src="/static/app/controllers/ganttresourcecontroller.js"></script>
<script src="/static/app/controllers/ganttprojectcontroller.js"></script>
<script src="/static/app/gantt-plugins/angular-gantt-contextmenu-plugin.js"></script>
......@@ -111,6 +112,7 @@
ui-grid-edit ui-grid-selection ui-grid-cellNav ui-grid-resize-columns ui-grid-auto-resize
class="grid"></div>
</div>
<div ui-layout options="{flow: 'row'}">
<md-content margin-top='10px' style="margin-right: 4px;">
<md-tabs md-dynamic-height md-border-bottom style="height: 100%; width: 100%;" >
<div ng-controller="GanttProjectController as ganttProjectCtrl" ng-init="enabled=true">
......@@ -165,6 +167,13 @@
</div>
</md-tabs>
</md-content>
<div ng-controller="EventGridController as eventGridCtrl" style="margin-right: 4px;" ui-layout-init-min-width="150px">
<div id="grid"
ui-grid="gridOptions"
ui-grid-resize-columns ui-grid-auto-resize
class="grid"></div>
</div>
</div>
</div>
</div>
{% endraw %}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment