poignatov/play-life
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

4.24.1: Фильтрация проектов в отслеживании
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m50s
Details

Browse Source
This commit is contained in:
poignatov
2026-02-06 15:22:09 +03:00
parent 65f21cd025
commit 8a036df1b4
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
4.24.0 4.24.1

3
play-life-backend/main.go
View File

@@ -14893,7 +14893,7 @@ func (a *App) getWeeklyStatsDataForUserAndWeek(userID int, year int, week int) (
p.color p.color
FROM FROM
projects p projects p
LEFT JOIN INNER JOIN
weekly_goals wg ON wg.project_id = p.id weekly_goals wg ON wg.project_id = p.id
AND wg.goal_year = $2 AND wg.goal_year = $2
AND wg.goal_week = $3 AND wg.goal_week = $3
@@ -14904,6 +14904,7 @@ func (a *App) getWeeklyStatsDataForUserAndWeek(userID int, year int, week int) (
AND $3 = wr.report_week AND $3 = wr.report_week
WHERE WHERE
p.deleted = FALSE AND p.user_id = $1 p.deleted = FALSE AND p.user_id = $1
AND wg.min_goal_score IS NOT NULL
ORDER BY ORDER BY
total_score DESC total_score DESC
` `

2
play-life-web/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "play-life-web", "name": "play-life-web",
"version": "4.24.0", "version": "4.24.1",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",