fix faulty recurse parsing for reports #980 (#981)

bmlt-enabled · Mar 23, 2024 · 512e168 · 512e168
1 parent f1050d1
commit 512e168
Show file tree

Hide file tree

Showing 10 changed files with 89 additions and 83 deletions.
diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -1,5 +1,9 @@
 # Release Notes
 
+### 4.3.3 (UNRELEASED)
+* Fix for reports where they are always recursing service bodies regardless of the setting [#980]
+* Fix for metrics counts summaries.
+
 ### 4.3.2 (March 21, 2024)
 * Fixes some admin logins for BMLT users with special characters. [#973]
 * Fixes validation for when there is no phone number set for volunteers on the Admin interface. [#975]

diff --git a/app/Http/Controllers/Api/V1/Admin/CdrController.php b/app/Http/Controllers/Api/V1/Admin/CdrController.php
@@ -22,7 +22,7 @@ public function index(Request $request): JsonResponse
             $request->get('service_body_id'),
             $request->get('date_range_start'),
             $request->get('date_range_end'),
-            $request->get('recurse')
+            filter_var($request->get('recurse'), FILTER_VALIDATE_BOOLEAN)
         ))->header("Content-Type", "application/json");
     }
 }
diff --git a/app/Http/Controllers/Api/V1/Admin/MapMetricController.php b/app/Http/Controllers/Api/V1/Admin/MapMetricController.php
@@ -25,7 +25,7 @@ public function index(Request $request)
                 $eventId,
                 $request->get("date_range_start"),
                 $request->get("date_range_end"),
-                $request->get("recurse")
+                filter_var($request->get("recurse"), FILTER_VALIDATE_BOOLEAN)
             );
 
             return response($data)
@@ -40,7 +40,7 @@ public function index(Request $request)
                 $request->get("service_body_id"),
                 $request->get("date_range_start"),
                 $request->get("date_range_end"),
-                $request->get("recurse")
+                filter_var($request->get("recurse"), FILTER_VALIDATE_BOOLEAN)
             );
 
             return response()->json($data)

diff --git a/app/Http/Controllers/Api/V1/Admin/MetricController.php b/app/Http/Controllers/Api/V1/Admin/MetricController.php
@@ -23,7 +23,7 @@ public function index(Request $request): JsonResponse
             $request->get("service_body_id"),
             $request->get("date_range_start"),
             $request->get("date_range_end"),
-            $request->get("recurse")
+            filter_var($request->get("recurse"), FILTER_VALIDATE_BOOLEAN)
         );
 
         return response()->json($data)

diff --git a/app/Services/SettingsService.php b/app/Services/SettingsService.php
@@ -12,7 +12,7 @@
 
 class SettingsService
 {
-    private string $version = "4.3.2";
+    private string $version = "4.3.3";
     private array $allowlist = [
         'announce_servicebody_volunteer_routing' => ['description' => '/helpline/announce_servicebody_volunteer_routing' , 'default' => false, 'overridable' => true, 'hidden' => false],
         'blocklist' => ['description' => '/general/blocklist' , 'default' => '', 'overridable' => true, 'hidden' => false],

diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -24,7 +24,7 @@
         "bootstrap": "^4.6.2",
         "dark-mode-switch": "^1.0.0",
         "daterangepicker": "^3.1.0",
-        "jquery": "~3.4.1",
+        "jquery": "~3.7.1",
         "jquery-ui-dist": "^1.13.2",
         "jquery-ui-touch-punch": "^0.2.3",
         "jquery-validation": "^1.19.5",

diff --git a/public/src/js/yap-core.js b/public/src/js/yap-core.js
@@ -169,7 +169,7 @@ function getMetricsData()
             var actions = ['Volunteer (CALL)', 'Meetings (CALL)', 'Just For Today (CALL)', 'Volunteer (SMS)', 'Meetings (SMS)', 'Just For Today (SMS)'];
             var actions_plots = [1, 2, 3, 19, 20, 21];
             var plots = {"1": [], "2": [], "3": [], "19": [], "20": [], "21": []};
-            for (var item of data['metrics']) {
+            for (let item of data['metrics']) {
                 plots[JSON.parse(item['data'])['searchType']].push({
                     'x': item['timestamp'],
                     'y': item['counts']
@@ -184,19 +184,19 @@ function getMetricsData()
             $("#summary-volunteer-sms").html("0");
 
             for (var item of data['summary']) {
-                if (item['event_id'] === "2") {
+                if (item['event_id'] === 2) {
                     $("#summary-meetingsearch-calls").html(item['counts'])
-                } else if (item['event_id'] === "19") {
+                } else if (item['event_id'] === 19) {
                     $("#summary-meetingsearch-sms").html(item['counts'])
-                } else if (item['event_id'] === "20") {
+                } else if (item['event_id'] === 20) {
                     $("#summary-volunteer-sms").html(item['counts'])
                 }
             }
 
             var totalCalls = data['calls'].length;
             var missedCalls = 0;
             $("#summary-volunteer-calls").html(totalCalls)
-            for (var item of data['calls']) {
+            for (let item of data['calls']) {
                 var answeredCount = parseInt(item['answered_count']);
                 var missedCount = parseInt(item['missed_count']);
                 if (answeredCount === 0 && missedCount > 0) {