From 1a823ca2f666a2b6186e49807ca11ecac1764673 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Tue, 29 Aug 2023 21:34:00 +0200 Subject: [PATCH] Always show complete package list, even with unready items --- rust/src/view/trip/packagelist.rs | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/rust/src/view/trip/packagelist.rs b/rust/src/view/trip/packagelist.rs index f367bc1..76986a2 100644 --- a/rust/src/view/trip/packagelist.rs +++ b/rust/src/view/trip/packagelist.rs @@ -257,7 +257,7 @@ impl TripPackageListCategoryBlockUnready { ."flex" ."flex-col" { - @for item in category.items.as_ref().unwrap().iter().filter(|item| item.picked) { + @for item in category.items.as_ref().unwrap().iter().filter(|item| item.picked && !item.ready) { (TripPackageListRowUnready::build(trip.id, item)) } } @@ -329,18 +329,25 @@ impl TripPackageList { ."gap-5" { @for category in trip.categories() { - (TripPackageListCategoryBlockUnready::build(trip, category)) + @let empty = !category + .items + .as_ref() + .unwrap() + .iter() + .any(|item| item.picked); + @if !empty { + (TripPackageListCategoryBlockUnready::build(trip, category)) + } } } - } @else { - p { "All items are ready, pack the following things:" } - div - ."columns-3" - ."gap-5" - { - @for category in trip.categories() { - (TripPackageListCategoryBlockReady::build(trip, category)) - } + } + p { "Pack the following things:" } + div + ."columns-3" + ."gap-5" + { + @for category in trip.categories() { + (TripPackageListCategoryBlockReady::build(trip, category)) } } }