Lars/mitai-jinkendo
1
0
Fork 0
Code Issues 23 Pull Requests Actions Packages Projects Releases 2 Wiki Activity

Goalsystem V1 #50

Merged
Lars merged 51 commits from develop into main 2026-03-27 17:40:51 +01:00
Conversation 0 Commits 51 Files Changed 33 +17 -6
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 217990d417 - Show all commits

23
backend/routers/goals.py
View File

@ -561,15 +561,25 @@ def create_goal_progress(goal_id: str, data: GoalProgressCreate, session: dict =
with get_db() as conn: with get_db() as conn:
cur = get_cursor(conn) cur = get_cursor(conn)
# Verify ownership # Verify ownership and check if manual entry is allowed
cur.execute( cur.execute("""
"SELECT id, unit FROM goals WHERE id = %s AND profile_id = %s", SELECT g.id, g.unit, gt.source_table
(goal_id, pid) FROM goals g
) LEFT JOIN goal_type_definitions gt ON g.goal_type = gt.type_key
WHERE g.id = %s AND g.profile_id = %s
""", (goal_id, pid))
goal = cur.fetchone() goal = cur.fetchone()
if not goal: if not goal:
raise HTTPException(status_code=404, detail="Ziel nicht gefunden") raise HTTPException(status_code=404, detail="Ziel nicht gefunden")
# Prevent manual entries for goals with automatic data sources
if goal['source_table']:
raise HTTPException(
status_code=400,
detail=f"Manuelle Einträge nicht erlaubt für automatisch erfasste Ziele. "
f"Bitte nutze die entsprechende Erfassungsseite (z.B. Gewicht, Aktivität)."
)
# Insert progress entry # Insert progress entry
try: try:
cur.execute(""" cur.execute("""
@ -660,7 +670,8 @@ def get_goals_grouped(session: dict = Depends(require_auth)):
g.unit, g.target_date, g.status, g.is_primary, g.category, g.priority, g.unit, g.target_date, g.status, g.is_primary, g.category, g.priority,
g.name, g.description, g.progress_pct, g.on_track, g.projection_date, g.name, g.description, g.progress_pct, g.on_track, g.projection_date,
g.created_at, g.updated_at, g.created_at, g.updated_at,
gt.label_de, gt.icon, gt.category as type_category gt.label_de, gt.icon, gt.category as type_category,
gt.source_table, gt.source_column, gt.direction
FROM goals g FROM goals g
LEFT JOIN goal_type_definitions gt ON g.goal_type = gt.type_key LEFT JOIN goal_type_definitions gt ON g.goal_type = gt.type_key
WHERE g.profile_id = %s WHERE g.profile_id = %s