From 904d56a7878df7d49d61c4da61708a1471a7b1bd Mon Sep 17 00:00:00 2001
From: brusnitsyn <brusnitsyn@gmail.com>
Date: Fri, 24 Jul 2026 17:02:27 +0900
Subject: [PATCH] =?UTF-8?q?=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D0=B2=D0=BE=D0=B4=D0=B0=20+1?=
 =?UTF-8?q?=20=20=D0=BF=D1=80=D0=B8=20=D0=B2=D1=8B=D0=B1=D0=BE=D1=80=D0=B5?=
 =?UTF-8?q?=20=D0=B4=D0=B0=D1=82=D1=8B=20=D0=B8=D0=B7=20=D0=BA=D0=BD=D0=BE?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=BA=20=D0=BA=D0=B0=D0=BB=D0=B5=D0=BD=D0=B4=D0=B0?=
 =?UTF-8?q?=D1=80=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Web/StatisticController.php | 4 ++--
 resources/js/Components/DatePickerQuery.vue      | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/Web/StatisticController.php b/app/Http/Controllers/Web/StatisticController.php
index 83212fd..53a7439 100644
--- a/app/Http/Controllers/Web/StatisticController.php
+++ b/app/Http/Controllers/Web/StatisticController.php
@@ -25,7 +25,7 @@ class StatisticController extends Controller
         $queryEndDate = $request->query('endAt');
         $queryDateRange = $this->dateService->getDateRangeFromRequest($request, $user, false);
         $isRangeOneDayQuery = $this->dateService->isRangeOneDay($queryDateRange->startDate, $queryDateRange->endDate);
-        $dateRange = $this->dateService->getDateRangeFromRequest($request, $user);
+        $dateRange = $this->dateService->getDateRangeFromRequest($request, $user, true);
         $isRangeOneDay = $this->dateService->isRangeOneDay($dateRange->startDate, $dateRange->endDate);
 
         $queryStartOfDateRange = $dateRange->start()->copy()->startOfYear();
@@ -49,7 +49,7 @@ class StatisticController extends Controller
             'isHeadOrAdmin' => $isHeadOrAdmin,
             'date' => [
                 $dateRange->startDate->getTimestampMs(),
-                $isRangeOneDayQuery ? $dateRange->endDate->getTimestampMs() : $dateRange->displayEnd()->getTimestampMs(),
+                $dateRange->displayEnd()->getTimestampMs(),
             ],
             'isOneDay' => $isRangeOneDay,
             'recipientPlanOfYear' => $finalData['recipientPlanOfYear'],
diff --git a/resources/js/Components/DatePickerQuery.vue b/resources/js/Components/DatePickerQuery.vue
index e7704f4..809bd02 100644
--- a/resources/js/Components/DatePickerQuery.vue
+++ b/resources/js/Components/DatePickerQuery.vue
@@ -153,7 +153,7 @@ const shortcuts = {
     'Вчера': () => getPreviousShift(),
     'За 7 дней': () => {
         const currentShift = getCurrentShift()
-        const end = currentShift[1]
+        const end = new Date() //currentShift[1]
         const start = new Date(end)
         start.setDate(start.getDate() - 7)
         start.setHours(9, 0, 0, 0)
@@ -161,7 +161,7 @@ const shortcuts = {
     },
     'За 30 дней': () => {
         const currentShift = getCurrentShift()
-        const end = currentShift[1]
+        const end = new Date() //currentShift[1]
         const start = new Date(end)
         start.setDate(start.getDate() - 30)
         start.setHours(9, 0, 0, 0)
@@ -169,7 +169,7 @@ const shortcuts = {
     },
     'Текущий год': () => {
         const currentShift = getCurrentShift()
-        const end = currentShift[1]
+        const end = new Date() //currentShift[1]
         const start = new Date(end.getFullYear(), 0, 1)
         start.setHours(9, 0, 0, 0)
         return [start, end]