From 7674ebf5834e06a7d39c9f6c6b5ba49e2e64a2e7 Mon Sep 17 00:00:00 2001 From: Jorrit Schaap <schaap@astron.nl> Date: Tue, 13 Jun 2017 08:50:09 +0000 Subject: [PATCH] Task #10902: cluster column width wider for dragnet --- .../lib/static/app/controllers/gridcontroller.js | 2 +- .../ResourceAssignmentEditor/lib/templates/index.html | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js index 6a362afa541..b0ac221dddb 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/static/app/controllers/gridcontroller.js @@ -230,7 +230,7 @@ gridControllerMod.controller('GridController', ['$scope', '$window', 'dataServic { field: 'cluster', displayName: 'Cluster', enableCellEdit: false, - width: '65', + width: '75', filter: { condition: uiGridConstants.filter.EXACT, type: uiGridConstants.filter.SELECT, diff --git a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html index a49f06ea37f..480d9452897 100644 --- a/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html +++ b/SAS/ResourceAssignment/ResourceAssignmentEditor/lib/templates/index.html @@ -116,7 +116,7 @@ </uib-progress> <div style="float:left; width:100%; top:70px ;" ui-layout options="{flow: 'column'}"> - <div ng-controller="GridController as gridCtrl" style="margin-right: 4px;" ui-layout-init-min-width="1160px"> + <div ng-controller="GridController as gridCtrl" style="margin-right: 4px;" ui-layout-init-min-width="1175px"> <div id="grid" ui-grid="gridOptions" ui-grid-edit ui-grid-selection ui-grid-cellNav ui-grid-resize-columns ui-grid-auto-resize @@ -150,7 +150,7 @@ </md-tab> </div> - <div ng-controller="GanttResourceController as ganttResourceCtrl" ng-init="enabled=false"> +<!-- <div ng-controller="GanttResourceController as ganttResourceCtrl" ng-init="enabled=false"> <md-tab label="Resources" md-on-select="enabled=true" md-on-deselect="enabled=false"> <div gantt data=ganttData api=options.api @@ -174,7 +174,7 @@ <highchart id="chart_resource_usage" config="chartConfig" style="margin: 12px;" ></highchart> </div> </md-tab> - </div> + </div>--> </md-tabs> </md-content> <div ng-controller="EventGridController as eventGridCtrl" ui-layout-init-height="250px"> -- GitLab