Skip to content

Commit 7f2ae35

Browse files
authored
Ajoute un filtre pour cacher les tests et les références (#329)
* feat: add filter in store and filters sidebar * feat: hide tests and references accordeons when filter is checked * docs: update changelog * docs: fix changelog order
1 parent bcfd1c8 commit 7f2ae35

4 files changed

Lines changed: 32 additions & 3 deletions

File tree

CHANGELOG.md

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,17 @@ Tous les changements notables de Ara sont documentés ici avec leur date, leur c
44

55
## 24/03/2023
66

7-
## 23/03/2023
7+
## Nouvelles fonctionnalités 🚀
8+
9+
- Ajout d’un filtre pour cacher les tests et références des critères ([#329](https://github.com/DISIC/Ara/pull/329))
810

911
## Autres changements ⚙️
1012

1113
- Petits ajustements d’affichage du contenu de la page Contexte d’un audit ([#331](https://github.com/DISIC/Ara/pull/331))
1214
- Mise à jour du wording pour la saisie d’un moyen de contact dans la déclaration ([#330](https://github.com/DISIC/Ara/pull/330))
1315

16+
## 23/03/2023
17+
1418
## Nouvelles fonctionnalités 🚀
1519

1620
- Ajout d’un interrupteur pour marquer le résultat d’un critère comme transverse sur toutes les pages ([#317](https://github.com/DISIC/Ara/pull/317))

confiture-web-app/src/components/AuditGenerationCriterium.vue

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@ import CriteriumNotApplicableAccordion from "./CriteriumNotApplicableAccordion.v
1515
import CriteriumNotCompliantAccordion from "./CriteriumNotCompliantAccordion.vue";
1616
import CriteriumRecommendationAccordion from "./CriteriumRecommendationAccordion.vue";
1717
import CriteriumTestsAccordion from "./CriteriumTestsAccordion.vue";
18-
import { useResultsStore } from "../store";
18+
import { useResultsStore, useFiltersStore } from "../store";
1919
import { useNotifications } from "../composables/useNotifications";
2020
import RadioGroup, { RadioColor } from "./RadioGroup.vue";
2121
import { captureException } from "@sentry/core";
2222
2323
const store = useResultsStore();
24+
const filtersStore = useFiltersStore();
2425
2526
const props = defineProps<{
2627
topicNumber: number;
@@ -196,7 +197,14 @@ const uniqueId = computed(() => {
196197
</div>
197198

198199
<!-- STATUS -->
199-
<div class="fr-mb-2w fr-ml-6w criterium-radios-container">
200+
<div
201+
:class="[
202+
'fr-ml-6w criterium-radios-container',
203+
{
204+
'fr-mb-2w': result.status !== CriteriumResultStatus.NOT_TESTED,
205+
},
206+
]"
207+
>
200208
<RadioGroup
201209
v-model="result.status"
202210
:label="`Statut du critère ${topicNumber}.${criterium.number}`"
@@ -256,6 +264,10 @@ const uniqueId = computed(() => {
256264

257265
<!-- TESTS + METHODO -->
258266
<CriteriumTestsAccordion
267+
v-if="!filtersStore.hideTestsAndReferences"
268+
:class="{
269+
'fr-mt-2w': result.status === CriteriumResultStatus.NOT_TESTED,
270+
}"
259271
:topic-number="topicNumber"
260272
:criterium="criterium"
261273
/>

confiture-web-app/src/components/AuditGenerationFilters.vue

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,17 @@ watch(
116116
filterStore.newEvaluatedCriteria.length
117117
}})
118118
</button>
119+
120+
<div class="fr-checkbox-group fr-mt-4w">
121+
<input
122+
id="hide-tests-and-references"
123+
v-model="filterStore.hideTestsAndReferences"
124+
type="checkbox"
125+
/>
126+
<label class="fr-label" for="hide-tests-and-references">
127+
Masquer les tests et références
128+
</label>
129+
</div>
119130
</div>
120131

121132
<div class="fr-form-group">

confiture-web-app/src/store/filters.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ interface FiltersStoreState {
99
search: string;
1010
topics: number[];
1111
hideEvaluatedCriteria: boolean;
12+
hideTestsAndReferences: boolean;
1213
newEvaluatedCriteria: string[];
1314
}
1415

@@ -17,6 +18,7 @@ export const useFiltersStore = defineStore("filters", {
1718
search: "",
1819
topics: [],
1920
hideEvaluatedCriteria: false,
21+
hideTestsAndReferences: false,
2022
newEvaluatedCriteria: [],
2123
}),
2224
getters: {

0 commit comments

Comments
 (0)