fix(faculty-members): use completeRecords for analyses graphs

Author: Mihoub2

client/src/boards/faculty-members/pages/structures/components/entity-view.tsx

@@ -28,8 +28,9 @@ interface Props {
 export default function EntityView({ viewType }: Props) {
     const [searchParams, setSearchParams] = useSearchParams();
     const labels = VIEW_LABELS[viewType];
+    console.log(labels);
 
-    const selectedId = searchParams.get("structureId") || "";
+    const selectedId = searchParams.get(getParamKey(viewType)) || "";
     const section = searchParams.get("section") || "enseignants-chercheurs";
 
     const { data: yearsData, isLoading: isLoadingYears } = useFacultyYears(viewType, selectedId);

client/src/boards/faculty-members/pages/structures/sections/analyses/index.tsx

@@ -67,21 +67,28 @@ export default function EvolutionsSection({ viewType, selectedId }: EvolutionsSe
         if (!data?.records?.length) {
             return { analysesWithData: new Set<string>(), allAnalyses: {}, metricsConfig: {}, records: [], periodText: "" };
         }
-        const analyses = buildAllFmAnalyses(data);
-        const metrics = buildAllFmMetricsConfig(data);
+        const completeRecords = data.records.filter(
+            (r: any) => (r.effectif_permanents || 0) > 0 && (r.effectif_non_titulaire || 0) > 0
+        );
+        if (!completeRecords.length) {
+            return { analysesWithData: new Set<string>(), allAnalyses: {}, metricsConfig: {}, records: [], periodText: "" };
+        }
+        const dataComplete = { ...data, records: completeRecords };
+        const analyses = buildAllFmAnalyses(dataComplete);
+        const metrics = buildAllFmMetricsConfig(dataComplete);
         const available = new Set<string>();
 
         Object.entries(analyses).forEach(([key, analysis]) => {
             const hasData = analysis.metrics.some((m) =>
-                data.records.some((r: any) => r[m] != null && r[m] !== 0)
+                completeRecords.some((r: any) => r[m] != null && r[m] !== 0)
             );
             if (hasData) available.add(key);
         });
 
-        const years = data.records.map((r: any) => r.annee_universitaire).filter(Boolean).sort();
+        const years = completeRecords.map((r: any) => r.annee_universitaire).filter(Boolean).sort();
         const period = years.length > 1 ? `${years[0]} — ${years[years.length - 1]}` : years[0] || "";
 
-        return { analysesWithData: available, allAnalyses: analyses, metricsConfig: metrics, records: data.records, periodText: period };
+        return { analysesWithData: available, allAnalyses: analyses, metricsConfig: metrics, records: completeRecords, periodText: period };
     }, [data]);
 
     useEffect(() => {

client/src/boards/faculty-members/pages/structures/sections/groupes-cnu/index.tsx

@@ -7,7 +7,7 @@ import TreemapSectionsChart from "./charts/treemap-sections";
 
 import DefaultSkeleton from "../../../../../../components/charts-skeletons/default";
 import FmMetricDefinitionsTable from "../../../../components/metric-definitions";
-import { CNU_GROUPS } from "../../../../pages/definitions/cnu-data";
+import { CNU_GROUPS } from "../../../definitions/cnu-data";
 
 interface GroupesCnuSectionProps {
     viewType: ViewType;
@@ -209,25 +209,23 @@ export default function GroupesCnuSection({ viewType, selectedId, selectedYear }
                 </Title>
             </div>
             <div className="fr-callout fr-mb-4w">
-                 <Text className="fr-callout__text fr-text--sm">
-                     <strong> Explicitez le périmètre de la donnée de la section CNU </strong>
-                     <br/>
-                     Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi risus diam,
-                     vestibulum vitae neque at, maximus placerat risus. In malesuada blandit lectus
-                     at scelerisque. Mauris a diam vel ante feugiat accumsan id finibus mi.
-                     Nam pellentesque libero sed turpis varius dapibus. Fusce sit amet urna id eros
-                     venenatis malesuada in et libero. Integer aliquam, magna quis tempus dignissim,
-                     magna metus efficitur nisl, in suscipit velit eros sit amet erat. Fusce dolor nibh, sagittis sed molestie id, auctor et augue. Nam nec magna vel nisl consequat interdum. Maecenas vestibulum lorem sit amet pretium scelerisque.
-                 </Text>
-             </div>   
-            <Row  className="fr-mb-5w">
+                <Text className="fr-callout__text fr-text--sm">
+                    <strong> Explicitez le périmètre de la donnée de la section CNU </strong>
+                    <br />
+                    Lorem ipsum dolor sit amet, consectetur adipiscing elit. Morbi risus diam,
+                    vestibulum vitae neque at, maximus placerat risus. In malesuada blandit lectus
+                    at scelerisque. Mauris a diam vel ante feugiat accumsan id finibus mi.
+                    Nam pellentesque libero sed turpis varius dapibus. Fusce sit amet urna id eros
+                    venenatis malesuada in et libero. Integer aliquam, magna quis tempus dignissim,
+                    magna metus efficitur nisl, in suscipit velit eros sit amet erat. Fusce dolor nibh, sagittis sed molestie id, auctor et augue. Nam nec magna vel nisl consequat interdum. Maecenas vestibulum lorem sit amet pretium scelerisque.
+                </Text>
+            </div>
+            <Row className="fr-mb-5w">
                 <Col>
                     <TreemapSectionsChart cnuGroups={currentData.cnuGroups} selectedYear={selectedYear} />
                 </Col>
             </Row>
 
-            
-
             <FmMetricDefinitionsTable
                 definitionKeys={[
                     "Groupe CNU",

client/src/boards/faculty-members/pages/structures/sections/sections-cnu/index.tsx

@@ -6,7 +6,7 @@ import MetricCard from "../../components/metric-card";
 import TreemapSectionsChart from "./charts/treemap-sections";
 import DefaultSkeleton from "../../../../../../components/charts-skeletons/default";
 import FmMetricDefinitionsTable from "../../../../components/metric-definitions";
-import { CNU_SECTIONS } from "../../../../pages/definitions/cnu-data";
+import { CNU_SECTIONS } from "../../../definitions/cnu-data";
 
 interface SectionsCnuSectionProps {
     viewType: ViewType;

server/src/routes/boards/faculty-members/data/structures/index.js

@@ -19,10 +19,10 @@ function buildMatchStage(view, id, year) {
       match.code_grande_discipline = id;
       break;
     case "region":
-      match.etablissement_region = id;
+      match.etablissement_code_region = id;
       break;
     case "academie":
-      match.etablissement_academie = id;
+      match.etablissement_code_academie = id;
       break;
   }
   return match;
@@ -34,8 +34,8 @@ async function getContextInfo(collection, view, id) {
   const fieldMap = {
     structure: "etablissement_id_paysage",
     discipline: "code_grande_discipline",
-    region: "etablissement_region",
-    academie: "etablissement_academie",
+    region: "etablissement_code_region",
+    academie: "etablissement_code_academie",
   };
 
   const doc = await collection.findOne(