From 895e3da21905bd5b3640c2dae3601d03d534d355 Mon Sep 17 00:00:00 2001
From: Vaibhav Surve <vaibhav.surve@marcoaiot.com>
Date: Fri, 11 Apr 2025 15:45:08 +0530
Subject: [PATCH] refactor(Dashboard): enhance project data handling and
 improve chart integration

---
 src/components/Dashboard/Dashboard.jsx | 192 +++++++++++++++++--------
 1 file changed, 132 insertions(+), 60 deletions(-)

diff --git a/src/components/Dashboard/Dashboard.jsx b/src/components/Dashboard/Dashboard.jsx
index accb9235..6ce7b8ab 100644
--- a/src/components/Dashboard/Dashboard.jsx
+++ b/src/components/Dashboard/Dashboard.jsx
@@ -1,25 +1,57 @@
-import React from 'react';
+import React, { useState } from 'react';
 import HorizontalBarChart from '../Charts/HorizontalBarChart';
 import LineChart from '../Charts/LineChart';
-const dummyCategories = ['Project 1', 'Project 2', 'Project 3', 'Project 4', 'Project 5'];
-const dummyData = [45, 38, 30, 25, 20];
-
-const lineChartseries = [
-  {
-    name: "Planned Projects",
-    data: [20, 25, 30, 35, 40, 45, 50]
-  },
-  {
-    name: "Completed Projects",
-    data: [5, 15, 28, 36, 42, 46, 48]
-  }
-];
-
-
-const lineChartCategories = ["January", "February", "March", "April", "May", "June", "July"];
-
+import { useProjects } from '../../hooks/useProjects';
+import {
+  useDashboard_Data,
+  useDashboardProjectsCardData,
+  useDashboardTeamsCardData,
+  useDashboardTasksCardData,
+} from "../../hooks/useDashboard_Data";
 
 const Dashboard = () => {
+  const { projects } = useProjects();
+  const [selectedProjectId, setSelectedProjectId] = useState('all');
+  const [FromDate, setFromDate] = useState(() => {
+    const today = new Date();
+    return today.toISOString().split('T')[0]; // YYYY-MM-DD
+  });
+const [days, setDays] = useState(10);
+const { projectsCardData,  } = useDashboardProjectsCardData();
+const { teamsCardData,} = useDashboardTeamsCardData();
+const { tasksCardData,  } = useDashboardTasksCardData();
+
+  const { dashboard_data, loading: lineLoading } = useDashboard_Data({
+    days,
+    FromDate,
+    projectId: selectedProjectId === 'all' ? 0 : selectedProjectId,
+  });
+
+  // Bar chart logic
+  const projectNames = projects?.map(p => p.name) || [];
+  const projectProgress = projects?.map(p => {
+    const completed = p.completedWork || 0;
+    const planned = p.plannedWork || 1;
+    const percent = (completed / planned) * 100;
+    return Math.min(Math.round(percent), 100);
+  }) || [];
+
+  // Line chart data
+  const lineChartSeries = [
+    {
+      name: 'Planned Work',
+      data: dashboard_data.map(d => d.plannedWork || 0),
+    },
+    {
+      name: 'Completed Work',
+      data: dashboard_data.map(d => d.completedWork || 0),
+    },
+  ];
+
+  const lineChartCategories = dashboard_data.map(d =>
+    new Date(d.date).toLocaleDateString('en-US', { month: 'short', day: 'numeric' })
+  );
+
   return (
     <div className="container-xxl flex-grow-1 container-p-y">
       <div className="row gy-4">
@@ -28,15 +60,15 @@ const Dashboard = () => {
         <div className="col-sm-6 col-lg-4">
           <div className="card p-3 h-100 text-center d-flex justify-content-between">
             <div className="d-flex justify-content-start align-items-center mb-3">
-              <h5 class="fw-bold mb-0 ms-2"><i class="rounded-circle bx bx-building-house" ></i> Projects</h5>
+              <h5 className="fw-bold mb-0 ms-2"><i className="rounded-circle bx bx-building-house"></i> Projects</h5>
             </div>
             <div className="d-flex justify-content-around align-items-start mt-n2">
               <div>
-                <h4 className="mb-0 fw-bold">25</h4>
+                <h4 className="mb-0 fw-bold">{projectsCardData.totalProjects?.toLocaleString()}</h4>
                 <small className="text-muted">Total</small>
               </div>
               <div>
-                <h4 className="mb-0 fw-bold">30</h4>
+                <h4 className="mb-0 fw-bold">{projectsCardData.ongoingProjects?.toLocaleString()}</h4>
                 <small className="text-muted">Ongoing</small>
               </div>
             </div>
@@ -47,15 +79,15 @@ const Dashboard = () => {
         <div className="col-sm-6 col-lg-4">
           <div className="card p-3 h-100 text-center d-flex justify-content-between">
             <div className="d-flex justify-content-start align-items-center mb-3">
-              <h5 class="fw-bold mb-0 ms-2"><i className="bx bx-group text-warning" ></i> Teams</h5>
+              <h5 className="fw-bold mb-0 ms-2"><i className="bx bx-group text-warning"></i> Teams</h5>
             </div>
             <div className="d-flex justify-content-around align-items-start mt-n2">
               <div>
-                <h4 className="mb-0 fw-bold">500</h4>
+                <h4 className="mb-0 fw-bold">{teamsCardData.totalEmployees?.toLocaleString()}</h4>
                 <small className="text-muted">Total Employees</small>
               </div>
               <div>
-                <h4 className="mb-0 fw-bold">360</h4>
+                <h4 className="mb-0 fw-bold">{teamsCardData.inToday?.toLocaleString()}</h4>
                 <small className="text-muted">In Today</small>
               </div>
             </div>
@@ -66,66 +98,106 @@ const Dashboard = () => {
         <div className="col-sm-6 col-lg-4">
           <div className="card p-3 h-100 text-center d-flex justify-content-between">
             <div className="d-flex justify-content-start align-items-center mb-3">
-              <h5 class="fw-bold mb-0 ms-2"><i className="bx bx-task text-success" ></i> Tasks</h5>
+              <h5 className="fw-bold mb-0 ms-2"><i className="bx bx-task text-success"></i> Tasks</h5>
             </div>
             <div className="d-flex justify-content-around align-items-start mt-n2">
               <div>
-                <h4 className="mb-0 fw-bold">10,000</h4>
+                <h4 className="mb-0 fw-bold">{tasksCardData.totalTasks?.toLocaleString()}</h4>
                 <small className="text-muted">Total</small>
               </div>
               <div>
-                <h4 className="mb-0 fw-bold">4,000</h4>
+                <h4 className="mb-0 fw-bold">{tasksCardData.completedTasks?.toLocaleString()}</h4>
                 <small className="text-muted">Completed</small>
               </div>
             </div>
           </div>
         </div>
-        {/* Chart Section */}
-        <div class="col-xxl-6 col-lg-7">
-          <div class="card h-100">
-            <div class="card-header d-flex align-items-start justify-content-between">
-              <div class="card-title mb-0">
-                <h5 class="mb-1">Projects </h5>
-                <p class="card-subtitle">Total Projects Overview</p>
+
+        {/* Bar Chart */}
+        <div className="col-xxl-6 col-lg-6">
+          <div className="card h-100">
+            <div className="card-header d-flex align-items-start justify-content-between">
+              <div className="card-title mb-0 text-start">
+                <h5 className="mb-1">Projects</h5>
+                <p className="card-subtitle">Total Projects Overview</p>
               </div>
             </div>
-            <div class="card-body">
+            <div className="card-body">
               <HorizontalBarChart
-                categories={dummyCategories}
-                seriesData={dummyData}
+                categories={projectNames}
+                seriesData={projectProgress}
               />
             </div>
           </div>
         </div>
-        <div class="col-xxl-6 col-lg-7">
-          <div class="card h-100">
-            <div class="card-header d-flex align-items-center justify-content-between">
-              <div class="card-title mb-0">
-                <h5 class="mb-1">Project Progress</h5>
-                <p class="card-subtitle">Progress Overview by Project</p>
+
+        {/* Line Chart */}
+        <div className="col-xxl-6 col-lg-6">
+          <div className="card h-100">
+            <div className="card-header d-flex flex-wrap align-items-center justify-content-between">
+              <div className="card-title mb-0 text-start">
+                <h5 className="mb-1">Project Progress</h5>
+                <p className="card-subtitle">Progress Overview by Project</p>
               </div>
-              <div class="btn-group">
-                <button type="button" class="btn btn-label-primary">Project A</button>
-                <button
-                  type="button"
-                  class="btn btn-label-primary dropdown-toggle dropdown-toggle-split"
-                  data-bs-toggle="dropdown"
-                  aria-expanded="false">
-                  <span class="visually-hidden">Toggle Dropdown</span>
-                </button>
-                <ul class="dropdown-menu">
-                  <li><a class="dropdown-item" href="javascript:void(0);">Project A</a></li>
-                  <li><a class="dropdown-item" href="javascript:void(0);">Project B</a></li>
-                  <li><a class="dropdown-item" href="javascript:void(0);">Project C</a></li>
-                  <li><a class="dropdown-item" href="javascript:void(0);">Project D</a></li>
-                </ul>
+              <div className="d-flex flex-wrap gap-2 align-items-center">
+                {/* Project Dropdown */}
+                <div className="btn-group">
+                  <button type="button" className="btn btn-label-primary">
+                    {selectedProjectId === 'all'
+                      ? 'All Projects'
+                      : projects?.find(p => p.id === selectedProjectId)?.name || 'Select Project'}
+                  </button>
+                  <button
+                    type="button"
+                    className="btn btn-label-primary dropdown-toggle dropdown-toggle-split"
+                    data-bs-toggle="dropdown"
+                    aria-expanded="false"
+                  >
+                    <span className="visually-hidden">Toggle Dropdown</span>
+                  </button>
+                  <ul className="dropdown-menu">
+                    <li>
+                      <button className="dropdown-item" onClick={() => setSelectedProjectId('all')}>
+                        All Projects
+                      </button>
+                    </li>
+                    {projects?.map((project) => (
+                      <li key={project.id}>
+                        <button className="dropdown-item" onClick={() => setSelectedProjectId(project.id)}>
+                          {project.name}
+                        </button>
+                      </li>
+                    ))}
+                  </ul>
+                </div>
+
+                {/* From Date */}
+                <input
+                  type="date"
+                  className="form-control"
+                  value={FromDate}
+                  onChange={(e) => setFromDate(e.target.value)}
+                  style={{ maxWidth: '150px' }}
+                />
+
+                {/* Days */}
+                <input
+                  type="number"
+                  className="form-control"
+                  value={days}
+                  min={1}
+                  onChange={(e) => setDays(Number(e.target.value))}
+                  style={{ maxWidth: '100px' }}
+                />
               </div>
             </div>
-            <div class="card-body">
-            <LineChart seriesData={lineChartseries} categories={lineChartCategories} />
+            <div className="card-body ">
+              <LineChart seriesData={lineChartSeries} categories={lineChartCategories} />
+              {lineLoading && <p className="text-center mt-3">Loading...</p>}
             </div>
           </div>
         </div>
+
       </div>
     </div>
   );