From e417b1c9c022f4a2395cd2b6127b4757fc1ae6d3 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 12 Feb 2020 14:48:03 -0800 Subject: [PATCH] Added base logic for seeing jobs to supplement. Supplement import not yet working. --- bodyshop_translations.babel | 63 +++++++ .../jobs-available-new.component.jsx | 5 +- .../jobs-available-new.container.jsx | 7 - .../jobs-available-supplement.component.jsx | 125 ++++++++----- .../jobs-available-supplement.container.jsx | 114 ++++++++++-- .../jobs-find-modal.component.jsx | 172 ++++++++++++++++++ .../jobs-find-modal.container.jsx | 46 +++++ .../owner-find-modal.component.jsx | 3 +- .../owner-find-modal.container.jsx | 1 + client/src/graphql/available-jobs.queries.js | 1 + client/src/translations/en_us/common.json | 3 + client/src/translations/es/common.json | 3 + client/src/translations/fr/common.json | 3 + 13 files changed, 473 insertions(+), 73 deletions(-) create mode 100644 client/src/components/jobs-find-modal/jobs-find-modal.component.jsx create mode 100644 client/src/components/jobs-find-modal/jobs-find-modal.container.jsx diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 36409c46d..b72fcab76 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -4299,6 +4299,27 @@ + + existing_jobs + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + lines false @@ -4341,6 +4362,27 @@ + + override_header + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + parts false @@ -5634,6 +5676,27 @@ labels + + create_new + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + existing_owners false diff --git a/client/src/components/jobs-available-new/jobs-available-new.component.jsx b/client/src/components/jobs-available-new/jobs-available-new.component.jsx index b7dd1d880..07cb073db 100644 --- a/client/src/components/jobs-available-new/jobs-available-new.component.jsx +++ b/client/src/components/jobs-available-new/jobs-available-new.component.jsx @@ -141,7 +141,8 @@ export default function JobsAvailableComponent({ estData.data.available_jobs_by_pk && estData.data.available_jobs_by_pk.est_data && estData.data.available_jobs_by_pk.est_data.owner && - estData.data.available_jobs_by_pk.est_data.owner.data + estData.data.available_jobs_by_pk.est_data.owner.data && + !estData.data.available_jobs_by_pk.issupplement ? estData.data.available_jobs_by_pk.est_data.owner.data : null; @@ -164,7 +165,7 @@ export default function JobsAvailableComponent({ return (
{ console.log(value); }} diff --git a/client/src/components/jobs-available-new/jobs-available-new.container.jsx b/client/src/components/jobs-available-new/jobs-available-new.container.jsx index 7c1932d9d..e6fd1e37b 100644 --- a/client/src/components/jobs-available-new/jobs-available-new.container.jsx +++ b/client/src/components/jobs-available-new/jobs-available-new.container.jsx @@ -29,14 +29,7 @@ export default withRouter(function JobsAvailableContainer({ const onModalOk = () => { setModalVisible(false); - console.log("selectedOwner", selectedOwner); setInsertLoading(true); - console.log( - "logitest", - estData.data && - estData.data.available_jobs_by_pk && - estData.data.available_jobs_by_pk.est_data - ); if ( !( diff --git a/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx b/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx index a6c44f5df..69d1b7462 100644 --- a/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx +++ b/client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx @@ -3,13 +3,24 @@ import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { alphaSort } from "../../utils/sorters"; import { DateTimeFormatter } from "../../utils/DateFormatter"; +import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container"; + export default function JobsAvailableSupplementComponent({ loading, data, refetch, deleteJob, + updateJob, + onModalOk, + onModalCancel, + modalVisible, + setModalVisible, + selectedJob, + setSelectedJob, deleteAllNewJobs, - estDataLazyLoad + loadEstData, + estData, + importOptionsState }) { const { t } = useTranslation(); @@ -127,7 +138,8 @@ export default function JobsAvailableSupplementComponent({