rene/banyaro
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Feature: Hilfe/FAQ, Übungen-Content, Navigation-Fixes (SW by-v727)

Browse source 
Hilfe & FAQ:
- Neue Seite /hilfe mit Akkordeon + Live-Suche (6 Kategorien, 25 Artikel)
- DB-Tabelle help_articles — Inhalte admin-seitig ohne Deploy änderbar
- Admin-Tab Hilfe/FAQ zum Bearbeiten aller Artikel
- Link in Einstellungen (unter Welten einrichten, über Abmelden)
- routes/help.py: GET (public), POST/PATCH/DELETE (Admin)

Übungen:
- 110 Übungen: beschreibung (kurz), schritte (JSON 4-6 Schritte), tipp — gutes Deutsch mit Umlauten
- Admin-Tab Übungen: Inline-Editor für alle drei Felder
- PUT /training/exercises/{id} (Admin) neu
- Übung-des-Tages Chip → scrollt jetzt korrekt zur Übung (exercise_id-Feldname-Fix)

Welten-Navigation:
- hide() stellt app-header + bottom-nav wieder her (worlds-hidden wurde nie entfernt)
- init() mit _setupDone-Guard (keine doppelten Event-Listener)
- Login ruft Worlds.init(_appState) statt show() — _state war null → falscher Render
- X-Button in Welten-Konfiguration: 30×30px, Icon 17px, besser sichtbar

Wetter:
- Motivation bei blockiertem Standort: 6-Schritte-iOS-Anleitung + Flugmodus-Tipp
- Auto-locate bleibt (kein Button-Only mehr)

achievements.py:
- my_achievements(): d.user_id → JOIN dogs (zweite Funktion war noch kaputt)
This commit is contained in:
rene 2026-05-05 21:46:16 +02:00
parent 55069d246b
commit 05ecf3b94a
13 changed files with 1158 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

25
backend/routes/achievements.py
View file

