diff --git a/components/suivis/Tableau.vue b/components/suivis/Tableau.vue index 845c5a909e60f6709b95e1b23bd9bd160668cd52..fddb63f5186cefb22c7f490f462ac1ac184f62ad 100644 --- a/components/suivis/Tableau.vue +++ b/components/suivis/Tableau.vue @@ -36,7 +36,7 @@ export default { data() { return { search: "", - filterStatus: ["NEWCOMER", "", "RENEW", "MISSING", ""], + filterStatus: ["NEWCOMER", "MEMBER", "RENEW", "MISSING", ""], filterCerts: "current", nbItems: 0 } diff --git a/pages/mes-suivis.vue b/pages/mes-suivis.vue index dfdf5a2ce8c9aaa16b59eeba41426a47885aed3e..4b4653ce067e1318a100ed5e9214a4c4b383b6b2 100644 --- a/pages/mes-suivis.vue +++ b/pages/mes-suivis.vue @@ -197,7 +197,7 @@ export default { status: ["warning", "danger"].includes( this.$options.filters.dateStatus(el.id.limitDate) - ) && el.id.status != "NEWCOMER" + ) && el.id.status == "MEMBER" ? "RENEW" : el.id.status, expired: false @@ -235,7 +235,7 @@ export default { status: ["warning", "danger"].includes( this.$options.filters.dateStatus(member.limitDate) - ) && member.status != "NEWCOMER" + ) && member.status == "MEMBER" ? "RENEW" : member.status, expired: member.expired || false @@ -257,8 +257,9 @@ export default { return { ...ret, status: - this.$options.filters.dateStatus(member.limitDate) == - "warning" && member.status != "NEWCOMER" + ["warning", "danger"].includes( + this.$options.filters.dateStatus(member.limitDate) + ) && member.status == "MEMBER" ? "RENEW" : member.status, expired: member.expired || false diff --git a/pages/previsions/futures_sorties.vue b/pages/previsions/futures_sorties.vue index 6ff7c72beaf1ebb3fe25a08664f9a57770b4d1ce..555c2b74847e58c8c7f66fc90803106c4efe9369 100644 --- a/pages/previsions/futures_sorties.vue +++ b/pages/previsions/futures_sorties.vue @@ -110,7 +110,7 @@ export default { status: ["warning", "danger"].includes( this.$options.filters.dateStatus(el.limitDate) - ) && el.status != "NEWCOMER" + ) && el.status == "MEMBER" ? "RENEW" : el.status } @@ -136,7 +136,7 @@ export default { status: ["warning", "danger"].includes( this.$options.filters.dateStatus(el.limitDate) - ) && el.status != "NEWCOMER" + ) && el.status == "MEMBER" ? "RENEW" : el.status }