diff --git a/client/src/pages/european-projects/charts-config.json b/client/src/pages/european-projects/charts-config.json index efc931ba..797f6821 100644 --- a/client/src/pages/european-projects/charts-config.json +++ b/client/src/pages/european-projects/charts-config.json @@ -51,6 +51,24 @@ "sourceURL": "https://cordis.europa.eu/", "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1" }, + { + "id": "projectsTypesPiliers2", + "title": "", + "subtitle": "Subventions demandées et obtenues (M€)", + "description": "", + "source": "Commission européenne, Cordis", + "sourceURL": "https://cordis.europa.eu/", + "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1" + }, + { + "id": "projectsTypesPiliers2Rates", + "title": "", + "subtitle": "Part des subventions demandées et obtenues sur HE", + "description": "", + "source": "Commission européenne, Cordis", + "sourceURL": "https://cordis.europa.eu/", + "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1" + }, { "id": "projectsTypesPiliers1Rates", "title": "", diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-1/options-subventions_values.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-1/options-subventions_values.tsx index 3c4b0e1c..83279cde 100644 --- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-1/options-subventions_values.tsx +++ b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-1/options-subventions_values.tsx @@ -1,5 +1,6 @@ export default function Options(data) { if (!data) return null; + console.log(data); const filteredData = data.country.filter( (el) => el.total_evaluated && el.total_successful diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/index.tsx index 15a6c175..32cd3754 100644 --- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/index.tsx +++ b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/index.tsx @@ -10,7 +10,7 @@ import ChartWrapper from "../../../../../chart-wrapper"; import { getDefaultParams } from "./utils"; import { Container, Row, Col } from "@dataesr/dsfr-plus"; -export default function ProjectsTypes1() { +export default function ProjectsTypesPiliers1() { const [searchParams] = useSearchParams(); const params = getDefaultParams(searchParams); diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/query.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/query.tsx index 07551116..1871c766 100644 --- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/query.tsx +++ b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/query.tsx @@ -1,9 +1,9 @@ const { VITE_APP_SERVER_URL } = import.meta.env; export async function GetData(params: string) { - let url = `${VITE_APP_SERVER_URL}/european-projects/analysis-synthese-projects-types-piliers-1`; + let url = `${VITE_APP_SERVER_URL}/european-projects/general-objectives-and-projects-types-piliers-subventions-1`; if (params !== "") { - url = `${VITE_APP_SERVER_URL}/european-projects/analysis-synthese-projects-types-piliers-1?${params}`; + url = `${VITE_APP_SERVER_URL}/european-projects/general-objectives-and-projects-types-piliers-subventions-1?${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/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/index.tsx new file mode 100644 index 00000000..cf6ab9c7 --- /dev/null +++ b/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-2/index.tsx @@ -0,0 +1,128 @@ +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