diff --git a/app/Repository/GraphDataRepository.php b/app/Repository/GraphDataRepository.php
index 9885ef4c4682eeebb3d3103c126c8c7dc74b4cbc..dd48a13a08bec6029b2e0146f395f3ec8aa93cf1 100644
--- a/app/Repository/GraphDataRepository.php
+++ b/app/Repository/GraphDataRepository.php
@@ -71,12 +71,17 @@ public function getExpositionDataForEvaluation(Evaluation $evaluation): array
return $dl->danger_id === $danger->id;
});
+ // the points for this danger are the total points for this danger,
+ // divided by the number of appllicable scenarios
$values[] = $v / $danger->scenarios->count() * $dangerLevel->level->getPointsAttribute();
}
$total = collect($values)->sum();
$percentages = collect($values)->map(function ($val) use ($total) {
+ if ($val === 0.0 || $total === 0.0) {
+ return 0;
+ }
return $val / $total * 100;
});
diff --git a/resources/js/components/Evaluations/Single/Components/Buttons.vue b/resources/js/components/Evaluations/Single/Components/Buttons.vue
index db75ab5c289dd8e668a138e1f5fba25e5b7d6db4..1ad7a19e027911051523548c61fb4fd3824b972d 100644
--- a/resources/js/components/Evaluations/Single/Components/Buttons.vue
+++ b/resources/js/components/Evaluations/Single/Components/Buttons.vue
@@ -101,7 +101,7 @@ export default {
this.$store.dispatch('getAllGraphsForEvaluation', this.evaluation.id)
this.drafting = false
- //this.$router.push('/evaluations')
+ // this.$router.push('/evaluations')
},
async next () {
this.saving = true
diff --git a/resources/js/components/Evaluations/Single/Components/Step3/AttackGraph.vue b/resources/js/components/Evaluations/Single/Components/Step3/AttackGraph.vue
index 0bfe9049eb0a8447b5c10c891f9aa52f796e1c43..861009d1c2d3c577d29241e400be06dd3d1ccf39 100644
--- a/resources/js/components/Evaluations/Single/Components/Step3/AttackGraph.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step3/AttackGraph.vue
@@ -31,10 +31,12 @@ export default {
responsive: true,
scales: {
r: {
+ min: 0,
ticks: {
color: '#000',
backdropColor: 'rgba(255,255,255, 0.5)',
z: 10,
+ callback: function (value) { if (Number.isInteger(value)) { return value; } },
},
pointLabels: {
display: true,
diff --git a/resources/js/components/Evaluations/Single/Components/Step3/ExpositionGraph.vue b/resources/js/components/Evaluations/Single/Components/Step3/ExpositionGraph.vue
index 00d44d81098807453087a6683b7903353fa64d94..1bfc90cd6bbe383a7145c4846203b76415ade7f7 100644
--- a/resources/js/components/Evaluations/Single/Components/Step3/ExpositionGraph.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step3/ExpositionGraph.vue
@@ -33,6 +33,11 @@ export default {
maxRotation: 40,
minRotation: 40
}
+ },
+ y: {
+ min: 0,
+ max: 100,
+ beginAtZero: true,
}
},
},
diff --git a/resources/js/components/Evaluations/Single/Components/Step4/CyberRiskGraphElement.vue b/resources/js/components/Evaluations/Single/Components/Step4/CyberRiskGraphElement.vue
index 387045d057758b1c8a7ebd68f5b5116ea8316cb1..4d03f6daaca921d2006a66a9754051ee7c7c13cc 100644
--- a/resources/js/components/Evaluations/Single/Components/Step4/CyberRiskGraphElement.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step4/CyberRiskGraphElement.vue
@@ -1,5 +1,5 @@
<template>
- <div class="graph-element row" v-if="singleData.labels.length">
+ <div v-if="singleData.labels.length" class="graph-element row">
<div class="graph-legend col-3 mr-0 pr-0 text-muted">
<span :title="fullLabel">{{singleData.labels[0]}}</span>
</div>
diff --git a/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue b/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue
index ae7e955eab60aa0454d46d5ae22ad92448054105..e323389e52e7bea72e15cc5fdf000df7efbf7139 100644
--- a/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue
+++ b/resources/js/components/Evaluations/Single/Components/Step4/MeasureLevelSelector.vue
@@ -14,7 +14,7 @@
:expected-level="measureLevel.expected_level"
/>
<!-- EN ATTENTE RETOUR CLIENT -->
-<!-- <p class="text-center my-4">Efficacité <i class="fas fa-angle-double-right px-2"></i> Efficacité</p>-->
+ <!-- <p class="text-center my-4">Efficacité <i class="fas fa-angle-double-right px-2"></i> Efficacité</p>-->
<MeasureActionForm
ref="MeasureActionForm"
diff --git a/resources/js/components/Evaluations/Single/Components/Step5/FutureRiskGraph.vue b/resources/js/components/Evaluations/Single/Components/Step5/FutureRiskGraph.vue
new file mode 100644
index 0000000000000000000000000000000000000000..ec4c59d770fa72176c57a1c996c556e1c5aa2d53
--- /dev/null
+++ b/resources/js/components/Evaluations/Single/Components/Step5/FutureRiskGraph.vue
@@ -0,0 +1,94 @@
+<template>
+ <Bar v-if="loaded && chartData" :chart-data="chartData" :chart-options="options" />
+ <div v-else class=" text-center">
+ <i class="fas fa-spin fa-spinner"></i>
+ </div>
+</template>
+
+<script>
+import { Bar } from 'vue-chartjs/legacy'
+import { Chart as ChartJS, Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale} from 'chart.js'
+
+ChartJS.register(Title, Tooltip, Legend, BarElement, CategoryScale, LinearScale)
+
+export default {
+ name: 'FutureRiskGraph',
+ components: {
+ Bar,
+ },
+ props: ['evaluation'],
+ data() {
+ return {
+ loaded: this.$store.state.graphs[this.evaluation.id] && this.$store.state.graphs[this.evaluation.id].risks && this.$store.state.graphs[this.evaluation.id].futurerisks,
+ options: {
+ plugins: {
+ legend: {
+ display: false
+ },
+ },
+ scales: {
+ x: {
+ ticks: {
+ autoSkip: false,
+ maxRotation: 40,
+ minRotation: 40,
+ }
+ },
+ y: {
+ min: 0,
+ max: 100,
+ beginAtZero: true,
+ }
+ },
+ },
+ }
+ },
+ computed: {
+ chartData() {
+ if (!this.$store.state.graphs[this.evaluation.id] || !this.$store.state.graphs[this.evaluation.id].risks) {
+ return null;
+ }
+ const labels = this.$store.state.graphs[this.evaluation.id].risks.labels.map(l => {
+ return l.match(/.{1,40}(\s|$)/g)
+ });
+ const data = this.$store.state.graphs[this.evaluation.id].risks.data;
+ const data2 = this.$store.state.graphs[this.evaluation.id].futurerisks.data;
+
+ return {
+ labels,
+ datasets: [
+ {
+ data,
+ backgroundColor: 'black',
+ borderColor: 'black',
+ // barThickness : 1,
+ },
+ {
+ data: data2,
+ backgroundColor: 'white',
+ borderColor: 'black',
+ borderWidth: 2,
+ // barThickness : 1,
+ },
+ ]
+ }
+ }
+ },
+ async mounted () {
+ this.loaded = false
+ if (typeof this.$store.state.graphs[this.evaluation.id] === 'undefined' || typeof this.$store.state.graphs[this.evaluation.id].risks === 'undefined') {
+ await this.$store.dispatch('getGraphForEvaluation', {
+ name: 'risks',
+ id: this.evaluation.id
+ })
+ }
+ if (typeof this.$store.state.graphs[this.evaluation.id] === 'undefined' || typeof this.$store.state.graphs[this.evaluation.id].futurerisks === 'undefined') {
+ await this.$store.dispatch('getGraphForEvaluation', {
+ name: 'futurerisks',
+ id: this.evaluation.id
+ })
+ }
+ this.loaded = true
+ }
+}
+</script>
diff --git a/resources/js/components/Evaluations/Single/View/index.vue b/resources/js/components/Evaluations/Single/View/index.vue
index 59384172716c81ed9c565633453add9d32908739..34c3fa9701e407308fa5f2cb769b8570fc80f248 100644
--- a/resources/js/components/Evaluations/Single/View/index.vue
+++ b/resources/js/components/Evaluations/Single/View/index.vue
@@ -36,7 +36,7 @@
</div>
</div>
<div class="card-body">
- <ExpositionGraph :evaluation="evaluation" />
+ <FutureRiskGraph :evaluation="evaluation" />
</div>
</div>
</div>
@@ -59,13 +59,13 @@ import PlanAction from '../Components/Results/PlanAction'
import MaturityCyber from '../Components/Results/MaturityCyber'
import Historic from '../Components/Results/Historic'
import NotFound from "../../../Errors/NotFound";
-import ExpositionGraph from "../Components/Step3/ExpositionGraph";
+import FutureRiskGraph from "../Components/Step5/FutureRiskGraph";
export default {
name: 'SingleEvaluationView',
components: {
- ExpositionGraph,
+ FutureRiskGraph,
NotFound,
Dangers,
Measures,