update
This commit is contained in:
@@ -1,7 +1,7 @@
|
||||
<script setup>
|
||||
import { ref, computed, onMounted } from 'vue'
|
||||
import { useRouter } from 'vue-router'
|
||||
import { getAllSchemas, getAllTasks, toggleTask } from '../services/api'
|
||||
import { getSchemas, getTasks, toggleTask } from '../services/api'
|
||||
import CategoryBadge from '../components/CategoryBadge.vue'
|
||||
import Icon from '../components/Icon.vue'
|
||||
|
||||
@@ -13,8 +13,8 @@ const mode = ref('schemas')
|
||||
async function fetchData(showLoading = true) {
|
||||
if (showLoading) loading.value = true
|
||||
items.value = mode.value === 'schemas'
|
||||
? await getAllSchemas()
|
||||
: await getAllTasks()
|
||||
? await getSchemas()
|
||||
: await getTasks()
|
||||
loading.value = false
|
||||
}
|
||||
|
||||
@@ -29,17 +29,29 @@ function formatDate(dateStr) {
|
||||
})
|
||||
}
|
||||
|
||||
function getDateKey(item) {
|
||||
if (!item.date) return null
|
||||
return item.date.split('T')[0]
|
||||
}
|
||||
|
||||
const groupedItems = computed(() => {
|
||||
const today = new Date().toISOString().split('T')[0]
|
||||
const noDate = items.value.filter(i => !i.deadline)
|
||||
const current = items.value.filter(i => i.deadline && i.deadline >= today)
|
||||
const past = items.value.filter(i => i.deadline && i.deadline < today)
|
||||
const noDate = items.value.filter(i => !getDateKey(i))
|
||||
const current = items.value.filter(i => {
|
||||
const d = getDateKey(i)
|
||||
return d && d >= today
|
||||
})
|
||||
const past = items.value.filter(i => {
|
||||
const d = getDateKey(i)
|
||||
return d && d < today
|
||||
})
|
||||
|
||||
const monthMap = {}
|
||||
const months = []
|
||||
for (const item of past) {
|
||||
const d = new Date(item.deadline + 'T00:00:00')
|
||||
const sortKey = item.deadline.substring(0, 7)
|
||||
const dateKey = getDateKey(item)
|
||||
const d = new Date(dateKey + 'T00:00:00')
|
||||
const sortKey = dateKey.substring(0, 7)
|
||||
const label = d.toLocaleDateString('de-DE', { month: 'long', year: 'numeric' })
|
||||
if (!monthMap[sortKey]) {
|
||||
monthMap[sortKey] = { sortKey, label, items: [] }
|
||||
@@ -53,7 +65,7 @@ const groupedItems = computed(() => {
|
||||
})
|
||||
|
||||
async function handleToggle(item) {
|
||||
await toggleTask(item.schemaId, item.deadline)
|
||||
await toggleTask(item.id)
|
||||
await fetchData(false)
|
||||
}
|
||||
|
||||
@@ -108,11 +120,11 @@ onMounted(fetchData)
|
||||
@click="handleToggle(item)"
|
||||
>
|
||||
<div class="task-left">
|
||||
<span class="task-name" :class="{ 'task--completed': item.status === 'erledigt' }">{{ item.name }}</span>
|
||||
<span class="task-name" :class="{ 'task--completed': item.status === 'done' }">{{ item.name }}</span>
|
||||
<CategoryBadge :category="item.category" />
|
||||
</div>
|
||||
<div class="task-right" @click.stop>
|
||||
<button @click="router.push({ name: 'task-detail', params: { id: item.taskId } })">Anzeigen</button>
|
||||
<button @click="router.push({ name: 'task-detail', params: { id: item.id } })">Anzeigen</button>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
@@ -125,12 +137,12 @@ onMounted(fetchData)
|
||||
@click="handleToggle(item)"
|
||||
>
|
||||
<div class="task-left">
|
||||
<span class="task-name" :class="{ 'task--completed': item.status === 'erledigt' }">{{ item.name }}</span>
|
||||
<span class="task-name" :class="{ 'task--completed': item.status === 'done' }">{{ item.name }}</span>
|
||||
<CategoryBadge :category="item.category" />
|
||||
</div>
|
||||
<div class="task-right" @click.stop>
|
||||
<span class="task-date">{{ formatDate(item.deadline) }}</span>
|
||||
<button @click="router.push({ name: 'task-detail', params: { id: item.taskId } })">Anzeigen</button>
|
||||
<span class="task-date">{{ formatDate(getDateKey(item)) }}</span>
|
||||
<button @click="router.push({ name: 'task-detail', params: { id: item.id } })">Anzeigen</button>
|
||||
</div>
|
||||
</li>
|
||||
|
||||
@@ -144,10 +156,10 @@ onMounted(fetchData)
|
||||
@click="handleToggle(item)"
|
||||
>
|
||||
<div class="task-left">
|
||||
<span class="task-name" :class="{ 'task--completed': item.status === 'erledigt' }">{{ item.name }}</span>
|
||||
<span class="task-name" :class="{ 'task--completed': item.status === 'done' }">{{ item.name }}</span>
|
||||
<CategoryBadge :category="item.category" />
|
||||
</div>
|
||||
<span class="task-date">{{ formatDate(item.deadline) }}</span>
|
||||
<span class="task-date">{{ formatDate(getDateKey(item)) }}</span>
|
||||
</li>
|
||||
</template>
|
||||
</template>
|
||||
|
||||
Reference in New Issue
Block a user