diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 130470e31..b70cd7802 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -22285,6 +22285,27 @@ + + date_repairstarted + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + date_scheduled false diff --git a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx index e1e165408..0dcc620ef 100644 --- a/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx +++ b/client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx @@ -59,14 +59,18 @@ export default function JobDetailCardsDatesComponent({ loading, data }) { {data.scheduled_in} ) : null} - {data.actual_in ? ( {data.actual_in} ) : null} - + {data.date_repairstarted ? ( + + + {data.date_repairstarted} + + ) : null} {data.scheduled_completion ? ( diff --git a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx index b0fc2f05c..d497c9618 100644 --- a/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx +++ b/client/src/components/jobs-admin-dates/jobs-admin-dates.component.jsx @@ -126,6 +126,9 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) { + + + - + @@ -73,6 +76,12 @@ export function JobsDetailDatesComponent({ jobRO, job, bodyshop }) { title={t("jobs.labels.calc_repair_days")} /> + + + { ), }, + //Added as a place holder for St Claude. Not implemented as it requires another join for a field used by only 1 client. // { // title: i18n.t("vehicles.fields.v_paint_codes", { number: "" }), @@ -555,6 +556,29 @@ const r = ({ technician, state, activeStatuses, bodyshop }) => { // // ) : null, // }, + { + title: i18n.t("jobs.fields.date_repairstarted"), + dataIndex: "date_repairstarted", + key: "date_repairstarted", + ellipsis: true, + sorter: (a, b) => dateSort(a.date_repairstarted, b.date_repairstarted), + sortOrder: + state.sortedInfo.columnKey === "date_repairstarted" && + state.sortedInfo.order, + render: (text, record) => ( + + ), + }, + { + title: i18n.t("jobs.fields.date_repairstarted") + " (HH:MM)", + dataIndex: "date_repairstarted_time", + key: "date_repairstarted_time", + ellipsis: true, + + render: (text, record) => ( + {record.date_repairstarted} + ), + }, ]; }; export default r; diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index 33363a5d3..2dd12f5cd 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -142,6 +142,7 @@ export const QUERY_EXACT_JOB_IN_PRODUCTION = gql` employee_refinish employee_prep employee_csr + date_repairstarted joblines_status { part_type status @@ -221,6 +222,7 @@ export const QUERY_EXACT_JOBS_IN_PRODUCTION = gql` employee_refinish employee_prep employee_csr + date_repairstarted joblines_status { part_type status @@ -302,6 +304,7 @@ export const QUERY_JOBS_IN_PRODUCTION = gql` employee_prep employee_csr suspended + date_repairstarted joblines_status { part_type status @@ -672,6 +675,7 @@ export const GET_JOB_BY_PK = gql` date_towin date_rentalresp date_exported + date_repairstarted status owner_owing tax_registration_number @@ -917,7 +921,7 @@ export const QUERY_JOB_CARD_DETAILS = gql` date_next_contact date_open date_exported - + date_repairstarted date_scheduled date_estimated employee_body_rel { diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 247263894..facde8e6a 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1351,6 +1351,7 @@ "date_next_contact": "Next Contact Date", "date_open": "Open", "date_rentalresp": "Shop Rental Responsibility Start", + "date_repairstarted": "Repairs Started", "date_scheduled": "Scheduled", "date_towin": "Towed In", "ded_amt": "Deductible", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 7aee1ce3e..7f38468c3 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1351,6 +1351,7 @@ "date_next_contact": "", "date_open": "Abierto", "date_rentalresp": "", + "date_repairstarted": "", "date_scheduled": "Programado", "date_towin": "", "ded_amt": "Deducible", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index fc95cb71d..8082b4bf0 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1351,6 +1351,7 @@ "date_next_contact": "", "date_open": "Ouvrir", "date_rentalresp": "", + "date_repairstarted": "", "date_scheduled": "Prévu", "date_towin": "", "ded_amt": "Déductible", diff --git a/hasura/metadata/tables.yaml b/hasura/metadata/tables.yaml index f1678c62e..3f600c70a 100644 --- a/hasura/metadata/tables.yaml +++ b/hasura/metadata/tables.yaml @@ -3025,6 +3025,7 @@ - date_next_contact - date_open - date_rentalresp + - date_repairstarted - date_scheduled - date_towin - ded_amt @@ -3288,6 +3289,7 @@ - date_next_contact - date_open - date_rentalresp + - date_repairstarted - date_scheduled - date_towin - ded_amt @@ -3561,6 +3563,7 @@ - date_next_contact - date_open - date_rentalresp + - date_repairstarted - date_scheduled - date_towin - ded_amt diff --git a/hasura/migrations/1670278883764_alter_table_public_jobs_add_column_date_repairstarted/down.sql b/hasura/migrations/1670278883764_alter_table_public_jobs_add_column_date_repairstarted/down.sql new file mode 100644 index 000000000..3728685cb --- /dev/null +++ b/hasura/migrations/1670278883764_alter_table_public_jobs_add_column_date_repairstarted/down.sql @@ -0,0 +1,4 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- alter table "public"."jobs" add column "date_repairstarted" timestamptz +-- null; diff --git a/hasura/migrations/1670278883764_alter_table_public_jobs_add_column_date_repairstarted/up.sql b/hasura/migrations/1670278883764_alter_table_public_jobs_add_column_date_repairstarted/up.sql new file mode 100644 index 000000000..dfe98e45b --- /dev/null +++ b/hasura/migrations/1670278883764_alter_table_public_jobs_add_column_date_repairstarted/up.sql @@ -0,0 +1,2 @@ +alter table "public"."jobs" add column "date_repairstarted" timestamptz + null;