Add drivers reports

Author: Toowise

client/hash.js

@@ -1,6 +1,6 @@
 const bcryptjs = require('bcryptjs')
 
-const plainPassword = 'Francis03'
+const plainPassword = 'hanni18'
 
 bcryptjs.hash(plainPassword, 10, (err, hashedPassword) => {
   if (err) {

client/src/views/pages/admin/Reports.js

@@ -26,20 +26,26 @@ const Reports = () => {
   const [shipments, setShipments] = useState([])
   const [loading, setLoading] = useState(true)
   const [error, setError] = useState(null)
+  const [drivers, setDrivers] = useState([])
 
   useEffect(() => {
-    const fetchShipments = async () => {
+    const fetchData = async () => {
       try {
-        const res = await axios.get('/api/shipments')
-        setShipments(Array.isArray(res.data) ? res.data : [])
+        const [shipmentsRes, driversRes] = await Promise.all([
+          axios.get('/api/shipments'),
+          axios.get('/api/drivers'),
+        ])
+
+        setShipments(Array.isArray(shipmentsRes.data) ? shipmentsRes.data : [])
+        setDrivers(Array.isArray(driversRes.data) ? driversRes.data : [])
       } catch (err) {
-        setError('Failed to load shipment reports.')
+        setError('Failed to load shipment or driver data.')
       } finally {
         setLoading(false)
       }
     }
 
-    fetchShipments()
+    fetchData()
   }, [])
 
   const summarize = (days) => {
@@ -65,10 +71,51 @@ const Reports = () => {
       range: `${start.format('MMM D')} - ${today.format('MMM D')}`,
     }
   }
+  const summarizeDrivers = (days) => {
+    const today = dayjs()
+    const start = today.subtract(days, 'day')
+
+    const filtered = shipments.filter((s) => dayjs(s.updated_at).isAfter(start))
+
+    const driverMap = {}
+    drivers.forEach((d) => {
+      driverMap[d.username] = d.name
+    })
+
+    const result = {}
+    Object.values(driverMap).forEach((name) => {
+      result[name] = {
+        count: 0,
+        shipments: [],
+      }
+    })
+
+    filtered.forEach((s) => {
+      const driverName = driverMap[s.driverUsername] || 'Unknown'
+      if (!result[driverName]) {
+        result[driverName] = {
+          count: 0,
+          shipments: [],
+        }
+      }
+      result[driverName].count += 1
+      result[driverName].shipments.push({
+        trackingNumber: s.trackingNumber,
+        date: dayjs(s.updated_at).format('YYYY-MM-DD'),
+      })
+    })
+
+    return result
+  }
+
   const daily = summarize(1)
   const weekly = summarize(7)
   const monthly = summarize(30)
 
+  const driverDaily = summarizeDrivers(1)
+  const driverWeekly = summarizeDrivers(7)
+  const driverMonthly = summarizeDrivers(30)
+
   const exportAsPDF = () => {
     const doc = new jsPDF()
 
@@ -95,6 +142,44 @@ const Reports = () => {
 
     doc.save('shipment-analytics.pdf')
   }
+  const exportDriverReportsPDF = () => {
+    const doc = new jsPDF()
+    let y = 10
+
+    const addDriverSection = (title, data, range) => {
+      doc.text(`${title} (${range})`, 14, y)
+      y += 6
+
+      const body = Object.entries(data).map(([driver, info]) => {
+        const shipmentsStr = info.shipments
+          .map((s) => `#${s.trackingNumber} - (${s.date})`)
+          .join('\n')
+
+        return [driver, info.count.toString(), shipmentsStr]
+      })
+
+      autoTable(doc, {
+        startY: y,
+        head: [['Driver', 'Total Shipments', 'Shipments']],
+        body: body,
+        margin: { top: 10, left: 14 },
+        styles: { fontSize: 10, cellPadding: 2, overflow: 'linebreak' },
+        columnStyles: {
+          0: { cellWidth: 40 },
+          1: { cellWidth: 30, halign: 'center' },
+          2: { cellWidth: 110 },
+        },
+      })
+
+      y = doc.lastAutoTable.finalY + 8
+    }
+
+    addDriverSection('Driver Daily Report', driverDaily, daily.range)
+    addDriverSection('Driver Weekly Report', driverWeekly, weekly.range)
+    addDriverSection('Driver Monthly Report', driverMonthly, monthly.range)
+
+    doc.save('driver-delivery-report.pdf')
+  }
 
   const renderTable = (summary) => (
     <CTable small responsive>
@@ -125,6 +210,33 @@ const Reports = () => {
     </CTable>
   )
 
+  const renderDriverTable = (data) => (
+    <CTable small responsive>
+      <CTableHead>
+        <CTableRow>
+          <CTableHeaderCell>Driver</CTableHeaderCell>
+          <CTableHeaderCell>Total Shipments</CTableHeaderCell>
+          <CTableHeaderCell>Shipments</CTableHeaderCell>
+        </CTableRow>
+      </CTableHead>
+      <CTableBody>
+        {Object.entries(data).map(([driver, info], index) => (
+          <CTableRow key={index}>
+            <CTableDataCell>{driver}</CTableDataCell>
+            <CTableDataCell>{info.count}</CTableDataCell>
+            <CTableDataCell>
+              {info.shipments.map((s) => (
+                <div key={s.trackingNumber}>
+                  #{s.trackingNumber} -({s.date})
+                </div>
+              ))}
+            </CTableDataCell>
+          </CTableRow>
+        ))}
+      </CTableBody>
+    </CTable>
+  )
+
   return (
     <>
       {loading && <CSpinner color="primary" />}
@@ -133,9 +245,18 @@ const Reports = () => {
         <>
           <div className="d-flex justify-content-end mb-3">
             <CButton color="primary" variant="outline" onClick={exportAsPDF}>
-              Export as PDF
+              Export Shipment Report
+            </CButton>
+            <CButton
+              color="success"
+              variant="outline"
+              className="ms-2"
+              onClick={exportDriverReportsPDF}
+            >
+              Export Drivers Report
             </CButton>
           </div>
+
           <CCard>
             <CCardHeader>Shipment Analytics Report</CCardHeader>
             <CCardBody>
@@ -155,6 +276,26 @@ const Reports = () => {
               </CAccordion>
             </CCardBody>
           </CCard>
+
+          <CCard className="mt-4">
+            <CCardHeader>Driver Delivery Reports</CCardHeader>
+            <CCardBody>
+              <CAccordion alwaysOpen>
+                <CAccordionItem itemKey={4}>
+                  <CAccordionHeader>📅 Driver Daily Report ({daily.range})</CAccordionHeader>
+                  <CAccordionBody>{renderDriverTable(driverDaily)}</CAccordionBody>
+                </CAccordionItem>
+                <CAccordionItem itemKey={5}>
+                  <CAccordionHeader>📈 Driver Weekly Report ({weekly.range})</CAccordionHeader>
+                  <CAccordionBody>{renderDriverTable(driverWeekly)}</CAccordionBody>
+                </CAccordionItem>
+                <CAccordionItem itemKey={6}>
+                  <CAccordionHeader>📆 Driver Monthly Report ({monthly.range})</CAccordionHeader>
+                  <CAccordionBody>{renderDriverTable(driverMonthly)}</CAccordionBody>
+                </CAccordionItem>
+              </CAccordion>
+            </CCardBody>
+          </CCard>
         </>
       )}
     </>