fix: stats évolutives - on gère les cas 0 et infini + bug fix du mult…

…i-choix 'Non renseigné'
SocialGouv · Feb 8, 2024 · a7c38b2 · a7c38b2
1 parent d8befde
commit a7c38b2
Show file tree

Hide file tree

Showing 2 changed files with 42 additions and 24 deletions.
diff --git a/dashboard/src/components/EvolutiveStatsViewer.tsx b/dashboard/src/components/EvolutiveStatsViewer.tsx
@@ -69,27 +69,32 @@ export default function EvolutiveStatsViewer({ evolutiveStatsIndicators, period,
           <p>{fieldStart}</p>
         </div>
       </div>
-      <div className="tw-flex tw-basis-1/2 tw-flex-col tw-items-center tw-justify-end tw-gap-y-4">
-        <div className="tw-flex tw-flex-col tw-items-center tw-justify-around tw-p-4">
-          <p className="tw-text-6xl tw-font-bold tw-text-main">{Math.round((valueEnd / valueStart) * 1000) / 10}%</p>
-          <p className="tw-m-0 tw-text-center">
-            des{' '}
-            <strong>
-              {field?.label}: {fieldStart}
-            </strong>{' '}
-            au {startDateFormatted.format('DD/MM/YYYY')}
-            <br />
-            ont évolué vers <strong>{fieldEnd}</strong> au {endDateFormatted.format('DD/MM/YYYY')}
-          </p>
-        </div>
-      </div>
-      <div className="tw-flex tw-shrink-0 tw-basis-1/4 tw-flex-col tw-items-center tw-justify-end tw-gap-y-4">
-        <h5>Au {endDateFormatted.format('DD/MM/YYYY')}</h5>
-        <div className="tw-flex tw-w-full tw-flex-col tw-items-center tw-justify-around tw-rounded-lg tw-border tw-p-4">
-          <p className="tw-text-6xl tw-font-bold tw-text-main">{valueEnd}</p>
-          <p>{fieldEnd}</p>
-        </div>
-      </div>
+      {valueStart !== 0 && (
+        <>
+          <div className="tw-flex tw-basis-1/2 tw-flex-col tw-items-center tw-justify-end tw-gap-y-4">
+            <div className="tw-flex tw-flex-col tw-items-center tw-justify-around tw-p-4">
+              <p className="tw-text-6xl tw-font-bold tw-text-main">{Math.round((valueEnd / valueStart) * 1000) / 10}%</p>
+              <p className="tw-m-0 tw-text-center">
+                des{' '}
+                <strong>
+                  {field?.label}: {fieldStart}
+                </strong>{' '}
+                au {startDateFormatted.format('DD/MM/YYYY')}
+                <br />
+                {fieldStart === fieldEnd ? ' sont restés à ' : ' ont évolué vers '}
+                <strong>{fieldEnd}</strong> au {endDateFormatted.format('DD/MM/YYYY')}
+              </p>
+            </div>
+          </div>
+          <div className="tw-flex tw-shrink-0 tw-basis-1/4 tw-flex-col tw-items-center tw-justify-end tw-gap-y-4">
+            <h5>Au {endDateFormatted.format('DD/MM/YYYY')}</h5>
+            <div className="tw-flex tw-w-full tw-flex-col tw-items-center tw-justify-around tw-rounded-lg tw-border tw-p-4">
+              <p className="tw-text-6xl tw-font-bold tw-text-main">{valueEnd}</p>
+              <p>{fieldEnd}</p>
+            </div>
+          </div>
+        </>
+      )}
     </div>
   );
 }

diff --git a/dashboard/src/recoil/evolutiveStats.ts b/dashboard/src/recoil/evolutiveStats.ts
@@ -70,8 +70,17 @@ function getValueByField(fieldName: CustomOrPredefinedField['name'], fieldsMap:
     if (value === true) return 'Oui';
     return 'Non';
   }
+  if (current.type === 'multi-choice') {
+    if (Array.isArray(value)) {
+      if (value.length === 0) return ['Non renseigné'];
+      return value;
+    }
+    if (value == null || value === '') {
+      return ['Non renseigné'];
+    }
+    return [value];
+  }
   if (value == null || value === '') {
-    if (current.type === 'multi-choice') return [];
     return 'Non renseigné'; // we cover the case of undefined, null, empty string
   }
   if (value.includes('Choisissez un genre')) return 'Non renseigné';
@@ -145,7 +154,10 @@ export const evolutiveStatsPersonSelector = selectorFamily({
       // how do we calculate ?
       // we start by the most recent version of the person, and we go back in time, day by day, to the beginning of the history
 
-      const indicatorsBase = get(evolutiveStatsIndicatorsBaseSelector);
+      const indicatorsBase = get(evolutiveStatsIndicatorsBaseSelector).filter((f) => {
+        if (evolutiveStatsIndicators.find((i) => i.fieldName === f.name)) return true;
+        return false;
+      });
       const fieldsMap: FieldsMap = indicatorsBase.reduce((acc, field) => {
         acc[field.name] = field;
         return acc;
@@ -178,7 +190,8 @@ export const evolutiveStatsPersonSelector = selectorFamily({
         persons = persons.filter((p) => {
           const snapshot = getPersonSnapshotAtDate({ person: p, snapshotDate: minimumDateForEvolutiveStats, fieldsMap });
           if (!snapshot) return false;
-          return getValueByField(indicatorFieldName, fieldsMap, p[indicatorFieldName]).includes(indicator.fromValue);
+          const isGood = getValueByField(indicatorFieldName, fieldsMap, snapshot[indicatorFieldName]).includes(indicator.fromValue);
+          return isGood;
         });
       }