diff --git a/components/screen-main/screen-main.component.jsx b/components/screen-main/screen-main.component.jsx index 2cf1c86..c536eeb 100644 --- a/components/screen-main/screen-main.component.jsx +++ b/components/screen-main/screen-main.component.jsx @@ -34,7 +34,7 @@ import ScreenSplash from "../screen-splash/screen-splash.component"; //TODO Inprogress JF add import for screens for time ticket browser here import EmployeeSignIn from "../screen-employee-sign-in/screen-employee-sign-in.component"; -import ScreenTimeTicketBrowser from "../screen-ap-time-ticket-list/screen-time-ticket-browser.component"; +import ScreenTimeTicketBrowser from "../screen-time-ticket-browser/screen-time-ticket-browser.component"; import SignOutButton from "../Buttons/employee-sign-out-button.component"; import AddTimeTicketButton from "../Buttons/create-time-ticket-button.component"; import ScreenTimeTicketCreate from "../time-ticket/screen-time-ticket-create.component"; diff --git a/redux/employee/employee.selectors.js b/redux/employee/employee.selectors.js index a611301..b8bfe8e 100644 --- a/redux/employee/employee.selectors.js +++ b/redux/employee/employee.selectors.js @@ -16,7 +16,7 @@ export const selectSignInError = createSelector( ); export const selectRates = createSelector( [selectEmployee], - (employee) => employee.currentEmployee.technician.rates + (employee) => employee?.currentEmployee?.technician?.rates ); export const selectGettingRates = createSelector( [selectEmployee], diff --git a/redux/timetickets/timetickets.sagas.js b/redux/timetickets/timetickets.sagas.js index 7e876b3..602297e 100644 --- a/redux/timetickets/timetickets.sagas.js +++ b/redux/timetickets/timetickets.sagas.js @@ -29,32 +29,33 @@ export function* insertNewTimeTicket({ payload: { timeTicketInput } }) { // pin: pin, // }); // const { valid, data, error } = response.data; - const result = yield client.query({ - query: INSERT_NEW_TIME_TICKET, + const result = yield client.mutate({ + mutation: INSERT_NEW_TIME_TICKET, variables: { timeTicketInput: [ - { - bodyshopid: bodyshop.id, - employeeid: technician.id, - date: moment(theTime).format("YYYY-MM-DD"), - clockon: moment(theTime), - jobid: values.jobid, - cost_center: values.cost_center, - ciecacode: - bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber - ? values.cost_center - : Object.keys( - bodyshop.md_responsibility_centers.defaults.costs - ).find((key) => { - return ( - bodyshop.md_responsibility_centers.defaults.costs[key] === - values.cost_center - ); - }), - }, + // { + // bodyshopid: bodyshop.id, + // employeeid: technician.id, + // date: moment(theTime).format("YYYY-MM-DD"), + // clockon: moment(theTime), + // jobid: values.jobid, + // cost_center: values.cost_center, + // ciecacode: + // bodyshop.cdk_dealerid || bodyshop.pbs_serialnumber + // ? values.cost_center + // : Object.keys( + // bodyshop.md_responsibility_centers.defaults.costs + // ).find((key) => { + // return ( + // bodyshop.md_responsibility_centers.defaults.costs[key] === + // values.cost_center + // ); + // }), + // }, ], }, }); + console.log(result); const { valid, data, error } = result.data; if (valid) { yield put(timeTicketCreateSuccess(data)); diff --git a/redux/timetickets/timetickets.selectors.js b/redux/timetickets/timetickets.selectors.js index 2539e99..a493260 100644 --- a/redux/timetickets/timetickets.selectors.js +++ b/redux/timetickets/timetickets.selectors.js @@ -1,16 +1,16 @@ import { createSelector } from "reselect"; -const selectTimeTicketsState = (state) => state.TimeTickets; +const selectTimeTicketsState = (state) => state.timeTickets; export const selectCurrentTimeTicketJobId = createSelector( [selectTimeTicketsState], - (TimeTickets) => TimeTickets.timeTicketJobId + (timeTickets) => timeTickets.timeTicketJobId ); export const selectCurrentTimeTicketJob = createSelector( [selectTimeTicketsState], - (TimeTickets) => TimeTickets.timeTicketJob + (timeTickets) => timeTickets.timeTicketJob ); export const selectCurrentTimeTicket = createSelector( [selectTimeTicketsState], - (TimeTickets) => TimeTickets.timeTicket + (timeTickets) => timeTickets.timeTicket );