From 9f3637113d5477bccd3037e90a924057f2ebb976 Mon Sep 17 00:00:00 2001 From: poignatov Date: Wed, 4 Mar 2026 18:09:50 +0300 Subject: [PATCH] =?UTF-8?q?5.10.2:=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D1=81=D0=B1=D1=80=D0=BE=D1=81=20=D0=BF?= =?UTF-8?q?=D1=80=D0=BE=D0=B3=D1=80=D0=B5=D1=81=D1=81=D0=B8=D0=B8=20=D0=B2?= =?UTF-8?q?=20null?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION | 2 +- play-life-backend/main.go | 46 ++++++++++++++++----- play-life-web/package.json | 2 +- play-life-web/src/components/TaskDetail.jsx | 6 +-- 4 files changed, 41 insertions(+), 15 deletions(-) diff --git a/VERSION b/VERSION index 4e32c7b..269fb5d 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -5.10.1 +5.10.2 diff --git a/play-life-backend/main.go b/play-life-backend/main.go index f10e58d..4eda985 100644 --- a/play-life-backend/main.go +++ b/play-life-backend/main.go @@ -434,9 +434,10 @@ type PostponeTaskRequest struct { // ============================================ type SaveDraftRequest struct { - ProgressionValue *float64 `json:"progression_value,omitempty"` - ChildrenTaskIDs *[]int `json:"children_task_ids,omitempty"` // только checked подзадачи, nil = не менять - AutoComplete *bool `json:"auto_complete,omitempty"` // nil = не менять + ProgressionValue *float64 `json:"progression_value,omitempty"` + ClearProgressionValue *bool `json:"clear_progression_value,omitempty"` // true = сбросить прогрессию в null + ChildrenTaskIDs *[]int `json:"children_task_ids,omitempty"` // только checked подзадачи, nil = не менять + AutoComplete *bool `json:"auto_complete,omitempty"` // nil = не менять } type TaskDraft struct { @@ -9406,6 +9407,7 @@ func (a *App) saveTaskDraftHandler(w http.ResponseWriter, r *http.Request) { err = tx.QueryRow("SELECT id FROM task_drafts WHERE task_id = $1", taskID).Scan(&draftID) var progressionValue sql.NullFloat64 + clearProgression := req.ClearProgressionValue != nil && *req.ClearProgressionValue if req.ProgressionValue != nil { progressionValue = sql.NullFloat64{Float64: *req.ProgressionValue, Valid: true} } @@ -9434,8 +9436,23 @@ func (a *App) saveTaskDraftHandler(w http.ResponseWriter, r *http.Request) { } else { // Обновляем существующий драфт // Обновляем только те поля, которые переданы - if req.ProgressionValue != nil || req.AutoComplete != nil { - if req.AutoComplete != nil { + if req.ProgressionValue != nil || req.AutoComplete != nil || clearProgression { + if clearProgression { + // Сбрасываем прогрессию в null + if req.AutoComplete != nil { + _, err = tx.Exec(` + UPDATE task_drafts + SET progression_value = NULL, auto_complete = $1, updated_at = NOW() + WHERE id = $2 + `, *req.AutoComplete, draftID) + } else { + _, err = tx.Exec(` + UPDATE task_drafts + SET progression_value = NULL, updated_at = NOW() + WHERE id = $1 + `, draftID) + } + } else if req.AutoComplete != nil { // Обновляем оба поля _, err = tx.Exec(` UPDATE task_drafts @@ -10055,6 +10072,7 @@ func (a *App) completeTaskAtEndOfDayHandler(w http.ResponseWriter, r *http.Reque err = tx.QueryRow("SELECT id FROM task_drafts WHERE task_id = $1", taskID).Scan(&draftID) var progressionValue sql.NullFloat64 + clearProgression := req.ClearProgressionValue != nil && *req.ClearProgressionValue if req.ProgressionValue != nil { progressionValue = sql.NullFloat64{Float64: *req.ProgressionValue, Valid: true} } @@ -10078,11 +10096,19 @@ func (a *App) completeTaskAtEndOfDayHandler(w http.ResponseWriter, r *http.Reque return } else { // Обновляем существующий драфт с auto_complete = true - _, err = tx.Exec(` - UPDATE task_drafts - SET progression_value = $1, auto_complete = $2, updated_at = NOW() - WHERE id = $3 - `, progressionValue, *req.AutoComplete, draftID) + if clearProgression { + _, err = tx.Exec(` + UPDATE task_drafts + SET progression_value = NULL, auto_complete = $1, updated_at = NOW() + WHERE id = $2 + `, *req.AutoComplete, draftID) + } else { + _, err = tx.Exec(` + UPDATE task_drafts + SET progression_value = $1, auto_complete = $2, updated_at = NOW() + WHERE id = $3 + `, progressionValue, *req.AutoComplete, draftID) + } if err != nil { log.Printf("Error updating draft: %v", err) diff --git a/play-life-web/package.json b/play-life-web/package.json index cb868cc..5f58ce4 100644 --- a/play-life-web/package.json +++ b/play-life-web/package.json @@ -1,6 +1,6 @@ { "name": "play-life-web", - "version": "5.10.1", + "version": "5.10.2", "type": "module", "scripts": { "dev": "vite", diff --git a/play-life-web/src/components/TaskDetail.jsx b/play-life-web/src/components/TaskDetail.jsx index 0ed9230..3d9731b 100644 --- a/play-life-web/src/components/TaskDetail.jsx +++ b/play-life-web/src/components/TaskDetail.jsx @@ -477,7 +477,7 @@ function TaskDetail({ taskId, onClose, onRefresh, onTaskCompleted, onNavigate }) children_task_ids: Array.from(selectedSubtasks) } - // Если есть прогрессия, отправляем значение (или null, если не введено) + // Если есть прогрессия, отправляем значение (или сбрасываем, если не введено) if (taskDetail.task.progression_base != null) { if (progressionValue.trim()) { const parsedValue = parseFloat(progressionValue) @@ -486,8 +486,8 @@ function TaskDetail({ taskId, onClose, onRefresh, onTaskCompleted, onNavigate }) } payload.progression_value = parsedValue } else { - // Если прогрессия не введена - отправляем null - payload.progression_value = null + // Если прогрессия не введена - сбрасываем в null + payload.clear_progression_value = true } } else { // Если нет progression_base, но пользователь ввел значение - отправляем его