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

v3.5.4: Скрыть дату под заголовком для задач в общем списке
All checks were successful
Build and Push Docker Image / build-and-push (push) Successful in 34s
Details

Browse Source
This commit is contained in:
poignatov
2026-01-09 14:17:17 +03:00
parent 97c031eda4
commit ef59781633
3 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
VERSION
View File

@@ -1 +1 @@
3.5.3 3.5.4

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

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

9
play-life-web/src/components/TaskList.jsx
View File

@@ -423,7 +423,7 @@ function TaskList({ onNavigate, data, loading, backgroundLoading, onRefresh }) {
return groups return groups
}, [tasks]) }, [tasks])
const renderTaskItem = (task) => { const renderTaskItem = (task, isCompleted = false) => {
const hasProgression = task.has_progression || task.progression_base != null const hasProgression = task.has_progression || task.progression_base != null
const hasSubtasks = task.subtasks_count > 0 const hasSubtasks = task.subtasks_count > 0
const showDetailOnCheckmark = hasProgression || hasSubtasks const showDetailOnCheckmark = hasProgression || hasSubtasks
@@ -510,7 +510,8 @@ function TaskList({ onNavigate, data, loading, backgroundLoading, onRefresh }) {
)} )}
</span> </span>
</div> </div>
{task.next_show_at && (() => { {/* Показываем дату только для выполненных задач */}
{isCompleted && task.next_show_at && (() => {
const showDate = new Date(task.next_show_at) const showDate = new Date(task.next_show_at)
// Нормализуем дату: устанавливаем время в 00:00:00 в локальном времени // Нормализуем дату: устанавливаем время в 00:00:00 в локальном времени
const showDateNormalized = new Date(showDate.getFullYear(), showDate.getMonth(), showDate.getDate()) const showDateNormalized = new Date(showDate.getFullYear(), showDate.getMonth(), showDate.getDate())
@@ -612,7 +613,7 @@ function TaskList({ onNavigate, data, loading, backgroundLoading, onRefresh }) {
{/* Обычные задачи (включая бесконечные) */} {/* Обычные задачи (включая бесконечные) */}
{group.notCompleted.length > 0 && ( {group.notCompleted.length > 0 && (
<div className="task-group"> <div className="task-group">
{group.notCompleted.map(renderTaskItem)} {group.notCompleted.map(task => renderTaskItem(task, false))}
</div> </div>
)} )}
@@ -630,7 +631,7 @@ function TaskList({ onNavigate, data, loading, backgroundLoading, onRefresh }) {
</button> </button>
{isCompletedExpanded && ( {isCompletedExpanded && (
<div className="task-group completed-tasks"> <div className="task-group completed-tasks">
{group.completed.map(renderTaskItem)} {group.completed.map(task => renderTaskItem(task, true))}
</div> </div>
)} )}
</div> </div>