From 346857bee9156cb052f8311cd36195e1e3b18a71 Mon Sep 17 00:00:00 2001
From: jerem <jeremy.peglion@gmail.com>
Date: Tue, 6 Aug 2024 17:17:46 +0200
Subject: [PATCH] two charts in one for parts

---
 .../charts/projects-types-piliers-2/index.tsx | 128 --------------
 .../options-subventions_values_evaluated.tsx  |  84 ---------
 ...ons-subventions_values_evaluated_rates.tsx | 121 -------------
 .../charts/projects-types-piliers-2/query.tsx |  10 --
 .../projects-types-piliers-2/template.tsx     |   7 -
 .../charts/projects-types-piliers-2/utils.tsx |   5 -
 .../charts/projects-types-piliers-3/index.tsx | 128 --------------
 .../options-subventions_values_evaluated.tsx  |  84 ---------
 ...ons-subventions_values_evaluated_rates.tsx | 121 -------------
 .../charts/projects-types-piliers-3/query.tsx |  10 --
 .../projects-types-piliers-3/template.tsx     |   7 -
 .../charts/projects-types-piliers-3/utils.tsx |   5 -
 .../index.tsx                                 | 167 +++++++++---------
 .../options-rates.tsx                         | 104 ++++++++++-
 .../pages/general/projects-types/index.tsx    |   7 -
 15 files changed, 181 insertions(+), 807 deletions(-)
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/index.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated_rates.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/query.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/template.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/utils.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/index.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated_rates.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/query.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/template.tsx
 delete mode 100644 client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/utils.tsx

diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/index.tsx
deleted file mode 100644
index cf6ab9c74..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/index.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { useSearchParams } from "react-router-dom";
-
-import Template from "./template";
-import { GetData } from "./query";
-import optionsSubventionsValuesEvaluated from "./options-subventions_values_evaluated";
-import optionsSubventionsValuesEvaluatedRates from "./options-subventions_values_evaluated_rates";
-
-import ChartWrapper from "../../../../../chart-wrapper";
-import { getDefaultParams } from "./utils";
-import { Container, Row, Col, Title } from "@dataesr/dsfr-plus";
-
-export default function ProjectsTypesPiliers2() {
-  const [searchParams] = useSearchParams();
-  const params = getDefaultParams(searchParams);
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["projectsTypesPiliers2", params],
-    queryFn: () => GetData(params),
-  });
-
-  if (isLoading || !data) return <Template />;
-
-  return (
-    <Container fluid>
-      <Row>
-        <Col>
-          <Title as="h3" look="h5">
-            Projets évalués
-          </Title>
-        </Col>
-      </Row>
-      <Row>
-        <Col>
-          <ChartWrapper
-            id="projectsTypesPiliers2"
-            options={optionsSubventionsValuesEvaluated(data)}
-            legend={
-              <ul className="legend">
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#A558A0",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>Europe plus innovante</span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#21AB8E",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>Excellence scientifique</span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#223F3A",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>
-                    Problématiques mondiales et compétitivité industrielle
-                    européenne
-                  </span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#E4794A",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>
-                    Élargir la participation et renforcer l'espace européen de
-                    la recherche
-                  </span>
-                </li>
-              </ul>
-            }
-          />
-        </Col>
-        <Col>
-          <ChartWrapper
-            id="projectsTypesPiliers2Rates"
-            options={optionsSubventionsValuesEvaluatedRates(data)}
-            legend={null}
-          />
-        </Col>
-      </Row>
-    </Container>
-  );
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated.tsx
deleted file mode 100644
index fa5b95669..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-export default function Options(data) {
-  if (!data) return null;
-
-  const filteredData = data.filter((item) => item.country !== "all")[0].data;
-
-  const years = new Set();
-  filteredData.forEach((item) => years.add(item.year));
-
-  return {
-    chart: {
-      type: "line",
-      height: 500,
-      backgroundColor: "transparent",
-    },
-    title: { text: "" },
-    legend: { enabled: false },
-    credits: { enabled: false },
-
-    xAxis: {
-      categories: Array.from(years),
-      crosshair: true,
-      accessibility: {
-        description: "Years",
-      },
-    },
-    yAxis: {
-      min: 0,
-      title: {
-        text: "(M€)",
-      },
-    },
-    tooltip: {
-      valueSuffix: " (M€)",
-    },
-    plotOptions: {
-      line: {
-        dataLabels: {
-          enabled: true,
-          formatter: function (this: Highcharts.TooltipFormatterContextObject) {
-            return (this.y as number).toFixed(1);
-          },
-        },
-      },
-    },
-    series: [
-      {
-        name: "Europe plus innovante",
-        data: filteredData
-          .filter((item) => item.pilier_name_fr === "Europe plus innovante")
-          .map((item) => item.total_evaluated / 1000000),
-        color: "#A558A0",
-      },
-      {
-        name: "Excellence scientifique",
-        data: filteredData
-          .filter((item) => item.pilier_name_fr === "Excellence scientifique")
-          .map((item) => item.total_evaluated / 1000000),
-        color: "#21AB8E",
-      },
-      {
-        name: "Problématiques mondiales et compétitivité industrielle européenne",
-        data: filteredData
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Problématiques mondiales et compétitivité industrielle européenne"
-          )
-          .map((item) => item.total_evaluated / 1000000),
-        color: "#223F3A",
-      },
-      {
-        name: "Élargir la participation et renforcer l'espace européen de la recherche",
-        data: filteredData
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Élargir la participation et renforcer l'espace européen de la recherche"
-          )
-          .map((item) => item.total_evaluated / 1000000),
-        color: "#E4794A",
-      },
-    ],
-  };
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated_rates.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated_rates.tsx
deleted file mode 100644
index 3c710c413..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/options-subventions_values_evaluated_rates.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-export default function Options(data) {
-  if (!data) return null;
-
-  const filteredDataCountry = data.filter((item) => item.country !== "all")[0]
-    .data;
-  const filteredDataAll = data.filter((item) => item.country === "all")[0].data;
-
-  const years = new Set();
-  filteredDataCountry.forEach((item) => years.add(item.year));
-
-  return {
-    chart: {
-      type: "line",
-      height: 500,
-      backgroundColor: "transparent",
-    },
-    title: { text: "" },
-    legend: { enabled: false },
-    credits: { enabled: false },
-
-    xAxis: {
-      categories: Array.from(years),
-      crosshair: true,
-      accessibility: {
-        description: "Years",
-      },
-    },
-    yAxis: {
-      min: 0,
-      title: {
-        text: "(%)",
-      },
-    },
-    tooltip: {
-      valueSuffix: " (M€)",
-    },
-    plotOptions: {
-      line: {
-        dataLabels: {
-          enabled: true,
-          formatter: function (this: Highcharts.TooltipFormatterContextObject) {
-            return (this.y as number).toFixed(1) + " %";
-          },
-        },
-      },
-    },
-    series: [
-      {
-        name: "Europe plus innovante",
-        data: filteredDataCountry
-          .filter((item) => item.pilier_name_fr === "Europe plus innovante")
-          .map(
-            (item) =>
-              Math.round(
-                ((item.total_evaluated * 100) /
-                  filteredDataAll.find(
-                    (itemAll) =>
-                      itemAll.year === item.year &&
-                      itemAll.pilier_name_fr === item.pilier_name_fr
-                  ).total_evaluated) *
-                  10
-              ) / 10
-          ),
-        color: "#A558A0",
-      },
-      {
-        name: "Excellence scientifique",
-        data: filteredDataCountry
-          .filter((item) => item.pilier_name_fr === "Excellence scientifique")
-          .map(
-            (item) =>
-              (item.total_evaluated * 100) /
-              filteredDataAll.find(
-                (itemAll) =>
-                  itemAll.year === item.year &&
-                  itemAll.pilier_name_fr === item.pilier_name_fr
-              ).total_evaluated
-          ),
-        color: "#21AB8E",
-      },
-      {
-        name: "Problématiques mondiales et compétitivité industrielle européenne",
-        data: filteredDataCountry
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Problématiques mondiales et compétitivité industrielle européenne"
-          )
-          .map(
-            (item) =>
-              (item.total_evaluated * 100) /
-              filteredDataAll.find(
-                (itemAll) =>
-                  itemAll.year === item.year &&
-                  itemAll.pilier_name_fr === item.pilier_name_fr
-              ).total_evaluated
-          ),
-        color: "#223F3A",
-      },
-      {
-        name: "Élargir la participation et renforcer l'espace européen de la recherche",
-        data: filteredDataCountry
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Élargir la participation et renforcer l'espace européen de la recherche"
-          )
-          .map(
-            (item) =>
-              (item.total_evaluated * 100) /
-              filteredDataAll.find(
-                (itemAll) =>
-                  itemAll.year === item.year &&
-                  itemAll.pilier_name_fr === item.pilier_name_fr
-              ).total_evaluated
-          ),
-        color: "#E4794A",
-      },
-    ],
-  };
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/query.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/query.tsx
deleted file mode 100644
index 8b8ed2ac6..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/query.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-const { VITE_APP_SERVER_URL } = import.meta.env;
-
-export async function GetData(params: string) {
-  let url = `${VITE_APP_SERVER_URL}/european-projects/general-objectives-and-projects-types-piliers-subventions-2`;
-  if (params !== "") {
-    url = `${VITE_APP_SERVER_URL}/european-projects/general-objectives-and-projects-types-piliers-subventions-2?${params}`;
-  }
-
-  return fetch(url).then((response) => response.json());
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/template.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/template.tsx
deleted file mode 100644
index 035d7d525..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/template.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Template() {
-  return (
-    <>
-      graph template
-    </>
-  );
-}
\ No newline at end of file
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/utils.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/utils.tsx
deleted file mode 100644
index 32137f2f7..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/utils.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export function getDefaultParams(searchParams) {
-  const params = [...searchParams].map(([key, value]) => `${key}=${value}`).join('&');
-
-  return params + '&stage=successful';
-}
\ No newline at end of file
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/index.tsx
deleted file mode 100644
index ebe132af2..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/index.tsx
+++ /dev/null
@@ -1,128 +0,0 @@
-import { useQuery } from "@tanstack/react-query";
-import { useSearchParams } from "react-router-dom";
-
-import Template from "./template";
-import { GetData } from "./query";
-import optionsSubventionsValuesEvaluated from "./options-subventions_values_evaluated";
-import optionsSubventionsValuesEvaluatedRates from "./options-subventions_values_evaluated_rates";
-
-import ChartWrapper from "../../../../../chart-wrapper";
-import { getDefaultParams } from "./utils";
-import { Container, Row, Col, Title } from "@dataesr/dsfr-plus";
-
-export default function ProjectsTypesPiliers3() {
-  const [searchParams] = useSearchParams();
-  const params = getDefaultParams(searchParams);
-
-  const { data, isLoading } = useQuery({
-    queryKey: ["projectsTypesPiliers3", params],
-    queryFn: () => GetData(params),
-  });
-
-  if (isLoading || !data) return <Template />;
-
-  return (
-    <Container fluid>
-      <Row>
-        <Col>
-          <Title as="h3" look="h5">
-            Projets lauréats
-          </Title>
-        </Col>
-      </Row>
-      <Row>
-        <Col>
-          <ChartWrapper
-            id="projectsTypesPiliers3"
-            options={optionsSubventionsValuesEvaluated(data)}
-            legend={
-              <ul className="legend">
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#A558A0",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>Europe plus innovante</span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#21AB8E",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>Excellence scientifique</span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#223F3A",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>
-                    Problématiques mondiales et compétitivité industrielle
-                    européenne
-                  </span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#E4794A",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>
-                    Élargir la participation et renforcer l'espace européen de
-                    la recherche
-                  </span>
-                </li>
-              </ul>
-            }
-          />
-        </Col>
-        <Col>
-          <ChartWrapper
-            id="projectsTypesPiliers3Rates"
-            options={optionsSubventionsValuesEvaluatedRates(data)}
-            legend={null}
-          />
-        </Col>
-      </Row>
-    </Container>
-  );
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated.tsx
deleted file mode 100644
index 9e776385e..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated.tsx
+++ /dev/null
@@ -1,84 +0,0 @@
-export default function Options(data) {
-  if (!data) return null;
-
-  const filteredData = data.filter((item) => item.country !== "all")[0].data;
-
-  const years = new Set();
-  filteredData.forEach((item) => years.add(item.year));
-
-  return {
-    chart: {
-      type: "line",
-      height: 500,
-      backgroundColor: "transparent",
-    },
-    title: { text: "" },
-    legend: { enabled: false },
-    credits: { enabled: false },
-
-    xAxis: {
-      categories: Array.from(years),
-      crosshair: true,
-      accessibility: {
-        description: "Years",
-      },
-    },
-    yAxis: {
-      min: 0,
-      title: {
-        text: "(M€)",
-      },
-    },
-    tooltip: {
-      valueSuffix: " (M€)",
-    },
-    plotOptions: {
-      line: {
-        dataLabels: {
-          enabled: true,
-          formatter: function (this: Highcharts.TooltipFormatterContextObject) {
-            return (this.y as number).toFixed(1);
-          },
-        },
-      },
-    },
-    series: [
-      {
-        name: "Europe plus innovante",
-        data: filteredData
-          .filter((item) => item.pilier_name_fr === "Europe plus innovante")
-          .map((item) => item.total_successful / 1000000),
-        color: "#A558A0",
-      },
-      {
-        name: "Excellence scientifique",
-        data: filteredData
-          .filter((item) => item.pilier_name_fr === "Excellence scientifique")
-          .map((item) => item.total_successful / 1000000),
-        color: "#21AB8E",
-      },
-      {
-        name: "Problématiques mondiales et compétitivité industrielle européenne",
-        data: filteredData
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Problématiques mondiales et compétitivité industrielle européenne"
-          )
-          .map((item) => item.total_successful / 1000000),
-        color: "#223F3A",
-      },
-      {
-        name: "Élargir la participation et renforcer l'espace européen de la recherche",
-        data: filteredData
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Élargir la participation et renforcer l'espace européen de la recherche"
-          )
-          .map((item) => item.total_successful / 1000000),
-        color: "#E4794A",
-      },
-    ],
-  };
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated_rates.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated_rates.tsx
deleted file mode 100644
index 9b96789db..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/options-subventions_values_evaluated_rates.tsx
+++ /dev/null
@@ -1,121 +0,0 @@
-export default function Options(data) {
-  if (!data) return null;
-
-  const filteredDataCountry = data.filter((item) => item.country !== "all")[0]
-    .data;
-  const filteredDataAll = data.filter((item) => item.country === "all")[0].data;
-
-  const years = new Set();
-  filteredDataCountry.forEach((item) => years.add(item.year));
-
-  return {
-    chart: {
-      type: "line",
-      height: 500,
-      backgroundColor: "transparent",
-    },
-    title: { text: "" },
-    legend: { enabled: false },
-    credits: { enabled: false },
-
-    xAxis: {
-      categories: Array.from(years),
-      crosshair: true,
-      accessibility: {
-        description: "Years",
-      },
-    },
-    yAxis: {
-      min: 0,
-      title: {
-        text: "(%)",
-      },
-    },
-    tooltip: {
-      valueSuffix: " (M€)",
-    },
-    plotOptions: {
-      line: {
-        dataLabels: {
-          enabled: true,
-          formatter: function (this: Highcharts.TooltipFormatterContextObject) {
-            return (this.y as number).toFixed(1) + " %";
-          },
-        },
-      },
-    },
-    series: [
-      {
-        name: "Europe plus innovante",
-        data: filteredDataCountry
-          .filter((item) => item.pilier_name_fr === "Europe plus innovante")
-          .map(
-            (item) =>
-              Math.round(
-                ((item.total_successful * 100) /
-                  filteredDataAll.find(
-                    (itemAll) =>
-                      itemAll.year === item.year &&
-                      itemAll.pilier_name_fr === item.pilier_name_fr
-                  ).total_successful) *
-                  10
-              ) / 10
-          ),
-        color: "#A558A0",
-      },
-      {
-        name: "Excellence scientifique",
-        data: filteredDataCountry
-          .filter((item) => item.pilier_name_fr === "Excellence scientifique")
-          .map(
-            (item) =>
-              (item.total_successful * 100) /
-              filteredDataAll.find(
-                (itemAll) =>
-                  itemAll.year === item.year &&
-                  itemAll.pilier_name_fr === item.pilier_name_fr
-              ).total_successful
-          ),
-        color: "#21AB8E",
-      },
-      {
-        name: "Problématiques mondiales et compétitivité industrielle européenne",
-        data: filteredDataCountry
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Problématiques mondiales et compétitivité industrielle européenne"
-          )
-          .map(
-            (item) =>
-              (item.total_successful * 100) /
-              filteredDataAll.find(
-                (itemAll) =>
-                  itemAll.year === item.year &&
-                  itemAll.pilier_name_fr === item.pilier_name_fr
-              ).total_successful
-          ),
-        color: "#223F3A",
-      },
-      {
-        name: "Élargir la participation et renforcer l'espace européen de la recherche",
-        data: filteredDataCountry
-          .filter(
-            (item) =>
-              item.pilier_name_fr ===
-              "Élargir la participation et renforcer l'espace européen de la recherche"
-          )
-          .map(
-            (item) =>
-              (item.total_successful * 100) /
-              filteredDataAll.find(
-                (itemAll) =>
-                  itemAll.year === item.year &&
-                  itemAll.pilier_name_fr === item.pilier_name_fr
-              ).total_successful
-          ),
-        color: "#E4794A",
-      },
-    ],
-  };
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/query.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/query.tsx
deleted file mode 100644
index 8b8ed2ac6..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/query.tsx
+++ /dev/null
@@ -1,10 +0,0 @@
-const { VITE_APP_SERVER_URL } = import.meta.env;
-
-export async function GetData(params: string) {
-  let url = `${VITE_APP_SERVER_URL}/european-projects/general-objectives-and-projects-types-piliers-subventions-2`;
-  if (params !== "") {
-    url = `${VITE_APP_SERVER_URL}/european-projects/general-objectives-and-projects-types-piliers-subventions-2?${params}`;
-  }
-
-  return fetch(url).then((response) => response.json());
-}
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/template.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/template.tsx
deleted file mode 100644
index 035d7d525..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/template.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-export default function Template() {
-  return (
-    <>
-      graph template
-    </>
-  );
-}
\ No newline at end of file
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/utils.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/utils.tsx
deleted file mode 100644
index 32137f2f7..000000000
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-3/utils.tsx
+++ /dev/null
@@ -1,5 +0,0 @@
-export function getDefaultParams(searchParams) {
-  const params = [...searchParams].map(([key, value]) => `${key}=${value}`).join('&');
-
-  return params + '&stage=successful';
-}
\ No newline at end of file
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/index.tsx
index e7143efc1..b040861cf 100644
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/index.tsx
+++ b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/index.tsx
@@ -4,7 +4,7 @@ import { useSearchParams } from "react-router-dom";
 import Template from "./template";
 import { GetData } from "./query";
 import optionsValues from "./options-values";
-// import optionsSubventionsValuesEvaluatedRates from "./options-rates";
+import optionsRates from "./options-rates";
 
 import ChartWrapper from "../../../../../chart-wrapper";
 import { getDefaultParams } from "./utils";
@@ -28,93 +28,96 @@ export default function ProjectsTypesPillarsSubsidiesRequested() {
           <ChartWrapper
             id="projectsTypesPiliers3"
             options={optionsValues(data)}
-            legend={
-              <ul className="legend">
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#A558A0",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>Europe plus innovante</span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#21AB8E",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>Excellence scientifique</span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#223F3A",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>
-                    Problématiques mondiales et compétitivité industrielle
-                    européenne
-                  </span>
-                </li>
-                <li
-                  style={{
-                    display: "flex",
-                    alignItems: "center",
-                    marginBottom: "5px",
-                  }}
-                >
-                  <div
-                    style={{
-                      width: "20px",
-                      height: "20px",
-                      background: "#E4794A",
-                      marginRight: "10px",
-                    }}
-                  ></div>
-                  <span>
-                    Élargir la participation et renforcer l'espace européen de
-                    la recherche
-                  </span>
-                </li>
-              </ul>
-            }
+            legend={null}
           />
         </Col>
-        {/* <Col>
+        <Col>
           <ChartWrapper
             id="projectsTypesPiliers3Rates"
-            options={optionsSubventionsValuesEvaluatedRates(data)}
+            options={optionsRates(data)}
             legend={null}
           />
-        </Col> */}
+        </Col>
+      </Row>
+      <Row>
+        <Col>
+          <ul className="legend">
+            <li
+              style={{
+                display: "flex",
+                alignItems: "center",
+                marginBottom: "5px",
+              }}
+            >
+              <div
+                style={{
+                  width: "20px",
+                  height: "20px",
+                  background: "#A558A0",
+                  marginRight: "10px",
+                }}
+              ></div>
+              <span>Europe plus innovante</span>
+            </li>
+            <li
+              style={{
+                display: "flex",
+                alignItems: "center",
+                marginBottom: "5px",
+              }}
+            >
+              <div
+                style={{
+                  width: "20px",
+                  height: "20px",
+                  background: "#21AB8E",
+                  marginRight: "10px",
+                }}
+              ></div>
+              <span>Excellence scientifique</span>
+            </li>
+            <li
+              style={{
+                display: "flex",
+                alignItems: "center",
+                marginBottom: "5px",
+              }}
+            >
+              <div
+                style={{
+                  width: "20px",
+                  height: "20px",
+                  background: "#223F3A",
+                  marginRight: "10px",
+                }}
+              ></div>
+              <span>
+                Problématiques mondiales et compétitivité industrielle
+                européenne
+              </span>
+            </li>
+            <li
+              style={{
+                display: "flex",
+                alignItems: "center",
+                marginBottom: "5px",
+              }}
+            >
+              <div
+                style={{
+                  width: "20px",
+                  height: "20px",
+                  background: "#E4794A",
+                  marginRight: "10px",
+                }}
+              ></div>
+              <span>
+                Élargir la participation et renforcer l'espace européen de la
+                recherche
+              </span>
+            </li>
+          </ul>
+        </Col>
       </Row>
     </Container>
   );
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/options-rates.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/options-rates.tsx
index 9b96789db..da636d7be 100644
--- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/options-rates.tsx
+++ b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/options-rates.tsx
@@ -17,14 +17,26 @@ export default function Options(data) {
     title: { text: "" },
     legend: { enabled: false },
     credits: { enabled: false },
-
-    xAxis: {
-      categories: Array.from(years),
-      crosshair: true,
-      accessibility: {
-        description: "Years",
+    xAxis: [
+      {
+        type: "category",
+        categories: Array.from(years),
+        width: "48%",
+        title: {
+          text: "Projets évalués",
+        },
       },
-    },
+      {
+        type: "category",
+        categories: Array.from(years),
+        offset: 0,
+        left: "50%",
+        width: "48%",
+        title: {
+          text: "Projets lauréats",
+        },
+      },
+    ],
     yAxis: {
       min: 0,
       title: {
@@ -32,7 +44,7 @@ export default function Options(data) {
       },
     },
     tooltip: {
-      valueSuffix: " (M€)",
+      valueSuffix: " %",
     },
     plotOptions: {
       line: {
@@ -47,6 +59,79 @@ export default function Options(data) {
     series: [
       {
         name: "Europe plus innovante",
+        data: filteredDataCountry
+          .filter((item) => item.pilier_name_fr === "Europe plus innovante")
+          .map(
+            (item) =>
+              Math.round(
+                ((item.total_evaluated * 100) /
+                  filteredDataAll.find(
+                    (itemAll) =>
+                      itemAll.year === item.year &&
+                      itemAll.pilier_name_fr === item.pilier_name_fr
+                  ).total_evaluated) *
+                  10
+              ) / 10
+          ),
+        color: "#A558A0",
+      },
+      {
+        name: "Excellence scientifique",
+        data: filteredDataCountry
+          .filter((item) => item.pilier_name_fr === "Excellence scientifique")
+          .map(
+            (item) =>
+              (item.total_evaluated * 100) /
+              filteredDataAll.find(
+                (itemAll) =>
+                  itemAll.year === item.year &&
+                  itemAll.pilier_name_fr === item.pilier_name_fr
+              ).total_evaluated
+          ),
+        color: "#21AB8E",
+      },
+      {
+        name: "Problématiques mondiales et compétitivité industrielle européenne",
+        data: filteredDataCountry
+          .filter(
+            (item) =>
+              item.pilier_name_fr ===
+              "Problématiques mondiales et compétitivité industrielle européenne"
+          )
+          .map(
+            (item) =>
+              (item.total_evaluated * 100) /
+              filteredDataAll.find(
+                (itemAll) =>
+                  itemAll.year === item.year &&
+                  itemAll.pilier_name_fr === item.pilier_name_fr
+              ).total_evaluated
+          ),
+        color: "#223F3A",
+      },
+      {
+        name: "Élargir la participation et renforcer l'espace européen de la recherche",
+        data: filteredDataCountry
+          .filter(
+            (item) =>
+              item.pilier_name_fr ===
+              "Élargir la participation et renforcer l'espace européen de la recherche"
+          )
+          .map(
+            (item) =>
+              (item.total_evaluated * 100) /
+              filteredDataAll.find(
+                (itemAll) =>
+                  itemAll.year === item.year &&
+                  itemAll.pilier_name_fr === item.pilier_name_fr
+              ).total_evaluated
+          ),
+        color: "#E4794A",
+      },
+
+      {
+        name: "Europe plus innovante",
+        xAxis: 1,
         data: filteredDataCountry
           .filter((item) => item.pilier_name_fr === "Europe plus innovante")
           .map(
@@ -65,6 +150,7 @@ export default function Options(data) {
       },
       {
         name: "Excellence scientifique",
+        xAxis: 1,
         data: filteredDataCountry
           .filter((item) => item.pilier_name_fr === "Excellence scientifique")
           .map(
@@ -80,6 +166,7 @@ export default function Options(data) {
       },
       {
         name: "Problématiques mondiales et compétitivité industrielle européenne",
+        xAxis: 1,
         data: filteredDataCountry
           .filter(
             (item) =>
@@ -99,6 +186,7 @@ export default function Options(data) {
       },
       {
         name: "Élargir la participation et renforcer l'espace européen de la recherche",
+        xAxis: 1,
         data: filteredDataCountry
           .filter(
             (item) =>
diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/index.tsx
index 6f560b681..7e740c952 100644
--- a/client/src/pages/european-projects/components/pages/general/projects-types/index.tsx
+++ b/client/src/pages/european-projects/components/pages/general/projects-types/index.tsx
@@ -5,8 +5,6 @@ import { useEffect } from "react";
 import ProjectsTypesPiliers1 from "./charts/projects-types-piliers-1";
 import ProjectsTypes1 from "./charts/projects-types-1";
 import ProjectsTypes2 from "./charts/projects-types-2";
-import ProjectsTypesPiliers2 from "./charts/projects-types-piliers-2";
-// import ProjectsTypesPiliers3 from "./charts/projects-types-piliers-3";
 import ProjectsTypesPillarsSubsidiesRequested from "./charts/projects-types-pillars-subsidies-requested";
 
 export default function ProjectsTypes() {
@@ -25,12 +23,7 @@ export default function ProjectsTypes() {
       </Title>
       <ProjectsTypesPiliers1 />
       <div className="fr-my-5w" />
-      <ProjectsTypesPiliers2 />
-      <div className="fr-my-5w" />
-      {/* <ProjectsTypesPiliers3 /> */}
       <ProjectsTypesPillarsSubsidiesRequested />
-      {/* 
-      <ProjectsTypes2 /> */}
       <div className="fr-my-5w" />
       <Title as="h2" look="h4">
         Par type de projets