Start on shopping list

Author: ComputerElite

EatSomewhere/Server/UserManagementServer.cs

@@ -10,7 +10,7 @@ public class UserManagementServer
 {
     public static User? GetUserBySession(ServerRequest request)
     {
-        string? session = null;
+        string? session;
         string? authorizationHeader = request.context.Request.Headers.Get("Authorization");
         if(authorizationHeader != null)
         {

app/lib/data/foodentry.dart

@@ -72,6 +72,20 @@ class FoodEntry {
     return (cost / getPersonCount()).ceil();
   }
 
+  List<IngredientEntry> getShoppingList() {
+    List<IngredientEntry> shoppingList = [];
+    int persons = getPersonCount();
+    if(food == null) return [];
+    for (IngredientEntry ingredient in food!.ingredients) {
+      print("Ingredient: ${ingredient.ingredient}");
+      if(ingredient.ingredient == null) continue;
+      IngredientEntry shoppingItem = IngredientEntry.fromIngredient(ingredient.ingredient!);
+      shoppingItem.amount = ingredient.amount / (food?.personCount ?? 1) * persons;
+      shoppingList.add(shoppingItem);
+    }
+    return shoppingList;
+  }
+
   FoodEntry.fromFood(Food this.food);
 }
 

app/lib/screens/create_food_entry_screen.dart

@@ -3,6 +3,7 @@ import 'package:eat_somewhere/data/food.dart';
 import 'package:eat_somewhere/data/foodentry.dart';
 import 'package:eat_somewhere/data/helper.dart';
 import 'package:eat_somewhere/screens/select_food.dart';
+import 'package:eat_somewhere/screens/shopping_list_screen.dart';
 import 'package:eat_somewhere/service/storage.dart';
 import 'package:eat_somewhere/widgets/chips/additional_persons_chip.dart';
 import 'package:eat_somewhere/widgets/chips/chip_combiner.dart';
@@ -203,6 +204,16 @@ class _CreateFoodEntryScreenState extends State<CreateFoodEntryScreen> {
                     }
                   },
                   child: const Text("Add Participant")),
+            FilledButton(onPressed: () {
+              Navigator.push(
+                context,
+                MaterialPageRoute(
+                  builder: (context) => ShoppingListScreen(
+                    foodEntry: widget.foodEntry
+                  ),
+                ),
+              );
+            }, child: Text("Show shopping list")),
             TextField(
               decoration: InputDecoration(
                 labelText: "Comment",

app/lib/screens/shopping_list_screen.dart

@@ -0,0 +1,54 @@
+import 'package:eat_somewhere/data/foodentry.dart';
+import 'package:eat_somewhere/data/helper.dart';
+import 'package:eat_somewhere/widgets/chips/price_chip.dart';
+import 'package:eat_somewhere/widgets/constrained_container.dart';
+import 'package:flutter/material.dart';
+
+class ShoppingListScreen extends StatefulWidget {
+  final FoodEntry foodEntry;
+
+  const ShoppingListScreen({Key? key, required this.foodEntry})
+      : super(key: key);
+
+  @override
+  State<ShoppingListScreen> createState() => _ShoppingListScreenState();
+}
+
+class _ShoppingListScreenState extends State<ShoppingListScreen> {
+  @override
+  Widget build(BuildContext context) {
+    return Scaffold(
+      appBar: AppBar(
+        title: const Text("Shopping List"),
+      ),
+      body: ConstrainedContainer(child: ListView(
+        children: [
+          ListTile(
+            title: Text(widget.foodEntry.food?.name ?? "Unknown"),
+            subtitle: Text(
+                "Price: ${PriceHelper.formatPriceWithUnit(widget.foodEntry.getEstimatedCost())}"),
+          ),
+          // Adjust the table to use the minimum width it needs
+          Row(
+            children: [
+              Expanded(child: Container(child: Table(
+                defaultVerticalAlignment: TableCellVerticalAlignment.middle,
+                children: [
+                  ...widget.foodEntry
+                      .getShoppingList()
+                      .map((item) => TableRow(
+                        children: [
+                            Text(item.amount.toString()),
+                            Text(item.ingredient?.unit.name ?? "Unknown"),
+                            Text(item.ingredient?.name ?? "Unknown"),
+                            PriceChip(amount: item.getEstimatedCost()),
+                          ])),
+                ],
+              )))
+            ],
+          )
+        ],
+      ),
+    ));
+  }
+}

app/lib/service/storage.dart

@@ -117,6 +117,7 @@ class Storage {
   }
   static Future reloadFoodEntries() async {
     instance.foodEntries[getSettings().chosenAssembly] = await ServerLoader.LoadFoodEntries(0, 20);
+    instance.foodEntries[getSettings().chosenAssembly]!.sort((x,y) => y.date.compareTo(x.date));
     onDataReload();
   }
 

app/lib/widgets/chips/additional_persons_chip.dart

@@ -15,8 +15,11 @@ class AdditionalPersonsChip extends CombinableChip {
   @override
   Widget build(BuildContext context) {
     return Chip(
-      label: Row(
+      label: SizedBox(
+        width: 55,
+        child: Row(
         spacing: 6,
+        mainAxisAlignment: MainAxisAlignment.spaceBetween,
         children: [
           Text(
             "+$additionalPersons",
@@ -25,6 +28,7 @@ class AdditionalPersonsChip extends CombinableChip {
           Icon(Icons.group, color: UserColors.getContrastColor(user),)
         ],
       ),
+      ),
       shape: this.shape,
       backgroundColor: UserColors.getColor(user),
       padding: const EdgeInsets.all(0),

app/lib/widgets/chips/arrow_price_chip.dart

@@ -14,8 +14,17 @@ class ArrowPriceChip extends CombinableChip {
     return InkWell(
       onTap: onTap,
       child: Chip(
-        label: Text(
-          "→ ${PriceHelper.formatPriceWithUnit(amount)} →"
+        label: SizedBox(
+          width: 90,
+          child: Row(
+            mainAxisAlignment: MainAxisAlignment.spaceBetween,
+            children: [
+              Text("→",),
+              Text(
+                PriceHelper.formatPriceWithUnit(amount)),
+              Text("→",),
+            ],
+          ),
         ),
         shape: shape,
         padding: const EdgeInsets.all(0),