Skip to content

Commit

Permalink
fix: 🐛 fix epaule_a_pompe securing steps
Browse files Browse the repository at this point in the history
  • Loading branch information
@nutfdt
nutfdt committed May 30, 2024
1 parent 5f9cef0 commit 64a5472
Show file tree
Hide file tree
Showing 3 changed files with 143 additions and 151 deletions.
2 changes: 1 addition & 1 deletion frontend/src/utils/firearms-utils/epaule-a-pompe.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ export const epaule_a_pompe = {
'Observer l’arme en l’orientant dans une <span class="font-bold">direction sans risque</span>, en manipulant avec précaution',
'Si la pompe est bloquée, <span class="font-bold">appuyer sur le bouton de déverrouillage</span> situé à l’avant ou sous le pontet',
'Actionner la pompe doucement d’arrière en avant afin d’<span class="font-bold">extraire toutes les munitions</span>',
'<span class="font-bold">Verrouiller l’arme</span> en avançant légèrement la pompe vers l’avant',
'Contrôler visuellement que la chambre est vide',
'<span class="font-bold">Verrouiller l’arme</span> en avançant légèrement la pompe vers l’avant',
'<span class="font-bold">Contrôler l’orifice du tube magasin</span> et constater que celui-ci est bien vide',
],
video: epaulePompeSimpleVideo,
Expand Down
2 changes: 1 addition & 1 deletion frontend/src/views/GuideSecuringFirearm/SecuringAchievement.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ function goToMissingCardPageIfMissing () {
<template>
<div class="fr-container">
<div class="result fr-col-11 fr-col-lg-6 m-auto">
<div v-if="TYPOLOGIES[typology]?.options_step_1 || TYPOLOGIES[typology]?.options || TYPOLOGIES[typology]?.text_steps">
<div v-if="TYPOLOGIES[typology]?.securingSteps">
<h2 class="mt-5 text-center">
Fin de la mise en sécurité de l’arme
</h2>
Expand Down
290 changes: 141 additions & 149 deletions frontend/src/views/GuideSecuringFirearm/SecuringTutorialContent.vue
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,171 +58,163 @@ const selectedOptionTexts = getSelectedOptionData(options).texts
</h3>
<div v-if="typology === 'revolver'">
<div v-if="selectedOptionStep === 'revolver_verrou_1892' || selectedOptionStep === 'revolver_1873_fr'">
<div v-if="selectedOptionStep === 'revolver_verrou_1892' || selectedOptionStep === 'revolver_1873_fr'">
<div
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="selectedOptionVideos"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 30 sec</span>
</div>
<div
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="selectedOptionVideos"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 30 sec</span>
</div>
<p class="manipulations -mx-8 p-8">
<ul class="list-none text-sm">
<li
v-for="option in selectedOptionTexts"
:key="option"
class="list-decimal"
v-html="option"
/>
</li>
</ul>
</p>
<div class="small-blank" />
<AskingExpert />
<FooterMES />
</div>
<div v-else>
<div
<p class="manipulations -mx-8 p-8">
<ul class="list-none text-sm">
<li
v-for="option in selectedOptionTexts"
:key="option"
class="list-decimal"
v-html="option"
/>
</ul>
</p>
<div class="small-blank" />
<AskingExpert />
<FooterMES />
</div>
<div v-else>
<div
v-if="selectedOptionStep"
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="selectedOptionVideos"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 1 min</span>
</div>
</div>
<div class="manipulations -mx-8 p-8">
<ul
v-if="selectedOptionStep"
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
class="list-none text-sm"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="selectedOptionVideos"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 1 min</span>
</div>
</div>
<div class="manipulations -mx-8 p-8">
<ul
v-if="selectedOptionStep"
class="list-none text-sm"
>
<li
v-for="option in selectedOptionTexts"
:key="option"
class="list-decimal"
v-html="option"
/>
</li>
</ul>
</div>
<div class="small-blank" />
<AskingExpert />
<FooterMES />
<li
v-for="option in selectedOptionTexts"
:key="option"
class="list-decimal"
v-html="option"
/>
</ul>
</div>
<div class="small-blank" />
<AskingExpert />
<FooterMES />
</div>
<div v-else>
<div v-if="!TYPOLOGIES[typology]?.securingSteps?.text_steps">
</div>
<div v-else>
<div v-if="!TYPOLOGIES[typology]?.securingSteps?.text_steps">
<div
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="TYPOLOGIES[typology]?.securingSteps[selectedOptionStep]?.video"
data-testid="video-tutoriel"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 30 sec</span>
</div>
</div>
<div class="manipulations -mx-8 p-8">
<ul class="list-none text-sm">
<li
v-for="option in TYPOLOGIES[typology]?.securingSteps[selectedOptionStep]?.text_steps"
:key="option.value"
class="list-decimal"
v-html="option"
/>
</ul>
<div
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
v-if="typology === `semi_auto_style_militaire_autre` && stepsStore.currentOptionStep['1'] === 'uzi'"
class="mb-2"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="TYPOLOGIES[typology]?.options[selectedOptionStep]?.video"
:src="TYPOLOGIES[typology]?.options[selectedOptionStep]?.video"
data-testid="video-tutoriel"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 30 sec</span>
</div>
<PopupVideo />
</div>
<div class="manipulations -mx-8 p-8">
<ul class="list-none text-sm">
<li
v-for="option in TYPOLOGIES[typology].options[selectedOptionStep]?.text_steps"
v-for="option in TYPOLOGIES[typology].options[selectedOptionStep]?.text_steps"
:key="option.value"
class="list-decimal"
v-html="option"
/>
</ul>
<div
v-if="typology === `semi_auto_style_militaire_autre` && stepsStore.currentOptionStep['1'] === 'uzi'"
class="mb-2"
>
<PopupVideo />
</div>
</div>
<div class="small-blank" />
<AskingExpert />
</div>
<div v-else>
<div
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="TYPOLOGIES[typology]?.securingSteps?.video"
data-testid="video-tutoriel"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 1 min</span>
</div>
<div class="small-blank" />
<AskingExpert />
</div>
<div v-else>
<div class="manipulations -mx-8 p-8">
<ul class="list-none text-sm">
<li
v-for="option in TYPOLOGIES[typology]?.securingSteps?.text_steps"
:key="option.value"
class="list-decimal"
v-html="option"
/>
</ul>
<div
class="fr-col-sm-6 fr-col-lg-12 mx-auto"
v-if="typology === 'epaule_a_verrou'"
class="text-sm mb-2"
>
<div class="fr-content-media relative">
<video
controls
playsinline
muted
:src="TYPOLOGIES[typology]?.video"
:src="TYPOLOGIES[typology]?.video"
data-testid="video-tutoriel"
/>
<span class="absolute -bottom-1.5rem right-0 text-sm">Environ 1 min</span>
</div>
<PopupVideo />
</div>
<div class="manipulations -mx-8 p-8">
<ul class="list-none text-sm">
<li
v-for="option in TYPOLOGIES[typology]?.text_steps"
v-for="option in TYPOLOGIES[typology]?.text_steps"
:key="option.value"
class="list-decimal"
v-html="option"
/>
</ul>
<div
v-if="typology === 'epaule_a_verrou'"
class="text-sm mb-2"
>
<PopupVideo />
</div>
<div>
<p class="text-sm mb-2">
3. Retourner l’arme et chercher la présence éventuelle de levier ou bouton devant le pontet en indiquant la présence d’un chargeur externe. Si tel est le cas, <span class="font-bold">extraire le chargeur</span> en appuyant ou en tirant sur ces derniers<br>
</p>
<p class="text-sm mb-2">
4. Si vous n’avez pas enlevé de chargeur, <span class="font-bold">vider le magasin des munitions</span> éventuelles en les faisant glisser vers l’avant à l’aide de votre pouce<br>
</p>
<p class="text-sm mb-2">
5. Contrôler visuellement la chambre
</p>
</div>
<div>
<p class="text-sm mb-2">
3. Retourner l’arme et chercher la présence éventuelle de levier ou bouton devant le pontet en indiquant la présence d’un chargeur externe. Si tel est le cas, <span class="font-bold">extraire le chargeur</span> en appuyant ou en tirant sur ces derniers<br>
</p>
<p class="text-sm mb-2">
4. Si vous n’avez pas enlevé de chargeur, <span class="font-bold">vider le magasin des munitions</span> éventuelles en les faisant glisser vers l’avant à l’aide de votre pouce<br>
</p>
<p class="text-sm mb-2">
5. Contrôler visuellement la chambre
</p>
</div>
<div class="small-blank" />
<AskingExpert />
</div>
<div class="footer">
<div class="fr-col-11 fr-col-lg-6 footer-actions mx-auto">
<DsfrButton
class="m-1 flex justify-center"
icon="ri-arrow-left-line"
:secondary="true"
label="Précédent"
@click="router.back()"
/>
<DsfrButton
class="m-1 flex justify-center"
icon="ri-arrow-right-line"
data-testid="button-next"
label="Suivant"
:icon-right="true"
@click="router.push({ name:'SecuringAchievement'})"
/>
</div>
<div class="small-blank" />
<AskingExpert />
</div>
<div class="footer">
<div class="fr-col-11 fr-col-lg-6 footer-actions mx-auto">
<DsfrButton
class="m-1 flex justify-center"
icon="ri-arrow-left-line"
:secondary="true"
label="Précédent"
@click="router.back()"
/>
<DsfrButton
class="m-1 flex justify-center"
icon="ri-arrow-right-line"
data-testid="button-next"
label="Suivant"
:icon-right="true"
@click="router.push({ name:'SecuringAchievement'})"
/>
</div>
</div>
</div>
Expand Down

0 comments on commit 64a5472

Please sign in to comment.