Add shopping entry notes

CloudronManifest.json

@@ -4,8 +4,8 @@
   "author": "Florian Heinz",
   "description": "Private Flask app for meals, shopping and gentle food planning",
   "tagline": "einfach essen planen",
-  "version": "1.2.2",
-  "upstreamVersion": "1.2.2",
+  "version": "1.3.0",
+  "upstreamVersion": "1.3.0",
   "healthCheckPath": "/",
   "httpPort": 8000,
   "manifestVersion": 2,

RELEASE_NOTES_1.3.0.md

@@ -0,0 +1,50 @@
+# Nouri 1.3.0
+
+Nouri 1.3.0 ist ein größerer Alltags- und Pflege-Release auf Basis von 1.2.2. Der Schwerpunkt liegt auf klareren Lebensmittel-Zuständen, einer ruhigeren Einkaufsliste und Formularen, die beim Bearbeiten nicht mehr aus dem Arbeitsfluss reißen.
+
+## Neu in 1.3.0
+
+- Lebensmittel haben jetzt eine klarere Alltagslogik:
+  - `Zuhause` ist ein Bestandsstatus
+  - `Gerade nicht da` ist ein fehlender Bestand
+  - `Archiviert` bleibt eine bewusste Entscheidung
+  - `Unsortiert` ist ein neuer Zwischenstatus für schnelle Sammelerfassung
+- Über `Schnell anlegen` lassen sich mehrere Lebensmittel auf einmal erfassen.
+  - Die Einträge landen zunächst in `Unsortiert`
+  - sie tauchen erst nach späterer Einordnung regulär im Alltag auf
+- Die Lebensmittelkarten wurden deutlich vereinfacht:
+  - Bild oder passendes Icon
+  - Titel
+  - Bearbeitung über die ganze Kachel
+  - Archivieren über ein kleines `x`
+  - Zusatzinfos nur noch als ruhige Hover-Ebene
+- Die Einkaufsliste wurde klarer und direkter:
+  - Suche nach Lebensmitteln statt Dropdown
+  - Einträge mit Bild oder passendem Icon
+  - Bearbeitung über Popup
+  - Archivierte und unsortierte Lebensmittel können ebenfalls über die Suche wieder auf die Einkaufsliste gesetzt werden
+
+## Enthaltene Feinschliffe seit 1.2.2
+
+- Die Lebensmittel- und Mahlzeitenlogik wurde weiter geschärft:
+  - Geschmacksrichtung `süß`, `herzhaft`, `neutral`
+  - bessere Filterung kulinarisch passender Vorschläge
+  - klarere Builder-Begriffe und ruhigere Formulare
+- Auswahlbereiche für Tageszeiten, Mahlzeit-Charakter und Builder-Felder wurden weiter vereinheitlicht.
+- Ausgewählte Zutaten in Mahlzeiten und Paketen sind sichtbarer und leichter bearbeitbar.
+- Mehr Formulare unterstützen jetzt einen ruhigeren Bearbeitungsfluss:
+  - `Speichern`
+  - `Speichern und schließen`
+  - Scroll-Position bleibt beim Weiterbearbeiten erhalten
+- Die Navigation und mehrere Detailansichten wurden weiter beruhigt und konsistenter gemacht.
+
+## Technisch
+
+- Cloudron-Version und Upstream-Version stehen jetzt auf `1.3.0`.
+- Die interne Schema-Version und der App-Version-Fallback wurden auf `1.3.0` angehoben.
+- Die Datenbank kennt jetzt zusätzliche Zustände und Felder für die überarbeitete Lebensmittel-Logik, unter anderem für `Unsortiert`.
+
+## Hinweis zum Update
+
+- Beim Cloudron-Update sollte der `data`-Ordner weiterhin schreibbar sein, damit Schema-Änderungen sauber angewendet werden können.
+- Für produktive Updates bleibt ein reguläres Cloudron-Backup vor dem Rollout die sichere Variante.

nouri/__init__.py

@@ -93,7 +93,7 @@ def load_app_version(root_dir: Path) -> str:
         ).strip()
         if manifest_version:
             return manifest_version
-    return "1.2.2"
+    return "1.3.0"
 
 
 def load_release_url() -> str:

nouri/admin.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 from flask import Blueprint, flash, g, redirect, render_template, request, url_for
 from werkzeug.security import generate_password_hash
 
-from .auth import admin_required, can_remove_last_admin, validate_admin_user_form
+from .auth import admin_required, can_remove_last_admin, url_with_scroll_position, validate_admin_user_form, wants_to_stay_on_form
 from .constants import BUILDER_DESCRIPTIONS, BUILDER_OPTIONS, DEFAULT_CATEGORIES, DEFAULT_CATEGORY_BUILDERS, ROLE_LABELS
 from .db import get_db
 
@@ -104,6 +104,19 @@ def user_create():
             )
             database.commit()
             flash("Der Nutzer wurde angelegt.", "success")
+            if wants_to_stay_on_form():
+                new_user = database.execute(
+                    """
+                    SELECT id
+                    FROM users
+                    WHERE household_id = ? AND username = ?
+                    ORDER BY id DESC
+                    LIMIT 1
+                    """,
+                    (g.user["household_id"], form_data["username"]),
+                ).fetchone()
+                if new_user is not None:
+                    return redirect(url_with_scroll_position(url_for("admin.user_edit", user_id=int(new_user["id"]))))
             return redirect(url_for("admin.user_list"))
 
         flash(error, "error")
@@ -185,6 +198,8 @@ def user_edit(user_id: int):
                 )
             database.commit()
             flash("Der Nutzer wurde aktualisiert.", "success")
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("admin.user_edit", user_id=user_id)))
             return redirect(url_for("admin.user_list"))
 
         flash(error, "error")

nouri/auth.py

@@ -2,6 +2,7 @@ from __future__ import annotations
 
 import functools
 import secrets
+from urllib.parse import parse_qsl, urlencode, urlsplit, urlunsplit
 
 from flask import (
     Blueprint,
@@ -25,23 +26,23 @@ auth_bp = Blueprint("auth", __name__, url_prefix="/auth")
 
 def login_required(view):
     @functools.wraps(view)
-    def wrapped_view(**kwargs):
+    def wrapped_view(*args, **kwargs):
         if g.user is None:
             return redirect(url_for("auth.login"))
-        return view(**kwargs)
+        return view(*args, **kwargs)
 
     return wrapped_view
 
 
 def admin_required(view):
     @functools.wraps(view)
-    def wrapped_view(**kwargs):
+    def wrapped_view(*args, **kwargs):
         if g.user is None:
             return redirect(url_for("auth.login"))
         if g.user["role"] != "admin":
             flash("Dieser Bereich ist für Admins gedacht.", "error")
             return redirect(url_for("main.dashboard"))
-        return view(**kwargs)
+        return view(*args, **kwargs)
 
     return wrapped_view
 
@@ -53,6 +54,25 @@ def ensure_csrf_token() -> str:
     return token
 
 
+def wants_to_stay_on_form() -> bool:
+    return request.form.get("save_mode", "").strip() == "stay"
+
+
+def url_with_scroll_position(url: str) -> str:
+    raw_scroll = request.form.get("_scroll", "").strip()
+    if not raw_scroll:
+        return url
+    try:
+        scroll_value = max(0, int(float(raw_scroll)))
+    except ValueError:
+        return url
+
+    parts = urlsplit(url)
+    query = dict(parse_qsl(parts.query, keep_blank_values=True))
+    query["_scroll"] = str(scroll_value)
+    return urlunsplit((parts.scheme, parts.netloc, parts.path, urlencode(query), parts.fragment))
+
+
 def normalize_login_value(raw: str) -> str:
     return raw.strip().lower()
 
@@ -231,7 +251,9 @@ def profile():
             )
             database.commit()
             flash("Dein Profil wurde aktualisiert.", "success")
