From 27bfed47f6a38df17d6f15f8303c2de8ae403d62 Mon Sep 17 00:00:00 2001 From: nafi-ullah Date: Fri, 29 Mar 2024 18:04:41 +0600 Subject: [PATCH] datepicker added in landfill entry and sts release --- .../modals/LandFillVehicleEntryModal.tsx | 26 +++++++++-- .../modals/STSVehicleReleaseModal.tsx | 44 +++++++++---------- 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/client/components/modals/LandFillVehicleEntryModal.tsx b/client/components/modals/LandFillVehicleEntryModal.tsx index 4e10c64..62b5b9b 100644 --- a/client/components/modals/LandFillVehicleEntryModal.tsx +++ b/client/components/modals/LandFillVehicleEntryModal.tsx @@ -35,6 +35,10 @@ import useVehicleReleaseFromSTS from "@/hooks/StsDashboard/useVehicleReleaseFrom import useUpcomingVehicle from "@/hooks/landFillDashboard/useUpcomingVehiclesList"; import useTripComplete from "@/hooks/landFillDashboard/useTripComplete"; +import DatePicker from "react-datepicker"; + +import "react-datepicker/dist/react-datepicker.css"; + type Vehicle = { tripId: string, @@ -61,6 +65,11 @@ export const LandfillVehicleEntryModal = ({ vehicleInfo }: { vehicleInfo: Vehicl const { TripComplete } = useTripComplete(); + const [selectedDateTime, setSelectedDateTime] = useState(new Date()); + +const handleDateChange = (date: Date) => { + setSelectedDateTime(date); +}; const handleSaveChanges = async () => { @@ -69,7 +78,7 @@ export const LandfillVehicleEntryModal = ({ vehicleInfo }: { vehicleInfo: Vehicl const postEntry = await TripComplete({ tripId: vehicleInfo.tripId, weightOfWaste: weightOfWaste, - entryTime: entryTime, + entryTime: selectedDateTime.toISOString()//entryTime, }); } catch (error) { @@ -141,13 +150,24 @@ export const LandfillVehicleEntryModal = ({ vehicleInfo }: { vehicleInfo: Vehicl - setEntryTime(e.target.value)} - /> + /> */} +
+ {/* Other component content */} + +
diff --git a/client/components/modals/STSVehicleReleaseModal.tsx b/client/components/modals/STSVehicleReleaseModal.tsx index c7eb610..d30a650 100644 --- a/client/components/modals/STSVehicleReleaseModal.tsx +++ b/client/components/modals/STSVehicleReleaseModal.tsx @@ -32,7 +32,9 @@ import editSTS from "@/hooks/entityCreation/editSTS"; import getUserByRole from "@/hooks/user_data/getUserByRole"; import VehicleRelaseRoute from "../maps/VehicleReleaseRoute"; import useVehicleReleaseFromSTS from "@/hooks/StsDashboard/useVehicleReleaseFromSTS"; +import DatePicker from "react-datepicker"; +import "react-datepicker/dist/react-datepicker.css"; type Vehicle = { entryId: string, @@ -60,25 +62,12 @@ export const STSVehicleRelease = ({ vehicleInfo }: { vehicleInfo: Vehicle }) => const [distance, setDistance] = useState(""); const [duration, setDuration] = useState("");const { VehicleReleaseFromSTS } = useVehicleReleaseFromSTS(); - - -// const dummyCoordinates[ -// 23.76652752, 90.4258899 -// 23.76449486, 90.3879528 -// 23.73897468, 90.3750954 -// 23.76431111, 90.3651622 -// 23.77393625, 90.3814204 -// 23.76461481, 90.3915441 -// 23.77089053, 90.4042765 -// 23.72965447, 90.3873709 -// ] -// { -// "stsVehicleId": "sv1", -// "weightOfWaste" : 2, -// "exitTime" : "2024-03-27T08:00:00Z", -// "distance": "156.3", -// "estimatedDuration": "23" -// } + const [selectedDateTime, setSelectedDateTime] = useState(new Date()); + + const handleDateChange = (date: Date) => { + setSelectedDateTime(date); + }; + const handleSaveChanges = async () => { @@ -87,7 +76,7 @@ export const STSVehicleRelease = ({ vehicleInfo }: { vehicleInfo: Vehicle }) => const postEntry = await VehicleReleaseFromSTS({ stsVehicleId: vehicleInfo.entryId, weightOfWaste: weightOfWaste, - exitTime: exitTime, + exitTime: selectedDateTime.toISOString(), distance: distance, estimatedDuration: duration }); @@ -165,13 +154,24 @@ export const STSVehicleRelease = ({ vehicleInfo }: { vehicleInfo: Vehicle }) => - setExitTime(e.target.value)} - /> + /> */} +
+ {/* Other component content */} + +