Commit b0dccfb8 authored by Prayas Jain's avatar Prayas Jain

Updated substaus report screen design

parent 3d0b653a
......@@ -6,10 +6,6 @@ myApp.controller("allocationChangeReportController",function($scope,exportUiGrid
$scope.toDate = today;
$scope.fromDate = priorDt;
// +'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<i ng-show="row.entity.status == \'InActive\'">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</i><i class="fa fa-minus-circle fa-2x" aria-hidden="true" style="font-size:1.5em;margin-top:3px;cursor:pointer;" data-placement="left" title="Delete" onmouseenter="$(this).tooltip(\'show\')" ng-click="grid.appScope.getRowData(row,\'Delete\')"></i></p>';
$scope.gridOptions = {
paginationPageSizes : [ 10, 20, 30, 40, 50, 100],
paginationPageSize : 10,
......
......@@ -7,7 +7,7 @@ myApp.controller("subStatusController", function($scope, $http, myFactory, $mdDi
// Date picker related code
var today = new Date();
var priorDt = today;
var priorDt = new Date(today.getTime() - ( 30 * 24 * 60 * 60 * 1000));
$scope.maxDate = today;
$scope.fromDate = priorDt;
$scope.toDate = today;
......@@ -24,7 +24,7 @@ myApp.controller("subStatusController", function($scope, $http, myFactory, $mdDi
{field : 'empStatus',displayName: 'Sub Status', enableColumnMenu: false, enableSorting: false,enableFiltering: true,width:'*'},
{field : 'fromDate',displayName: 'From Date', enableColumnMenu: false,enableFiltering: false, cellFilter: 'date:"dd-MMM-yyyy"',width:'*'},
{field : 'toDate',displayName: 'To Date', enableColumnMenu: false,enableSorting: false,enableFiltering: false , cellFilter: 'date:"dd-MMM-yyyy"',width:'*'},
{field : 'functionalGroup',displayName: 'Functional Group', enableColumnMenu: false, enableSorting: false,enableFiltering: false, enableFiltering: true,width:'*'}
{field : 'functionalGroup',displayName: 'Functional Group', enableColumnMenu: false, enableSorting: false, enableFiltering: true,width:'*'}
],
enableGridMenu: true,
enableSelectAll: true,
......
......@@ -692,5 +692,5 @@ cursor: pointer;
margin:0;
}
.substatus-report-grid {
height: calc(85vh - 243px) !important;
height: calc(85vh - 150px) !important;
}
\ No newline at end of file
......@@ -49,11 +49,14 @@
</div>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<div id="gridTest" ui-grid="gridOptions" ui-grid-pagination ui-grid-exporter
class="mygrid substatus-report-grid">
class="myGrid substatus-report-grid">
<div class="watermark" ng-show="!gridOptions.data.length">No
data available</div>
</div>
</div>
</div>
</div>
</div>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment