Fixed data calculation for today date range filter (#2856)

xibosignage · Jan 17, 2025 · a757f95 · a757f95
1 parent 3885219
commit a757f95
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 2 deletions.
diff --git a/lib/Report/ApiRequests.php b/lib/Report/ApiRequests.php
@@ -181,6 +181,12 @@ public function getResults(SanitizerInterface $sanitizedParams)
         // depending on the date range selected.
         $fromDt = $sanitizedParams->getDate('fromDt');
         $toDt = $sanitizedParams->getDate('toDt');
+        $currentDate = Carbon::now()->startOfDay();
+
+        // If toDt is current date then make it current datetime
+        if ($toDt->format('Y-m-d') == $currentDate->format('Y-m-d')) {
+            $toDt = Carbon::now();
+        }
 
         $type = $sanitizedParams->getString('type');
 

diff --git a/lib/Report/DisplayAlerts.php b/lib/Report/DisplayAlerts.php
@@ -171,6 +171,12 @@ public function getResults(SanitizerInterface $sanitizedParams)
         // depending on the date range selected.
         $fromDt = $sanitizedParams->getDate('fromDt');
         $toDt = $sanitizedParams->getDate('toDt');
+        $currentDate = Carbon::now()->startOfDay();
+
+        // If toDt is current date then make it current datetime
+        if ($toDt->format('Y-m-d') == $currentDate->format('Y-m-d')) {
+            $toDt = Carbon::now();
+        }
 
         $metadata = [
             'periodStart' => Carbon::createFromTimestamp($fromDt->toDateTime()->format('U'))

diff --git a/lib/Report/SessionHistory.php b/lib/Report/SessionHistory.php
@@ -177,6 +177,12 @@ public function getResults(SanitizerInterface $sanitizedParams)
         // depending on the date range selected.
         $fromDt = $sanitizedParams->getDate('fromDt');
         $toDt = $sanitizedParams->getDate('toDt');
+        $currentDate = Carbon::now()->startOfDay();
+
+        // If toDt is current date then make it current datetime
+        if ($toDt->format('Y-m-d') == $currentDate->format('Y-m-d')) {
+            $toDt = Carbon::now();
+        }
 
         $metadata = [
             'periodStart' => Carbon::createFromTimestamp($fromDt->toDateTime()->format('U'))

diff --git a/lib/Report/TimeDisconnectedSummary.php b/lib/Report/TimeDisconnectedSummary.php
@@ -200,15 +200,19 @@ public function getResults(SanitizerInterface $sanitizedParams)
         $onlyLoggedIn = $sanitizedParams->getCheckbox('onlyLoggedIn') == 1;
         $groupBy = $sanitizedParams->getString('groupBy');
 
-        $currentDate = Carbon::now()->startOfDay();
-
         //
         // From and To Date Selection
         // --------------------------
         // The report uses a custom range filter that automatically calculates the from/to dates
         // depending on the date range selected.
         $fromDt = $sanitizedParams->getDate('fromDt');
         $toDt = $sanitizedParams->getDate('toDt');
+        $currentDate = Carbon::now()->startOfDay();
+
+        // If toDt is current date then make it current datetime
+        if ($toDt->format('Y-m-d') == $currentDate->format('Y-m-d')) {
+            $toDt = Carbon::now();
+        }
 
         // Get an array of display groups this user has access to
         $displayGroupIds = [];