diff --git a/client/src/pages/european-projects/charts-config.json b/client/src/pages/european-projects/charts-config.json index cd597fe3..bb1c4777 100644 --- a/client/src/pages/european-projects/charts-config.json +++ b/client/src/pages/european-projects/charts-config.json @@ -52,7 +52,7 @@ "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-2" }, { - "id": "projectsTypesPiliers1", + "id": "pillarsSubsidiesRequestedByProjects", "title": "", "subtitle": "Subventions demandées et obtenues (M€)", "description": "", @@ -79,7 +79,7 @@ "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1" }, { - "id": "projectsTypesPiliers3", + "id": "projectsTypesPillarsSubsidiesRequested", "title": "", "subtitle": "Subventions demandées et obtenues (M€)", "description": "", @@ -88,7 +88,7 @@ "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1" }, { - "id": "projectsTypesPiliers3Rates", + "id": "projectsTypesPillarsSubsidiesRequestedRates", "title": "", "subtitle": "Part des subventions demandées et obtenues sur HE", "description": "", @@ -97,7 +97,7 @@ "integrationURL": "/european-projects/components/pages/analysis/overview/charts/projects-types-1" }, { - "id": "projectsTypesPiliers1Rates", + "id": "pillarsSubsidiesRequestedByProjectsRates", "title": "", "subtitle": "Part des subventions demandées et obtenues sur HE", "description": "", 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/pillars-subsidies-requested-by-projects/index.tsx similarity index 92% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/index.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/index.tsx index 32cd3754..82007550 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/pillars-subsidies-requested-by-projects/index.tsx @@ -10,12 +10,12 @@ import ChartWrapper from "../../../../../chart-wrapper"; import { getDefaultParams } from "./utils"; import { Container, Row, Col } from "@dataesr/dsfr-plus"; -export default function ProjectsTypesPiliers1() { +export default function PillarsSubsidiesRequestedByProjects() { const [searchParams] = useSearchParams(); const params = getDefaultParams(searchParams); const { data, isLoading } = useQuery({ - queryKey: ["projectsTypesPiliers1", params], + queryKey: ["PillarsSubsidiesRequestedByProjects", params], queryFn: () => GetData(params), }); @@ -26,7 +26,7 @@ export default function ProjectsTypesPiliers1() { diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/options-subventions_rates.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/options-subventions_rates.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/options-subventions_rates.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/options-subventions_rates.tsx diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/options-subventions_values.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/options-subventions_values.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/options-subventions_values.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/options-subventions_values.tsx diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/query.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/query.tsx new file mode 100644 index 00000000..7065555d --- /dev/null +++ b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/query.tsx @@ -0,0 +1,10 @@ +const { VITE_APP_SERVER_URL } = import.meta.env; + +export async function GetData(params: string) { + let url = `${VITE_APP_SERVER_URL}/european-projects/general-projectsTypes-pillarsSubsidiesRequestedByProjects`; + if (params !== "") { + url = `${VITE_APP_SERVER_URL}/european-projects/general-projectsTypes-pillarsSubsidiesRequestedByProjects?${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-1/template.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/template.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/template.tsx diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/utils.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/utils.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested-by-projects/utils.tsx 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/pillars-subsidies-requested/index.tsx similarity index 96% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/index.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/index.tsx index 68d5a217..efbde823 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/pillars-subsidies-requested/index.tsx @@ -26,14 +26,14 @@ export default function ProjectsTypesPillarsSubsidiesRequested() { 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/pillars-subsidies-requested/options-rates.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/options-rates.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/options-rates.tsx diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/options-values.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/options-values.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/options-values.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/options-values.tsx diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/query.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/query.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/query.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/query.tsx diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/template.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/template.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/template.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/template.tsx diff --git a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/utils.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/utils.tsx similarity index 100% rename from client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-pillars-subsidies-requested/utils.tsx rename to client/src/pages/european-projects/components/pages/general/projects-types/charts/pillars-subsidies-requested/utils.tsx 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 deleted file mode 100644 index 1871c766..00000000 --- a/client/src/pages/european-projects/components/pages/general/projects-types/charts/projects-types-piliers-1/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-1`; - if (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/index.tsx b/client/src/pages/european-projects/components/pages/general/projects-types/index.tsx index 651652cd..58d54d5c 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 @@ -2,10 +2,10 @@ import { Container, Title } from "@dataesr/dsfr-plus"; import { useSearchParams } from "react-router-dom"; import { useEffect } from "react"; -import ProjectsTypesPiliers1 from "./charts/projects-types-piliers-1"; +import PillarsSubsidiesRequestedByProjects from "./charts/pillars-subsidies-requested-by-projects"; import ProjectsTypes1 from "./charts/projects-types-1"; import SuccessRateForAmountsByTypeOfFinancing from "./charts/success-rate-for-amounts-by-type-of-financing"; -import ProjectsTypesPillarsSubsidiesRequested from "./charts/projects-types-pillars-subsidies-requested"; +import PillarsSubsidiesRequestedLines from "./charts/pillars-subsidies-requested"; import SuccessRateForAmountsByPillar from "./charts/success-rate-for-amounts-by-pillar"; export default function ProjectsTypes() { @@ -22,9 +22,10 @@ export default function ProjectsTypes() { Par pilier - + +
- +
diff --git a/server/src/routes/tableaux/european-projects/index.js b/server/src/routes/tableaux/european-projects/index.js index 14058ffd..25adfdf3 100644 --- a/server/src/routes/tableaux/european-projects/index.js +++ b/server/src/routes/tableaux/european-projects/index.js @@ -638,7 +638,7 @@ router router .route( - "/european-projects/general-objectives-and-projects-types-piliers-subventions-1" + "/european-projects/general-projectsTypes-pillarsSubsidiesRequestedByProjects" ) .get(async (req, res) => { if (!req.query.country_code) {