diff --git a/src/components/MyActiveJobs/ActiveJobs.jsx b/src/components/MyActiveJobs/ActiveJobs.jsx index 129f1a0..da8f85a 100644 --- a/src/components/MyActiveJobs/ActiveJobs.jsx +++ b/src/components/MyActiveJobs/ActiveJobs.jsx @@ -15,6 +15,8 @@ import { SocketValues } from "../Contexts/SocketIOContext"; import TabButton from "../customTabs/TabButton"; import AttachFile from "../attachmentCom/AttachFile"; +import JobDetailPopout from "./JobDetailPopout"; + function ActiveJobs(props) { let {sendMessage, joinRoom} = SocketValues() // destructures 'SEND MESSAGE' and 'JOIN ROOM' FUNCTIONS FROM SOCKET @@ -43,6 +45,8 @@ function ActiveJobs(props) { let [popUp, setPopUp] = useState(false); // STATE FOR POPOUT MODAL + let [jobDetailModal, setJobDetailModal] = useState(false); // STATE FOR JOB DELIVERY DETAIL POPOUT MODAL + const printRef = useRef(); // to handle printing const handlePrint = useReactToPrint({ @@ -54,6 +58,10 @@ function ActiveJobs(props) { setPopUp((prev) => !prev); }; + const jobDetailModalHandler = () => { // FUNCTION TO CLOSE JOB DELIVERY DETAIL MODAL + setJobDetailModal((prev) => !prev); + }; + // FUNCTION TO HANDLE MESSAGE CHANGE const handleMessageChange = ({ target: { value } }) => { setMessageToSend(value); @@ -325,7 +333,7 @@ function ActiveJobs(props) { {/* job details */}
Delivery Detail
+ {passDue ? (
@@ -587,6 +595,16 @@ function ActiveJobs(props) {
/>
)}
{/* END OF POPOUT SECTION */}
+
+ {/* Delivery Details Popout */}
+ {jobDetailModal &&
+ {jobDetail}
+ Delivery Detail
+
+
+