From a6fc69637326254f8e4addefd5dba4b21cb9aadf Mon Sep 17 00:00:00 2001
From: Elizabeth Danzberger <spookystuff@protonmail.com>
Date: Thu, 18 Jan 2024 10:02:44 -0500
Subject: [PATCH] fixed sorting for upcoming cards

Signed-off-by: Elizabeth Danzberger <elizabethdanzberger@gmail.com>
---
 src/components/overview/Overview.vue | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/components/overview/Overview.vue b/src/components/overview/Overview.vue
index 4aae3d847..dff7d92fd 100644
--- a/src/components/overview/Overview.vue
+++ b/src/components/overview/Overview.vue
@@ -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>
@@ -79,7 +79,6 @@
 </template>
 
 <script>
-
 import Controls from '../Controls.vue'
 import CardItem from '../cards/CardItem.vue'
 import { mapGetters } from 'vuex'
@@ -121,9 +120,7 @@ export default {
 				return ''
 			}
 		},
-		...mapGetters([
-			'assignedCardsDashboard',
-		]),
+		...mapGetters(['assignedCardsDashboard']),
 	},
 	watch: {
 		'$route.params.filter'() {
@@ -145,6 +142,18 @@ export default {
 			}
 			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
+			})
+		},
 	},
 
 }