From 2882bb7e740cab730581a8c7a7e22f0b30ad7a58 Mon Sep 17 00:00:00 2001
From: Nastya <nastyab015@yandex.ru>
Date: Mon, 28 Jul 2025 16:36:16 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=B5=D0=B3=D0=BE=D0=B4=D0=BD=D1=8F?=
 =?UTF-8?q?=D1=88=D0=BD=D0=B8=D0=B9=20=D0=B4=D0=B5=D0=BD=D1=8C=20=D1=83?=
 =?UTF-8?q?=D1=87=D0=B8=D1=82=D1=8B=D0=B2=D0=B0=D0=B5=D1=82=D1=81=D1=8F=20?=
 =?UTF-8?q?=D0=B2=20=D0=B3=D1=80=D0=B0=D1=84=D0=B8=D0=BA=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/pages/Analytics/General.tsx | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/pages/Analytics/General.tsx b/src/pages/Analytics/General.tsx
index be9b7b88..33f6d581 100644
--- a/src/pages/Analytics/General.tsx
+++ b/src/pages/Analytics/General.tsx
@@ -131,11 +131,21 @@ export const General: FC<GeneralProps> = ({ data, day }) => {
   const generalResponse = Object.entries(data).reduce(
     (total, [fatherKey, values]) => {
       const value = Object.keys(values).reduce((totalValue, key) => {
-        if (Number(key) - currentDate < 0) {
+        const keyTimestamp = Number(key);
+        const todayStart = moment().startOf('day').unix();
+        const todayEnd = moment().endOf('day').unix();
+        
+        // Включаем данные за сегодня и прошлые дни, исключаем будущие дни
+        if (keyTimestamp >= todayStart && keyTimestamp <= todayEnd) {
+          // Сегодняшний день - включаем
           return { ...totalValue, [key]: values[key] };
+        } else if (keyTimestamp < todayStart) {
+          // Прошлые дни - включаем
+          return { ...totalValue, [key]: values[key] };
+        } else {
+          // Будущие дни - исключаем
+          return totalValue;
         }
-
-        return totalValue;
       }, {});
 
       return { ...total, [fatherKey]: value };