poignatov/play-life
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6.18.0: Улучшения диалога товара и кнопки прогрессии
Some checks failed
Build and Push Docker Image / build-and-push (push) Failing after 1m13s
Details

Browse Source
This commit is contained in:
poignatov
2026-03-15 18:13:20 +03:00
parent 4f69481efe
commit 7ec76ea59b
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
6.17.5 6.18.0

2
play-life-web/package.json
View File

@@ -1,6 +1,6 @@
{ {
"name": "play-life-web", "name": "play-life-web",
"version": "6.17.5", "version": "6.18.0",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "vite", "dev": "vite",

3
play-life-web/src/components/ShoppingItemDetail.jsx
View File

@@ -196,7 +196,8 @@ function ShoppingItemDetail({ itemId, onClose, onRefresh, onItemCompleted, onNav
type="button" type="button"
className="progression-control-btn progression-control-plus" className="progression-control-btn progression-control-plus"
onClick={() => { onClick={() => {
const current = parseFloat(volumeValue) || 0 const base = item.last_volume ?? item.volume_base ?? 1
const current = volumeValue.trim() ? parseFloat(volumeValue) : base
const step = item.volume_base || 1 const step = item.volume_base || 1
setVolumeValue((current + step).toString()) setVolumeValue((current + step).toString())
}} }}

4
play-life-web/src/components/TaskDetail.css
View File

@@ -218,6 +218,10 @@
flex: 1; flex: 1;
} }
.shopping-item-complete-row .progression-label {
margin-bottom: 0;
}
.shopping-item-complete-row + .task-action-left { .shopping-item-complete-row + .task-action-left {
margin-top: 0.75rem; margin-top: 0.75rem;
} }

3
play-life-web/src/components/TaskDetail.jsx
View File

@@ -840,7 +840,8 @@ function TaskDetail({ taskId, onClose, onRefresh, onTaskCompleted, onNavigate })
type="button" type="button"
className="progression-control-btn progression-control-plus" className="progression-control-btn progression-control-plus"
onClick={() => { onClick={() => {
const current = parseFloat(progressionValue) || 0 const base = task.progression_base ?? 1
const current = progressionValue.trim() ? parseFloat(progressionValue) : base
const step = task.progression_base || 1 const step = task.progression_base || 1
setProgressionValue((current + step).toString()) setProgressionValue((current + step).toString())
}} }}