fixed sorting for upcoming cards

Signed-off-by: Elizabeth Danzberger <elizabethdanzberger@gmail.com>
This commit is contained in:
Elizabeth Danzberger
2024-01-18 10:02:44 -05:00
parent 020c15bb31
commit a6fc696373

View File

@@ -33,35 +33,35 @@
<div v-else-if="isValidFilter" class="overview"> <div v-else-if="isValidFilter" class="overview">
<div class="dashboard-column"> <div class="dashboard-column">
<h3>{{ t('deck', 'Overdue') }}</h3> <h3>{{ t('deck', 'Overdue') }}</h3>
<div v-for="card in assignedCardsDashboard.overdue" :key="card.id"> <div v-for="card in sortCards('overdue')" :key="card.id">
<CardItem :id="card.id" /> <CardItem :id="card.id" />
</div> </div>
</div> </div>
<div class="dashboard-column"> <div class="dashboard-column">
<h3>{{ t('deck', 'Today') }}</h3> <h3>{{ t('deck', 'Today') }}</h3>
<div v-for="card in assignedCardsDashboard.today" :key="card.id"> <div v-for="card in sortCards('today')" :key="card.id">
<CardItem :id="card.id" /> <CardItem :id="card.id" />
</div> </div>
</div> </div>
<div class="dashboard-column"> <div class="dashboard-column">
<h3>{{ t('deck', 'Tomorrow') }}</h3> <h3>{{ t('deck', 'Tomorrow') }}</h3>
<div v-for="card in assignedCardsDashboard.tomorrow" :key="card.id"> <div v-for="card in sortCards('tomorrow')" :key="card.id">
<CardItem :id="card.id" /> <CardItem :id="card.id" />
</div> </div>
</div> </div>
<div class="dashboard-column"> <div class="dashboard-column">
<h3>{{ t('deck', 'Next 7 days') }}</h3> <h3>{{ t('deck', 'Next 7 days') }}</h3>
<div v-for="card in assignedCardsDashboard.nextSevenDays" :key="card.id"> <div v-for="card in sortCards('nextSevenDays')" :key="card.id">
<CardItem :id="card.id" /> <CardItem :id="card.id" />
</div> </div>
</div> </div>
<div class="dashboard-column"> <div class="dashboard-column">
<h3>{{ t('deck', 'Later') }}</h3> <h3>{{ t('deck', 'Later') }}</h3>
<div v-for="card in assignedCardsDashboard.later" :key="card.id"> <div v-for="card in sortCards('later')" :key="card.id">
<CardItem :id="card.id" /> <CardItem :id="card.id" />
</div> </div>
</div> </div>
@@ -79,7 +79,6 @@
</template> </template>
<script> <script>
import Controls from '../Controls.vue' import Controls from '../Controls.vue'
import CardItem from '../cards/CardItem.vue' import CardItem from '../cards/CardItem.vue'
import { mapGetters } from 'vuex' import { mapGetters } from 'vuex'
@@ -121,9 +120,7 @@ export default {
return '' return ''
} }
}, },
...mapGetters([ ...mapGetters(['assignedCardsDashboard']),
'assignedCardsDashboard',
]),
}, },
watch: { watch: {
'$route.params.filter'() { '$route.params.filter'() {
@@ -145,6 +142,18 @@ export default {
} }
this.loading = false this.loading = false
}, },
sortCards(when) {
const cards = this.assignedCardsDashboard[when]
if (!cards) return null
return cards.toSorted((current, next) => {
const currentDueDate = new Date(current.duedate)
const nextDueDate = new Date(next.duedate)
return currentDueDate - nextDueDate
})
},
}, },
} }