6.0.1: Срок разблокировки цели при редактировании
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m5s
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 1m5s
This commit is contained in:
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "play-life-web",
|
"name": "play-life-web",
|
||||||
"version": "6.0.0",
|
"version": "6.0.1",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
|
|||||||
@@ -1409,10 +1409,19 @@ function ConditionForm({ tasks, projects, onSubmit, onCancel, editingCondition,
|
|||||||
const [projectId, setProjectId] = useState(editingCondition?.project_id?.toString() || '')
|
const [projectId, setProjectId] = useState(editingCondition?.project_id?.toString() || '')
|
||||||
const [requiredPoints, setRequiredPoints] = useState(editingCondition?.required_points?.toString() || '')
|
const [requiredPoints, setRequiredPoints] = useState(editingCondition?.required_points?.toString() || '')
|
||||||
const [startDate, setStartDate] = useState(editingCondition?.start_date || '')
|
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
|
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(() => {
|
useEffect(() => {
|
||||||
if (preselectedTaskId && !editingCondition) {
|
if (preselectedTaskId && !editingCondition) {
|
||||||
@@ -1473,6 +1482,11 @@ function ConditionForm({ tasks, projects, onSubmit, onCancel, editingCondition,
|
|||||||
project_id: type === 'project_points' ? parseInt(projectId) : null,
|
project_id: type === 'project_points' ? parseInt(projectId) : null,
|
||||||
required_points: type === 'project_points' ? parseFloat(requiredPoints) : null,
|
required_points: type === 'project_points' ? parseFloat(requiredPoints) : null,
|
||||||
start_date: type === 'project_points' && startDate ? startDate : 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)
|
onSubmit(condition)
|
||||||
// Сброс формы
|
// Сброс формы
|
||||||
|
|||||||
Reference in New Issue
Block a user