diff --git a/VERSION b/VERSION index cece3b9..1e16a1f 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -6.15.4 +6.15.5 diff --git a/play-life-backend/main.go b/play-life-backend/main.go index 79022ae..21d8475 100644 --- a/play-life-backend/main.go +++ b/play-life-backend/main.go @@ -7469,6 +7469,16 @@ func (a *App) getFullStatisticsHandler(w http.ResponseWriter, r *http.Request) { return } + // Добавляем pending scores из драфтов с auto_complete=true + draftPendingScores, err := a.getDraftPendingScores(userID) + if err != nil { + log.Printf("Error getting draft pending scores for full statistics: %v", err) + } else { + for projectID, pendingScore := range draftPendingScores { + currentWeekScores[projectID] += pendingScore + } + } + // Получаем ISO год и неделю для текущей даты (в настроенном часовом поясе) timezoneStr := getEnv("TIMEZONE", "UTC") loc, locErr := time.LoadLocation(timezoneStr) diff --git a/play-life-backend/play-eng-backend b/play-life-backend/play-eng-backend index 90c13a4..3581833 100755 Binary files a/play-life-backend/play-eng-backend and b/play-life-backend/play-eng-backend differ diff --git a/play-life-web/package.json b/play-life-web/package.json index 1cf5e79..42e3de5 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "6.15.4", + "version": "6.15.5", "type": "module", "scripts": { "dev": "vite",