diff --git a/VERSION b/VERSION index 2d6c0bc..ab0fa33 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.0.4 +5.0.5 diff --git a/play-life-backend/main.go b/play-life-backend/main.go index c17f328..98a9095 100644 --- a/play-life-backend/main.go +++ b/play-life-backend/main.go @@ -6785,8 +6785,12 @@ func (a *App) getFullStatisticsHandler(w http.ResponseWriter, r *http.Request) { if item.ReportYear == currentYearInt && item.ReportWeek == currentWeekInt { if score, exists := currentWeekScores[projectID]; exists { item.TotalScore = score - // Для текущей недели normalized_total_score не отправляем - item.NormalizedTotalScore = 0 + // Нормализованный score для текущей недели — та же логика, что в MV: LEAST(score, max) + if item.MaxGoalScore > 0 { + item.NormalizedTotalScore = math.Min(score, item.MaxGoalScore) + } else { + item.NormalizedTotalScore = score + } } } @@ -6847,14 +6851,19 @@ func (a *App) getFullStatisticsHandler(w http.ResponseWriter, r *http.Request) { totalScore = score } - // Для текущей недели normalized_total_score не отправляем + // Нормализованный score для текущей недели — та же логика, что в MV: LEAST(score, max) + normalizedScore := totalScore + if maxGoalScore > 0 { + normalizedScore = math.Min(totalScore, maxGoalScore) + } + _, weekISO := time.Now().ISOWeek() item := FullStatisticsItem{ ProjectName: projectName, ReportYear: time.Now().Year(), ReportWeek: weekISO, TotalScore: totalScore, - NormalizedTotalScore: 0, + NormalizedTotalScore: normalizedScore, MinGoalScore: minGoalScore, MaxGoalScore: maxGoalScore, Color: projectColor, diff --git a/play-life-web/package.json b/play-life-web/package.json index 833d9bf..2b23493 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "5.0.4", + "version": "5.0.5", "type": "module", "scripts": { "dev": "vite",