From c6a5bb26af16c04421c14eecfbb69124f9e7b4a0 Mon Sep 17 00:00:00 2001
From: sebastien <dupuy@datakode.fr>
Date: Thu, 2 Mar 2023 15:31:25 +0100
Subject: [PATCH] =?UTF-8?q?issue=5F17=20correctif=20pour=20lier=20les=20ch?=
=?UTF-8?q?amps=20aux=20formulaires=20et=20corrig=C3=A9=20des=20=C3=A9l?=
=?UTF-8?q?=C3=A9ments=20<i>=20mal=20impl=C3=A9ment=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Components/ActionPlanTable.vue | 2 +-
.../ManagerView/Components/MeasureCard.vue | 4 ++--
.../Evaluations/Single/Steps/Step3.vue | 2 +-
.../components/Measures/Single/LevelBlock.vue | 11 +++++-----
resources/js/components/Menu/Side.vue | 20 ++++++++++++-------
.../Organizations/Single/AddressBlock.vue | 6 +++---
.../Single/InformationsBlock.vue | 12 +++++------
.../components/Territories/Single/index.vue | 5 +++--
resources/js/components/Users/Single.vue | 3 ++-
.../dossierCyberSecurite/dossier.blade.php | 2 +-
10 files changed, 38 insertions(+), 29 deletions(-)
diff --git a/resources/js/components/Dashboard/ManagerView/Components/ActionPlanTable.vue b/resources/js/components/Dashboard/ManagerView/Components/ActionPlanTable.vue
index e427193a..7e674a48 100644
--- a/resources/js/components/Dashboard/ManagerView/Components/ActionPlanTable.vue
+++ b/resources/js/components/Dashboard/ManagerView/Components/ActionPlanTable.vue
@@ -6,7 +6,7 @@
<thead>
<tr>
<th>Actions à réaliser</th>
- <th>Date limite de mise en oeuvre</th>
+ <th>Date limite de mise en Å“uvre</th>
<th>Personne en charge</th>
</tr>
</thead>
diff --git a/resources/js/components/Dashboard/ManagerView/Components/MeasureCard.vue b/resources/js/components/Dashboard/ManagerView/Components/MeasureCard.vue
index 98e86b54..bc10157c 100644
--- a/resources/js/components/Dashboard/ManagerView/Components/MeasureCard.vue
+++ b/resources/js/components/Dashboard/ManagerView/Components/MeasureCard.vue
@@ -5,7 +5,7 @@
</div>
<div class="card-body col-8 py-2">
<div class="card-text">
- Mise en oeuvre des mesures de sécurité
+ Mise en œuvre des mesures de sécurité
<div v-if="totalMeasuresLevel" class="small font-weight-bold">{{ Math.round(totalMeasuresLevel / 30 * 100) }} %</div>
<div v-else class="small font-weight-bold">0 %</div>
</div>
@@ -41,4 +41,4 @@ export default {
align-items: center;
justify-content: center;
}
-</style>
\ No newline at end of file
+</style>
diff --git a/resources/js/components/Evaluations/Single/Steps/Step3.vue b/resources/js/components/Evaluations/Single/Steps/Step3.vue
index a97577b9..68aba342 100644
--- a/resources/js/components/Evaluations/Single/Steps/Step3.vue
+++ b/resources/js/components/Evaluations/Single/Steps/Step3.vue
@@ -5,7 +5,7 @@
<div class="card card-info">
<div class="card-header py-1">
<div class="card-title">
- Surface de mise en oeuvre des mesures de sécurité
+ Surface de mise en œuvre des mesures de sécurité
</div>
</div>
<div class="card-body">
diff --git a/resources/js/components/Measures/Single/LevelBlock.vue b/resources/js/components/Measures/Single/LevelBlock.vue
index 63f73bae..d8ea4ad9 100644
--- a/resources/js/components/Measures/Single/LevelBlock.vue
+++ b/resources/js/components/Measures/Single/LevelBlock.vue
@@ -48,6 +48,7 @@
<label
class="m-0"
:class="{ 'text-danger': submitted && $v.levelEdit.file.$error }"
+ :for="`file${level.level}`"
>Remplacer la fiche</label>
</div>
<div v-else>
@@ -73,7 +74,7 @@
</div>
<!-- END FILE -->
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.levelEdit.difficulty.$error }" :for="`difficulty${level.level}`">Niveau de difficulté de l'action <i class="text-muted small">(Obligatoire)</i></label>
+ <label :class="{ 'text-danger': submitted && $v.levelEdit.difficulty.$error }" :for="`difficulty${level.level}`">Niveau de difficulté de l'action <i class="text-muted small">(Obligatoire)</i></label>
<select
:id="`difficulty${level.level}`"
v-model="levelEdit.difficulty"
@@ -96,7 +97,7 @@
</div>
</div>
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.levelEdit.cost.$error }" :for="`cost${level.level}`">Coût estimé pour la mise en oeuvre de l'action</label> <i class="text-muted small">(Obligatoire)</i>
+ <label :class="{ 'text-danger': submitted && $v.levelEdit.cost.$error }" :for="`cost${level.level}`">Coût estimé pour la mise en œuvre de l'action <i class="text-muted small">(Obligatoire)</i></label>
<input
:id="`cost${level.level}`"
v-model="levelEdit.cost" type="text"
@@ -111,7 +112,7 @@
</div>
</div>
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.levelEdit.duration.$error }" :for="`duration${level.level}`">Temps estimé pour la mise en oeuvre de l'action <i class="text-muted small">(Obligatoire)</i></label>
+ <label :class="{ 'text-danger': submitted && $v.levelEdit.duration.$error }" :for="`duration${level.level}`">Temps estimé pour la mise en œuvre de l'action <i class="text-muted small">(Obligatoire)</i></label>
<input
:id="`duration${level.level}`"
v-model="levelEdit.duration" type="text"
@@ -126,7 +127,7 @@
</div>
</div>
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.levelEdit.assistance.$error }" :for="`assistance${level.level}`">Besoin d'accompagnement <i class="text-muted small">(Obligatoire)</i></label>
+ <label :class="{ 'text-danger': submitted && $v.levelEdit.assistance.$error }" :for="`assistance${level.level}`">Besoin d'accompagnement <i class="text-muted small">(Obligatoire)</i></label>
<select
:id="`assistance${level.level}`"
v-model="levelEdit.assistance" class="form-control form-control-sm"
@@ -150,7 +151,7 @@
<div class="form-group">
<label class="m-0">Informations pratiques</label>
<div class="small text-muted">
- (Coût, difficulté de mise en oeuvre, prestataire...)
+ (Coût, difficulté de mise en œuvre, prestataire...)
</div>
<ckeditor
v-model="levelEdit.info"
diff --git a/resources/js/components/Menu/Side.vue b/resources/js/components/Menu/Side.vue
index 1ac6ee67..ad5f93cb 100644
--- a/resources/js/components/Menu/Side.vue
+++ b/resources/js/components/Menu/Side.vue
@@ -30,7 +30,7 @@
role="menu"
data-accordion="false"
>
- <li class="nav-item">
+ <li class="nav-item" role="menuitem">
<router-link
to="/"
class="nav-link w-100 rounded-0"
@@ -42,10 +42,10 @@
</p>
</router-link>
</li>
- <li class="nav-header">
+ <li class="nav-header" role="menuitem">
Évaluations
</li>
- <li class="nav-item">
+ <li class="nav-item" role="menuitem">
<router-link
to="/evaluations"
class="nav-link w-100 rounded-0"
@@ -57,10 +57,10 @@
</p>
</router-link>
</li>
- <li v-if="user && user.organization_id" class="nav-header">
+ <li v-if="user && user.organization_id" class="nav-header" role="menuitem">
Rapports
</li>
- <li v-if="user && user.organization_id" class="nav-item">
+ <li v-if="user && user.organization_id" class="nav-item" role="menuitem">
<a
:href="`/pdf/dossierCyberSecurite/${user.organization_id}`"
target="_blank"
@@ -73,7 +73,7 @@
</p>
</a>
</li>
- <li v-if="user && user.organization_id" class="nav-item">
+ <li v-if="user && user.organization_id" class="nav-item" role="menuitem">
<a
:href="`/pdf/politiqueSecurite/${user.organization_id}`"
target="_blank"
@@ -86,7 +86,7 @@
</p>
</a>
</li>
- <li v-if="user && user.organization_id" class="nav-item">
+ <li v-if="user && user.organization_id" class="nav-item" role="menuitem">
<a
:href="`/pdf/planAction/${user.organization_id}`"
target="_blank"
@@ -102,12 +102,14 @@
<li
v-if="isAdmin()"
class="nav-header"
+ role="menuitem"
>
Configuration
</li>
<li
v-if="isAdmin()"
class="nav-item"
+ role="menuitem"
>
<router-link
to="/mesures"
@@ -123,12 +125,14 @@
<li
v-if="user.role < roles.ROLE_USER"
class="nav-header"
+ role="menuitem"
>
Espace d'administration
</li>
<li
v-if="isAdmin()"
class="nav-item"
+ role="menuitem"
>
<router-link
to="/territoires"
@@ -141,6 +145,7 @@
<li
v-if="user.role < roles.ROLE_USER"
class="nav-item"
+ role="menuitem"
>
<router-link
v-if="isAdmin()"
@@ -162,6 +167,7 @@
<li
v-if="user.role < roles.ROLE_USER"
class="nav-item"
+ role="menuitem"
>
<router-link
v-if="isAdmin()"
diff --git a/resources/js/components/Organizations/Single/AddressBlock.vue b/resources/js/components/Organizations/Single/AddressBlock.vue
index 8664c43c..cfed5f11 100644
--- a/resources/js/components/Organizations/Single/AddressBlock.vue
+++ b/resources/js/components/Organizations/Single/AddressBlock.vue
@@ -10,7 +10,7 @@
<div class="form-group">
<label
:class="{ 'text-danger': submitted && $v.address.address.$error }"
- for="adresse">Adresse</label> <i class="text-muted small">(Obligatoire)</i>
+ for="adresse">Adresse <i class="text-muted small">(Obligatoire)</i></label>
<div class="text-muted small">Rue, voie, boîte postale...</div>
<input
id="adresse" v-model="address.address"
@@ -34,8 +34,8 @@
<div v-if="submitted && !$v.address.cp.integer" class="text-danger">Doit être un nombre</div>
</div>
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.address.city.$error }" for="ville">Ville</label> <i
- class="text-muted small">(Obligatoire)</i>
+ <label :class="{ 'text-danger': submitted && $v.address.city.$error }" for="ville">Ville <i
+ class="text-muted small">(Obligatoire)</i></label>
<input
id="ville" v-model="address.city"
type="text" class="form-control form-control-sm"
diff --git a/resources/js/components/Organizations/Single/InformationsBlock.vue b/resources/js/components/Organizations/Single/InformationsBlock.vue
index 86dc4b9e..84b82d7e 100644
--- a/resources/js/components/Organizations/Single/InformationsBlock.vue
+++ b/resources/js/components/Organizations/Single/InformationsBlock.vue
@@ -7,7 +7,7 @@
</div>
<div class="card-body">
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.organization.name.$error }" for="nom">Nom<i class="text-muted small">(Obligatoire)</i></label>
+ <label :class="{ 'text-danger': submitted && $v.organization.name.$error }" for="nom">Nom<i class="text-muted small">(Obligatoire)</i></label>
<input
id="nom"
v-model="organization.name" :disabled="!isAdmin()"
@@ -17,7 +17,7 @@
</div>
<div class="form-group">
<label :class="{ 'text-danger': submitted && $v.organization.short_name.$error }" for="nom_court">Nom
- court <i class="text-muted small">(Obligatoire)</i></label>
+ court <i class="text-muted small">(Obligatoire)</i></label>
<input
id="nom_court"
v-model="organization.short_name" :disabled="!isAdmin()"
@@ -27,7 +27,7 @@
</div>
<div class="form-group">
<label :class="{ 'text-danger': submitted && $v.organization.type.$error }" for="type">Type <i
- class="text-muted small">(Obligatoire)</i></label>
+ class="text-muted small">(Obligatoire)</i></label>
<select
id="type" v-model="organization.type"
:disabled="!isAdmin()"
@@ -42,7 +42,7 @@
<div v-if="$v.organization.type.$error" class="text-danger">Champ obligatoire</div>
</div>
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.organization.siren.$error }" for="siren">SIREN <i class="text-muted small">(Obligatoire)</i></label>
+ <label :class="{ 'text-danger': submitted && $v.organization.siren.$error }" for="siren">SIREN <i class="text-muted small">(Obligatoire)</i></label>
<input
id="siren" v-model="organization.siren"
:disabled="!isAdmin()"
@@ -51,9 +51,9 @@
<div v-if="$v.organization.siren.$error" class="text-danger">Champ obligatoire</div>
</div>
<div class="form-group">
- <label :class="{ 'text-danger': submitted && $v.organization.territory_id.$error }" for="territory">Territoire <i class="text-muted small">(Obligatoire)</i></label>
+ <label :class="{ 'text-danger': submitted && $v.organization.territory_id.$error }" for="Territoire">Territoire <i class="text-muted small">(Obligatoire)</i></label>
<select
- id="type" v-model="organization.territory_id"
+ id="Territoire" v-model="organization.territory_id"
:disabled="!isAdmin()"
class="form-control" :class="{ 'is-invalid': submitted && $v.organization.territory_id.$error }">
<option v-for="ter in territories" :key="ter.id" :value="ter.id">{{
diff --git a/resources/js/components/Territories/Single/index.vue b/resources/js/components/Territories/Single/index.vue
index d55aea64..8e1acee2 100644
--- a/resources/js/components/Territories/Single/index.vue
+++ b/resources/js/components/Territories/Single/index.vue
@@ -9,13 +9,14 @@
<div class="card card-light">
<div class="card-header py1">
<div class="card-title">
- Nom du territoire <i class="text-muted small">(Obligatoire)</i>
+ Informations générales
</div>
</div>
<div class="card-body">
<div class="form-group">
+ <label for="territoire">Nom du territoire <i class="text-muted small">(Obligatoire)</i></label>
<input
- id="nom" v-model="territory.name"
+ id="territoire" v-model="territory.name"
type="text" class="form-control form-control-sm"
:class="{ 'is-invalid': submitted && $v.territory.name.$error }">
</div>
diff --git a/resources/js/components/Users/Single.vue b/resources/js/components/Users/Single.vue
index c32023a2..b0fc9151 100644
--- a/resources/js/components/Users/Single.vue
+++ b/resources/js/components/Users/Single.vue
@@ -102,9 +102,10 @@
</div>
<div v-if="isAdmin()" class="form-group">
<label
- :class="{ 'text-danger': submitted && $v.user.organization_id.$error }">Structure <i class="text-muted small">(Obligatoire pour les lecteurs et gestionnaires)</i></label>
+ :class="{ 'text-danger': submitted && $v.user.organization_id.$error }" for="Structure">Structure <i class="text-muted small">(Obligatoire pour les lecteurs et gestionnaires)</i></label>
<select
v-model="user.organization_id" class="form-control"
+ id="Structure"
:class="{ 'is-invalid': submitted && $v.user.organization_id.$error }"
:disabled="!user.role || user.role == 0">
<option v-for="org in organizations" :key="org.id" :value="org.id">{{
diff --git a/resources/views/pdf/dossierCyberSecurite/dossier.blade.php b/resources/views/pdf/dossierCyberSecurite/dossier.blade.php
index afa44568..3426030d 100644
--- a/resources/views/pdf/dossierCyberSecurite/dossier.blade.php
+++ b/resources/views/pdf/dossierCyberSecurite/dossier.blade.php
@@ -227,7 +227,7 @@
<br>
- {{-- todo mettre les graphes : surface de mise en oeuvre des mesures de protection, mesures de sécurité mises en place--}}
+ {{-- todo mettre les graphes : surface de mise en œuvre des mesures de protection, mesures de sécurité mises en place--}}
<div class="reportGraph">
<canvas id="measuresGraph" style="width: 900px; height: 500px" width="1800" height="1000"></canvas>
</div>
--
GitLab