From 5006a17afbb9ea3cdab6dbb452bb3d3a215378ea Mon Sep 17 00:00:00 2001
From: Hannah Eslinger <heslinge@nrel.gov>
Date: Tue, 28 Jan 2025 15:01:38 -0700
Subject: [PATCH 1/2] Fix group meter interval

---
 ...nventory_group_detail_meters_controller.js | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 deletions(-)

diff --git a/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js b/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js
index 0285d094ef..458615adbb 100644
--- a/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js
+++ b/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js
@@ -13,7 +13,7 @@ angular.module('SEED.controller.inventory_group_detail_meters', [])
     'Notification',
     'dataset_service',
     'inventory_service',
-    'meter_service',
+    'inventory_group_service',
     'cycles',
     'meters',
     'inventory_payload',
@@ -33,7 +33,7 @@ angular.module('SEED.controller.inventory_group_detail_meters', [])
       Notification,
       dataset_service,
       inventory_service,
-      meter_service,
+      inventory_group_service,
       cycles,
       meters,
       inventory_payload,
@@ -312,21 +312,15 @@ angular.module('SEED.controller.inventory_group_detail_meters', [])
       // according to the selected interval
       $scope.refresh_readings = () => {
         spinner_utility.show();
-        meter_service
-          .property_meter_usage(
-            $scope.inventory.view_id,
-            $scope.organization.id,
-            $scope.interval.selected,
-            [] // Not excluding any meters from the query
-          )
-          .then((usage) => {
-            // update the base data and reset filters
-            property_meter_usage = usage;
-
-            resetSelections();
-            $scope.applyFilters();
-            spinner_utility.hide();
-          });
+        inventory_group_service.get_meter_usage($stateParams.group_id, $scope.interval.selected)
+        .then((usage) => {
+          // update the base data and reset filters
+          property_meter_usage = usage;
+
+          resetSelections();
+          $scope.applyFilters();
+          spinner_utility.hide();
+        });
       };
 
       $scope.open_group_meter_create_modal = () => {

From 2cab10f74c4dba43dfaf6b5905c37ea3c22b6fba Mon Sep 17 00:00:00 2001
From: Hannah Eslinger <heslinge@nrel.gov>
Date: Wed, 29 Jan 2025 12:04:08 -0700
Subject: [PATCH 2/2] Lint

---
 .../inventory_group_detail_meters_controller.js    | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js b/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js
index 458615adbb..8215ceecef 100644
--- a/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js
+++ b/seed/static/seed/js/controllers/inventory_group_detail_meters_controller.js
@@ -313,14 +313,14 @@ angular.module('SEED.controller.inventory_group_detail_meters', [])
       $scope.refresh_readings = () => {
         spinner_utility.show();
         inventory_group_service.get_meter_usage($stateParams.group_id, $scope.interval.selected)
-        .then((usage) => {
-          // update the base data and reset filters
-          property_meter_usage = usage;
+          .then((usage) => {
+            // update the base data and reset filters
+            property_meter_usage = usage;
 
-          resetSelections();
-          $scope.applyFilters();
-          spinner_utility.hide();
-        });
+            resetSelections();
+            $scope.applyFilters();
+            spinner_utility.hide();
+          });
       };
 
       $scope.open_group_meter_create_modal = () => {