harmonize nc and c gauges on both audit and report

DISIC · Oct 10, 2024 · 8190e84 · 8190e84
1 parent a53c585
commit 8190e84
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 5 deletions.
diff --git a/confiture-web-app/src/components/report/ReportResults.vue b/confiture-web-app/src/components/report/ReportResults.vue
@@ -51,7 +51,7 @@ const stats = computed(() => {
     {
       title: "Critères<br/> conformes",
       value: report.data?.criteriaCount.compliant,
-      total: report.data?.criteriaCount.total,
+      total: report.data?.criteriaCount.applicable,
       theme: "green" as StatDonutTheme
     }
   ];

diff --git a/confiture-web-app/src/composables/useAuditStats.ts b/confiture-web-app/src/composables/useAuditStats.ts
@@ -27,7 +27,11 @@ export function useAuditStats() {
 
   const applicableCriteria = computed(() => {
     return Object.values(groupedCriteria.value).filter((criteria) =>
-      criteria.some((c) => c.status !== CriteriumResultStatus.NOT_APPLICABLE)
+      criteria.some(
+        (c) =>
+          c.status !== CriteriumResultStatus.NOT_APPLICABLE &&
+          c.status !== CriteriumResultStatus.NOT_TESTED
+      )
     );
   });
 
@@ -118,6 +122,7 @@ export function useAuditStats() {
 
   return {
     groupedCriteria,
+    applicableCriteriaCount: applicableCriteria,
     notApplicableCriteriaCount,
     compliantCriteriaCount,
     notCompliantCriteriaCount,

diff --git a/confiture-web-app/src/pages/audit/AuditGenerationPage.vue b/confiture-web-app/src/pages/audit/AuditGenerationPage.vue
@@ -16,7 +16,7 @@ import rgaa from "../../criteres.json";
 import { CRITERIA_BY_AUDIT_TYPE } from "../../criteria";
 import { useAuditStore, useFiltersStore, useResultsStore } from "../../store";
 import { AuditPage, AuditType, CriteriumResultStatus } from "../../types";
-import { getCriteriaCount, pluralize } from "../../utils";
+import { pluralize } from "../../utils";
 
 const route = useRoute();
 
@@ -89,6 +89,7 @@ function updateCurrentPageId(i: number) {
 const {
   complianceLevel,
   compliantCriteriaCount,
+  applicableCriteriaCount,
   notCompliantCriteriaCount,
   blockingCriteriaCount
 } = useAuditStats();
@@ -119,13 +120,13 @@ const headerInfos = computed(() => [
       blockingCriteriaCount.value
     )} pour l’usager`,
     value: notCompliantCriteriaCount.value,
-    total: getCriteriaCount(auditStore.currentAudit?.auditType as AuditType),
+    total: applicableCriteriaCount.value.length,
     theme: "red" as StatDonutTheme
   },
   {
     title: "Critères<br/> conformes",
     value: compliantCriteriaCount.value,
-    total: getCriteriaCount(auditStore.currentAudit?.auditType as AuditType),
+    total: applicableCriteriaCount.value.length,
     theme: "green" as StatDonutTheme
   }
 ]);