Merge pull request #97 from Franpastoragusti/graph-to-highcharts

fix x periods
BuidlGuidl · Jul 25, 2024 · 1139453 · 1139453
2 parents 6adb45a + 44fb4c4
commit 1139453
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/.../nextjs/components/onchain-impact-dashboard/leaderBoardComponent/leaderBoardComponent.tsx b/.../nextjs/components/onchain-impact-dashboard/leaderBoardComponent/leaderBoardComponent.tsx
@@ -51,7 +51,7 @@ export const LeaderBoardComponent = () => {
       return;
     }
     if (val != "" && valEnd != "") {
-      getScores(`${val},${valEnd}`);
+      getScores(`${startDate},${endDate}`);
     }
   }, [startDate, endDate]);
 

diff --git a/...ages/nextjs/components/onchain-impact-dashboard/projectTotalsGraph/projectTotalsGraph.tsx b/...ages/nextjs/components/onchain-impact-dashboard/projectTotalsGraph/projectTotalsGraph.tsx
@@ -33,6 +33,8 @@ export const ProjectTotalsGraph = ({
   totalsRecord,
   filter,
 }: IProps) => {
+  const intFilter = parseInt(filter) >= 60 ? 30 : parseInt(filter) > 7 ? 7 : 1;
+  const tickInterval = 24 * 3600 * 1000;
   const options = {
     chart: {
       type: "line",
@@ -49,6 +51,7 @@ export const ProjectTotalsGraph = ({
     },
     xAxis: {
       type: "datetime",
+      tickInterval: intFilter * tickInterval,
       title: {
         text: "",
       },

diff --git a/packages/nextjs/services/onchainImpactDashboardApi/globalScoreServices.ts b/packages/nextjs/services/onchainImpactDashboardApi/globalScoreServices.ts
@@ -4,16 +4,17 @@ export const GlobalScoreService = () => {
   const baseURL = `${process.env.NEXT_PUBLIC_API_URL}/globalScore`;
   const getGlobalScores = async (filter?: string) => {
     let url = `${baseURL}`;
+    let startDate = new Date();
+    let endDate = new Date();
     if (filter) {
       if (filter.includes(",")) {
         const [start, end] = filter.split(",");
-        url += `?startDate=${start}&endDate=${end}`;
+        startDate = new Date(start);
+        endDate = new Date(end);
       } else if (typeof parseInt(filter) === "number") {
-        const startDate = new Date();
         startDate.setDate(startDate.getDate() - parseInt(filter));
-        const endDate = new Date();
-        url += `?startDate=${startDate.toISOString()}&endDate=${endDate.toISOString()}`;
       }
+      url += `?startDate=${startDate.toISOString()}&endDate=${endDate.toISOString()}`;
     }
     const response = await fetch(url);
     const { data }: { data: IGlobalScore[] } = await response.json();