From 6085d954601977dc542165e64b209c98b7b4bb2e Mon Sep 17 00:00:00 2001
From: paidge <paidge_cs@hotmail.com>
Date: Mon, 7 Nov 2022 07:41:16 +0100
Subject: [PATCH] improve RENEW status #2
---
components/suivis/Tableau.vue | 2 +-
pages/mes-suivis.vue | 9 +++++----
pages/previsions/futures_sorties.vue | 4 ++--
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/components/suivis/Tableau.vue b/components/suivis/Tableau.vue
index 845c5a9..fddb63f 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 dfdf5a2..4b4653c 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 6ff7c72..555c2b7 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
}
--
GitLab