Functions Completed

backend/models/DeliveryQueue.model.js

@@ -7,12 +7,12 @@ const DeliveryQueueSchema = new Schema(
     OrderId: { type: String, required: true },
     CustomerName: { type: String, required: true },
     ContactNo: { type: Number, required: true },
-    Item: { type: String, required: true },
     Quantity: { type: Number, required: true },
     Location: { type: String, required: true },
     Driver: { type: String, required: true },
     Vehicle: { type: String, required: true },
     DeleveryDate: { type: Date, required: true },
+    DeleveryTime: { type: String, required: true },
 },
 {
     timestamps: true,
@@ -21,4 +21,4 @@ const DeliveryQueueSchema = new Schema(
 
 const DeliveryQueue = mongoose.model("DeliveryQueue",DeliveryQueueSchema);
 
-module.exports = DeliveryQueue;
+module.exports = DeliveryQueue;

backend/routes/deliveryqueue.js

@@ -15,24 +15,24 @@ router.route('/add').post((req, res) => {
     const OrderId = (req.body.OrderId);
     const CustomerName = (req.body.CustomerName);
     const ContactNo = Number(req.body.ContactNo);
-    const Item = (req.body.Item);
     const Quantity = Number(req.body.Quantity);
     const Location = (req.body.Location);
     const Driver = (req.body.Driver);
     const Vehicle = (req.body.Vehicle);
     const DeleveryDate = Date(req.body.DeleveryDate);
+    const DeleveryTime = (req.body.DeleveryTime);
 
 
     const newDeliveryQueue = new DeliveryQueue({
         OrderId,
         CustomerName,
         ContactNo,
-        Item,
         Quantity,
         Location,
         Driver,
         Vehicle,
         DeleveryDate,
+        DeleveryTime,
     });
     newDeliveryQueue.save()
         .then(() => res.json('Delivery Queue Added!'))
@@ -42,15 +42,15 @@ router.route('/add').post((req, res) => {
 //Return one specific row
 
 router.route('/:id').get((req, res) => {
-    DeliveryQueue.findById(req.params.id)
+    DeliveryQueue.findOne({OrderId:req.params.id})
         .then(deliveryqueue => res.json(deliveryqueue))
         .catch(err => res.status(400).json('Error : ' + err));
 });
 
 //Delete one specific record
 
 router.route('/:id').delete((req, res) => {
-    DeliveryQueue.findByIdAndDelete(req.params.id)
+    DeliveryQueue.findOneAndDelete({OrderId:req.params.id})
         .then(() => res.json('Delivery Queue has been deleted!'))
         .catch(err => res.status(400).json('Error : ' + err));
 });
@@ -63,12 +63,12 @@ router.route('/update/:id').post((req, res) => {
             deliveryqueue.OrderId = (req.body.OrderId);
             deliveryqueue.CustomerName = (req.body.CustomerName);
             deliveryqueue.ContactNo = Number(req.body.ContactNo);
-            deliveryqueue.Item = (req.body.Item);
             deliveryqueue.Quantity = Number(req.body.Quantity);
             deliveryqueue.Location = (req.body.Location);
             deliveryqueue.Driver = (req.body.Driver);
             deliveryqueue.Vehicle = (req.body.Vehicle);
             deliveryqueue.DeleveryDate = Date(req.body.DeleveryDate);
+            deliveryqueue.DeleveryTime = Date(req.body.DeleveryTime);
 
             deliveryqueue.save()
                 .then(() => res.json('Delivery Queue updated'))

backend/routes/order.js

@@ -41,6 +41,7 @@ router.route('/:id').get((req,res) => {
         .catch(err => res.status(400).json('Error : ' +err));
 });
 
+
 router.route('/:id').delete((req,res) => {
     Order.findByIdAndDelete(req.params.id)
         .then(() => res.json('Order deleted'))
@@ -75,5 +76,10 @@ router.route('/').get((req,res) => {
         .catch(err => res.status(400).json('Error : ' +err));
 });
 
+router.route('/search/:id').get((req,res) => {
+    Order.findOne({orderNumber:req.params.id})
+        .then(order => res.json(order))
+        .catch(err => res.status(400).json('Error : ' +err));
+});
 
 module.exports = router;

backend/server.js

@@ -29,6 +29,7 @@ const orderRouter = require('./routes/order');
 const vehicleRouter = require('./routes/vehicle');
 const finishedproductRouter = require('./routes/finishedproduct');
 const rawmaterialRouter = require('./routes/rawmaterial');
+const deliveryQueueRouter = require('./routes/deliveryQueue');
 
 
 const usersRouter = require('./routes/users');
@@ -49,6 +50,7 @@ app.use('/salary' , salaryRouter);
 app.use('/employee', employeeRouter);
 app.use('/order', orderRouter);
 app.use('/vehicle', vehicleRouter);
+app.use('/deliveryQueue', deliveryQueueRouter);
 
 app.use('/users',usersRouter);
 app.use('/equipments',equipmentRouter);

debug.log

@@ -2150,3 +2150,5 @@
 [1017/001934.960:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
 [1018/110055.060:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
 [1018/152431.490:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[1018/195538.205:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)
+[1018/212140.845:ERROR:directory_reader_win.cc(43)] FindFirstFile: The system cannot find the path specified. (0x3)

src/App.js

@@ -52,8 +52,6 @@ import OrderManagement from "./components/order-management.component";
 //Delivery Management
 import DeliveryQueueTable from "./components/DeliveryQueueTable.component";
 import UpcomingDeliveriesTable from "./components/UpcomingDeliveriesTable.component";
-import CompletedDeliveriesTable from "./components/CompletedDeliveriesTable.component";
-import OngoingDeliveryTable from "./components/OngoingDeliveryTable.component";
 import AssignDriverForm from "./components/AssignDriverForm.component";
 
 //Vehicle Management
@@ -132,8 +130,6 @@ function App() {
 
       <Route path="/Deliveries" exact component={DeliveryQueueTable} />
       <Route path="/Upcoming" exact component={UpcomingDeliveriesTable} />
-      <Route path="/Completed" exact component={CompletedDeliveriesTable} />
-      <Route path="/Ongoing" exact component={OngoingDeliveryTable} />
       <Route path="/AssignDriver" exact component={AssignDriverForm} />
 
 

src/animations/LeftSideBar/LeftSection/index.js

@@ -67,11 +67,8 @@ const LeftSection = () => {
   </Dropdown.Toggle>
 
   <Dropdown.Menu>
-    <Dropdown.Item href="/Deliveries">Delivery Queue</Dropdown.Item>
     <Dropdown.Item href="/Upcoming">Upcoming Deliveries</Dropdown.Item>
-    <Dropdown.Item href="/Ongoing">Ongoing Deliveries</Dropdown.Item>
-    <Dropdown.Item href="/Completed">Completed Deliveries</Dropdown.Item>
-    <Dropdown.Item href="/AssignDriver">Assign Driver</Dropdown.Item>
+    <Dropdown.Item href="/Deliveries">Delivery Queue</Dropdown.Item>
   </Dropdown.Menu>
 </Dropdown>
 
@@ -82,8 +79,6 @@ const LeftSection = () => {
 
   <Dropdown.Menu>
     <Dropdown.Item href="VehicleManagement">Vehicle Management</Dropdown.Item>
-    <Dropdown.Item href="InsertVehicle">Insert Vehicle</Dropdown.Item>
-    <Dropdown.Item href="UpdateVehicle">Update Vehicle</Dropdown.Item>
   </Dropdown.Menu>
 </Dropdown>