diff --git a/resources/js/components/Dashboard/ManagerView/Components/ActionsDoneCard.vue b/resources/js/components/Dashboard/ManagerView/Components/ActionsDoneCard.vue index 8dfa00feb844b0184bc1bf855823c6f57454f39f..3f980547047b599b929868b73abce439b2cbddd2 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 31df38117bb80f96a04e34bafa7f8f8fba942aaa..550ce367090be487696d49fcf9b310cfc933986e 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 962e2582f853a8e7299399cd6c4a4b8839e58b74..020377311f0a406c8ce8fed4c0ef691fb1e698de 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>