Merge branch 'bug-date-sorties' into 'master'

Fix bug displaying date in future exits

See merge request !8

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: {

pages/index.vue

@@ -85,7 +85,7 @@ export default {
 						if (!users.includes(member.member.uid)) {
 							if (member.member.history.length == 1) {
 								this.addValue(result["entrees"], member.member)
-							} else if (member.inOut) {
+							} else if (member.inOut || member.member.status === "MEMBER") {
 								this.addValue(result["renew"], member.member)
 							} else {
 								this.addValue(result["sorties"], member.member)

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>