From 0bb60fe21e311802c2ddf025c1975900ae582ba0 Mon Sep 17 00:00:00 2001 From: bach Date: Sat, 15 Jul 2023 22:12:40 +0200 Subject: [PATCH] menace / maintient #2205 --- src/api/gql/concernement.fragment.gql | 1 + src/components/contents/Entite.vue | 31 ++++++++++++++++++------ src/components/contents/TerrainDeVie.vue | 2 +- 3 files changed, 26 insertions(+), 8 deletions(-) diff --git a/src/api/gql/concernement.fragment.gql b/src/api/gql/concernement.fragment.gql index 320fec4..47db11b 100644 --- a/src/api/gql/concernement.fragment.gql +++ b/src/api/gql/concernement.fragment.gql @@ -27,6 +27,7 @@ fragment ConcernementFields on Concernement { name } entites { + menacemaintien entite { title id diff --git a/src/components/contents/Entite.vue b/src/components/contents/Entite.vue index 38dbc38..1ab61d4 100644 --- a/src/components/contents/Entite.vue +++ b/src/components/contents/Entite.vue @@ -4,16 +4,33 @@ import { mapActions, mapState } from 'pinia' import { ConcernementsStore } from '@stores/concernements' export default { - props: ['entite'], + props: ['entite', 'eid'], data() { return { } }, computed: { - ...mapState(ConcernementsStore,['opened_concernement']), - ...mapState(ConcernementsStore,['ct_concernement']), - ...mapState(ConcernementsStore,['ct_entite']), - + ...mapState(ConcernementsStore,['opened_concernement', + 'ct_concernement', + 'ct_entite']), + field_menace_maintien_label (){ + let str; + if (this.opened_concernement.entites_byid[this.eid].menacemaintien < 0) { + str = this.ct_entite.field_menace_maintien.description.replace('/maintient', '') + } else { + str = this.ct_entite.field_menace_maintien.description.replace('menace/', '') + } + return str; + }, + field_sources_label () { + let str; + if (this.opened_concernement.entites_byid[this.eid].menacemaintien < 0) { + str = this.ct_entite.field_sources.description.replace('/ ce maintient', '') + } else { + str = this.ct_entite.field_sources.description.replace('cette menace /', '') + } + return str; + } }, methods: { @@ -29,7 +46,7 @@ export default {
- +
@@ -41,7 +58,7 @@ export default { :key="index" class="source">
- +
diff --git a/src/components/contents/TerrainDeVie.vue b/src/components/contents/TerrainDeVie.vue index 027cb98..d1a0141 100644 --- a/src/components/contents/TerrainDeVie.vue +++ b/src/components/contents/TerrainDeVie.vue @@ -115,7 +115,7 @@ export default { - +