diff --git a/VERSION b/VERSION index 252fdf2..6055679 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.24.0 +4.24.1 diff --git a/play-life-backend/main.go b/play-life-backend/main.go index e9b69d0..ae79ddb 100644 --- a/play-life-backend/main.go +++ b/play-life-backend/main.go @@ -14893,7 +14893,7 @@ func (a *App) getWeeklyStatsDataForUserAndWeek(userID int, year int, week int) ( p.color FROM projects p - LEFT JOIN + INNER JOIN weekly_goals wg ON wg.project_id = p.id AND wg.goal_year = $2 AND wg.goal_week = $3 @@ -14904,6 +14904,7 @@ func (a *App) getWeeklyStatsDataForUserAndWeek(userID int, year int, week int) ( AND $3 = wr.report_week WHERE p.deleted = FALSE AND p.user_id = $1 + AND wg.min_goal_score IS NOT NULL ORDER BY total_score DESC ` diff --git a/play-life-web/package.json b/play-life-web/package.json index 940c7ab..2d153d2 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "4.24.0", + "version": "4.24.1", "type": "module", "scripts": { "dev": "vite",