diff --git a/pwa/app/components/bar-chart/form.jsx b/pwa/app/components/bar-chart/form.jsx index 610f403f111e0ded5f893b8dddec8d1fa3009d70..7771f23db369f8f5a9458a120beb750ca4404ba1 100644 --- a/pwa/app/components/bar-chart/form.jsx +++ b/pwa/app/components/bar-chart/form.jsx @@ -8,6 +8,12 @@ const DataForm = ({ onSubmit }) => { const handleSubmit = (event) => { event.preventDefault(); + + if (startDate === endDate) { + alert("La date de début ne doit pas être égale à la date de fin."); + return; + } + onSubmit({ startDate, endDate, granularity }); }; diff --git a/pwa/app/help/fetch-service.js b/pwa/app/help/fetch-service.js index d3b8c7048f609d0bc3e03902b9654bf513b0e644..72a5f6653dc8fa789d2ed27d45938fd057fade3c 100644 --- a/pwa/app/help/fetch-service.js +++ b/pwa/app/help/fetch-service.js @@ -1,3 +1,4 @@ +import config from '../../config.js'; /** * @param {number} year */ @@ -28,7 +29,14 @@ async function getDonutContent(year) { ); }); } +async function fetchBarChartData(formData) { + const url = `${config.apiUrl}/bar-chart/${formData.startDate}/${formData.endDate}/${formData.granularity}?page=1`; + const response = await fetch(url); + const data = await response.json(); + return data; +} export default { - getDonutContent + getDonutContent, + fetchBarChartData }; diff --git a/pwa/app/page.jsx b/pwa/app/page.jsx index bd347f89d60712c18fda4b589ea229444eb9ee03..569943ea59c82eb08d6d20e73e9c1d03588a0f5e 100644 --- a/pwa/app/page.jsx +++ b/pwa/app/page.jsx @@ -1,7 +1,6 @@ "use client"; import React, {useEffect, useState} from "react"; -import config from '../config.js'; import FetchService from "./help/fetch-service"; import Donut from "./components/donut"; @@ -14,14 +13,11 @@ export default function Page() { const [chartData, setChartData] = useState([]); const [isLoading, setIsLoading] = useState(false); const Loader = () =>