diff --git a/components/certif/List.vue b/components/certif/List.vue
index 7c9e3281c9b73c46fbb6afaa1d292f1dd4c880ee..7d656c9b375c1e0cd6cce3363765af2407adae3e 100644
--- a/components/certif/List.vue
+++ b/components/certif/List.vue
@@ -39,7 +39,7 @@
<div class="text-truncate">{{ certif.uid }}</div>
<BadgeDanger
- :limitDate="certif.received_certifications.limit"
+ :limitDate="certif.certsLimit"
:memberStatus="certif.status" />
</div>
<BadgeStatus :membre="certif" />
diff --git a/components/member/Card.vue b/components/member/Card.vue
index b128a13f9f4f5287e580087c93b0487e2b1447d1..1eb76c3c919b4917dc4518b41345b0b5fa303be9 100644
--- a/components/member/Card.vue
+++ b/components/member/Card.vue
@@ -90,16 +90,9 @@
<td
:class="
'list-group-item-' +
- $options.filters.dateStatus(
- hash.received_certifications.limit
- )
+ $options.filters.dateStatus(hash.certsLimit)
">
- {{
- $d(
- new Date(hash.received_certifications.limit * 1000),
- "long"
- )
- }}
+ {{ $d(new Date(hash.certsLimit * 1000), "long") }}
</td>
</tr>
<tr v-if="hash.status == 'MEMBER'">
diff --git a/components/member/List.vue b/components/member/List.vue
index e905118ef3eb382097397fa53c3bed74f577abd0..ad36e4170fc86e9812a0894ec54ea2ecac71ba16 100644
--- a/components/member/List.vue
+++ b/components/member/List.vue
@@ -72,7 +72,7 @@
<div class="text-truncate">{{ member.uid }}</div>
<BadgeDanger
- :limitDate="member.received_certifications.limit"
+ :limitDate="member.certsLimit"
:memberStatus="member.status" />
</div>
<div v-if="['adhesion', 'certif'].includes(type)" class="d-sm-none">
@@ -108,9 +108,7 @@
}"
v-if="['certif', 'favoris'].includes(type)"
@click="redirect(member.hash)">
- <BadgeDate
- :date="member.received_certifications.limit"
- styleDate="short" />
+ <BadgeDate :date="member.certsLimit" styleDate="short" />
</td>
<td class="py-1" v-if="type == 'favoris'" style="width: 60px">
<button
@@ -178,8 +176,8 @@ export default {
},
getDate(member) {
if (this.type == "adhesion") return member.limitDate
- if (this.type == "certif") return member.received_certifications.limit
- return Math.min(member.limitDate, member.received_certifications.limit)
+ if (this.type == "certif") return member.certsLimit
+ return Math.min(member.limitDate, member.certsLimit)
},
getOrder(a, b, order) {
if (a < b) return -1 * order
@@ -208,11 +206,7 @@ export default {
} else if (this.currentSort == "date_membership") {
return this.getOrder(a["limitDate"], b["limitDate"], modifier)
} else if (this.currentSort == "date_certs") {
- return this.getOrder(
- a["received_certifications"]["limit"],
- b["received_certifications"]["limit"],
- modifier
- )
+ return this.getOrder(a["certsLimit"], b["certsLimit"], modifier)
}
return 0
})
diff --git a/graphql/queries.js b/graphql/queries.js
index bf90f745eb4123cf0768a24b7fae5e09d171f730..fe68c143272898e499db251629ec4afba14e3f6d 100644
--- a/graphql/queries.js
+++ b/graphql/queries.js
@@ -31,6 +31,7 @@ export const LAST_EVENTS = gql`
hash
minDatePassed
minDate
+ certsLimit
limitDate
quality {
__typename
@@ -44,10 +45,6 @@ export const LAST_EVENTS = gql`
number
}
}
- received_certifications {
- __typename
- limit
- }
sent_certifications {
__typename
pending
@@ -79,11 +76,8 @@ export const NEWCOMERS = gql`
uid
status
hash
+ certsLimit
limitDate
- received_certifications {
- __typename
- limit
- }
}
date
after
@@ -106,15 +100,12 @@ export const SEARCH_MEMBERS = gql`
minDate
minDatePassed
hash
+ certsLimit
limitDate
quality {
__typename
ratio
}
- received_certifications {
- __typename
- limit
- }
sent_certifications {
__typename
pending
@@ -151,14 +142,11 @@ export const SEARCH_MEMBER = gql`
}
received_certifications {
__typename
- certifications {
- __typename
- from {
- ...attr
- }
- expires_on
- pending
+ from {
+ ...attr
}
+ expires_on
+ pending
}
sent_certifications {
__typename
@@ -175,6 +163,7 @@ export const SEARCH_MEMBER = gql`
uid
hash
status
+ certsLimit
limitDate
minDate
minDatePassed
@@ -182,10 +171,6 @@ export const SEARCH_MEMBER = gql`
__typename
ratio
}
- received_certifications {
- __typename
- limit
- }
sent_certifications {
__typename
pending
@@ -229,6 +214,7 @@ export const FAVORIS = gql`
uid
status
hash
+ certsLimit
limitDate
minDatePassed
minDate
@@ -236,10 +222,6 @@ export const FAVORIS = gql`
__typename
ratio
}
- received_certifications {
- __typename
- limit
- }
sent_certifications {
__typename
pending
@@ -258,15 +240,12 @@ export const NEXT_EXITS = gql`
hash
minDatePassed
minDate
+ certsLimit
limitDate
quality {
__typename
ratio
}
- received_certifications {
- __typename
- limit
- }
sent_certifications {
__typename
pending
@@ -288,29 +267,23 @@ export const NEXT_LOOSE_CERTS = gql`
period: $period
missingIncluded: $missingIncluded
) {
- id {
+ __typename
+ pubkey
+ uid
+ status
+ hash
+ minDatePassed
+ minDate
+ certsLimit
+ limitDate
+ quality {
__typename
- pubkey
- uid
- status
- hash
- minDatePassed
- minDate
- limitDate
- quality {
- __typename
- ratio
- }
- received_certifications {
- __typename
- limit
- }
- sent_certifications {
- __typename
- pending
- }
+ ratio
+ }
+ sent_certifications {
+ __typename
+ pending
}
- date
}
}
`
diff --git a/package.json b/package.json
index 906d414fdacc3887049f6d875f11e975b0d86944..0a5c5f8c92999e9c57d912f8a8a306c345b49aef 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "wotwizard-ui",
- "version": "0.23.0",
+ "version": "0.24.0",
"private": true,
"scripts": {
"dev": "nuxt",
diff --git a/pages/membre.vue b/pages/membre.vue
index 72cae00b73385ce340c7dea3ad011a0962f04492..809a0e3307908de7577d03f981d4a69715382170 100644
--- a/pages/membre.vue
+++ b/pages/membre.vue
@@ -21,11 +21,10 @@
:class="{
'text-success':
['NEWCOMER', 'MISSING'].includes(idFromHash.status) &&
- idFromHash.received_certifications.certifications.length >=
- 5,
+ idFromHash.received_certifications.length >= 5,
'text-danger':
['NEWCOMER', 'MISSING'].includes(idFromHash.status) &&
- idFromHash.received_certifications.certifications.length < 5
+ idFromHash.received_certifications.length < 5
}">
{{ $t("certification.recues") }} ({{ nbCertifsReceived
}}<span v-if="nbCertifsPendingReceived != 0">{{
@@ -33,11 +32,11 @@
}}</span
>)
<BadgeDanger
- :limitDate="idFromHash.received_certifications.limit"
+ :limitDate="idFromHash.certsLimit"
:memberStatus="idFromHash.status" />
</h3>
<CertifGroup
- :certifs="idFromHash.received_certifications.certifications"
+ :certifs="idFromHash.received_certifications"
type="received" />
</div>
<div
@@ -106,11 +105,10 @@ export default {
computed: {
classWarning() {
return {
- "text-danger": !this.idFromHash.received_certifications.limit,
+ "text-danger": !this.idFromHash.certsLimit,
"text-warning":
- this.$options.filters.dateStatus(
- this.idFromHash.received_certifications.limit
- ) == "warning"
+ this.$options.filters.dateStatus(this.idFromHash.certsLimit) ==
+ "warning"
}
},
nbCertifsSent() {
@@ -119,11 +117,9 @@ export default {
}).length
},
nbCertifsReceived() {
- return this.idFromHash.received_certifications.certifications.filter(
- (el) => {
- return el.pending == false
- }
- ).length
+ return this.idFromHash.received_certifications.filter((el) => {
+ return el.pending == false
+ }).length
},
nbCertifsPendingSent() {
return this.idFromHash.sent_certifications.filter((el) => {
@@ -131,11 +127,9 @@ export default {
}).length
},
nbCertifsPendingReceived() {
- return this.idFromHash.received_certifications.certifications.filter(
- (el) => {
- return el.pending == true
- }
- ).length
+ return this.idFromHash.received_certifications.filter((el) => {
+ return el.pending == true
+ }).length
}
},
mounted() {
diff --git a/pages/previsions/futures_sorties.vue b/pages/previsions/futures_sorties.vue
index 91a4af88f3115261a00137f136115d6b4cf16ef5..96b647eeb94263ee2150c33db920bf70bcc3a8f5 100644
--- a/pages/previsions/futures_sorties.vue
+++ b/pages/previsions/futures_sorties.vue
@@ -96,9 +96,6 @@ export default {
variables() {
return this.getParams
},
- update(data) {
- return data.certEnds.map((item) => item.id)
- },
error(err) {
this.error = err.message
}