diff --git a/VERSION b/VERSION index 826f5ce..09a7391 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.6.0 +6.6.1 diff --git a/play-life-web/package.json b/play-life-web/package.json index cc34ca5..98d30c0 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "6.6.0", + "version": "6.6.1", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/ShoppingList.jsx b/play-life-web/src/components/ShoppingList.jsx index 5a4a6f5..a96ebb9 100644 --- a/play-life-web/src/components/ShoppingList.jsx +++ b/play-life-web/src/components/ShoppingList.jsx @@ -638,7 +638,19 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia {hasFuture && isFutureExpanded && (
- {group.future.map(item => ( + {group.future.map(item => { + let dateDisplay = null + if (item.next_show_at) { + const itemDate = new Date(item.next_show_at) + const now = new Date() + now.setHours(0, 0, 0, 0) + const target = new Date(itemDate.getFullYear(), itemDate.getMonth(), itemDate.getDate()) + if (target > now) { + dateDisplay = formatDateForDisplay(item.next_show_at) + } + } + + return (
{item.name}
-
- {formatDateForDisplay(item.next_show_at)} -
+ {dateDisplay && ( +
{dateDisplay}
+ )}
@@ -683,7 +695,7 @@ function ShoppingList({ onNavigate, refreshTrigger = 0, isActive = false, initia
- ))} + )})} )}