improve RENEW status #2

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
 		}

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

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
 						}