From 4c2265950cee6e9fefb470d129ebfc7b71ddb4a9 Mon Sep 17 00:00:00 2001
From: Dan Brown <jdanbrown@gmail.com>
Date: Wed, 26 Feb 2014 12:16:32 -0500
Subject: [PATCH 1/2] Add ResourceGroup to /summary

---
 grails-app/views/dashboard/summary.gsp |  7 ++++++-
 grails-app/views/layouts/main.gsp      | 10 ++++++++--
 web-app/js/ice.js                      | 20 +++++++++++++++++++-
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/grails-app/views/dashboard/summary.gsp b/grails-app/views/dashboard/summary.gsp
index 61640dd7..49c1707d 100644
--- a/grails-app/views/dashboard/summary.gsp
+++ b/grails-app/views/dashboard/summary.gsp
@@ -31,6 +31,7 @@
       <td>Account</td>
       <td>Region</td>
       <td>Product</td>
+      <td ng-show="showResourceGroups">ResourceGroup</td>
       <td>Operation</td>
       <td>UsageType</td>
     </tr>
@@ -50,6 +51,10 @@
         <select ng-model="selected_products" ng-options="a.name for a in products | filter:filter_products" ng-change="productsChanged()" multiple="multiple" class="metaProducts metaSelect"></select>
         <br><input ng-model="filter_products" type="text" class="metaFilter" placeholder="filter">
       </td>
+      <td class="metaTd" ng-show="showResourceGroups">
+        <select ng-model="selected_resourceGroups" ng-options="a.name for a in resourceGroups | filter:filter_resourceGroups" ng-change="resourceGroupsChanged()" multiple="multiple" class="metaResourceGroups metaSelect"></select>
+        <br><input ng-model="filter_resourceGroups" type="text" class="metaFilter" placeholder="filter">
+      </td>
       <td class="metaTd">
         <select ng-model="selected_operations" ng-options="a.name for a in operations | filter:filter_operations" ng-change="operationsChanged()" multiple="multiple" class="metaOperations metaSelect"></select>
         <br><input ng-model="filter_operations" type="text" class="metaFilter" placeholder="filter">
@@ -64,7 +69,7 @@
     <img src="${resource(dir: '/')}images/spinner.gif" ng-show="loading">
     <a href="javascript:void(0)" class="monitor" style="background-image: url(${resource(dir: '/')}images/tango/16/apps/utilities-system-monitor.png)"
        ng-click="updateUrl(); getData()" ng-show="!loading"
-       ng-disabled="selected_accounts.length == 0|| selected_regions.length == 0 || selected_products.length == 0 || selected_operations.length == 0 || selected_usageTypes.length == 0">Submit</a>
+       ng-disabled="selected_accounts.length == 0|| selected_regions.length == 0 || selected_products.length == 0 || showResourceGroups && selected_resourceGroups.length == 0 || selected_operations.length == 0 || selected_usageTypes.length == 0">Submit</a>
   </div>
 
   <div id="highchart_container" style="width: 100%; height: 400px;">
diff --git a/grails-app/views/layouts/main.gsp b/grails-app/views/layouts/main.gsp
index 7e1e094d..e5784ab6 100644
--- a/grails-app/views/layouts/main.gsp
+++ b/grails-app/views/layouts/main.gsp
@@ -39,8 +39,14 @@
     </div>
   </div>
   <ul class="nav" ng-show="!graphOnly()">
-    <li class="menuButton">
-        <a class="" href="${resource(dir: 'dashboard', file: 'summary')}" ng-click="reload()">AWS Summary</a>
+    <li class="menuButton dropdown">
+      <a class="link_with_params" href="${resource(dir: 'dashboard', file: 'summary')}" ng-click="reload()">AWS Summary</a>
+      <ul>
+        <li class="menuButton"><a class="link_with_params" href="${resource(dir: 'dashboard', file: 'summary')}" ng-click="reload()">General Summary</a></li>
+        <g:if test="${ReaderConfig.getInstance().resourceService != null}">
+        <li class="menuButton"><a class="link_with_params" href="${resource(dir: 'dashboard', file: 'summary')}#showResourceGroups=true" ng-click="reload()">Summary With Resource Groups</a></li>
+        </g:if>
+      </ul>
     </li>
     <li class="menuButton dropdown">
       <a class="link_with_params" href="${resource(dir: 'dashboard', file: 'detail')}#{{getTimeParams()}}" ng-click="reload()">AWS Details</a>
diff --git a/web-app/js/ice.js b/web-app/js/ice.js
index 823bda81..b89fe206 100644
--- a/web-app/js/ice.js
+++ b/web-app/js/ice.js
@@ -1488,6 +1488,7 @@ function summaryCtrl($scope, $location, usage_db, highchart) {
         {name: "Account"},
         {name: "Region"},
         {name: "Product"},
+        {name: "ResourceGroup"},
         {name: "Operation"},
         {name: "UsageType"}
     ],
@@ -1514,6 +1515,7 @@ function summaryCtrl($scope, $location, usage_db, highchart) {
           account: {selected: $scope.selected_accounts, from: $scope.accounts},
           region: {selected: $scope.selected_regions, from: $scope.regions},
           product: {selected: $scope.selected_products, from: $scope.products},
+          resourceGroup: {selected: $scope.selected_resourceGroups, from: $scope.resourceGroups},
           operation: {selected: $scope.selected_operations, from: $scope.operations},
           usageType: {selected: $scope.selected_usageTypes, from: $scope.usageTypes}
         });
@@ -1608,6 +1610,13 @@ function summaryCtrl($scope, $location, usage_db, highchart) {
   }
 
   $scope.productsChanged = function() {
+    if ($scope.showResourceGroups)
+      $scope.updateResourceGroups();
+    else
+      $scope.updateOperations();
+  }
+
+  $scope.resourceGroupsChanged = function() {
       $scope.updateOperations();
   }
 
@@ -1626,9 +1635,18 @@ function summaryCtrl($scope, $location, usage_db, highchart) {
     });
   }
 
+  $scope.updateResourceGroups = function() {
+    usage_db.getResourceGroups($scope, function(data){
+      $scope.updateOperations();
+    });
+  }
+
   $scope.updateProducts = function() {
     usage_db.getProducts($scope, function(data){
-      $scope.updateOperations();
+      if ($scope.showResourceGroups)
+        $scope.updateResourceGroups();
+      else
+        $scope.updateOperations();
     });
   }
 

From 9eb24a279306c3c10b800c3b4877b49e7499d056 Mon Sep 17 00:00:00 2001
From: Dan Brown <jdanbrown@gmail.com>
Date: Wed, 26 Feb 2014 12:31:34 -0500
Subject: [PATCH 2/2] highchart legend.maxHeight=55 to avoid legend blowup

---
 web-app/js/ice.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/web-app/js/ice.js b/web-app/js/ice.js
index b89fe206..9faed487 100644
--- a/web-app/js/ice.js
+++ b/web-app/js/ice.js
@@ -46,7 +46,8 @@ ice.factory('highchart', function() {
       text: 'Cost Per Hour'
     },
     legend: {
-        enabled: true
+        enabled: true,
+        maxHeight: 55
     },
     rangeSelector: {
         inputEnabled: false ,