diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
index 6aa662528283473b2524cd715310803fbd395107..0b1d42a76295b2c4313054f4b981ebe836fdf261 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js
@@ -4,7 +4,8 @@ var gridControllerMod = angular.module('GridControllerMod', ['ui.grid',
'ui.grid.edit',
'ui.grid.selection',
'ui.grid.cellNav',
- 'ui.grid.resizeColumns']);
+ 'ui.grid.resizeColumns',
+ 'ui.grid.autoResize']);
gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGridConstants', function($scope, dataService, uiGridConstants) {
@@ -77,6 +78,7 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGrid
enableFiltering: true,
enableCellEdit: false,
enableColumnResize: true,
+ enableHorizontalScrollbar: uiGridConstants.scrollbars.NEVER,
enableRowSelection: true,
enableRowHeaderSelection: true,
enableFullRowSelection: false,
@@ -104,7 +106,6 @@ gridControllerMod.controller('GridController', ['$scope', 'dataService', 'uiGrid
}
};
-
function filterTasks() {
var taskDict = $scope.dataService.taskDict;
var filteredTasks = [];
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
index cdd0568f2c5e686eecb680d293843e055d4467ea..1b1dad2e22a0e22b9c96ee85058baaf6c8ce6317 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/css/main.css
@@ -3,8 +3,13 @@
.grid {
min-height: 400px;
min-width: 500px;
- height: auto;
- width: auto;
+ height: 100%;
+ width: 100%;
+
+}
+
+.stretch {
+ overflow: initial;
}
.gantt {
@@ -24,13 +29,13 @@
}
.ui-layout-row > .ui-splitbar {
- height: 8px;
- background-color: #888888;
+ height: 6px;
+ background-color: #CCCCCC;
}
.ui-layout-column > .ui-splitbar {
- width: 8px;
- background-color: #888888;
+ width: 6px;
+ background-color: #CCCCCC;
}
ul.uib-datepicker-popup.dropdown-menu button.btn.btn-sm.btn-danger.uib-clear {
@@ -52,7 +57,7 @@ table.uib-timepicker td.uib-time {
}
.top-stretch {
- top: 60px;
+ top: 65px;
}
.gantt-task-content {
diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html
index 214ea165b3b292ea76865274977b0be55241a15c..0818ef43f8f240e2d2771e329100588ec14a4cc2 100644
--- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html
+++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html
@@ -42,7 +42,7 @@
<script src="/static/app/controllers/ganttprojectcontroller.js"></script>
<script src="/static/app/controllers/chartresourceusagecontroller.js"></script>
</head>
- <body>
+ <body style="overflow:hidden;">
{% raw %}
<div ng-controller="DataController as dataCtrl" class="container-fluid">
<div class="row">
@@ -87,68 +87,61 @@
</p>
</div>
</div>
- <div ui-layout class="top-stretch" ui-layout="{flow: 'column'}">
- <header>
- <uib-tabset margin-top='10px'>
- <uib-tab heading="Tasks" index='0' active='true'>
- <div ng-controller="GridController as gridCtrl">
- <div id="grid" ui-grid="gridOptions" ui-grid-edit ui-grid-selection ui-grid-cellnav ui-grid-resize-columns class="grid">
- </div>
- </div>
- </uib-tab>
- <uib-tab heading="Usages" index='1' active='false'>
- <div class="tab-pane active" ng-controller="ChartResourceUsageController as chartResourceUsageCtrl">
- <highchart id="chart_resource_usage" config="chartConfig" style="width: 95%; height: 40%; margin: 10px;" ></highchart>
- </div>
- </uib-tab>
- </uib-tabset>
- </header>
- <header>
- <uib-tabset margin-top='10px'>
- <uib-tab heading="Projects" index='0' active='true'>
- <div class="tab-pane active" ng-controller="GanttProjectController as ganttProjectCtrl">
- <div gantt data=ganttData
- api=options.api
- show-side='true'
- view-scale="options.viewScale"
- from-date="options.fromDate"
- to-date="options.toDate"
- current-date="options.currentDate"
- current-date-value="options.currentDateValue"
- column-magnet="options.columnMagnet">
- <gantt-tree enabled="true"></gantt-tree>
- <gantt-movable enabled="true"
- allow-moving="true"
- allow-resizing="true"
- allow-row-switching="false">
- </gantt-movable>
- <gantt-tooltips enabled="true" date-format="'YYYY-MM-DD HH:mm'"></gantt-tooltips>
- <gantt-dependencies enabled="true"></gantt-dependencies>
- </div>
- </div>
- </uib-tab>
- <uib-tab heading="Resources" index='1' active='false'>
- <div class="tab-pane active" ng-controller="GanttResourceController as ganttResourceCtrl">
- <div gantt data=ganttData
- api=options.api
- show-side='true'
- view-scale="options.viewScale"
- from-date="options.fromDate"
- to-date="options.toDate"
- current-date="options.currentDate"
- current-date-value="options.currentDateValue"
- column-magnet="options.columnMagnet">
- <gantt-tree enabled="true"></gantt-tree>
- <gantt-movable enabled="true"
- allow-moving="true"
- allow-resizing="true"
- allow-row-switching="false"></gantt-movable>
- <gantt-tooltips enabled="true" date-format="'YYYY-MM-DD HH:mm'"></gantt-tooltips>
- </div>
- </div>
- </uib-tab>
- <uib-tabset>
- <header>
+
+
+ <div class="top-stretch" ui-layout options="{flow: 'column'}">
+ <div ng-controller="GridController as gridCtrl" style="margin-right: 4px;" >
+ <div id="grid"
+ ui-grid="gridOptions"
+ 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'}">
+ <div ng-controller="GanttProjectController as ganttProjectCtrl" style="overflow:auto; margin-left:12px; margin-bottom:4px; ">
+ <div gantt data=ganttData
+ api=options.api
+ show-side='true'
+ view-scale="options.viewScale"
+ from-date="options.fromDate"
+ to-date="options.toDate"
+ current-date="options.currentDate"
+ current-date-value="options.currentDateValue"
+ column-magnet="options.columnMagnet">
+ <gantt-tree enabled="true"></gantt-tree>
+ <gantt-movable enabled="true"
+ allow-moving="true"
+ allow-resizing="true"
+ allow-row-switching="false">
+ </gantt-movable>
+ <gantt-tooltips enabled="true" date-format="'YYYY-MM-DD HH:mm'"></gantt-tooltips>
+ <gantt-dependencies enabled="true"></gantt-dependencies>
+ </div>
+ </div>
+
+ <div ng-controller="ChartResourceUsageController as chartResourceUsageCtrl">
+ <highchart id="chart_resource_usage" config="chartConfig" style="width: 96%; height: 100%; margin: 12px;" ></highchart>
+ </div>
+
+ <div ng-controller="GanttResourceController as ganttResourceCtrl" style="overflow:auto; margin-left:12px; margin-top:12px">
+ <div gantt data=ganttData
+ api=options.api
+ show-side='true'
+ view-scale="options.viewScale"
+ from-date="options.fromDate"
+ to-date="options.toDate"
+ current-date="options.currentDate"
+ current-date-value="options.currentDateValue"
+ column-magnet="options.columnMagnet">
+ <gantt-tree enabled="true"></gantt-tree>
+ <gantt-movable enabled="true"
+ allow-moving="true"
+ allow-resizing="true"
+ allow-row-switching="false"></gantt-movable>
+ <gantt-tooltips enabled="true" date-format="'YYYY-MM-DD HH:mm'"></gantt-tooltips>
+ </div>
+ </div>
+
+ </div>
</div>
</div>
{% endraw %}