From c3323f01224f18747fe59a31ff68e147e4cf0e56 Mon Sep 17 00:00:00 2001
From: CaTasTrOOf <benoit@besnard.biz>
Date: Wed, 26 Jan 2022 11:15:04 +0100
Subject: [PATCH] Fix bug displaying date in future exits
---
components/member/List.vue | 14 +++++++++-----
pages/previsions/futures_sorties.vue | 3 ++-
2 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/components/member/List.vue b/components/member/List.vue
index ad0d665..2313cd8 100644
--- a/components/member/List.vue
+++ b/components/member/List.vue
@@ -66,11 +66,7 @@
class="d-none d-sm-table-cell"
v-if="displayDate"
@click="redirect(member.hash)">
- <BadgeDate
- :date="
- Math.min(member.limitDate, member.received_certifications.limit)
- "
- styleDate="long" />
+ <BadgeDate :date="date(member)" styleDate="long" />
</td>
<td class="py-1 text-center" :title="$t('favoris.supprimer')">
<button
@@ -111,6 +107,10 @@ export default {
displayDate: {
type: Boolean,
default: true
+ },
+ adhesion: {
+ type: Boolean,
+ default: false
}
},
methods: {
@@ -124,6 +124,10 @@ export default {
this.currentSortDir = this.currentSortDir === "asc" ? "desc" : "asc"
}
this.currentSort = s
+ },
+ date(member) {
+ if (this.adhesion) return member.limitDate
+ return member.received_certifications.limit
}
},
computed: {
diff --git a/pages/previsions/futures_sorties.vue b/pages/previsions/futures_sorties.vue
index 864725a..dc6fb5f 100644
--- a/pages/previsions/futures_sorties.vue
+++ b/pages/previsions/futures_sorties.vue
@@ -44,7 +44,8 @@
<h2 class="h4 text-danger text-center">{{ $t("statut.renew") }}</h2>
<MemberList
:members="wwResult['membership']"
- :displayPubkey="false" />
+ :displayPubkey="false"
+ :adhesion="true" />
</div>
</div>
</div>
--
GitLab