Apollo-DEC/apollodec
Apollo-DEC/apollodec
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dashboard changes

Browse Source
This commit is contained in:
gandhimathi 2018-10-24 14:48:54 +05:30
parent 6ed86962aa
commit 1eb11b0186
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Apollo/assets/js/controllers/dashboardCtrl.js
View File

@ -897,8 +897,6 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
allowSortingBySummary: true, allowSortingBySummary: true,
allowSorting: true, allowSorting: true,
allowFiltering: true, allowFiltering: true,
allowExpandAll: true,
wordWrapEnabled: true,
height: 440, height: 440,
showBorders: true, showBorders: true,
fieldChooser: { fieldChooser: {
@ -920,8 +918,6 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
}, { }, {
caption: "staff", caption: "staff",
dataField: "Staff", dataField: "Staff",
dataType: "string",
width: 200,
area: "column" area: "column"
}, { }, {
caption: "TotalNoOfAdmissions", caption: "TotalNoOfAdmissions",
@ -1041,15 +1037,15 @@ app.controller('dashboardCtrl', ["$scope", "$rootScope", "toaster", "$filter", "
}, { }, {
caption: "staff", caption: "staff",
dataField: "Staff", dataField: "Staff",
dataType: "string", // dataType: "string",
width: 200, // width: 200,
area: "column" area: "column"
}, { }, {
caption: "TotalNoOfAdmissions", caption: "TotalNoOfAdmissions",
dataField: "TotalNoOfAdmissions", dataField: "TotalNoOfAdmissions",
dataType: "number", dataType: "number",
summaryType: "sum", summaryType: "sum",
width: 100, // width: 100,
area: "data" area: "data"
}], }],
store: $scope.adBatchfilter store: $scope.adBatchfilter

5
Apollo/assets/views/dashboard_tile3.html
View File

@ -136,9 +136,10 @@
</center> </center>
</div> </div>
<!-- <div id="dxPivotGrid" dx-pivot-grid="adBatchgrid" ng-if="adb==false"></div> --> <!-- <div id="dxPivotGrid" dx-pivot-grid="adBatchgrid" ng-if="adb==false"></div> -->
<div id="dxPivotGrid" dx-pivot-grid="adBatchgrid" ng-if="adb==false && fbselect==false"></div> <div class="table-responsive">
<div dx-pivot-grid="adBatchgrid" ng-if="adb==false && fbselect==false"></div>
<div dx-pivot-grid="adBatchgrid1" ng-if="fbselect==true"></div> <div dx-pivot-grid="adBatchgrid1" ng-if="fbselect==true"></div>
</div>
</div> </div>