poignatov/play-life
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.4.4: Логика чипсов и кнопки Без даты
Some checks failed
Build and Push Docker Image / build-and-push (push) Has been cancelled
Details

Browse Source
This commit is contained in:
poignatov
2026-03-08 19:36:45 +03:00
parent 4169285394
commit 81de26e586
3 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
6.4.3 6.4.4

2
play-life-web/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "play-life-web", "name": "play-life-web",
"version": "6.4.3", "version": "6.4.4",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

10
play-life-web/src/components/ShoppingList.jsx
View File

@@ -333,13 +333,15 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia
groups[groupKey] = { active: [], future: [] } groups[groupKey] = { active: [], future: [] }
} }
if (item.next_show_at) { if (!item.next_show_at) {
groups[groupKey].future.push(item)
return
}
const showAt = new Date(item.next_show_at) const showAt = new Date(item.next_show_at)
if (showAt > todayEnd) { if (showAt > todayEnd) {
groups[groupKey].future.push(item) groups[groupKey].future.push(item)
return return
} }
}
groups[groupKey].active.push(item) groups[groupKey].active.push(item)
}) })
@@ -709,9 +711,9 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia
nextShowAtStr = formatDateToLocal(nextShowAtDate) nextShowAtStr = formatDateToLocal(nextShowAtDate)
} }
const isToday = nextShowAtStr === todayStr
const isTomorrow = nextShowAtStr === tomorrowStr const isTomorrow = nextShowAtStr === tomorrowStr
const showTodayChip = !nextShowAtStr || nextShowAtStr > todayStr // Показываем "Сегодня" только если дата строго в будущем (null, сегодня и прошлое — не показываем)
const showTodayChip = !!nextShowAtStr && nextShowAtStr > todayStr
// Дата "по плану" // Дата "по плану"
const item = selectedItemForPostpone const item = selectedItemForPostpone