diff --git a/components/time-ticket-items/clockedin-list-item.component.jsx b/components/time-ticket-items/clockedin-list-item.component.jsx index 4d92c93..2a699db 100644 --- a/components/time-ticket-items/clockedin-list-item.component.jsx +++ b/components/time-ticket-items/clockedin-list-item.component.jsx @@ -13,34 +13,37 @@ import { logImEXEvent } from "../../firebase/firebase.analytics"; import { employeeSignInStart } from "../../redux/employee/employee.actions"; import { useRef } from "react"; - // const selectNumCompletedTodos = createSelector( // (state) => state.timeTickets, // (timeTickets) => timeTickets.timeTicketJobId // ); //const mapStateToProps = createStructuredSelector({}); - // // setTimeTicketJobId: (jobId) =>dispatch(setTimeTicketJobId({jobId})), - //employeeSignInStart:(idjob) => dispatch(employeeSignInStart(idjob)), +// // setTimeTicketJobId: (jobId) =>dispatch(setTimeTicketJobId({jobId})), +//employeeSignInStart:(idjob) => dispatch(employeeSignInStart(idjob)), const mapDispatchToProps = (dispatch) => ({ - setTmTicketJobId:() => dispatch(setTmTicketJobId(jobId)), + setTmTicketJobId: () => dispatch(setTmTicketJobId({ jobId })), }); -export function ClockedinListItem( props ) { +export function ClockedinListItem( {setTmTicketJobId, ticket }) { + console.log("ClockedinListItem, ticket", ticket); + console.log("ClockedinListItem, setTmTicketJobId", setTmTicketJobId); const { t } = useTranslation(); const navigation = useNavigation(); - console.log("ClockedinListItem, ", props.ticket.job.id); - const jbId = props.ticket.job.id; + + console.log("ClockedinListItem, ticket job id", ticket.job.id); + const jbId = ticket.job.id; console.log("ClockedinListItem, jbId: ", jbId); - const te = useRef(jbId) - let makeNave = (jobId) => ( - console.log("ClockedinListItem ", setTmTicketJobId) - ,console.log("te", jobId) - ,setTmTicketJobId(jobId) - - // ,navigation.navigate("TimeTicketClockOff") - ); + // const te = useRef(jbId); + + const makeNavToTimeTicketClockOff = (jbId,setTmTicketJobId) => ( + console.log("ClockedinListItem, makeNavToTimeTicketClockOff, setTmTicketJobId :", setTmTicketJobId), + console.log("ClockedinListItem, makeNavToTimeTicketClockOff, jobId :", jbId) + //,setTmTicketJobId(jbId) + + ,navigation.navigate("TimeTicketClockOff") + ); // const onPress = (ticket, setCameraJobId) => { // console.log("ClockedinListItem, onPress called"); // console.log("ClockedinListItem, ticket", ticket); @@ -63,24 +66,25 @@ export function ClockedinListItem( props ) { Vehicle : - {`${props.ticket.job.v_model_yr || ""} ${props.ticket.job.v_make_desc || ""} ${ - props.ticket.job.v_model_desc || "" - }`} + {`${ticket.job.v_model_yr || ""} ${ + ticket.job.v_make_desc || "" + } ${ticket.job.v_model_desc || ""}`} - Clocked In : {props.ticket.clockon} + Clocked In :{" "} + {ticket.clockon} Cost Center :{" "} - {props.ticket.cost_center === "timetickets.labels.shift" - ? t(props.ticket.cost_center) - : props.ticket.cost_center} + {ticket.cost_center === "timetickets.labels.shift" + ? t(ticket.cost_center) + : ticket.cost_center} @@ -90,25 +94,25 @@ export function ClockedinListItem( props ) { completedCallback={refetch} /> */} diff --git a/components/time-ticket-lists/employee-clockedin-list.component.jsx b/components/time-ticket-lists/employee-clockedin-list.component.jsx index ec1b2cd..a83cf99 100644 --- a/components/time-ticket-lists/employee-clockedin-list.component.jsx +++ b/components/time-ticket-lists/employee-clockedin-list.component.jsx @@ -11,15 +11,16 @@ import { useQuery } from "@apollo/client"; import { createStructuredSelector } from "reselect"; import { useTranslation } from "react-i18next"; import { ClockedinListItem } from "../time-ticket-items/clockedin-list-item.component"; -import { setTmTicketJobId } from "../../redux/app/app.actions"; + +// import { setTmTicketJobId } from "../../redux/app/app.actions"; const mapStateToProps = createStructuredSelector({ technician: selectTechnician, //currentEmployee: selectCurrentEmployee, }); -const mapDispatchToProps = (dispatch) => ({ - setTmTicketJobId: (jobId) => dispatch(setTmTicketJobId(jobId)), -}); +// const mapDispatchToProps = (dispatch) => ({ +// setTmTicketJobId: (jobId) => dispatch(setTmTicketJobId(jobId)), +// }); export function EmployeeClockedInList({ technician }) { const { t } = useTranslation(); @@ -37,23 +38,26 @@ export function EmployeeClockedInList({ technician }) { ); if (loading) return ; if (error) return ; - //if (error) return ; - console.log("QUERY_ACTIVE_TIME_TICKETS data", data); + + console.log("EmployeeClockedInList, QUERY_ACTIVE_TIME_TICKETS data:", data); // if (data) () => {setTmTicketJobId(data)} + const onRefresh = async () => { return refetch(); }; + return ( {data.timetickets.length > 0 ? ( - You are already clocked in to the following job(s): + You are already clocked in to the following job(s): } - renderItem={(object) => } + renderItem={(object) => } + // setTmTicketJobId={setTmTicketJobId} /> ) : null} @@ -117,4 +121,4 @@ export function EmployeeClockedInList({ technician }) { ); } -export default connect(mapStateToProps, mapDispatchToProps)(EmployeeClockedInList); +export default connect(mapStateToProps, null)(EmployeeClockedInList); diff --git a/redux/timetickets/timetickets.sagas.js b/redux/timetickets/timetickets.sagas.js index 5c702b6..f4de54d 100644 --- a/redux/timetickets/timetickets.sagas.js +++ b/redux/timetickets/timetickets.sagas.js @@ -24,6 +24,7 @@ export function* onCreateTimeTicketStart() { export function* insertNewTimeTicket({ payload: { timeTicketInput } }) { try { logImEXEvent("redux_insertnewtimeticket_attempt"); + console.log("Saga, TIME_TICKET_CREATE_START :", timeTicketInput); //console.loging // console.log("Saga", employeeId, pin, pin); const timeTicket = yield select(selectCurrentTimeTicket);