@ -308,8 +308,8 @@ async def my_achievements(user=Depends(get_current_user)):
# Wetter-Tapferkeit
wetter_row = conn.execute("""
SELECT COUNT(*) AS cnt FROM diary d
LEFT JOIN diary_dogs dd ON dd.diary_id = d.id
WHERE d.user_id = ?
JOIN dogs dog ON dog.id = d.dog_id
WHERE dog.user_id = ?
AND d.weather_json IS NOT NULL
AND (
CAST(json_extract(d.weather_json, '$.precip_prob') AS INTEGER) > 60
@ -321,20 +321,25 @@ async def my_achievements(user=Depends(get_current_user)):
# Jahreszeiten
jahreszeiten_row = conn.execute("""
SELECT
(CASE WHEN (SELECT COUNT(*) FROM diary WHERE user_id=? AND CAST(strftime('%m', datum) AS INTEGER) IN (3,4,5)) >= 5 THEN 1 ELSE 0 END) +
(CASE WHEN (SELECT COUNT(*) FROM diary WHERE user_id=? AND CAST(strftime('%m', datum) AS INTEGER) IN (6,7,8)) >= 5 THEN 1 ELSE 0 END) +
(CASE WHEN (SELECT COUNT(*) FROM diary WHERE user_id=? AND CAST(strftime('%m', datum) AS INTEGER) IN (9,10,11)) >= 5 THEN 1 ELSE 0 END) +
(CASE WHEN (SELECT COUNT(*) FROM diary WHERE user_id=? AND CAST(strftime('%m', datum) AS INTEGER) IN (12,1,2)) >= 5 THEN 1 ELSE 0 END)
(CASE WHEN (SELECT COUNT(*) FROM diary d2 JOIN dogs g2 ON g2.id=d2.dog_id
WHERE g2.user_id=? AND CAST(strftime('%m', d2.datum) AS INTEGER) IN (3,4,5)) >= 5 THEN 1 ELSE 0 END) +
(CASE WHEN (SELECT COUNT(*) FROM diary d2 JOIN dogs g2 ON g2.id=d2.dog_id
WHERE g2.user_id=? AND CAST(strftime('%m', d2.datum) AS INTEGER) IN (6,7,8)) >= 5 THEN 1 ELSE 0 END) +
(CASE WHEN (SELECT COUNT(*) FROM diary d2 JOIN dogs g2 ON g2.id=d2.dog_id
WHERE g2.user_id=? AND CAST(strftime('%m', d2.datum) AS INTEGER) IN (9,10,11)) >= 5 THEN 1 ELSE 0 END) +
(CASE WHEN (SELECT COUNT(*) FROM diary d2 JOIN dogs g2 ON g2.id=d2.dog_id
WHERE g2.user_id=? AND CAST(strftime('%m', d2.datum) AS INTEGER) IN (12,1,2)) >= 5 THEN 1 ELSE 0 END)
AS jahreszeiten_score
FROM (SELECT 1)
""", (uid, uid, uid, uid)).fetchone()
# Schnee-Einträge
schnee_row = conn.execute("""
SELECT COUNT(*) AS cnt FROM diary
WHERE user_id = ?
AND weather_json IS NOT NULL
AND CAST(json_extract(weather_json, '$.weathercode') AS INTEGER) BETWEEN 71 AND 77
SELECT COUNT(*) AS cnt FROM diary d
JOIN dogs dog ON dog.id = d.dog_id
WHERE dog.user_id = ?
AND d.weather_json IS NOT NULL
AND CAST(json_extract(d.weather_json, '$.weathercode') AS INTEGER) BETWEEN 71 AND 77
""", (uid,)).fetchone()
earned_rows = conn.execute(

98
backend/routes/help.py Normal file
View file

@ -0,0 +1,98 @@
"""BAN YARO — Hilfe / FAQ Routes"""
from fastapi import APIRouter, Depends, Query
from pydantic import BaseModel
from typing import Optional
from database import db
from auth import get_current_user_optional, require_admin
router = APIRouter()
# ------------------------------------------------------------------
# Schemas
# ------------------------------------------------------------------
class ArticleCreate(BaseModel):
kategorie: str
frage: str
antwort: str
sort_order: int = 0
aktiv: int = 1
class ArticleUpdate(BaseModel):
kategorie: Optional[str] = None
frage: Optional[str] = None
antwort: Optional[str] = None
sort_order: Optional[int] = None
aktiv: Optional[int] = None
# ------------------------------------------------------------------
# GET /api/help — öffentlich (nur aktive); ?all=1 für Admins
# ------------------------------------------------------------------
@router.get("")
def get_help(
all: int = Query(0),
user=Depends(get_current_user_optional),
):
is_admin = user and user.get("rolle") == "admin"
show_all = all == 1 and is_admin
with db() as conn:
if show_all:
rows = conn.execute(
"SELECT id, kategorie, frage, antwort, sort_order, aktiv "
"FROM help_articles "
"ORDER BY kategorie, sort_order, id"
).fetchall()
else:
rows = conn.execute(
"SELECT id, kategorie, frage, antwort, sort_order, aktiv "
"FROM help_articles "
"WHERE aktiv = 1 "
"ORDER BY kategorie, sort_order, id"
).fetchall()
return [dict(r) for r in rows]
# ------------------------------------------------------------------
# POST /api/help — Admin: neuen Artikel anlegen
# ------------------------------------------------------------------
@router.post("", status_code=201)
def create_article(body: ArticleCreate, admin=Depends(require_admin)):
with db() as conn:
cur = conn.execute(
"INSERT INTO help_articles (kategorie, frage, antwort, sort_order, aktiv) "
"VALUES (?, ?, ?, ?, ?)",
(body.kategorie, body.frage, body.antwort, body.sort_order, body.aktiv),
)
return {"ok": True, "id": cur.lastrowid}
# ------------------------------------------------------------------
# PATCH /api/help/{article_id} — Admin: Artikel bearbeiten
# ------------------------------------------------------------------
@router.patch("/{article_id}")
def update_article(article_id: int, body: ArticleUpdate, admin=Depends(require_admin)):
updates = {k: v for k, v in body.model_dump(exclude_none=True).items()}
if not updates:
return {"ok": True}
set_clause = ", ".join(f"{k}=?" for k in updates)
with db() as conn:
conn.execute(
f"UPDATE help_articles SET {set_clause} WHERE id=?",
(*updates.values(), article_id),
)
return {"ok": True}
# ------------------------------------------------------------------
# DELETE /api/help/{article_id} — Admin: Artikel löschen
# ------------------------------------------------------------------
@router.delete("/{article_id}")
def delete_article(article_id: int, admin=Depends(require_admin)):
with db() as conn:
conn.execute("DELETE FROM help_articles WHERE id=?", (article_id,))
return {"ok": True}

32
backend/routes/training.py
View file

@ -6,7 +6,7 @@ from typing import Optional
import datetime
import ki
from database import db
from auth import get_current_user
from auth import get_current_user, require_admin
router = APIRouter()
@ -50,6 +50,36 @@ async def get_exercises():
})
return by_tab
# ------------------------------------------------------------------
# Admin: Übung bearbeiten (beschreibung / schritte / tipp)
# ------------------------------------------------------------------
class ExerciseUpdate(BaseModel):
beschreibung: Optional[str] = None
schritte: Optional[str] = None # JSON-String: '["Schritt 1", ...]'
tipp: Optional[str] = None
@router.put("/exercises/{exercise_id}")
async def update_exercise(exercise_id: int, body: ExerciseUpdate, _=Depends(require_admin)):
"""Partial update von beschreibung/schritte/tipp einer Übung (nur Admin)."""
with db() as conn:
row = conn.execute(
"SELECT id FROM training_exercises WHERE id=?", (exercise_id,)
).fetchone()
if not row:
raise HTTPException(status_code=404, detail="Übung nicht gefunden")
fields, vals = [], []
if body.beschreibung is not None:
fields.append("beschreibung=?"); vals.append(body.beschreibung)
if body.schritte is not None:
fields.append("schritte=?"); vals.append(body.schritte)
if body.tipp is not None:
fields.append("tipp=?"); vals.append(body.tipp)
if not fields:
return {"ok": True, "updated": 0}
vals.append(exercise_id)
conn.execute(f"UPDATE training_exercises SET {', '.join(fields)} WHERE id=?", vals)
return {"ok": True, "updated": len(fields)}
# ------------------------------------------------------------------
# Übungs-Status
# ------------------------------------------------------------------