Skip to content

Commit

Permalink
done
Browse files Browse the repository at this point in the history
  • Loading branch information
lksnjw committed Sep 30, 2024
1 parent 5042e48 commit 0317bc1
Show file tree
Hide file tree
Showing 4 changed files with 161 additions and 199 deletions.
23 changes: 22 additions & 1 deletion backend/controllers/DLDeliveryController.js
Original file line number Diff line number Diff line change
Expand Up @@ -200,4 +200,25 @@ export const updateDeliveryStatus = asyncHandler(async (req, res) => {
} catch (error) {
res.status(500).json({ message: 'Error updating delivery status', error });
}
});
});




// Controller to get all deliveries for a specific driver
export const getDeliveriesByDriver = async (req, res) => {
const { driverID } = req.params; // Get driverID from route params

try {
// Fetch all deliveries where the driverID matches
const deliveries = await DLDelivery.find({ driverID: driverID });

if (!deliveries || deliveries.length === 0) {
return res.status(404).json({ message: 'No deliveries found for this driver.' });
}

res.status(200).json(deliveries); // Return deliveries as response
} catch (error) {
res.status(500).json({ message: 'Error fetching deliveries', error: error.message });
}
};
5 changes: 4 additions & 1 deletion backend/routes/DLDeliveryRoute.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import { getAllDeliveries ,getDeliveryById,getTotalDeliveries,getOngoingDeliveries,getOngoingDeliveriesByDriver,updateDeliveryStatus} from '../controllers/DLDeliveryController.js';
import { getAllDeliveries ,getDeliveryById,getTotalDeliveries,getOngoingDeliveries,getOngoingDeliveriesByDriver,updateDeliveryStatus,getDeliveriesByDriver} from '../controllers/DLDeliveryController.js';

const router = express.Router();

Expand All @@ -26,5 +26,8 @@ router.get('/ongoing/:driverID', getOngoingDeliveriesByDriver);
// Route to update delivery status
router.put('/:deliveryId/status', updateDeliveryStatus);

// Route to get all deliveries for a specific driver
router.get('/driver/:driverID', getDeliveriesByDriver);


export default router;
4 changes: 2 additions & 2 deletions frontend/src/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ import DLAllDeliveries from './Pages/delivery/DLviewDeliveries'; // Import the D
import DLViewDelivery from './Pages/delivery/DLviewDelivery'; // Import the
import OngoingDelivery from './Pages/delivery/driver/OngoingDelivery'; // Import the OngoingDelivery component
import ViewDelivery from './Pages/delivery/driver/ViewDelivery'; // Import the ViewDelivery page

import ViewDeliveries from './Pages/delivery/driver/ViewDeliveries'; // Import the ViewDeliveries page



Expand Down Expand Up @@ -207,7 +207,7 @@ const router = createBrowserRouter(
<Route path="/manager/delivery/:id" element={<DLViewDelivery />} />
<Route path="/ongoing" element={<OngoingDelivery />} />
<Route path="/driver/delivery/:id" element={<ViewDelivery />} /> {/* Route for viewing a specific delivery */}

<Route path="/driver/deliveries" element={<ViewDeliveries />} />

<Route path="*" element={<NotFound />} />
</Route>
Expand Down
Loading

0 comments on commit 0317bc1

Please sign in to comment.