From ea9ad5ff30be63393bfe9b047f787a0c1b84253c Mon Sep 17 00:00:00 2001
From: Jonathan Foucher <jfoucher@gmail.com>
Date: Tue, 6 Sep 2022 11:31:38 +0200
Subject: [PATCH] Fix graph
---
.../Components/ActionsDoneCard.vue | 24 ++++++++++---------
.../Components/MaturityCyberCard.vue | 6 ++---
.../Dashboard/ManagerView/index.vue | 5 ++--
3 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/resources/js/components/Dashboard/ManagerView/Components/ActionsDoneCard.vue b/resources/js/components/Dashboard/ManagerView/Components/ActionsDoneCard.vue
index 8dfa00fe..3f980547 100644
--- a/resources/js/components/Dashboard/ManagerView/Components/ActionsDoneCard.vue
+++ b/resources/js/components/Dashboard/ManagerView/Components/ActionsDoneCard.vue
@@ -1,15 +1,17 @@
<template>
- <div class="card flex-row">
- <div class="col-4 bg-primary">
- <i class="fas fa-bullseye" style="font-size: 50px;"></i>
- </div>
- <div class="card-body col-8">
- <div class="card-text">
- Actions réalisées <br />
- <div class="small font-weight-bold">{{ doneMeasures ? doneMeasures.length : 0 }} sur {{ plannedMeasures ? plannedMeasures.length : 0 }}</div>
+ <div class="col-md-6" v-if="plannedMeasures && plannedMeasures.length > 0">
+ <div class="card flex-row">
+ <div class="col-4 bg-primary">
+ <i class="fas fa-bullseye" style="font-size: 50px;"></i>
</div>
- <div class="progress progress-xs">
- <div class="progress-bar bg-success" role="progressbar" :style="{ 'width' : `${plannedMeasures && doneMeasures ? doneMeasures.length / plannedMeasures.length * 100 : 0}%`}" aria-valuemin="0" aria-valuemax="100"></div>
+ <div class="card-body col-8">
+ <div class="card-text">
+ Actions réalisées <br />
+ <div class="small font-weight-bold">{{ doneMeasures ? doneMeasures.length : 0 }} sur {{ plannedMeasures ? plannedMeasures.length : 0 }}</div>
+ </div>
+ <div class="progress progress-xs">
+ <div class="progress-bar bg-success" role="progressbar" :style="{ 'width' : `${plannedMeasures && doneMeasures ? doneMeasures.length / plannedMeasures.length * 100 : 0}%`}" aria-valuemin="0" aria-valuemax="100"></div>
+ </div>
</div>
</div>
</div>
@@ -52,4 +54,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/MaturityCyberCard.vue b/resources/js/components/Dashboard/ManagerView/Components/MaturityCyberCard.vue
index 31df3811..550ce367 100644
--- a/resources/js/components/Dashboard/ManagerView/Components/MaturityCyberCard.vue
+++ b/resources/js/components/Dashboard/ManagerView/Components/MaturityCyberCard.vue
@@ -10,7 +10,7 @@
</div>
<div class="progress progress-xs">
<div
- v-if="plannedMeasures" class="progress-bar bg-success"
+ v-if="averageCurrentMaturityCyber" class="progress-bar bg-success"
role="progressbar" :style="{ 'width' : `${averageCurrentMaturityCyber / 3 * 100}%`}"
aria-valuemin="0"
aria-valuemax="100"></div>
@@ -52,7 +52,7 @@ export default {
const pourcent = (this.averageCurrentMaturityCyber - this.averagePreviousMaturityCyber) / this.averagePreviousMaturityCyber * 100
return Math.sign(pourcent) * Math.round(Math.abs(pourcent))
}
-
+
},
watch : {
currentEvaluation () {
@@ -91,4 +91,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/index.vue b/resources/js/components/Dashboard/ManagerView/index.vue
index 962e2582..02037731 100644
--- a/resources/js/components/Dashboard/ManagerView/index.vue
+++ b/resources/js/components/Dashboard/ManagerView/index.vue
@@ -2,9 +2,8 @@
<div class="row" style="max-width: 1200px;margin: 0 auto">
<div class="col-md-6">
<div class="row">
- <div class="col-md-6">
- <ActionsDoneCard :current-evaluation="currentEvaluation" :previous-evaluation="previousEvaluation"/>
- </div>
+
+ <ActionsDoneCard :current-evaluation="currentEvaluation" :previous-evaluation="previousEvaluation"/>
<div class="col-md-6">
<MeasureCard :current-evaluation="currentEvaluation" />
</div>
--
GitLab