From ff16f9873675107dd1a089e0798ef7f7139a43a7 Mon Sep 17 00:00:00 2001
From: poignatov <poignatov@avito.ru>
Date: Thu, 5 Mar 2026 12:59:31 +0300
Subject: [PATCH] =?UTF-8?q?6.0.1:=20=D0=A1=D1=80=D0=BE=D0=BA=20=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B7=D0=B1=D0=BB=D0=BE=D0=BA=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=BA=D0=B8=20=D1=86=D0=B5=D0=BB=D0=B8=20=D0=BF=D1=80=D0=B8=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B4=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2?=
 =?UTF-8?q?=D0=B0=D0=BD=D0=B8=D0=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 VERSION                                       |  2 +-
 play-life-web/package.json                    |  2 +-
 play-life-web/src/components/WishlistForm.jsx | 16 +++++++++++++++-
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/VERSION b/VERSION
index 09b254e..5fe6072 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-6.0.0
+6.0.1
diff --git a/play-life-web/package.json b/play-life-web/package.json
index 4a1e61f..e22a332 100644
--- a/play-life-web/package.json
+++ b/play-life-web/package.json
@@ -1,6 +1,6 @@
 {
   "name": "play-life-web",
-  "version": "6.0.0",
+  "version": "6.0.1",
   "type": "module",
   "scripts": {
     "dev": "vite",
diff --git a/play-life-web/src/components/WishlistForm.jsx b/play-life-web/src/components/WishlistForm.jsx
index a343e03..8fe6280 100644
--- a/play-life-web/src/components/WishlistForm.jsx
+++ b/play-life-web/src/components/WishlistForm.jsx
@@ -1409,10 +1409,19 @@ function ConditionForm({ tasks, projects, onSubmit, onCancel, editingCondition,
   const [projectId, setProjectId] = useState(editingCondition?.project_id?.toString() || '')
   const [requiredPoints, setRequiredPoints] = useState(editingCondition?.required_points?.toString() || '')
   const [startDate, setStartDate] = useState(editingCondition?.start_date || '')
-  const [calculatedWeeksText, setCalculatedWeeksText] = useState(null)
+  const [calculatedWeeksText, setCalculatedWeeksText] = useState(
+    editingCondition?.type === 'project_points' ? (editingCondition?.weeks_text ?? null) : null
+  )
 
   const isEditing = editingCondition !== null
 
+  // Показываем срок разблокировки из редактируемого условия до прихода ответа API
+  useEffect(() => {
+    if (editingCondition?.type === 'project_points' && editingCondition?.weeks_text) {
+      setCalculatedWeeksText(editingCondition.weeks_text)
+    }
+  }, [editingCondition?.id, editingCondition?.type, editingCondition?.weeks_text])
+
   // Автоподстановка новой задачи
   useEffect(() => {
     if (preselectedTaskId && !editingCondition) {
@@ -1473,6 +1482,11 @@ function ConditionForm({ tasks, projects, onSubmit, onCancel, editingCondition,
       project_id: type === 'project_points' ? parseInt(projectId) : null,
       required_points: type === 'project_points' ? parseFloat(requiredPoints) : null,
       start_date: type === 'project_points' && startDate ? startDate : null,
+      ...(type === 'project_points' && {
+        weeks_text: calculatedWeeksText || editingCondition?.weeks_text || null,
+      }),
+      ...(editingCondition?.id != null && { id: editingCondition.id }),
+      ...(editingCondition?.user_id != null && { user_id: editingCondition.user_id }),
     }
     onSubmit(condition)
     // Сброс формы