From 536fd606ed68ef3672e7d2f643f1a0db2ec3405a Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 16 Dec 2020 15:58:07 -0800 Subject: [PATCH] Transfered alt_transport to job from event and added to production boards. IO-462 --- bodyshop_translations.babel | 21 ++ ...production-board-kanban-card.component.jsx | 5 +- .../production-list-columns.data.js | 7 + .../schedule-event.at.component.jsx | 13 +- .../schedule-event.component.jsx | 8 +- .../schedule-job-modal.component.jsx | 2 +- .../schedule-job-modal.container.jsx | 3 +- client/src/graphql/appointments.queries.js | 21 +- client/src/graphql/jobs.queries.js | 42 ++- client/src/translations/en_us/common.json | 1 + client/src/translations/es/common.json | 1 + client/src/translations/fr/common.json | 1 + .../down.yaml | 38 +++ .../up.yaml | 37 +++ .../down.yaml | 39 +++ .../up.yaml | 38 +++ .../down.yaml | 38 +++ .../up.yaml | 37 +++ .../down.yaml | 11 + .../up.yaml | 5 + .../down.yaml | 5 + .../up.yaml | 5 + .../down.yaml | 262 +++++++++++++++++ .../up.yaml | 263 +++++++++++++++++ .../down.yaml | 263 +++++++++++++++++ .../up.yaml | 264 ++++++++++++++++++ .../down.yaml | 262 +++++++++++++++++ .../up.yaml | 263 +++++++++++++++++ hasura/migrations/metadata.yaml | 6 +- 29 files changed, 1927 insertions(+), 34 deletions(-) create mode 100644 hasura/migrations/1608161228998_update_permission_user_public_table_appointments/down.yaml create mode 100644 hasura/migrations/1608161228998_update_permission_user_public_table_appointments/up.yaml create mode 100644 hasura/migrations/1608161238714_update_permission_user_public_table_appointments/down.yaml create mode 100644 hasura/migrations/1608161238714_update_permission_user_public_table_appointments/up.yaml create mode 100644 hasura/migrations/1608161255330_update_permission_user_public_table_appointments/down.yaml create mode 100644 hasura/migrations/1608161255330_update_permission_user_public_table_appointments/up.yaml create mode 100644 hasura/migrations/1608161269241_alter_table_public_appointments_drop_column_alt_transport/down.yaml create mode 100644 hasura/migrations/1608161269241_alter_table_public_appointments_drop_column_alt_transport/up.yaml create mode 100644 hasura/migrations/1608161391053_alter_table_public_jobs_add_column_alt_transport/down.yaml create mode 100644 hasura/migrations/1608161391053_alter_table_public_jobs_add_column_alt_transport/up.yaml create mode 100644 hasura/migrations/1608161407237_update_permission_user_public_table_jobs/down.yaml create mode 100644 hasura/migrations/1608161407237_update_permission_user_public_table_jobs/up.yaml create mode 100644 hasura/migrations/1608161439192_update_permission_user_public_table_jobs/down.yaml create mode 100644 hasura/migrations/1608161439192_update_permission_user_public_table_jobs/up.yaml create mode 100644 hasura/migrations/1608161448390_update_permission_user_public_table_jobs/down.yaml create mode 100644 hasura/migrations/1608161448390_update_permission_user_public_table_jobs/up.yaml diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index c16554b90..b17a11aff 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -13301,6 +13301,27 @@ + + alt_transport + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + ca_gst_registrant false diff --git a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx index 5fb15a73c..bcc93ce3e 100644 --- a/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx +++ b/client/src/components/production-board-kanban-card/production-board-kanban-card.component.jsx @@ -72,9 +72,12 @@ export default function ProductionBoardCard(card) { - + {card.scheduled_completion} + +
{card.alt_transport || ""}
+
diff --git a/client/src/components/production-list-columns/production-list-columns.data.js b/client/src/components/production-list-columns/production-list-columns.data.js index 084565bcf..2a5c4d1e0 100644 --- a/client/src/components/production-list-columns/production-list-columns.data.js +++ b/client/src/components/production-list-columns/production-list-columns.data.js @@ -156,6 +156,13 @@ const r = [ ellipsis: true, sorter: (a, b) => alphaSort(a.csr, b.csr), }, + { + title: i18n.t("jobs.fields.alt_transport"), + dataIndex: "alt_transport", + key: "alt_transport", + ellipsis: true, + sorter: (a, b) => alphaSort(a.alt_transport, b.alt_transport), + }, { title: i18n.t("jobs.fields.status"), dataIndex: "status", diff --git a/client/src/components/schedule-event/schedule-event.at.component.jsx b/client/src/components/schedule-event/schedule-event.at.component.jsx index 79d44e220..6de4942c6 100644 --- a/client/src/components/schedule-event/schedule-event.at.component.jsx +++ b/client/src/components/schedule-event/schedule-event.at.component.jsx @@ -1,6 +1,6 @@ import React from "react"; import { useMutation } from "react-apollo"; -import { UPDATE_APPOINTMENT } from "../../graphql/appointments.queries"; +import { UPDATE_JOB } from "../../graphql/jobs.queries"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; @@ -16,12 +16,12 @@ const mapDispatchToProps = (dispatch) => ({ }); export function ScheduleAtChange({ bodyshop, event }) { - const [updateAppointment] = useMutation(UPDATE_APPOINTMENT); + const [updateJob] = useMutation(UPDATE_JOB); const { t } = useTranslation(); const onClick = async ({ key }) => { - const result = await updateAppointment({ - variables: { appid: event.id, app: { alt_transport: key } }, + const result = await updateJob({ + variables: { jobId: event.job.id, job: { alt_transport: key } }, }); if (!!!result.errors) { @@ -35,7 +35,10 @@ export function ScheduleAtChange({ bodyshop, event }) { } }; const menu = ( - + {bodyshop.appt_alt_transport && bodyshop.appt_alt_transport.map((alt) => ( {alt} diff --git a/client/src/components/schedule-event/schedule-event.component.jsx b/client/src/components/schedule-event/schedule-event.component.jsx index d7b0b795b..bb79a4aaf 100644 --- a/client/src/components/schedule-event/schedule-event.component.jsx +++ b/client/src/components/schedule-event/schedule-event.component.jsx @@ -64,8 +64,8 @@ export function ScheduleEventComponent({ {(event.job && event.job.ownr_ph1) || ""} - - {event.alt_transport || ""} + + {(event.job && event.job.alt_transport) || ""}
@@ -134,8 +134,8 @@ export function ScheduleEventComponent({ (event.job && event.job.larhrs.aggregate.sum.mod_lb_hrs) || "0" })`} - {event.alt_transport && ( -
{event.alt_transport}
+ {event.job && event.job.alt_transport && ( +
{event.job.alt_transport}
)} ) : ( diff --git a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx index 5c1421dfa..bfc7fde7f 100644 --- a/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx +++ b/client/src/components/schedule-job-modal/schedule-job-modal.component.jsx @@ -146,7 +146,7 @@ export function ScheduleJobModalComponent({