Skip to content

fixed sorting for upcoming cards #5493

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
juliusknorr merged 2 commits into from
Jan 25, 2024
Merged

fixed sorting for upcoming cards #5493

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a6fc696
fixed sorting for upcoming cards
Jan 18, 2024
220f91f
fixed to follow nextcloud coding guidelines
Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 20 additions & 9 deletions src/components/overview/Overview.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,35 @@
<div v-else-if="isValidFilter" class="overview">
<div class="dashboard-column">
<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" />
</div>
</div>

<div class="dashboard-column">
<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" />
</div>
</div>

<div class="dashboard-column">
<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" />
</div>
</div>

<div class="dashboard-column">
<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" />
</div>
</div>

<div class="dashboard-column">
<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" />
</div>
</div>
Expand All @@ -79,7 +79,6 @@
</template>

<script>

import Controls from '../Controls.vue'
import CardItem from '../cards/CardItem.vue'
import { mapGetters } from 'vuex'
Expand Down Expand Up @@ -121,9 +120,7 @@ export default {
return ''
}
},
...mapGetters([
'assignedCardsDashboard',
]),
...mapGetters(['assignedCardsDashboard']),
},
watch: {
'$route.params.filter'() {
Expand All @@ -145,6 +142,20 @@ export default {
}
this.loading = false
},
sortCards(when) {
const cards = this.assignedCardsDashboard[when]

if (!cards) {
return null
} else {
return cards.toSorted((current, next) => {
const currentDueDate = new Date(current.duedate)
const nextDueDate = new Date(next.duedate)

return currentDueDate - nextDueDate
})
}
},
Comment on lines +150 to +158
Copy link
Copy Markdown
Member

@juliusknorr juliusknorr Jan 24, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a very small detail. Since the if-branch returns, we don't need an else branch which slightly improves readability:

Suggested change
} else {
return cards.toSorted((current, next) => {
const currentDueDate = new Date(current.duedate)
const nextDueDate = new Date(next.duedate)
return currentDueDate - nextDueDate
})
}
},
return cards.toSorted((current, next) => {
const currentDueDate = new Date(current.duedate)
const nextDueDate = new Date(next.duedate)
return currentDueDate - nextDueDate
})
},

},

}
Expand Down
⚡