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

fix: использовать приоритет только из weekly_goals, без fallback на projects.priority (v3.1.3)
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 40s
Details

Browse Source
This commit is contained in:
poignatov
2026-01-06 15:09:58 +03:00
parent 9e5790f70e
commit 28a45ab81e
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
3.1.2 3.1.3

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

@@ -2186,7 +2186,7 @@ func (a *App) getWeeklyStatsHandler(w http.ResponseWriter, r *http.Request) {
COALESCE(wr.total_score, 0.0000) AS total_score, COALESCE(wr.total_score, 0.0000) AS total_score,
wg.min_goal_score, wg.min_goal_score,
wg.max_goal_score, wg.max_goal_score,
COALESCE(wg.priority, p.priority) AS priority wg.priority AS priority
FROM FROM
projects p projects p
LEFT JOIN LEFT JOIN
@@ -3010,7 +3010,7 @@ func (a *App) getWeeklyStatsData() (*WeeklyStatsResponse, error) {
COALESCE(wr.total_score, 0.0000) AS total_score, COALESCE(wr.total_score, 0.0000) AS total_score,
wg.min_goal_score, wg.min_goal_score,
wg.max_goal_score, wg.max_goal_score,
COALESCE(wg.priority, p.priority) AS priority wg.priority AS priority
FROM FROM
projects p projects p
LEFT JOIN LEFT JOIN
@@ -3144,7 +3144,7 @@ func (a *App) getWeeklyStatsDataForUser(userID int) (*WeeklyStatsResponse, error
COALESCE(wr.total_score, 0.0000) AS total_score, COALESCE(wr.total_score, 0.0000) AS total_score,
wg.min_goal_score, wg.min_goal_score,
wg.max_goal_score, wg.max_goal_score,
COALESCE(wg.priority, p.priority) AS priority wg.priority AS priority
FROM FROM
projects p projects p
LEFT JOIN LEFT JOIN

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

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