-            return redirect(url_for("auth.profile"))
+            if wants_to_stay_on_form():
+                return redirect(url_with_scroll_position(url_for("auth.profile")))
+            return redirect(url_for("main.dashboard"))
 
         flash(error, "error")
 

nouri/backup.py

@@ -52,13 +52,25 @@ def export_backup_archive(
         payload["tables"][table_name] = [dict(row) for row in rows]
 
     uploads_root = Path(upload_folder)
-    with zipfile.ZipFile(archive_path, "w", compression=zipfile.ZIP_DEFLATED) as archive:
-        archive.writestr("backup.json", json.dumps(payload, ensure_ascii=False, indent=2))
+    uploads_snapshot_dir = Path(tempfile.mkdtemp(prefix="nouri-backup-uploads-"))
+    try:
         if uploads_root.exists():
             for file_path in uploads_root.rglob("*"):
+                if not file_path.is_file():
+                    continue
+                relative_path = file_path.relative_to(uploads_root)
+                snapshot_path = uploads_snapshot_dir / relative_path
+                snapshot_path.parent.mkdir(parents=True, exist_ok=True)
+                shutil.copy2(file_path, snapshot_path)
+
+        with zipfile.ZipFile(archive_path, "w", compression=zipfile.ZIP_DEFLATED) as archive:
+            archive.writestr("backup.json", json.dumps(payload, ensure_ascii=False, indent=2))
+            for file_path in uploads_snapshot_dir.rglob("*"):
                 if file_path.is_file():
-                    relative_path = file_path.relative_to(uploads_root)
+                    relative_path = file_path.relative_to(uploads_snapshot_dir)
                     archive.write(file_path, f"uploads/{relative_path.as_posix()}")
+    finally:
+        shutil.rmtree(uploads_snapshot_dir, ignore_errors=True)
 
     return archive_path, backup_name
 

nouri/constants.py

@@ -17,6 +17,7 @@ DAYPART_SLUG_TO_MEAL_TYPE = {
 }
 
 DEFAULT_CATEGORIES = [
+    "Unsortiert",
     "Kohlenhydrate",
     "Milchprodukt",
     "Obst",
@@ -30,6 +31,7 @@ DEFAULT_CATEGORIES = [
 ]
 
 DEFAULT_CATEGORY_BUILDERS = {
+    "Unsortiert": "neutral",
     "Kohlenhydrate": "carb",
     "Brot & Getreide": "carb",
     "Milchprodukt": "dairy",
@@ -226,9 +228,10 @@ ITEM_KIND_SINGULAR_LABELS = {
 }
 
 AVAILABILITY_LABELS = {
-    "idea": "Merkliste",
+    "idea": "Gerade nicht da",
     "home": "Zuhause",
-    "archived": "Archiv",
+    "unsorted": "Unsortiert",
+    "archived": "Archiviert",
 }
 
 ROLE_LABELS = {

nouri/db.py

@@ -15,7 +15,7 @@ from .constants import (
     DEFAULT_CATEGORY_BUILDERS,
 )
 
-CURRENT_SCHEMA_VERSION = "1.2.2"
+CURRENT_SCHEMA_VERSION = "1.3.0"
 
 ANIMAL_HINTS = (
     "huhn",
@@ -344,6 +344,19 @@ def migrate_food_flavor_profiles(database: sqlite3.Connection) -> None:
     set_meta(database, "food_flavor_profiles_migrated", "1")
 
 
+def migrate_item_archive_state(database: sqlite3.Connection) -> None:
+    if get_meta(database, "item_archive_state_migrated") == "1":
+        return
+
+    if "is_archived" not in table_columns(database, "items"):
+        return
+
+    database.execute("UPDATE items SET is_archived = 0 WHERE is_archived IS NULL")
+    database.execute("UPDATE items SET is_archived = 1 WHERE availability_state = 'archived'")
+    database.execute("UPDATE items SET availability_state = 'idea' WHERE availability_state = 'archived'")
+    set_meta(database, "item_archive_state_migrated", "1")
+
+
 def get_db() -> sqlite3.Connection:
     if "db" not in g:
         g.db = sqlite3.connect(
@@ -468,11 +481,13 @@ def bootstrap_legacy_schema(database: sqlite3.Connection) -> None:
         add_column_if_missing(database, "items", "meal_type TEXT")
         add_column_if_missing(database, "items", "meal_tags TEXT NOT NULL DEFAULT ''")
         add_column_if_missing(database, "items", "energy_density TEXT NOT NULL DEFAULT 'neutral'")
+        add_column_if_missing(database, "items", "is_archived INTEGER NOT NULL DEFAULT 0")
 
     if table_exists(database, "shopping_entries"):
         add_column_if_missing(database, "shopping_entries", "household_id INTEGER")
         add_column_if_missing(database, "shopping_entries", "owner_user_id INTEGER")
         add_column_if_missing(database, "shopping_entries", "visibility TEXT NOT NULL DEFAULT 'shared'")
+        add_column_if_missing(database, "shopping_entries", "shopping_note TEXT NOT NULL DEFAULT ''")
         add_column_if_missing(database, "shopping_entries", "needed_for_date TEXT")
         add_column_if_missing(database, "shopping_entries", "needed_for_daypart_id INTEGER")
 
@@ -722,8 +737,11 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
     add_column_if_missing(database, "items", "meal_type TEXT")
     add_column_if_missing(database, "items", "meal_tags TEXT NOT NULL DEFAULT ''")
     add_column_if_missing(database, "items", "energy_density TEXT NOT NULL DEFAULT 'neutral'")
+    add_column_if_missing(database, "items", "is_archived INTEGER NOT NULL DEFAULT 0")
+    add_column_if_missing(database, "items", "is_quick_added INTEGER NOT NULL DEFAULT 0")
     add_column_if_missing(database, "shopping_entries", "needed_for_date TEXT")
     add_column_if_missing(database, "shopping_entries", "needed_for_daypart_id INTEGER")
+    add_column_if_missing(database, "shopping_entries", "shopping_note TEXT NOT NULL DEFAULT ''")
     add_column_if_missing(database, "user_settings", "suggestion_style TEXT NOT NULL DEFAULT 'balanced'")
     add_column_if_missing(database, "user_settings", "energy_preference TEXT NOT NULL DEFAULT 'neutral'")
     add_column_if_missing(database, "user_settings", "protein_preference TEXT NOT NULL DEFAULT 'mixed'")
@@ -771,6 +789,7 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
     sync_default_categories(database)
     migrate_item_profiles(database)
     migrate_food_flavor_profiles(database)
+    migrate_item_archive_state(database)
     database.execute(
         """
         INSERT OR IGNORE INTO user_settings (user_id)
@@ -784,6 +803,9 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
     database.execute("UPDATE items SET suggestion_priority = 'normal' WHERE suggestion_priority IS NULL OR suggestion_priority = ''")
     database.execute("UPDATE items SET can_be_meal_core = 0 WHERE can_be_meal_core IS NULL")
     database.execute("UPDATE items SET meal_tags = '' WHERE meal_tags IS NULL")
+    database.execute("UPDATE items SET is_archived = 0 WHERE is_archived IS NULL")
+    database.execute("UPDATE items SET is_quick_added = 0 WHERE is_quick_added IS NULL")
+    database.execute("UPDATE shopping_entries SET shopping_note = '' WHERE shopping_note IS NULL")
     database.execute("UPDATE user_settings SET suggestion_style = 'balanced' WHERE suggestion_style IS NULL OR suggestion_style = ''")
     database.execute("UPDATE user_settings SET energy_preference = 'neutral' WHERE energy_preference IS NULL OR energy_preference = ''")
     database.execute("UPDATE user_settings SET protein_preference = 'mixed' WHERE protein_preference IS NULL OR protein_preference = ''")
@@ -805,6 +827,12 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
         ON items (household_id, visibility, availability_state)
         """
     )
+    database.execute(
+        """
+        CREATE INDEX IF NOT EXISTS idx_items_household_visibility_archived
+        ON items (household_id, visibility, is_archived, availability_state)
+        """
+    )
     database.execute(
         """
         CREATE INDEX IF NOT EXISTS idx_items_target_user
@@ -823,6 +851,14 @@ def ensure_schema_upgrades(database: sqlite3.Connection) -> None:
         ON shopping_entries (household_id, visibility, is_checked)
         """
     )
+    database.execute("DROP INDEX IF EXISTS idx_shopping_entries_open_item")
+    database.execute(
+        """
+        CREATE UNIQUE INDEX IF NOT EXISTS idx_shopping_entries_open_item
+        ON shopping_entries (item_id, COALESCE(shopping_note, ''))
+        WHERE is_checked = 0
+        """
+    )
     database.execute(
         """
         CREATE INDEX IF NOT EXISTS idx_shopping_needs_household_activation

nouri/main.py

@@ -9,7 +9,6 @@ import sqlite3
 
 from flask import (
     Blueprint,
-    after_this_request,
     current_app,
     flash,
     g,
@@ -1002,6 +1001,10 @@ def should_activate_shopping_need(needed_date: date, today: date | None = None)
     return (today or date.today()) >= shopping_activation_date_for(needed_date)
 
 
+def normalize_shopping_note(value: str | None) -> str:
+    return " ".join((value or "").strip().split())[:80]
+
+
 def schedule_shopping_need(
     *,
     item_id: int,
@@ -1083,14 +1086,16 @@ def add_to_shopping_list(
     visibility_override: str | None = None,
     needed_for_date: str | None = None,
     needed_for_daypart_id: int | None = None,
+    shopping_note: str | None = None,
 ) -> bool:
     item = get_item(item_id)
+    normalized_note = normalize_shopping_note(shopping_note)
     existing = get_db().execute(
         """
         SELECT id FROM shopping_entries
-        WHERE item_id = ? AND is_checked = 0
+        WHERE item_id = ? AND shopping_note = ? AND is_checked = 0
         """,
-        (item_id,),
+        (item_id, normalized_note),
     ).fetchone()
     if existing:
         return False
@@ -1100,15 +1105,16 @@ def add_to_shopping_list(
     get_db().execute(
         """
         INSERT INTO shopping_entries (
-            household_id, owner_user_id, visibility, item_id, added_by, needed_for_date, needed_for_daypart_id
+            household_id, owner_user_id, visibility, item_id, shopping_note, added_by, needed_for_date, needed_for_daypart_id
         )
-        VALUES (?, ?, ?, ?, ?, ?, ?)
+        VALUES (?, ?, ?, ?, ?, ?, ?, ?)
         """,
         (
             current_household_id(),
             owner_user_id,
             visibility,
             item_id,
+            normalized_note,
             user_id,
             needed_for_date,
             needed_for_daypart_id,
@@ -1151,6 +1157,7 @@ def ensure_item_or_missing_components_are_shopped(
     needed_for_date: str | None = None,
     needed_for_daypart_id: int | None = None,
     source_item_id: int | None = None,
+    shopping_note: str | None = None,
 ) -> dict:
     item = get_item(item_id)
     if item["kind"] == "meal":
@@ -1220,6 +1227,7 @@ def ensure_item_or_missing_components_are_shopped(
         visibility_override=visibility,
         needed_for_date=needed_for_date,
         needed_for_daypart_id=needed_for_daypart_id,
+        shopping_note=shopping_note,
     )
     return {
         "added": added,
@@ -1290,6 +1298,39 @@ def fetch_items_by_ids(item_ids: list[int]) -> list[dict]:
     return [items_by_id[item_id] for item_id in normalized_ids if item_id in items_by_id]
 
 
+def find_shopping_food_by_name(name: str) -> dict | None:
+    normalized_name = name.strip().lower()
+    if not normalized_name:
+        return None
+    row = get_db().execute(
+        f"""
+        SELECT items.*,
+               owner.display_name AS owner_display_name,
+               owner.username AS owner_username,
+               target.display_name AS target_display_name,
+               target.username AS target_username,
+               EXISTS(
+                   SELECT 1
+                   FROM shopping_entries
+                   WHERE shopping_entries.item_id = items.id AND shopping_entries.is_checked = 0
+               ) AS is_on_shopping_list
+        FROM items
+        LEFT JOIN users AS owner ON owner.id = items.owner_user_id
+        LEFT JOIN users AS target ON target.id = items.target_user_id
+        WHERE items.kind = 'food'
+          AND items.is_archived = 0
+          AND LOWER(items.name) = ?
+          AND {visible_clause('items')}
+        ORDER BY LOWER(items.name), items.id
+        LIMIT 1
+        """,
+        [normalized_name, *visible_params()],
+    ).fetchone()
+    if row is None:
+        return None
+    return attach_builder_keys(attach_dayparts(describe_records([row])))[0]
+
+
 def fetch_shopping_entries():
     rows = get_db().execute(
         f"""
@@ -3710,18 +3751,17 @@ def backup_export():
         current_app.config["APP_VERSION"],
     )
 
-    @after_this_request
-    def cleanup_backup(response):
-        Path(archive_path).unlink(missing_ok=True)
-        return response
-
-    return send_file(
+    archive_size = Path(archive_path).stat().st_size
+    response = send_file(
         archive_path,
         as_attachment=True,
         download_name=download_name,
         mimetype="application/zip",
         max_age=0,
     )
+    response.content_length = archive_size
+    response.call_on_close(lambda: Path(archive_path).unlink(missing_ok=True))
+    return response
 
 
 @main_bp.post("/settings/backup/restore")
@@ -4387,6 +4427,56 @@ def remove_shopping_entry(entry_id: int) -> None:
     get_db().commit()
 
 
+@main_bp.post("/shopping/<int:entry_id>/note")
+@login_required
+def shopping_update_note(entry_id: int):
+    entry = get_db().execute(
+        f"""
+        SELECT shopping_entries.*,
+               owner.display_name AS owner_display_name,
+               owner.username AS owner_username
+        FROM shopping_entries
+        LEFT JOIN users AS owner ON owner.id = shopping_entries.owner_user_id
+        WHERE shopping_entries.id = ? AND {visible_clause('shopping_entries')}
+        """,
+        [entry_id, *visible_params()],
+    ).fetchone()
+    if entry is None:
+        flash("Der Einkaufseintrag wurde nicht gefunden.", "error")
+        return redirect(url_with_scroll_position(url_for("main.shopping_list")))
+
+    try:
+        ensure_can_edit(describe_record(dict(entry)), "Diesen Einkaufseintrag kannst du gerade nicht ändern.")
+    except PermissionError as exc:
+        flash(str(exc), "error")
+        return redirect(url_with_scroll_position(url_for("main.shopping_list")))
+
+    shopping_note = normalize_shopping_note(request.form.get("shopping_note"))
+    duplicate = get_db().execute(
+        """
+        SELECT id
+        FROM shopping_entries
+        WHERE item_id = ?
+          AND shopping_note = ?
+          AND is_checked = 0
+          AND id != ?
+        LIMIT 1
+        """,
+        (entry["item_id"], shopping_note, entry_id),
+    ).fetchone()
+    if duplicate:
+        flash("Dieser Hinweis steht für das Lebensmittel schon auf der Einkaufsliste.", "info")
+        return redirect(url_with_scroll_position(url_for("main.shopping_list")))
+
+    get_db().execute(
+        "UPDATE shopping_entries SET shopping_note = ? WHERE id = ?",
+        (shopping_note, entry_id),
+    )
+    get_db().commit()
+    flash("Der Einkaufshinweis wurde gespeichert.", "success")
+    return redirect(url_with_scroll_position(url_for("main.shopping_list")))
+
+
 @main_bp.post("/items/<int:item_id>/shopping/bought")
 @login_required
 def item_mark_bought(item_id: int):
@@ -4438,30 +4528,40 @@ def item_remove_from_shopping(item_id: int):
 def shopping_list():
     if request.method == "POST":
         selected_item_id = request.form.get("item_id", "").strip()
-        if not selected_item_id.isdigit():
-            flash("Bitte zuerst etwas auswählen.", "error")
-        else:
+        item_search = request.form.get("item_search", "").strip()
+        shopping_note = normalize_shopping_note(request.form.get("shopping_note"))
+        item = None
+        if selected_item_id.isdigit():
             try:
                 item = get_item(int(selected_item_id))
-                result = ensure_item_or_missing_components_are_shopped(
-                    item["id"],
-                    g.user["id"],
-                    item["visibility"],
-                )
-                if result["count"]:
-                    flash(f"Die Einkaufsliste wurde ergänzt: {', '.join(result['names'][:4])}.", "success")
-                elif result["scheduled_count"]:
-                    flash("Ein paar Dinge sind für einen späteren Einkauf vorgemerkt.", "info")
-                else:
-                    flash("Dafür ist gerade nichts zusätzlich nötig.", "info")
             except ValueError as exc:
                 flash(str(exc), "error")
+        elif item_search:
+            item = find_shopping_food_by_name(item_search)
+            if item is None:
+                flash("Bitte ein Lebensmittel aus der Suche auswählen.", "error")
+        else:
+            flash("Bitte zuerst etwas auswählen.", "error")
+
+        if item is not None:
+            result = ensure_item_or_missing_components_are_shopped(
+                item["id"],
+                g.user["id"],
+                item["visibility"],
+                shopping_note=shopping_note,
+            )
+            if result["count"]:
+                note_suffix = f" ({shopping_note})" if shopping_note else ""
+                flash(f"Die Einkaufsliste wurde ergänzt: {', '.join(result['names'][:4])}{note_suffix}.", "success")
+            elif result["scheduled_count"]:
+                flash("Ein paar Dinge sind für einen späteren Einkauf vorgemerkt.", "info")
+            else:
+                flash("Dieser Einkaufseintrag steht so schon auf der Liste.", "info")
         return redirect(url_with_scroll_position(url_for("main.shopping_list")))
 
     entries = fetch_shopping_entries()
     upcoming_entries = fetch_upcoming_shopping_needs()
-    addable_items = fetch_items(include_archived=True, include_quick_added=True)
-    addable_items = [item for item in addable_items if item["kind"] == "food" and not item["is_on_shopping_list"]]
+    addable_items = fetch_items(kind="food", include_archived=False, include_quick_added=True)
     household_settings = get_household_settings()
     shopping_weekday_label = dict(WEEKDAY_OPTIONS).get(household_settings["shopping_weekday"], "gesetzt")
     return render_template(

nouri/schema.sql

@@ -132,6 +132,8 @@ CREATE TABLE IF NOT EXISTS items (
     note TEXT,
     photo_filename TEXT,
     availability_state TEXT NOT NULL DEFAULT 'idea' CHECK (availability_state IN ('idea', 'home', 'archived')),
+    is_archived INTEGER NOT NULL DEFAULT 0,
+    is_quick_added INTEGER NOT NULL DEFAULT 0,
     created_by INTEGER,
     updated_by INTEGER,
     created_at TEXT NOT NULL DEFAULT CURRENT_TIMESTAMP,
@@ -165,6 +167,7 @@ CREATE TABLE IF NOT EXISTS shopping_entries (
     owner_user_id INTEGER,
     visibility TEXT NOT NULL DEFAULT 'shared',
     item_id INTEGER NOT NULL,
+    shopping_note TEXT NOT NULL DEFAULT '',
     added_by INTEGER,
     checked_by INTEGER,
     needed_for_date TEXT,
@@ -181,7 +184,7 @@ CREATE TABLE IF NOT EXISTS shopping_entries (
 );
 
 CREATE UNIQUE INDEX IF NOT EXISTS idx_shopping_entries_open_item
-ON shopping_entries (item_id)
+ON shopping_entries (item_id, COALESCE(shopping_note, ''))
 WHERE is_checked = 0;
 
 CREATE TABLE IF NOT EXISTS shopping_needs (
@@ -304,6 +307,9 @@ ON items (kind, name);
 CREATE INDEX IF NOT EXISTS idx_items_household_visibility
 ON items (household_id, visibility, availability_state);
 
+CREATE INDEX IF NOT EXISTS idx_items_household_visibility_archived
+ON items (household_id, visibility, is_archived, availability_state);
+
 CREATE INDEX IF NOT EXISTS idx_items_target_user
 ON items (target_user_id);
 

nouri/static/css/styles.css

@@ -1219,6 +1219,13 @@ h3 {
     grid-column: 1 / -1;
 }
 
+.shopping-add-form {
+    display: grid;
+    grid-template-columns: minmax(0, 1.5fr) minmax(11rem, 0.8fr) auto;
+    gap: 0.8rem;
+    align-items: end;
+}
+
 .shopping-add-grid {
     display: grid;
     grid-template-columns: repeat(auto-fit, minmax(190px, 1fr));
@@ -1244,6 +1251,9 @@ h3 {
     padding: 0.85rem 0.95rem;
     border-radius: 22px;
     text-align: left;
+    background: color-mix(in srgb, var(--surface-strong) 86%, var(--accent-soft) 14%);
+    color: var(--text);
+    border-color: color-mix(in srgb, var(--line) 72%, var(--accent) 28%);
 }
 
 .shopping-add-card-visual,
@@ -1342,6 +1352,20 @@ h3 {
     margin: 0;
 }
 
+.shopping-entry-note {
+    width: fit-content;
+    max-width: 100%;
+    margin: 0;
+    padding: 0.12rem 0.5rem;
+    border-radius: 999px;
+    background: color-mix(in srgb, var(--accent-soft) 56%, transparent 44%);
+    color: color-mix(in srgb, var(--accent-strong) 70%, var(--text) 30%);
+    font-size: 0.82rem;
+    font-weight: 700;
+    line-height: 1.35;
+    overflow-wrap: anywhere;
+}
+
 .shopping-entry-actions {
     display: flex;
     align-items: center;
@@ -1356,6 +1380,18 @@ h3 {
     white-space: nowrap;
 }
 
+.shopping-entry-check-button {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    gap: 0.5rem;
+}
+
+.shopping-entry-check-mark {
+    font-size: 1rem;
+    line-height: 1;
+}
+
 .shopping-entry-close-form {
     flex: 0 0 auto;
     margin: 0;
@@ -1414,25 +1450,81 @@ h3 {
 }
 
 @media (max-width: 680px) {
+    .shopping-add-form {
+        grid-template-columns: 1fr;
+    }
+
+    .shopping-add-form button {
+        width: 100%;
+    }
+
     .shopping-entry-row {
-        align-items: stretch;
-        flex-direction: column;
+        display: grid;
+        grid-template-columns: minmax(0, 1fr) auto auto;
+        align-items: center;
+        gap: 0.7rem;
     }
 
     .shopping-entry-open {
-        width: 100%;
+        min-width: 0;
+    }
+
+    .shopping-entry-main {
+        grid-template-columns: 56px minmax(0, 1fr);
+        gap: 0.8rem;
+        align-items: center;
+    }
+
+    .shopping-entry-visual,
+    .shopping-entry-fallback {
+        width: 56px;
+        height: 56px;
+        border-radius: 16px;
+    }
+
+    .shopping-entry-copy {
+        gap: 0.12rem;
+    }
+
+    .shopping-entry-copy strong {
+        font-size: 1rem;
+    }
+
+    .shopping-entry-copy .muted {
+        display: none;
+    }
+
+    .shopping-entry-note {
+        font-size: 0.78rem;
     }
 
     .shopping-entry-actions,
     .shopping-entry-actions form,
     .shopping-entry-actions button,
     .shopping-entry-close-form {
-        width: 100%;
+        width: auto;
+    }
+
+    .shopping-entry-check-button {
+        min-width: 0;
+        padding: 0.75rem 0.9rem;
+        border-radius: 16px;
+        gap: 0;
+    }
+
+    .shopping-entry-check-label {
+        display: none;
+    }
+
+    .shopping-entry-check-mark {
+        font-size: 1.05rem;
     }
 
     .shopping-entry-close {
-        width: 100%;
-        border-radius: 18px;
+        width: 2.75rem;
+        height: 2.75rem;
+        min-width: 2.75rem;
+        border-radius: 16px;
     }
 }
 
@@ -1448,6 +1540,31 @@ h3 {
     border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.18) 42%);
 }
 
+[data-theme="dark"] button.shopping-add-card,
+[data-theme="dark"] .shopping-add-card {
+    background: linear-gradient(
+        180deg,
+        color-mix(in srgb, var(--surface-soft) 70%, #4a3e3a 30%),
+        color-mix(in srgb, var(--surface) 92%, #241f1d 8%)
+    );
+    color: var(--text);
+    border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.16) 42%);
+    box-shadow: none;
+}
+
+[data-theme="dark"] button.shopping-add-card:hover,
+[data-theme="dark"] .shopping-add-card:hover {
+    background: linear-gradient(
+        180deg,
+        color-mix(in srgb, var(--surface-soft) 62%, #5a4840 38%),
+        color-mix(in srgb, var(--surface) 88%, #2f2724 12%)
+    );
+}
+
+[data-theme="dark"] .shopping-add-card-copy small {
+    color: color-mix(in srgb, var(--muted) 86%, white 14%);
+}
+
 [data-theme="dark"] .shopping-entry-card {
     background: linear-gradient(
         180deg,
@@ -1457,6 +1574,11 @@ h3 {
     border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.14) 42%);
 }
 
+[data-theme="dark"] .shopping-entry-note {
+    background: color-mix(in srgb, var(--accent-soft) 54%, rgba(32, 27, 25, 0.46) 46%);
+    color: color-mix(in srgb, var(--accent-strong) 82%, white 18%);
+}
+
 .auth-shell {
     min-height: calc(100vh - 10rem);
     display: grid;
@@ -1783,6 +1905,7 @@ legend {
     border-radius: 18px;
     border: 1px solid var(--line);
     background: color-mix(in srgb, var(--surface-strong) 82%, #fff 18%);
+    color: var(--text);
 }
 
 .quick-select-card strong,
@@ -1800,6 +1923,20 @@ legend {
     color: var(--muted);
 }
 
+[data-theme="dark"] .quick-select-card {
+    background: linear-gradient(
+        180deg,
+        color-mix(in srgb, var(--surface-soft) 70%, #4a3e3a 30%),
+        color-mix(in srgb, var(--surface) 92%, #241f1d 8%)
+    );
+    border-color: color-mix(in srgb, var(--line) 58%, rgba(243, 177, 125, 0.16) 42%);
+    color: var(--text);
+}
+
+[data-theme="dark"] .quick-select-card small {
+    color: color-mix(in srgb, var(--muted) 86%, white 14%);
+}
+
 .inline-photo img {
     width: min(220px, 100%);
     border-radius: 18px;

nouri/static/js/ui.js

@@ -1,4 +1,62 @@
 (() => {
+    const scrollStorageKey = () => `nouri-scroll:${window.location.pathname}${window.location.search}`;
+
+    const initPostFormScrollMemory = () => {
+        const restoreFromUrl = () => {
+            const currentUrl = new URL(window.location.href);
+            const rawScroll = currentUrl.searchParams.get("_scroll");
+            if (!rawScroll) return false;
+
+            const scrollValue = Number.parseInt(rawScroll, 10);
+            currentUrl.searchParams.delete("_scroll");
+
+            window.requestAnimationFrame(() => {
+                if (Number.isFinite(scrollValue)) {
+                    window.scrollTo({ top: scrollValue, left: 0, behavior: "auto" });
+                }
+                window.history.replaceState({}, "", currentUrl.toString());
+            });
+            return true;
+        };
+
+        const restoreFromStorage = () => {
+            const savedScroll = sessionStorage.getItem(scrollStorageKey());
+            if (!savedScroll) return;
+
+            sessionStorage.removeItem(scrollStorageKey());
+            const scrollValue = Number.parseInt(savedScroll, 10);
+            if (!Number.isFinite(scrollValue)) return;
+
+            window.requestAnimationFrame(() => {
+                window.scrollTo({ top: scrollValue, left: 0, behavior: "auto" });
+            });
+        };
+
+        if (!restoreFromUrl()) {
+            restoreFromStorage();
+        }
+
+        document.addEventListener("submit", (event) => {
+            const form = event.target;
+            if (!(form instanceof HTMLFormElement)) return;
+
+            const method = (form.getAttribute("method") || "get").toLowerCase();
+            if (method !== "post") return;
+
+            const scrollValue = String(Math.round(window.scrollY));
+            sessionStorage.setItem(scrollStorageKey(), scrollValue);
+
+            let scrollInput = form.querySelector('input[name="_scroll"]');
+            if (!(scrollInput instanceof HTMLInputElement)) {
+                scrollInput = document.createElement("input");
+                scrollInput.type = "hidden";
+                scrollInput.name = "_scroll";
+                form.appendChild(scrollInput);
+            }
+            scrollInput.value = scrollValue;
+        });
+    };
+
     const initMobileSheet = () => {
         const sheet = document.querySelector("[data-mobile-sheet]");
         const navStack = document.querySelector("[data-mobile-nav-stack]");
@@ -153,9 +211,66 @@
         }, { passive: false });
     };
 
+    const initDialogs = () => {
+        document.addEventListener("click", (event) => {
+            const openButton = event.target.closest("[data-dialog-open]");
+            if (openButton instanceof HTMLElement) {
+                const dialogId = openButton.getAttribute("data-dialog-open");
+                if (!dialogId) return;
+                const dialog = document.getElementById(dialogId);
+                if (dialog instanceof HTMLDialogElement) {
+                    dialog.showModal();
+                }
+                return;
+            }
+
+            const closeButton = event.target.closest("[data-dialog-close]");
+            if (closeButton instanceof HTMLElement) {
+                const dialog = closeButton.closest("dialog");
+                if (dialog instanceof HTMLDialogElement) {
+                    dialog.close();
+                }
+            }
+        });
+
+        document.addEventListener("keydown", (event) => {
+            const target = event.target;
+            if (!(target instanceof HTMLElement)) return;
+            const openButton = target.closest("[data-dialog-open]");
+            if (!(openButton instanceof HTMLElement)) return;
+            if (event.key !== "Enter" && event.key !== " ") return;
+            event.preventDefault();
+            const dialogId = openButton.getAttribute("data-dialog-open");
+            if (!dialogId) return;
+            const dialog = document.getElementById(dialogId);
+            if (dialog instanceof HTMLDialogElement) {
+                dialog.showModal();
+            }
+        });
+
+        document.querySelectorAll("dialog").forEach((dialog) => {
+            dialog.addEventListener("click", (event) => {
+                if (event.target === dialog && dialog instanceof HTMLDialogElement) {
+                    dialog.close();
+                }
+            });
+        });
+
+        document.addEventListener("keydown", (event) => {
+            if (event.key !== "Escape") return;
+            document.querySelectorAll("dialog[open]").forEach((dialog) => {
+                if (dialog instanceof HTMLDialogElement) {
+                    dialog.close();
+                }
+            });
+        });
+    };
+
     document.addEventListener("DOMContentLoaded", () => {
+        initPostFormScrollMemory();
         initMobileSheet();
         initFilterInputs();
         initIosPullToRefresh();
+        initDialogs();
     });
 })();

nouri/templates/admin/user_form.html

@@ -45,7 +45,8 @@
             <input type="password" name="password_repeat" autocomplete="new-password" {% if not user %}required{% endif %}>
         </label>
         <div class="form-actions">
-            <button type="submit">Speichern</button>
+            <button type="submit" name="save_mode" value="stay">Speichern</button>
+            <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
             <a class="ghost-button" href="{{ url_for('admin.user_list') }}">Zurück</a>
         </div>
     </form>

nouri/templates/archive/list.html

@@ -5,7 +5,7 @@
     <div>
         <p class="eyebrow">Archiv</p>
         <h1>Frühere Ideen bleiben greifbar</h1>
-        <p class="lead">Das Archiv ist ein Erinnerungsspeicher. Von hier aus lassen sich vertraute Dinge leicht wieder einplanen oder einkaufen.</p>
+        <p class="lead">Archiv bedeutet bewusst ausgeblendet, nicht verbraucht. Von hier aus lassen sich Dinge jederzeit wieder aktivieren.</p>
     </div>
 </section>
 
@@ -93,13 +93,15 @@
                 <div class="item-actions">
                     <form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
                         {{ csrf_input() }}
-                        <button type="submit">Wieder einkaufen</button>
+                        <button type="submit">Auf Einkaufsliste</button>
                     </form>
-                    <a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
+                    {% if item.can_edit %}
+                        <a class="ghost-button" href="{{ url_for('main.item_edit', item_id=item.id) }}">Bearbeiten</a>
+                    {% endif %}
                     {% if item.can_edit %}
                         <form method="post" action="{{ url_for('main.item_restore', item_id=item.id) }}">
                             {{ csrf_input() }}
-                            <button class="ghost-button" type="submit">Zur aktiven Liste</button>
+                            <button class="ghost-button" type="submit">Wieder aktivieren</button>
                         </form>
                     {% endif %}
                 </div>

nouri/templates/auth/profile.html

@@ -41,7 +41,10 @@
                 E-Mail
                 <input type="email" name="email" value="{{ g.user.email or '' }}" autocomplete="email">
             </label>
-            <button type="submit">Speichern</button>
+            <div class="form-actions">
+                <button type="submit" name="save_mode" value="stay">Speichern</button>
+                <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
+            </div>
         </form>
     </article>
 

nouri/templates/dashboard.html

@@ -80,7 +80,7 @@
                                 <span class="chip">{{ entry.for_label }}</span>
                             </div>
                         </div>
-                        {% if entry.availability_state == 'home' %}
+                        {% if entry.is_home %}
                             <span class="status-pill status-home">zuhause</span>
                         {% endif %}
                     </li>

nouri/templates/home/list.html

@@ -5,7 +5,7 @@
     <div>
         <p class="eyebrow">Zuhause</p>
         <h1>Was aktuell da ist</h1>
-        <p class="lead">Sichtbar, ruhig und nach Tageszeiten sortiert. Wenn etwas aufgebraucht ist, bleibt es später im Archiv greifbar.</p>
+        <p class="lead">Hier erscheinen aktive Lebensmittel und Mahlzeitenideen, die gerade wirklich da sind. Wenn etwas leer ist, wird es einfach als gerade nicht da markiert.</p>
     </div>
 </section>
 
@@ -124,17 +124,27 @@
                                 {% endif %}
                             </div>
                             <div class="item-actions">
-                                <a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
-                                {% if item.can_edit %}
-                                    <form method="post" action="{{ url_for('main.item_archive', item_id=item.id) }}">
+                                {% if item.kind == 'meal' %}
+                                    <a class="ghost-button" href="{{ url_for('main.planner_day', date=today.isoformat(), item_id=item.id, daypart_id=item.primary_daypart_id) }}">Im Tagesplan öffnen</a>
+                                {% else %}
+                                    {% if item.can_edit %}
+                                        <form method="post" action="{{ url_for('main.item_set_not_home', item_id=item.id) }}">
+                                            {{ csrf_input() }}
+                                            <button class="secondary" type="submit">Nicht mehr da</button>
+                                        </form>
+                                    {% endif %}
+                                    <form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
                                         {{ csrf_input() }}
-                                        <button class="ghost-button" type="submit">Verbraucht / nicht mehr da</button>
+                                        <button type="submit">Auf Einkaufsliste</button>
                                     </form>
+                                    {% if item.can_edit %}
+                                        <a class="ghost-button" href="{{ url_for('main.item_edit', item_id=item.id) }}">Bearbeiten</a>
+                                        <form method="post" action="{{ url_for('main.item_archive', item_id=item.id) }}">
+                                            {{ csrf_input() }}
+                                            <button class="ghost-button" type="submit">Archivieren</button>
+                                        </form>
+                                    {% endif %}
                                 {% endif %}
-                                <form method="post" action="{{ url_for('main.item_add_to_shopping', item_id=item.id) }}">
-                                    {{ csrf_input() }}
-                                    <button type="submit">Erneut einkaufen</button>
-                                </form>
                             </div>
                         </article>
                     {% endfor %}

nouri/templates/items/form.html

@@ -351,7 +351,8 @@
         {% endif %}
 
         <div class="form-actions">
-            <button type="submit" name="form_action" value="save_item">Speichern</button>
+            <button type="submit" name="save_mode" value="stay">Speichern</button>
+            <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
             <a class="ghost-button" href="{{ url_for('main.item_list', kind=kind) }}">Zurück</a>
         </div>
     </form>

nouri/templates/items/quick_add.html

@@ -0,0 +1,128 @@
+{% extends "base.html" %}
+{% block title %}Schnell anlegen | Nouri{% endblock %}
+{% block content %}
+<section class="page-intro">
+    <div>
+        <p class="eyebrow">Lebensmittel</p>
+        <h1>Schnell anlegen</h1>
+        <p class="lead">Hier kannst du mehrere Lebensmittel in einem Schritt anlegen. Sie landen zuerst als ruhige Platzhalter auf der Einkaufsliste und lassen sich später einzeln weiter ordnen.</p>
+    </div>
+    <a class="ghost-button" href="{{ url_for('main.item_list', kind='food') }}">Zurück</a>
+</section>
+
+<section class="panel form-panel">
+    <form method="post" class="stack-form">
+        {{ csrf_input() }}
+
+        <label>
+            Namen untereinander
+            <textarea name="names_text" rows="10" placeholder="Erdbeeren&#10;Himbeeren&#10;Blaubeeren" required>{{ form_data.names_text }}</textarea>
+            <small class="helper-text">Jede Zeile wird als eigenes Lebensmittel angelegt.</small>
+        </label>
+
+        <div class="dual-grid">
+            <label>
+                Sichtbarkeit
+                <select name="visibility">
+                    {% for value, label in visibility_options %}
+                        <option value="{{ value }}" {% if form_data.visibility == value %}selected{% endif %}>{{ label }}</option>
+                    {% endfor %}
+                </select>
+            </label>
+
+            <label>
+                Für wen?
+                <select name="target_user_id">
+                    {% for option in target_user_options %}
+                        <option value="{{ option.value }}" {% if form_data.target_user_raw == option.value %}selected{% endif %}>{{ option.label }}</option>
+                    {% endfor %}
+                </select>
+            </label>
+        </div>
+
+        <div class="dual-grid">
+            <label>
+                Baustein
+                <select name="base_type">
+                    {% for value, label in builder_options %}
+                        <option value="{{ value }}" {% if form_data.base_type == value %}selected{% endif %}>{{ label }}</option>
+                    {% endfor %}
+                </select>
+            </label>
+
+            <label>
+                Geschmacksrichtung
+                <select name="flavor_profile">
+                    {% for value, label in food_flavor_options %}
+                        <option value="{{ value }}" {% if form_data.flavor_profile == value %}selected{% endif %}>{{ label }}</option>
+                    {% endfor %}
+                </select>
+            </label>
+        </div>
+
+        <div class="dual-grid">
+            <label>
+                Rolle in Vorschlägen
+                <select name="suggestion_role">
+                    {% for value, label in food_role_options %}
+                        <option value="{{ value }}" {% if form_data.suggestion_role == value %}selected{% endif %}>{{ label }}</option>
+                    {% endfor %}
+                </select>
+            </label>
+
+            <label>
+                Wird eher vorgeschlagen
+                <select name="suggestion_priority">
+                    {% for value, label in suggestion_priority_options %}
+                        <option value="{{ value }}" {% if form_data.suggestion_priority == value %}selected{% endif %}>{{ label }}</option>
+                    {% endfor %}
+                </select>
+            </label>
+        </div>
+
+        <div class="dual-grid">
+            <label>
+                Energiedichte
+                <select name="energy_density">
+                    {% for value, label in energy_density_options %}
+                        <option value="{{ value }}" {% if form_data.energy_density == value %}selected{% endif %}>{{ label }}</option>
+                    {% endfor %}
+                </select>
+            </label>
+
+            <label class="inline-check">
+                <input type="checkbox" name="can_be_meal_core" value="1" {% if form_data.can_be_meal_core %}checked{% endif %}>
+                <span>Kann gut eine Mahlzeit tragen</span>
+            </label>
+        </div>
+
+        <fieldset>
+            <legend>Passende Tageszeiten</legend>
+            <div class="checkbox-grid daypart-option-grid">
+                {% for daypart in dayparts %}
+                    <label class="daypart-option">
+                        <input type="checkbox" name="daypart_ids" value="{{ daypart.id }}" {% if daypart.id in form_data.daypart_ids %}checked{% endif %}>
+                        <span class="daypart-option-card">
+                            <span class="daypart-option-icon">
+                                <span class="ui-icon {{ daypart_icon_class(daypart.slug) }}"></span>
+                            </span>
+                            <span class="daypart-option-label">{{ daypart.name }}</span>
+                        </span>
+                    </label>
+                {% endfor %}
+            </div>
+        </fieldset>
+
+        <label>
+            Gemeinsame Notiz
+            <textarea name="note" rows="3" placeholder="Optional, wenn diese Gruppe etwas gemeinsam braucht.">{{ form_data.note }}</textarea>
+            <small class="helper-text">Die Einträge starten in „Unsortiert“, sind zunächst nicht zuhause und tauchen erst nach einer späteren Einordnung im Alltag regulär auf.</small>
+        </label>
+
+        <div class="form-actions">
+            <button type="submit">In Unsortiert anlegen</button>
+            <a class="ghost-button" href="{{ url_for('main.item_list', kind='food') }}">Abbrechen</a>
+        </div>
+    </form>
+</section>
+{% endblock %}

nouri/templates/library/day_form.html

@@ -85,7 +85,8 @@
         </div>
 
         <div class="form-actions">
-            <button type="submit">Speichern</button>
+            <button type="submit" name="save_mode" value="stay">Speichern</button>
+            <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
             <a class="ghost-button" href="{{ url_for('main.template_library') }}">Zurück</a>
         </div>
     </form>

nouri/templates/library/set_form.html

@@ -155,7 +155,8 @@
         </fieldset>
 
         <div class="form-actions">
-            <button type="submit">Speichern</button>
+            <button type="submit" name="save_mode" value="stay">Speichern</button>
+            <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
             <a class="ghost-button" href="{{ url_for('main.template_library') }}">Zurück</a>
         </div>
     </form>

nouri/templates/library/week_form.html

@@ -71,7 +71,8 @@
         </div>
 
         <div class="form-actions">
-            <button type="submit">Speichern</button>
+            <button type="submit" name="save_mode" value="stay">Speichern</button>
+            <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
             <a class="ghost-button" href="{{ url_for('main.template_library') }}">Zurück</a>
         </div>
     </form>

nouri/templates/planner/day.html

@@ -127,7 +127,7 @@
                                     <input type="hidden" name="visibility" value="{{ item.visibility }}">
                                     <button class="quick-add-button compact-button" type="submit">
                                         <span>{{ item.name }}</span>
-                                        {% if item.availability_state == 'home' %}<small>zuhause vorhanden</small>{% endif %}
+                                        {% if item.is_home %}<small>zuhause vorhanden</small>{% endif %}
                                     </button>
                                 </form>
                             {% endfor %}
@@ -190,7 +190,7 @@
                                     <span>{{ item.name }}</span>
                                     <small>
                                         {{ item_kind_labels[item.kind] }}
-                                        {% if item.availability_state == 'home' %} · zuhause{% endif %}
+                                        {% if item.is_home %} · zuhause{% endif %}
                                     </small>
                                 </button>
                             </form>
@@ -205,7 +205,7 @@
                                 <div class="planner-entry-top">
                                     <div>
                                         <strong>{{ entry.item_name }}</strong>
-                                        <small>{{ item_kind_labels[entry.item_kind] }}{% if entry.availability_state == 'home' %} · zuhause{% else %} · bei Bedarf auf Einkaufsliste{% endif %}</small>
+                                        <small>{{ item_kind_labels[entry.item_kind] }}{% if entry.is_home %} · zuhause{% else %} · bei Bedarf auf Einkaufsliste{% endif %}</small>
                                         <div class="chip-row">
                                             <span class="chip">{{ entry.visibility_label }}</span>
                                             <span class="chip status-soft">{{ entry.owner_label }}</span>

nouri/templates/planner/week.html

@@ -161,7 +161,7 @@
                                                 <input type="hidden" name="visibility" value="{{ item.visibility }}">
                                                 <button class="quick-add-button compact-button" type="submit">
                                                     <span>{{ item.name }}</span>
-                                                    {% if item.availability_state == 'home' %}<small>Zuhause vorhanden</small>{% endif %}
+                                                    {% if item.is_home %}<small>Zuhause vorhanden</small>{% endif %}
                                                 </button>
                                             </form>
                                         {% endfor %}

nouri/templates/settings.html

@@ -34,7 +34,8 @@
                 <input type="time" name="shopping_reminder_time" value="{{ household_settings.shopping_reminder_time }}">
             </label>
             <div class="form-actions">
-                <button type="submit">Speichern</button>
+                <button type="submit" name="save_mode" value="stay">Speichern</button>
+                <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
             </div>
         </form>
     </article>
@@ -151,7 +152,8 @@
         </div>
 
         <div class="form-actions">
-            <button type="submit">Speichern</button>
+            <button type="submit" name="save_mode" value="stay">Speichern</button>
+            <button class="secondary" type="submit" name="save_mode" value="close">Speichern und schließen</button>
             <a class="ghost-button" href="{{ url_for('auth.profile') }}">Zum Profil</a>
         </div>
     </form>

nouri/templates/shopping/list.html

@@ -10,68 +10,34 @@
 </section>
 
 <section class="panel compact-form-panel">
-    <div class="stack-sections">
+    <form method="post" class="shopping-add-form">
+        {{ csrf_input() }}
         <label>
             Lebensmittel suchen
             <input
                 type="text"
+                name="item_search"
+                list="shopping-food-options"
                 placeholder="Nach Lebensmitteln suchen"
-                data-filter-input
-                data-filter-target="#shopping-add-list"
-                data-filter-limit="8"
+                autocomplete="off"
             >
         </label>
-        <div class="shopping-add-grid" id="shopping-add-list">
+        <label>
+            Einkaufshinweis
+            <input
+                type="text"
+                name="shopping_note"
+                maxlength="80"
+                placeholder="z. B. TK, Dose, frisch"
+            >
+        </label>
+        <datalist id="shopping-food-options">
             {% for item in addable_items %}
-                {% set item_icon_class = {
-                    'protein': 'icon-component-protein',
-                    'carb': 'icon-component-carb',
-                    'veg': 'icon-component-veg',
-                    'fruit': 'icon-component-fruit',
-                    'dairy': 'icon-component-dairy',
-                    'nuts': 'icon-component-nuts',
-                    'seeds': 'icon-component-seeds',
-                    'neutral': 'icon-component-neutral',
-                }.get(item.primary_builder_key or item.base_type, 'icon-component-neutral') %}
-                <form method="post" data-filter-label="{{ item.name|lower }} {{ item.base_type_label|lower }} {{ item.for_label|lower }}">
-                    {{ csrf_input() }}
-                    <input type="hidden" name="item_id" value="{{ item.id }}">
-                    <button class="shopping-add-card" type="submit">
-                        <span class="shopping-add-card-visual">
-                            {% if item.photo_filename %}
-                                <img
-                                    src="{{ image_url(item.photo_filename, 'md') }}"
-                                    srcset="{{ image_srcset(item.photo_filename) }}"
-                                    sizes="{{ image_sizes('grid') }}"
-                                    alt=""
-                                    loading="lazy">
-                            {% else %}
-                                <span class="shopping-add-card-fallback">
-                                    <span class="ui-icon {{ item_icon_class }}"></span>
-                                </span>
-                            {% endif %}
-                        </span>
-                        <span class="shopping-add-card-copy">
-                            <strong>{{ item.name }}</strong>
-                            <small>
-                                {% if item.is_archived %}
-                                    Archiviert
-                                {% elif item.is_quick_added %}
-                                    Unsortiert
-                                {% elif item.is_home %}
-                                    Zuhause · trotzdem ergänzen
-                                {% else %}
-                                    Gerade nicht da
-                                {% endif %}
-                            </small>
-                        </span>
-                    </button>
-                </form>
-            {% else %}
-                <p class="shopping-add-empty muted">Gerade ist nichts zusätzlich offen.</p>
+                <option value="{{ item.name }}"></option>
             {% endfor %}
-        </div>
-    </div>
+        </datalist>
+        <button type="submit">Auf die Liste</button>
+    </form>
 </section>
 
 {% if entries %}
@@ -119,6 +85,9 @@
                             </div>
                             <div class="shopping-entry-copy">
                                 <strong>{{ entry.item_name }}</strong>
+                                {% if entry.shopping_note %}
+                                    <p class="shopping-entry-note">{{ entry.shopping_note }}</p>
+                                {% endif %}
                                 {% if entry.needed_for_label %}
                                     <p class="muted">
                                         Für {{ entry.needed_for_label }}
@@ -131,7 +100,10 @@
                     <div class="shopping-entry-actions">
                         <form method="post" action="{{ url_for('main.shopping_check', entry_id=entry.id) }}">
                             {{ csrf_input() }}
-                            <button type="submit">Eingekauft</button>
+                            <button type="submit" class="shopping-entry-check-button">
+                                <span class="shopping-entry-check-mark" aria-hidden="true">✔</span>
+                                <span class="shopping-entry-check-label">Eingekauft</span>
+                            </button>
                         </form>
                     </div>
                     {% if entry.can_edit %}
@@ -150,7 +122,9 @@
                         <div>
                             <h3>{{ entry.item_name }}</h3>
                             <p>
-                                {% if entry.needed_for_label %}
+                                {% if entry.shopping_note %}
+                                    {{ entry.shopping_note }}
+                                {% elif entry.needed_for_label %}
                                     Für {{ entry.needed_for_label }}
                                     {% if entry.needed_daypart_name %} · {{ entry.needed_daypart_name }}{% endif %}
                                 {% elif entry.is_home %}
@@ -171,6 +145,20 @@
                             <button type="submit">Eingekauft</button>
                         </form>
                         {% if entry.can_edit %}
+                            <form method="post" action="{{ url_for('main.shopping_update_note', entry_id=entry.id) }}">
+                                {{ csrf_input() }}
+                                <label>
+                                    Einkaufshinweis
+                                    <input
+                                        type="text"
+                                        name="shopping_note"
+                                        maxlength="80"
+                                        value="{{ entry.shopping_note }}"
+                                        placeholder="z. B. TK, Dose, frisch"
+                                    >
+                                </label>
+                                <button class="ghost-button" type="submit">Hinweis speichern</button>
+                            </form>
                             <form method="post" action="{{ url_for('main.shopping_remove', entry_id=entry.id) }}">
                                 {{ csrf_input() }}
                                 <button class="ghost-button" type="submit">Von Einkaufsliste nehmen</button>