Fix: Geburtstag aller Hunde + Kotbeutel-Stationen in Stats (SW by-v962)
- worlds.js: bdayDog = _dogs.find(...) — Geburtstag gilt für alle Hunde, nicht nur den aktiven - Banner, KI-Call, "Was hat sich X gewünscht?" nutzen bdayDog.name - stats.py: kotbeutel-Count aus user_map_pois WHERE type='kotbeutel' - landing: Stats-Band 5. Kachel "Kotbeutel-Stationen"
This commit is contained in:
parent
ebff9d820d
commit
07db68aea2
6 changed files with 28 additions and 18 deletions
|
|
@ -406,7 +406,7 @@ async def serve_media(path: str, request: _Request):
|
||||||
raise _HE(404, "Nicht gefunden.")
|
raise _HE(404, "Nicht gefunden.")
|
||||||
return _media_response(filepath)
|
return _media_response(filepath)
|
||||||
|
|
||||||
APP_VER = "961" # muss mit APP_VER in app.js übereinstimmen
|
APP_VER = "962" # muss mit APP_VER in app.js übereinstimmen
|
||||||
|
|
||||||
@app.get("/.well-known/assetlinks.json")
|
@app.get("/.well-known/assetlinks.json")
|
||||||
async def assetlinks():
|
async def assetlinks():
|
||||||
|
|
|
||||||
|
|
@ -30,19 +30,23 @@ async def public_stats():
|
||||||
if _pub_cache["data"] and now - _pub_cache["ts"] < _PUB_TTL:
|
if _pub_cache["data"] and now - _pub_cache["ts"] < _PUB_TTL:
|
||||||
return _pub_cache["data"]
|
return _pub_cache["data"]
|
||||||
with db() as conn:
|
with db() as conn:
|
||||||
users = conn.execute("SELECT COUNT(*) FROM users").fetchone()[0]
|
users = conn.execute("SELECT COUNT(*) FROM users").fetchone()[0]
|
||||||
dogs = conn.execute("SELECT COUNT(*) FROM dogs").fetchone()[0]
|
dogs = conn.execute("SELECT COUNT(*) FROM dogs").fetchone()[0]
|
||||||
km = conn.execute(
|
km = conn.execute(
|
||||||
"SELECT ROUND(COALESCE(SUM(distanz_km),0),0) FROM routes"
|
"SELECT ROUND(COALESCE(SUM(distanz_km),0),0) FROM routes"
|
||||||
).fetchone()[0]
|
).fetchone()[0]
|
||||||
posts = conn.execute("SELECT COUNT(*) FROM forum_posts").fetchone()[0]
|
posts = conn.execute("SELECT COUNT(*) FROM forum_posts").fetchone()[0]
|
||||||
diary = conn.execute("SELECT COUNT(*) FROM diary").fetchone()[0]
|
diary = conn.execute("SELECT COUNT(*) FROM diary").fetchone()[0]
|
||||||
|
kotbeutel = conn.execute(
|
||||||
|
"SELECT COUNT(*) FROM user_map_pois WHERE type='kotbeutel'"
|
||||||
|
).fetchone()[0]
|
||||||
data = {
|
data = {
|
||||||
"users": users,
|
"users": users,
|
||||||
"dogs": dogs,
|
"dogs": dogs,
|
||||||
"km": int(km or 0),
|
"km": int(km or 0),
|
||||||
"forum_posts": posts,
|
"forum_posts": posts,
|
||||||
"diary_entries": diary,
|
"diary_entries": diary,
|
||||||
|
"kotbeutel": kotbeutel,
|
||||||
}
|
}
|
||||||
_pub_cache["data"] = data
|
_pub_cache["data"] = data
|
||||||
_pub_cache["ts"] = now
|
_pub_cache["ts"] = now
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Router, State-Management, Navigation, Initialisierung.
|
Router, State-Management, Navigation, Initialisierung.
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
const APP_VER = '961'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
const APP_VER = '962'; // ← bei jedem Deploy mit Frontend-Änderungen erhöhen
|
||||||
const APP_VERSION = '1.5.1'; // ← semantische Version, wird bei make release gesetzt
|
const APP_VERSION = '1.5.1'; // ← semantische Version, wird bei make release gesetzt
|
||||||
const IS_STAGING = location.hostname === 'staging.banyaro.app';
|
const IS_STAGING = location.hostname === 'staging.banyaro.app';
|
||||||
// Cache-Bust-Parameter nach Update-Reload sofort entfernen
|
// Cache-Bust-Parameter nach Update-Reload sofort entfernen
|
||||||
|
|
|
||||||
|
|
@ -1342,8 +1342,9 @@ window.Worlds = (() => {
|
||||||
if (mmdd === `${mt}-${dt}`) return 'tomorrow';
|
if (mmdd === `${mt}-${dt}`) return 'tomorrow';
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
const bday = _birthdayState(dog.geburtstag);
|
const bdayDog = _dogs.find(d => _birthdayState(d.geburtstag)) || null;
|
||||||
const bdayYear = dog.geburtstag ? new Date().getFullYear() - parseInt(dog.geburtstag.slice(0, 4)) : null;
|
const bday = bdayDog ? _birthdayState(bdayDog.geburtstag) : null;
|
||||||
|
const bdayYear = bdayDog?.geburtstag ? new Date().getFullYear() - parseInt(bdayDog.geburtstag.slice(0, 4)) : null;
|
||||||
|
|
||||||
const [streakRes, diaryRes] = await Promise.allSettled([
|
const [streakRes, diaryRes] = await Promise.allSettled([
|
||||||
_cachedGet(`streak_${dog.id}`, `/streak/${dog.id}`),
|
_cachedGet(`streak_${dog.id}`, `/streak/${dog.id}`),
|
||||||
|
|
@ -1428,8 +1429,8 @@ window.Worlds = (() => {
|
||||||
</div>
|
</div>
|
||||||
<div style="font-weight:800;font-size:var(--text-sm);color:#fff;letter-spacing:0.01em">
|
<div style="font-weight:800;font-size:var(--text-sm);color:#fff;letter-spacing:0.01em">
|
||||||
${bday === 'today'
|
${bday === 'today'
|
||||||
? `Alles Gute zum ${bdayYear}. Geburtstag, ${_esc(dog.name)}!`
|
? `Alles Gute zum ${bdayYear}. Geburtstag, ${_esc(bdayDog.name)}!`
|
||||||
: `Morgen hat ${_esc(dog.name)} Geburtstag!`}
|
: `Morgen hat ${_esc(bdayDog.name)} Geburtstag!`}
|
||||||
</div>
|
</div>
|
||||||
<div style="display:flex;gap:8px;align-items:center">
|
<div style="display:flex;gap:8px;align-items:center">
|
||||||
<svg class="ph-icon bday-fw3" style="width:1rem;height:1rem;color:#e8c96e"><use href="/icons/phosphor.svg#sparkle"></use></svg>
|
<svg class="ph-icon bday-fw3" style="width:1rem;height:1rem;color:#e8c96e"><use href="/icons/phosphor.svg#sparkle"></use></svg>
|
||||||
|
|
@ -1443,7 +1444,7 @@ window.Worlds = (() => {
|
||||||
</div>` : ''}
|
</div>` : ''}
|
||||||
<div style="display:flex;align-items:center;gap:4px;font-size:10px;color:rgba(196,132,58,0.9);font-weight:700;margin-top:2px">
|
<div style="display:flex;align-items:center;gap:4px;font-size:10px;color:rgba(196,132,58,0.9);font-weight:700;margin-top:2px">
|
||||||
<svg class="ph-icon" style="width:11px;height:11px"><use href="/icons/phosphor.svg#magic-wand"></use></svg>
|
<svg class="ph-icon" style="width:11px;height:11px"><use href="/icons/phosphor.svg#magic-wand"></use></svg>
|
||||||
${bday === 'today' ? 'Was hat sich Ban Yaro gewünscht?' : 'KI-Überraschungsideen'}
|
${bday === 'today' ? `Was hat sich ${_esc(bdayDog.name)} gewünscht?` : 'KI-Überraschungsideen'}
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
${bday === 'today' && new Date().getHours() >= 18 ? `
|
${bday === 'today' && new Date().getHours() >= 18 ? `
|
||||||
|
|
@ -1563,10 +1564,10 @@ window.Worlds = (() => {
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const res = await API.post('/ki/geburtstag', {
|
const res = await API.post('/ki/geburtstag', {
|
||||||
dog_id: dog.id,
|
dog_id: bdayDog.id,
|
||||||
name: dog.name,
|
name: bdayDog.name,
|
||||||
rasse: dog.rasse || null,
|
rasse: bdayDog.rasse || null,
|
||||||
alter: dog.alter_jahre ? Math.round(dog.alter_jahre) : null,
|
alter: bdayDog.alter_jahre ? Math.round(bdayDog.alter_jahre) : null,
|
||||||
mode: bdayMode,
|
mode: bdayMode,
|
||||||
});
|
});
|
||||||
const body = ov.querySelector('#bday-ki-body');
|
const body = ov.querySelector('#bday-ki-body');
|
||||||
|
|
|
||||||
|
|
@ -824,6 +824,10 @@
|
||||||
<div class="stats-band-num" id="big-posts">…</div>
|
<div class="stats-band-num" id="big-posts">…</div>
|
||||||
<div class="stats-band-label">Forum-Beiträge</div>
|
<div class="stats-band-label">Forum-Beiträge</div>
|
||||||
</div>
|
</div>
|
||||||
|
<div class="stats-band-item fade-up">
|
||||||
|
<div class="stats-band-num" id="big-kotbeutel">…</div>
|
||||||
|
<div class="stats-band-label">Kotbeutel-Stationen</div>
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</section>
|
</section>
|
||||||
|
|
@ -1579,7 +1583,8 @@
|
||||||
set('big-users', d.users);
|
set('big-users', d.users);
|
||||||
set('big-dogs', d.dogs);
|
set('big-dogs', d.dogs);
|
||||||
set('big-km', d.km);
|
set('big-km', d.km);
|
||||||
set('big-posts', d.forum_posts);
|
set('big-posts', d.forum_posts);
|
||||||
|
set('big-kotbeutel', d.kotbeutel);
|
||||||
|
|
||||||
var heroStats = document.getElementById('hero-stats');
|
var heroStats = document.getElementById('hero-stats');
|
||||||
if (heroStats && d.users > 0) heroStats.style.display = 'flex';
|
if (heroStats && d.users > 0) heroStats.style.display = 'flex';
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,7 @@
|
||||||
Offline-Cache + Push Notifications + Tile-Cache
|
Offline-Cache + Push Notifications + Tile-Cache
|
||||||
============================================================ */
|
============================================================ */
|
||||||
|
|
||||||
const CACHE_VERSION = 'by-v961';
|
const CACHE_VERSION = 'by-v962';
|
||||||
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
const CACHE_STATIC = `${CACHE_VERSION}-static`;
|
||||||
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
|
||||||
const CACHE_API = 'ban-yaro-api-v1'; // API-Response-Cache
|
const CACHE_API = 'ban-yaro-api-v1'; // API-Response-Cache
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue