From 81de26e586e08bdc70e6c85cbbd40d2b451362a9 Mon Sep 17 00:00:00 2001 From: poignatov Date: Sun, 8 Mar 2026 19:36:45 +0300 Subject: [PATCH] =?UTF-8?q?6.4.4:=20=D0=9B=D0=BE=D0=B3=D0=B8=D0=BA=D0=B0?= =?UTF-8?q?=20=D1=87=D0=B8=D0=BF=D1=81=D0=BE=D0=B2=20=D0=B8=20=D0=BA=D0=BD?= =?UTF-8?q?=D0=BE=D0=BF=D0=BA=D0=B8=20=D0=91=D0=B5=D0=B7=20=D0=B4=D0=B0?= =?UTF-8?q?=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- play-life-web/package.json | 2 +- play-life-web/src/components/ShoppingList.jsx | 18 ++++++++++-------- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/VERSION b/VERSION index 133cad2..49df80b 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.4.3 +6.4.4 diff --git a/play-life-web/package.json b/play-life-web/package.json index 66e551e..a256893 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "6.4.3", + "version": "6.4.4", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/ShoppingList.jsx b/play-life-web/src/components/ShoppingList.jsx index d00e785..4ef9702 100644 --- a/play-life-web/src/components/ShoppingList.jsx +++ b/play-life-web/src/components/ShoppingList.jsx @@ -333,12 +333,14 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia groups[groupKey] = { active: [], future: [] } } - if (item.next_show_at) { - const showAt = new Date(item.next_show_at) - if (showAt > todayEnd) { - groups[groupKey].future.push(item) - return - } + if (!item.next_show_at) { + groups[groupKey].future.push(item) + return + } + const showAt = new Date(item.next_show_at) + if (showAt > todayEnd) { + groups[groupKey].future.push(item) + return } groups[groupKey].active.push(item) }) @@ -709,9 +711,9 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia nextShowAtStr = formatDateToLocal(nextShowAtDate) } - const isToday = nextShowAtStr === todayStr const isTomorrow = nextShowAtStr === tomorrowStr - const showTodayChip = !nextShowAtStr || nextShowAtStr > todayStr + // Показываем "Сегодня" только если дата строго в будущем (null, сегодня и прошлое — не показываем) + const showTodayChip = !!nextShowAtStr && nextShowAtStr > todayStr // Дата "по плану" const item = selectedItemForPostpone