diff --git a/resources/js/components/Dashboard/AdminView/Components/MaturityCyberByTerritory.vue b/resources/js/components/Dashboard/AdminView/Components/MaturityCyberByTerritory.vue
index 8ff47379af0ce755dacc8c205b08aa7803f4646d..2f4dbd5fca5b62b381d92582abadfae349b7e0d0 100644
--- a/resources/js/components/Dashboard/AdminView/Components/MaturityCyberByTerritory.vue
+++ b/resources/js/components/Dashboard/AdminView/Components/MaturityCyberByTerritory.vue
@@ -14,7 +14,7 @@
<div class="card-body">
<PolarArea :chart-data="chartData" :chart-options="options" />
<div class="row">
- <div v-for="t in territories" :key="t.id" :class="`col-mt-4 mt-4 ${territories.length > 1 ? 'border-right' : ''}`">
+ <div v-for="t in territories" :key="t.id" :class="`col-md-4 col-sm-12 mt-4 ${territories.length > 1 ? 'border-right' : ''}`">
<b>{{ t.name }}</b> <br/>
<small>Indice de maturité cyber</small> <br/>
<span v-if="t.organizations.length"> {{ Math.round(t.current_maturity_cyber * 10)/10 }}</span> <span v-else>-</span>
diff --git a/resources/js/components/Dashboard/AdminView/Components/MeasurePlanned.vue b/resources/js/components/Dashboard/AdminView/Components/MeasurePlanned.vue
index 606feec2ccecdbb1c5b561a05f09156da8a1e7b7..8b76fe81711a85cb620d091158067b13a7666795 100644
--- a/resources/js/components/Dashboard/AdminView/Components/MeasurePlanned.vue
+++ b/resources/js/components/Dashboard/AdminView/Components/MeasurePlanned.vue
@@ -19,9 +19,9 @@
<div class="progress progress-xs my-1">
<div
class="progress-bar"
- :class="measure.max_levels[0] === 1 ? 'bg-danger' : measure.max_levels[0] === 2 ? 'bg-info' : measure.max_levels[0] === 3 ? 'bg-success' : 'black'"
role="progressbar"
- :style="{width: measure.max_levels[0] === 1 ? '33%' : measure.max_levels[0] === 2 ? '66%' : measure.max_levels[0] === 3 ? '100%' : '0%'}"
+ :style="{width: measure.max_levels[0] === 1 ? '33%' : measure.max_levels[0] === 2 ? '66%' : measure.max_levels[0] === 3 ? '100%' : '0%',
+ background: measure.max_levels[0] === 1 ? '#D63F49' : measure.max_levels[0] === 2 ? '#FFC107' : measure.max_levels[0] === 3 ? '#468355' : 'black'}"
aria-valuemin="0" aria-valuemax="100"></div>
</div>
<div v-if="organizationsNumber" class="card-text">
diff --git a/resources/js/components/Dashboard/AdminView/Components/MeasuresInAction.vue b/resources/js/components/Dashboard/AdminView/Components/MeasuresInAction.vue
index ad13634283da4f1e69a7b04c2040a8dcd420f514..20e66af3657f7ac85ac7ed9423a2c5140a3d9442 100644
--- a/resources/js/components/Dashboard/AdminView/Components/MeasuresInAction.vue
+++ b/resources/js/components/Dashboard/AdminView/Components/MeasuresInAction.vue
@@ -60,11 +60,11 @@ export default {
},
computed: {
evaluations () {
- return this.$store.state.evaluations.all
+ return this.$store.state.evaluations.all
},
organizations () {
return this.$store.state.organizations.all
- .map( org => ({...org,
+ .map( org => ({...org,
evaluations : this.evaluations.filter( e => e.organization_id === org.id)
.filter( e => e.status === 2)
.sort( (a,b) => new Date(b.updated_at) - new Date(a.updated_at)) ,
@@ -73,7 +73,7 @@ export default {
},
chartData() {
// niveaux de mesures planifiés en moyenne dans les plan d’actions des structures actives
- // Dans chaque Organisation active > Prendre la dernière evaluation >
+ // Dans chaque Organisation active > Prendre la dernière evaluation >
// Regarder les measures_levels, mettre la measure id 1 à la première place du tableau correspondant au expected_level de la measure.
const labels = this.$store.state.measures.all.map( m => m.short_name)
@@ -92,17 +92,17 @@ export default {
datasets: [
{
label: 'Niveau 1',
- backgroundColor: '#ff327b',
+ backgroundColor: '#D63F49',
data: this.data1
},
{
label: 'Niveau 2',
- backgroundColor: '#0698ed',
+ backgroundColor: '#FFC107',
data: this.data2
},
{
label: 'Niveau 3',
- backgroundColor: '#00c6c3',
+ backgroundColor: '#468355',
data: this.data3
},
]
@@ -110,4 +110,4 @@ export default {
}
}
}
-</script>
\ No newline at end of file
+</script>
diff --git a/resources/js/components/Dashboard/ManagerView/Components/ActionPlanTable.vue b/resources/js/components/Dashboard/ManagerView/Components/ActionPlanTable.vue
index e427193a71c26c23a19e4d67ac4237ababe50874..7e674a48f8350aa069575f1151d4e078b5b39155 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 98e86b5412a07eebdd0476b10a4966e97b94d80e..bc10157cf9aee4eeeb1ff6c11d2245efaabb74b0 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/Dashboard/ManagerView/Components/MeasurePlanned.vue b/resources/js/components/Dashboard/ManagerView/Components/MeasurePlanned.vue
index 43b27dac96a97e5860af9aeadb536d41585de2e1..5c5a468532148a66a6b5958ec60f65f7ce91e982 100644
--- a/resources/js/components/Dashboard/ManagerView/Components/MeasurePlanned.vue
+++ b/resources/js/components/Dashboard/ManagerView/Components/MeasurePlanned.vue
@@ -2,7 +2,7 @@
<div v-if="favoriteMeasures" class="card py-3 px-2">
<div class="card-title mb-3"> Top 3 des niveaux de mesures de sécurité planifiées</div>
- <div v-for="(ml, i) in favoriteMeasures" :key="i" class="card flex-row">
+ <div v-for="(ml, i) in favoriteMeasures" :key="i" class="card flex-row">
<div class="col-2 bg-primary font-weight-bold">
<span style="font-size: 50px;">{{ i + 1 }}</span>
</div>
@@ -13,9 +13,9 @@
</div>
<div class="progress progress-xs my-1">
<div
- class="progress-bar bg-success" role="progressbar"
- :style="{width: ml.max_levels == 1 ? '33%' : ml.max_levels == 2 ? '66%' : ml.max_levels == 3 ? '100%' : '0%'}"
- :class="ml.max_levels == 1 ? 'bg-danger' : ml.max_levels == 2 ? 'bg-info' : ml.max_levels == 3 ? 'bg-success' : 'black'"
+ class="progress-bar" role="progressbar"
+ :style="{width: ml.max_levels === 1 ? '33%' : ml.max_levels === 2 ? '66%' : ml.max_levels === 3 ? '100%' : '0%',
+ background: ml.max_levels === 1 ? '#D63F49' : ml.max_levels === 2 ? '#FFC107' : ml.max_levels === 3 ? '#468355' : 'black'}"
aria-valuemin="0" aria-valuemax="100">
</div>
</div>
@@ -65,4 +65,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 a97577b9026204306d008fe55b64dae1beba9af8..68aba3425cfdf821e56266236257d21f0f25a0c1 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 63f73baea3fb04b5a9015d71bb24fbf029aa28b8..d8ea4ad953d481fb9bbb7e4ba42cde96a9b13df6 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 1ac6ee67a37596522543e8517e372f62952a5c8a..ad5f93cb108f3334fd417d832a0e2e491f7e04b1 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 8664c43cc4ff3c4ae82259ca38b47e72ef384fc6..cfed5f1189c7c783a294f833b8ca6984fb85b188 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 86dc4b9e912ac09dc81264def9e6145d9cc7b4d1..84b82d7ebdccdf1cc45a92d3a2fc9155277ae7f4 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 d55aea64c336e96b3ec54bd9ec5c26e56f7d96e8..8e1acee28c79db60def56520ba41ec155d6c3959 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 c32023a22a85fdb583d2017f6e5807fcd94cb2ba..b0fc9151932cbdfb3541c1d56ff83d0244ec3ad6 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 2b2c19055f9a61eb0ac643d51d9080c0403b2204..5a18fe5fab5e076ca8aebe063e830f6b6590c951 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>