diff --git a/frontend/src/components/ResultPage.vue b/frontend/src/components/ResultPage.vue index 62b08fb7..1340bc3b 100644 --- a/frontend/src/components/ResultPage.vue +++ b/frontend/src/components/ResultPage.vue @@ -20,7 +20,7 @@ const img = computed(() => resultStore.img) const typology = TYPOLOGIES[resultStore.typology] const isDummy = computed(() => stepsStore.isDummy) -const hasGuideDummy = typology?.guideDummy !== undefined +const hasDummyOptions = typology?.dummyOptions !== undefined const isCardDetected = computed(() => resultStore.gunLength !== null && resultStore.gunBarrelLength !== null) const isUp = ref(false) @@ -75,7 +75,7 @@ function sendFeedback (isCorrect: boolean) {
@@ -178,7 +178,7 @@ function sendFeedback (isCorrect: boolean) {
diff --git a/frontend/src/utils/firearms-utils/epaule-a-verrou.ts b/frontend/src/utils/firearms-utils/epaule-a-verrou.ts index e8223b31..56f4bd2d 100644 --- a/frontend/src/utils/firearms-utils/epaule-a-verrou.ts +++ b/frontend/src/utils/firearms-utils/epaule-a-verrou.ts @@ -28,20 +28,16 @@ export const epaule_a_verrou = { ], }, ], - guideDummy: [ + dummyOptions: [ { - options: [ - { - label: 'Balles', - value: 'cartouches', - img_ammo: epauleAVerrouCartridges, - }, - { - label: 'Billes ou trou pour billes', - value: 'billes', - img_ammo: epauleAVerrouBalls, - }, - ], + label: 'Balles', + value: 'cartouches', + img_ammo: epauleAVerrouCartridges, + }, + { + label: 'Billes ou trou pour billes', + value: 'billes', + img_ammo: epauleAVerrouBalls, }, ], getDisclaimer: getEpaulLevierVerrouDisclaimer, diff --git a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts index a61de593..6c52be97 100644 --- a/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts +++ b/frontend/src/utils/firearms-utils/pistolet-semi-auto-moderne.ts @@ -50,20 +50,16 @@ export const pistolet_semi_auto_moderne = { ], }, ], - guideDummy: [ + dummyOptions: [ { - options: [ - { - label: 'Cartouches', - value: 'cartouches', - img_ammo: pistoletSemiAutoModerneCartridges, - }, - { - label: 'Billes', - value: 'billes', - img_ammo: pistoletSemiAutoModerneBalls, - }, - ], + label: 'Cartouches', + value: 'cartouches', + img_ammo: pistoletSemiAutoModerneCartridges, + }, + { + label: 'Billes', + value: 'billes', + img_ammo: pistoletSemiAutoModerneBalls, }, ], getDisclaimer: (category: string) => { diff --git a/frontend/src/utils/firearms-utils/revolver.ts b/frontend/src/utils/firearms-utils/revolver.ts index c567528b..b0da961e 100644 --- a/frontend/src/utils/firearms-utils/revolver.ts +++ b/frontend/src/utils/firearms-utils/revolver.ts @@ -163,20 +163,16 @@ export const revolver = { ], }, ], - guideDummy: [ + dummyOptions: [ { - options: [ - { - label: 'Balles', - value: 'cartouches', - img_ammo: revolverCartridges, - }, - { - label: 'Billes ou trou pour billes', - value: 'billes', - img_ammo: revolverBalls, - }, - ], + label: 'Balles', + value: 'cartouches', + img_ammo: revolverCartridges, + }, + { + label: 'Billes ou trou pour billes', + value: 'billes', + img_ammo: revolverBalls, }, ], getDisclaimer: (category: string) => { diff --git a/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts b/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts index 324d0837..744cc2e6 100644 --- a/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts +++ b/frontend/src/utils/firearms-utils/semi-auto-style-militaire-autre.ts @@ -101,20 +101,16 @@ export const semi_auto_style_militaire_autre = { ], }, ], - guideDummy: [ + dummyOptions: [ { - options: [ - { - label: 'Cartouches', - value: 'cartouches', - img_ammo: semiAutoMilitaireCartridges, - }, - { - label: 'Billes', - value: 'billes', - img_ammo: semiAutoMilitaireBalls, - }, - ], + label: 'Cartouches', + value: 'cartouches', + img_ammo: semiAutoMilitaireCartridges, + }, + { + label: 'Billes', + value: 'billes', + img_ammo: semiAutoMilitaireBalls, }, ], getDisclaimer: () => "Catégorie A si à l'origine l’arme était à répétition automatique puis a été transformée en arme semi automatique, ou si l’arme possède une crosse rétractable / pliable et qu’en configuration la plus courte elle mesure moins de 60 cm.", diff --git a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue index c0a398c5..6284d077 100644 --- a/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue +++ b/frontend/src/views/GuideIdentificationFirearm/GuideIdentificationFirearm.vue @@ -23,7 +23,7 @@ const currentStep = ref(1) const isLowConfidence = confidenceLevel.value === 'low' const steps = computed(() => { - if (TYPOLOGIES[typology]?.guideDummy || !isLowConfidence) { + if (TYPOLOGIES[typology]?.dummyOptions || !isLowConfidence) { if (ALARM_GUNS_TYPOLOGIES.includes(resultStore.typology) && stepsStore.selectedAmmo === 'cartouches') { return ['Typologie de l\'arme', 'Compléments', 'Typologie de munitions', 'Identification d\'une arme d\'alarme', 'Résultat final'] } else { @@ -97,7 +97,7 @@ const showDiv = ref(false)