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

Feature: Übung des Tages — personalisiert aus exercise_progress, 4. Chip auf Welcome — SW by-v481, APP_VER 458

Browse source
This commit is contained in:
rene 2026-04-29 09:26:41 +02:00
parent 7048499624
commit d9a0be489b
4 changed files with 36 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

40
backend/routes/dogs.py
View file

@ -157,20 +157,34 @@ async def get_welcome_dashboard(dog_id: int, user=Depends(get_current_user)):
"SELECT COUNT(*) AS n FROM diary WHERE dog_id=?", (dog_id,)
).fetchone()["n"]
# Tagesübung — stabil pro Tag, rotiert täglich
exercise_count = conn.execute(
"SELECT COUNT(*) AS n FROM training_exercises"
).fetchone()["n"]
# Tagesübung — personalisiert aus exercise_progress, tagesstabil
import datetime as _dt
day_num = (_dt.date.today() - _dt.date(2024, 1, 1)).days
# Übungen in Bearbeitung (noch-nicht / manchmal / meistens), älteste zuerst
in_progress = conn.execute(
"""SELECT ep.exercise_id, te.name, te.kategorie, te.schwierigkeit
FROM exercise_progress ep
JOIN training_exercises te ON te.exercise_id = ep.exercise_id
WHERE ep.user_id = ? AND ep.status IN ('noch-nicht', 'manchmal', 'meistens')
ORDER BY ep.updated_at ASC LIMIT 20""",
(user["id"],)
).fetchall()
daily_exercise = None
if exercise_count:
import datetime as _dt
day_num = (_dt.date.today() - _dt.date(2024, 1, 1)).days
offset = day_num % exercise_count
ex_row = conn.execute(
"SELECT exercise_id, name, kategorie, schwierigkeit FROM training_exercises ORDER BY id LIMIT 1 OFFSET ?",
(offset,)
).fetchone()
daily_exercise = dict(ex_row) if ex_row else None
if in_progress:
daily_exercise = dict(in_progress[day_num % len(in_progress)])
else:
# Fallback: globale Rotation über alle Übungen
exercise_count = conn.execute(
"SELECT COUNT(*) AS n FROM training_exercises"
).fetchone()["n"]
if exercise_count:
ex_row = conn.execute(
"SELECT exercise_id, name, kategorie, schwierigkeit FROM training_exercises ORDER BY id LIMIT 1 OFFSET ?",
(day_num % exercise_count,)
).fetchone()
daily_exercise = dict(ex_row) if ex_row else None
return {
"random_photo": random_photo,

2
backend/static/js/app.js
View file

@ -3,7 +3,7 @@
Router, State-Management, Navigation, Initialisierung.
============================================================ */
const APP_VER = '457'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
const APP_VER = '458'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
const App = (() => {

7
backend/static/js/pages/welcome.js
View file

@ -346,6 +346,7 @@ window.Page_welcome = (() => {
const diaryText = diaryDate ? (_relDate(diaryDate) || diaryDate) : '—';
const weight = dashData?.last_weight;
const weightVal = weight ? `${weight.wert} ${weight.einheit}` : '—';
const ex = dashData?.daily_exercise;
return `
<div class="wc-chips" id="wc-chips-row">
@ -360,6 +361,12 @@ window.Page_welcome = (() => {
<span class="wc-chip-label">Gewicht</span>
<span class="wc-chip-val${weight ? '' : ' wc-chip-val--empty'}">${weightVal}</span>
</div>
${ex ? `
<div class="wc-chip" data-nav="uebungen">
<svg class="ph-icon wc-chip-icon" aria-hidden="true"><use href="/icons/phosphor.svg#target"></use></svg>
<span class="wc-chip-label">Übung des Tages</span>
<span class="wc-chip-val">${UI.escape(ex.name)}</span>
</div>` : ''}
</div>`;
}

2
backend/static/sw.js
View file

@ -3,7 +3,7 @@
Offline-Cache + Push Notifications + Tile-Cache
============================================================ */
const CACHE_VERSION = 'by-v480';
const CACHE_VERSION = 'by-v481';
const CACHE_STATIC = `${CACHE_VERSION}-static`;
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten