From cb729fee3189b879d0b078766a50276ecf3d4e2e Mon Sep 17 00:00:00 2001
From: hrushikesh07 <hrushikesh.das@relevancelab.com>
Date: Mon, 10 Oct 2016 11:12:26 +0530
Subject: [PATCH] Usage report added

---
 .../dashboard/analytics/analytics.html        |  2 +-
 .../sections/dashboard/analytics/analytics.js |  2 +-
 .../analytics/controller/usageCtrl.js         | 17 ++++++++++++++
 .../dashboard/analytics/view/usage.html       | 23 +++++++++++--------
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html
index 11cf8c116..385f6cdc9 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.html
@@ -108,7 +108,7 @@
 		<div id='rightPanel' class='container-fluid'>
 			<ul class="nav nav-tabs" >
 				<li ng-class="{'active':analytic.tabShowChat === true}"><a ng-click="analytic.tabShow(true,false)"  ><i class="fa fa-area-chart fa-2" aria-hidden="true"></i> Dashboard</a></li>
-				<li ng-show="!stateItems.filterView.report" ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
+				<li ng-class="{'active':analytic.tabShowReport === true}"><a ng-click="analytic.tabShow(false,true)" ><i class="fa fa-file-text fa-2" aria-hidden="true"></i> Reports</a></li>
 				<li class="form-group pull-right filter-btn" >
 					<button type="button" class="btn btn-xs cat-btn-update ng-scope pull-right margin-left6" ng-click="isOpenSidebar = !isOpenSidebar">
 						<i class="fa fa-filter fa-2 white" aria-hidden="true"></i>&nbsp;Filter
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
index 2d5cdbb1c..63ca85a8d 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/analytics.js
@@ -43,7 +43,7 @@
 				url: "usage/",
 				templateUrl: "src/partials/sections/dashboard/analytics/view/usage.html",
 				controller: "usageCtrl as usage",
-				params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true,report:true}},
+				params:{filterView:{usage:true,org:true,provi:true,instanceType:true,resources:true}},
 				resolve: {
 					auth: ["$q", function ($q) {
 						var deferred = $q.defer();
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js b/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
index 7de7571ca..ab09f30e4 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
+++ b/client/cat3/src/partials/sections/dashboard/analytics/controller/usageCtrl.js
@@ -72,6 +72,7 @@
                  };
                 usage.getData=function(fltObj){
                     usage.trendLineChart.data = [];
+                    usage.costGridOptions.data=[];
                     var  $today = new Date();
                     var $yesterday = new Date($today);
                     $yesterday.setDate($today.getDate() - 1);
@@ -84,7 +85,23 @@
                        // angular.forEach(result[usage.splitUp], function (valu, keyChild) {
                            var va = [];
                             if(result && result.length >0) {
+                                usage.costGridOptions.columnDefs=[
+                                    {name: 'name', field: 'name'},
+                                    {name: 'fromTime', field: 'fromTime'},
+                                    {name: 'toTime', field: 'toTime'},
+                                    {name: 'maximum', field: 'maximum'},
+                                    {name: 'minimum', field: 'minimum'},
+                                    {name: 'average', field: 'average'},
+                                ]
                                 angular.forEach(result[usage.splitUp].dataPoints, function (value) {
+                                    usage.costGridOptions.data.push({
+                                        name:$rootScope.filterNewEnt.platformId[resId],
+                                        fromTime:value.fromTime,
+                                        toTime:value.toTime,
+                                        maximum:value.maximum,
+                                        minimum:value.minimum,
+                                        average:value.average
+                                    });
                                     va.push([Date.parse(value.fromTime), value.average]);
                                 });
                                 usage.trendLineChart.data.push({
diff --git a/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html b/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html
index 0bf6d7c4b..46d4870ee 100644
--- a/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html
+++ b/client/cat3/src/partials/sections/dashboard/analytics/view/usage.html
@@ -1,17 +1,20 @@
 <div class="leftnavdiv" style="padding-right:7px;">
     <br>
+    <div class="col-lg-12 col-md-12 col-sm-12 top-stats">
+        <span class="pull-right">
+        <span class="box-title font-size-15">Usage Type</span>
+        <select  class="form-control select2 select2-hidden-accessible " ng-change="usage.splitChange()" style="width: auto;height: 31px;display: table-cell" ng-model="usage.splitUp" >
+            <option value="CPUUtilization">CPUUtilization</option>
+            <option value="DiskReadBytes">DiskReadBytes</option>
+            <option value="DiskWriteBytes">DiskWriteBytes</option>
+            <option value="NetworkIn">NetworkIn</option>
+            <option value="NetworkOut">NetworkOut</option>
+        </select>
+            </span>
+    </div>
+    <div class="clearfix"></div>
     <div ng-if="analytic.tabShowChat">
         <div class="row usage">
-            <div class="col-lg-12 col-md-12 col-sm-12 top-stats">                 
-                <span class="box-title font-size-15">Usage Type</span>
-                <select  class="form-control select2 select2-hidden-accessible " ng-change="usage.splitChange()" style="width: auto;height: 31px;display: table-cell" ng-model="usage.splitUp" >
-                    <option value="CPUUtilization">CPUUtilization</option>
-                    <option value="DiskReadBytes">DiskReadBytes</option>
-                    <option value="DiskWriteBytes">DiskWriteBytes</option>
-                    <option value="NetworkIn">NetworkIn</option>
-                    <option value="NetworkOut">NetworkOut</option>
-                </select>            
-            </div>
             <div class="col-lg-12 col-md-12 col-sm-12" >
                 <div class="box box-infobox box-info">
                     <div class="box-header with-border"><h3 class="box-title font-size-15"><i class="fa fa-line-chart"></i> Daily trends of usage</h3>