@@ -306,6 +325,8 @@ window.Page_breeder = (() => {
const _STATUS_COLOR = { geplant: '#6b7280', geboren: '#3b82f6', verfuegbar: '#16a34a', abgeschlossen: '#9ca3af' };
function _wurfCard(w) {
+ const wurfTitel = [w.wurf_rang ? `${w.wurf_rang}-Wurf` : null, w.wurf_name]
+ .filter(Boolean).join(' · ');
const eltern = [w.vater_name, w.mutter_name].filter(Boolean).join(' × ') || '—';
const datum = w.geburt_datum
? `Geburt: ${_fmtDate(w.geburt_datum)}`
@@ -316,6 +337,7 @@ window.Page_breeder = (() => {
+ ${wurfTitel ? `${UI.escape(wurfTitel)}` : ''}
${UI.escape(eltern)}
${sl}
diff --git a/backend/static/landing.html b/backend/static/landing.html
index 891c8f2..cfed93e 100644
--- a/backend/static/landing.html
+++ b/backend/static/landing.html
@@ -4,7 +4,7 @@
-
+
Ban Yaro — Die Hunde-App für Deutschland, Österreich & Schweiz
diff --git a/backend/static/sw.js b/backend/static/sw.js
index fd4c73b..7998404 100644
--- a/backend/static/sw.js
+++ b/backend/static/sw.js
@@ -4,7 +4,7 @@
============================================================ */
// ← EINZIGE Stelle für die Version — STATIC_ASSETS und CACHE_VERSION leiten sich ab
-const VER = '1269';
+const VER = '1270';
const CACHE_VERSION = `by-v${VER}`;
const CACHE_STATIC = `${CACHE_VERSION}-static`;
const CACHE_TILES = 'ban-yaro-tiles-v1'; // bleibt über SW-Updates erhalten
diff --git a/tests/test_breeder_editor.py b/tests/test_breeder_editor.py
index bd520d8..f58fd2c 100644
--- a/tests/test_breeder_editor.py
+++ b/tests/test_breeder_editor.py
@@ -14,20 +14,65 @@ def test_my_editor_without_profile_404(client, admin):
def test_my_editor_with_profile(client, user):
- """Zuechter mit Profil -> profile + litters + storage."""
+ """Zuechter mit Profil -> profile (inkl. photos/certificates) + litters mit Namen + storage."""
from database import db
with db() as conn:
uid = conn.execute("SELECT id FROM users WHERE email=?", (user["email"],)).fetchone()["id"]
- conn.execute("UPDATE users SET rolle='breeder' WHERE id=?", (uid,))
+ conn.execute("UPDATE users SET rolle='breeder', breeder_status='approved' WHERE id=?", (uid,))
conn.execute(
"""INSERT INTO breeder_profiles (user_id, zwingername, rasse_text, verein, stadt)
VALUES (?,?,?,?,?)""",
(uid, "Vom Teststall", "Labrador", "VDH", "Ebersberg")
)
+ bid = conn.execute("SELECT last_insert_rowid()").fetchone()[0]
+ conn.execute(
+ "INSERT INTO litters (breeder_id, wurf_rang, wurf_name, welpen_gesamt) VALUES (?,?,?,?)",
+ (bid, "B", "Bergfest-Wurf", 6)
+ )
r = client.get("/api/breeder/my-editor", headers=user["headers"])
assert r.status_code == 200, r.text
d = r.json()
assert d["profile"]["zwingername"] == "Vom Teststall"
- assert isinstance(d["litters"], list)
+ assert isinstance(d["profile"]["photos"], list)
+ assert isinstance(d["profile"]["certificates"], list)
+ assert d["litters"][0]["wurf_rang"] == "B"
+ assert d["litters"][0]["foto_count"] == 0 # kein 'undefined Medien' mehr
assert d["storage_limit_mb"] == 200
assert d["storage_mb"] >= 0
+
+
+def test_certificate_upload_and_public_profile(client, user):
+ """Zertifikat hochladen -> erscheint im Editor UND auf der oeffentlichen Profilseite."""
+ import io
+ from PIL import Image
+ from database import db
+ with db() as conn:
+ uid = conn.execute("SELECT id FROM users WHERE email=?", (user["email"],)).fetchone()["id"]
+ conn.execute("UPDATE users SET rolle='breeder', breeder_status='approved' WHERE id=?", (uid,))
+ conn.execute(
+ """INSERT INTO breeder_profiles (user_id, zwingername, rasse_text, verein, stadt)
+ VALUES (?,?,?,?,?)""",
+ (uid, "Zertifikat-Zwinger", "Collie", "VDH", "Ebersberg")
+ )
+ bid = conn.execute("SELECT last_insert_rowid()").fetchone()[0]
+
+ buf = io.BytesIO()
+ Image.new("RGB", (64, 64), "gold").save(buf, format="PNG")
+ buf.seek(0)
+ r = client.post("/api/breeder/photos/upload", headers=user["headers"],
+ data={"entity_type": "certificate", "entity_id": str(bid),
+ "visibility": "public", "caption": "VDH-Mitglied"},
+ files={"file": ("vdh.png", buf, "image/png")})
+ assert r.status_code == 200, r.text
+
+ # Editor liefert das Zertifikat
+ r = client.get("/api/breeder/my-editor", headers=user["headers"])
+ certs = r.json()["profile"]["certificates"]
+ assert len(certs) == 1 and certs[0]["caption"] == "VDH-Mitglied"
+
+ # Oeffentliche Profilseite (ohne Login) zeigt es
+ r = client.get("/api/breeder/profil/Zertifikat-Zwinger")
+ assert r.status_code == 200, r.text
+ z = r.json()["zertifikate"]
+ assert len(z) == 1 and z[0]["caption"] == "VDH-Mitglied"
+ assert z[0]["url"].startswith("/media/")