Merge pull request #2308 from MTES-MCT/fix/2288-public-stats-pris-en-…

…charge [FO - Statistiques] Modification du calcul du % de pris en charge dans les stats publiques
MTES-MCT · Mar 5, 2024 · 1a27779 · 1a27779
2 parents 7175872 + 12da994
commit 1a27779
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/assets/vue/components/front-stats/TheHistoFrontStatsGlobal.vue b/assets/vue/components/front-stats/TheHistoFrontStatsGlobal.vue
@@ -13,7 +13,7 @@
             <template #title>territoires déployés</template>
           </TheHistoFrontStatsDetailsItem>
           <TheHistoFrontStatsDetailsItem :data="strPercentValidated">
-            <template #title>taux de prise en charge</template>
+            <template #title>taux de dossiers traités ou en cours de traitement</template>
           </TheHistoFrontStatsDetailsItem>
           <TheHistoFrontStatsDetailsItem :data="strPercentClosed">
             <template #title>taux de clôture des signalements</template>

diff --git a/src/Repository/SignalementRepository.php b/src/Repository/SignalementRepository.php
@@ -78,8 +78,12 @@ public function findAllWithGeoData(?User $user, array $options, int $offset): ar
         return $qb->getQuery()->getArrayResult();
     }
 
-    public function countAll(?Territory $territory, ?Partner $partner, bool $removeImported = false, bool $removeArchived = false): int
-    {
+    public function countAll(
+        ?Territory $territory,
+        ?Partner $partner,
+        bool $removeImported = false,
+        bool $removeArchived = false
+    ): int {
         $qb = $this->createQueryBuilder('s');
         $qb->select('COUNT(s.id)');
 
@@ -162,7 +166,7 @@ public function countByStatus(?Territory $territory, ?Partner $partner, ?int $ye
 
     public function countValidated(bool $removeImported = false): int
     {
-        $notStatus = [Signalement::STATUS_NEED_VALIDATION, Signalement::STATUS_REFUSED, Signalement::STATUS_ARCHIVED];
+        $notStatus = [Signalement::STATUS_NEED_VALIDATION, Signalement::STATUS_ARCHIVED];
         $qb = $this->createQueryBuilder('s');
         $qb->select('COUNT(s.id)');
         $qb->andWhere('s.statut NOT IN (:notStatus)')

diff --git a/templates/front/index.html.twig b/templates/front/index.html.twig
@@ -299,7 +299,7 @@
                                     <h3 class="fr-card__title fr-h1 fr-text-title--blue-france">
                                         {{ stats.pris_en_compte }} %
                                     </h3>
-                                    <p class="fr-card__desc fr-text--lg">des signalements pris en charge</p>
+                                    <p class="fr-card__desc fr-text--lg">des signalements traités ou en cours de traitement</p>
                                 </div>
                             </div>
                         </div>