ramon
/
vbv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sort dueDates by start date

This commit is contained in:
Daniel Egger 2023-08-23 15:14:05 +02:00
parent 2fa17e1204
commit 969c55f15d
2 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
client/src/components/dueDates/DueDatesList.vue
View File

@ -1,23 +1,3 @@
<template>
<div>
<ul>
<li
v-for="dueDate in dueDatesDisplayed"
:key="dueDate.id"
:class="{ 'first:border-t': props.showTopBorder, 'border-b': true }"
>
<DueDateSingle :due-date="dueDate"></DueDateSingle>
</li>
</ul>
<div v-if="allDueDates.length > props.maxCount" class="flex items-center pt-6">
<!--a href="">{{ $t("dueDates.showAllDueDates") }}</a-->
<it-icon-arrow-right />
</div>
<div v-if="allDueDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
</div>
</template>
<script lang="ts" setup>
import DueDateSingle from "@/components/dueDates/DueDateSingle.vue";
import type { DueDate } from "@/types";
@ -37,3 +17,23 @@ const dueDatesDisplayed = computed(() => {
return props.dueDates.slice(0, props.maxCount);
});
</script>
<template>
<div>
<ul>
<li
v-for="dueDate in dueDatesDisplayed"
:key="dueDate.id"
:class="{ 'first:border-t': props.showTopBorder, 'border-b': true }"
>
<DueDateSingle :due-date="dueDate"></DueDateSingle>
</li>
</ul>
<div v-if="allDueDates.length > props.maxCount" class="flex items-center pt-6">
<!--a href="">{{ $t("dueDates.showAllDueDates") }}</a-->
<it-icon-arrow-right />
</div>
<div v-if="allDueDates.length === 0">{{ $t("dueDates.noDueDatesAvailable") }}</div>
</div>
</template>

4
client/src/stores/courseSessions.ts
View File

@ -209,8 +209,8 @@ export const useCourseSessionsStore = defineStore("courseSessions", () => {
function sortDueDates(dueDates: DueDate[]) {
dueDates.sort((a, b) => {
const dateA = dayjs(a.end);
const dateB = dayjs(b.end);
const dateA = dayjs(a.start);
const dateB = dayjs(b.start);
if (!dateA.isValid() && !dateB.isValid()) return 0; // If both are invalid, they are equal
if (!dateA.isValid()) return 1; // If dateA is invalid, it goes after dateB