diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel index 3686dcf30..7b07e622e 100644 --- a/bodyshop_translations.babel +++ b/bodyshop_translations.babel @@ -29415,6 +29415,32 @@ + + errors + + + inserting + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + + + fields @@ -29549,6 +29575,27 @@ + + notetoadd + false + + + + + + en-US + false + + + es-MX + false + + + fr-CA + false + + + diff --git a/client/src/components/global-search/global-search.component.jsx b/client/src/components/global-search/global-search.component.jsx index 6d2d138b0..4135f8dc7 100644 --- a/client/src/components/global-search/global-search.component.jsx +++ b/client/src/components/global-search/global-search.component.jsx @@ -62,7 +62,7 @@ export default function GlobalSearch() { }`, label: ( - }> + } wrap> {`${owner.ownr_fn || ""} ${owner.ownr_ln || ""} ${ owner.ownr_co_nm || "" }`} diff --git a/client/src/components/job-detail-lines/job-lines.component.jsx b/client/src/components/job-detail-lines/job-lines.component.jsx index 9d799b991..1b1964664 100644 --- a/client/src/components/job-detail-lines/job-lines.component.jsx +++ b/client/src/components/job-detail-lines/job-lines.component.jsx @@ -296,18 +296,17 @@ export function JobLinesComponent({ onClick={async () => { await deleteJobLine({ variables: { joblineId: record.id }, - // update(cache) { - // cache.modify({ - // id: cache.identify(job), - // fields: { - // joblines(existingJobLines, { readField }) { - // return existingJobLines.filter( - // (jlRef) => record.id !== readField("id", jlRef) - // ); - // }, - // }, - // }); - // }, + update(cache) { + cache.modify({ + fields: { + joblines(existingJobLines, { readField }) { + return existingJobLines.filter( + (jlRef) => record.id !== readField("id", jlRef) + ); + }, + }, + }); + }, }); await axios.post("/job/totalsssu", { id: job.id, 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 031c49e32..027cfcc32 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 @@ -15,6 +15,7 @@ import ProductionListColumnPaintPriority from "./production-list-columns.paintpr import ProductionListColumnNote from "./production-list-columns.productionnote.component"; import ProductionListColumnStatus from "./production-list-columns.status.component"; import ProductionlistColumnTouchTime from "./prodution-list-columns.touchtime.component"; +import ProductionListLastContacted from "./production-list-columns.lastcontacted.component"; const r = ({ technician, state }) => { return [ @@ -106,9 +107,7 @@ const r = ({ technician, state }) => { sortOrder: state.sortedInfo.columnKey === "date_last_contacted" && state.sortedInfo.order, - render: (text, record) => ( - - ), + render: (text, record) => , }, { title: i18n.t("jobs.fields.scheduled_delivery"), diff --git a/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx new file mode 100644 index 000000000..94c68674b --- /dev/null +++ b/client/src/components/production-list-columns/production-list-columns.lastcontacted.component.jsx @@ -0,0 +1,132 @@ +import { useMutation } from "@apollo/client"; +import { Button, Card, Dropdown, Form, Input, notification, Space } from "antd"; +import moment from "moment"; +import React, { useState, useEffect } from "react"; +import { useTranslation } from "react-i18next"; +import { connect } from "react-redux"; +import { createStructuredSelector } from "reselect"; +import { logImEXEvent } from "../../firebase/firebase.utils"; +import { UPDATE_JOB } from "../../graphql/jobs.queries"; +import { INSERT_NEW_NOTE } from "../../graphql/notes.queries"; +import { selectCurrentUser } from "../../redux/user/user.selectors"; +import { DateFormatter } from "../../utils/DateFormatter"; +import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component"; + +const mapStateToProps = createStructuredSelector({ + currentUser: selectCurrentUser, +}); +const mapDispatchToProps = (dispatch) => ({ + //setUserLanguage: language => dispatch(setUserLanguage(language)) +}); +export default connect( + mapStateToProps, + mapDispatchToProps +)(ProductionLastContacted); + +export function ProductionLastContacted({ currentUser, record }) { + const [updateAlert] = useMutation(UPDATE_JOB); + const [insertNote] = useMutation(INSERT_NEW_NOTE); + const [visible, setVisible] = useState(false); + const { t } = useTranslation(); + const [form] = Form.useForm(); + const handleFinish = async ({ date_last_contacted, note }) => { + logImEXEvent("production_last_contacted"); + + //e.stopPropagation(); + const res = await updateAlert({ + variables: { + jobId: record.id, + job: { + date_last_contacted, + }, + }, + }); + if (res.errors) { + notification.open({ + type: "error", + message: t("jobs.errors.saving", { + error: JSON.stringify(res.errors), + }), + }); + } + if (note && note.trim() !== "") { + //Insert a note. + const res2 = await insertNote({ + variables: { + noteInput: { + jobid: record.id, + text: note, + created_by: currentUser.email, + }, + }, + }); + if (res2.errors) { + notification.open({ + type: "error", + message: t("notes.errors.inserting", { + error: JSON.stringify(res.errors), + }), + }); + } + } + if (record.refetch) record.refetch(); + + setVisible(false); + }; + + useEffect(() => { + if (visible) { + form.setFieldsValue({ + note: null, + date_last_contacted: + record.date_last_contacted && moment(record.date_last_contacted), + }); + } + }, [visible, form, record.date_last_contacted]); + + return ( +
+ e.stopPropagation()} + > +
+ + + + + + + + + + +
+ + } + > +
setVisible(true)} + style={{ + height: "19px", + }} + > + + {record.date_last_contacted} + +
+ +
+ ); +} diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json index 7a1590ba5..ba295c6bc 100644 --- a/client/src/translations/en_us/common.json +++ b/client/src/translations/en_us/common.json @@ -1739,6 +1739,9 @@ "edit": "Edit Note", "new": "New Note" }, + "errors": { + "inserting": "Error inserting note. {{error}}" + }, "fields": { "createdby": "Created By", "critical": "Critical", @@ -1747,7 +1750,8 @@ "updatedat": "Updated At" }, "labels": { - "newnoteplaceholder": "Add a note..." + "newnoteplaceholder": "Add a note...", + "notetoadd": "Note to Add" }, "successes": { "create": "Note created successfully.", diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json index 6ce6c9bc8..679ce223d 100644 --- a/client/src/translations/es/common.json +++ b/client/src/translations/es/common.json @@ -1739,6 +1739,9 @@ "edit": "Editar nota", "new": "Nueva nota" }, + "errors": { + "inserting": "" + }, "fields": { "createdby": "Creado por", "critical": "Crítico", @@ -1747,7 +1750,8 @@ "updatedat": "Actualizado en" }, "labels": { - "newnoteplaceholder": "Agrega una nota..." + "newnoteplaceholder": "Agrega una nota...", + "notetoadd": "" }, "successes": { "create": "Nota creada con éxito.", diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json index 7198486db..aab0aa3b3 100644 --- a/client/src/translations/fr/common.json +++ b/client/src/translations/fr/common.json @@ -1739,6 +1739,9 @@ "edit": "Note éditée", "new": "Nouvelle note" }, + "errors": { + "inserting": "" + }, "fields": { "createdby": "Créé par", "critical": "Critique", @@ -1747,7 +1750,8 @@ "updatedat": "Mis à jour à" }, "labels": { - "newnoteplaceholder": "Ajouter une note..." + "newnoteplaceholder": "Ajouter une note...", + "notetoadd": "" }, "successes": { "create": "Remarque créée avec succès.", diff --git a/hasura/migrations/1633647205750_run_sql_migration/down.sql b/hasura/migrations/1633647205750_run_sql_migration/down.sql new file mode 100644 index 000000000..36ca692a7 --- /dev/null +++ b/hasura/migrations/1633647205750_run_sql_migration/down.sql @@ -0,0 +1,51 @@ +-- Could not auto-generate a down migration. +-- Please write an appropriate down migration for the SQL below: +-- CREATE +-- OR REPLACE FUNCTION public.search_owners (search text) RETURNS SETOF owners LANGUAGE plpgsql STABLE AS $function$ +-- BEGIN +-- IF search = '' +-- THEN +-- RETURN query +-- SELECT +-- * +-- FROM +-- owners; +-- ELSE +-- RETURN query +-- SELECT +-- * +-- FROM +-- owners +-- WHERE +-- ( +-- ownr_fn || ' ' || ownr_ln +-- ) +-- ILIKE '%' || search || '%' +-- OR ownr_ln ILIKE '%' || search || '%' +-- OR ownr_fn ILIKE '%' || search || '%' +-- OR ownr_fn ILIKE '%' || search || '%' +-- OR ownr_co_nm ILIKE '%' || search || '%' +-- OR ownr_ph1 ILIKE '%' || search || '%' +-- OR ownr_ph2 ILIKE '%' || search || '%' +-- OR ownr_addr1 ILIKE '%' || search || '%' +-- ORDER BY +-- (ownr_fn || ' ' || ownr_ln) ILIKE '%' || search || '%' +-- OR NULL, +-- ownr_ln ILIKE '%' || search || '%' +-- OR NULL, +-- ownr_fn ILIKE '%' || search || '%' +-- OR NULL, +-- ownr_co_nm ILIKE '%' || search || '%' +-- OR NULL, +-- ownr_fn ILIKE '%' || search || '%' +-- OR NULL, +-- ownr_ph1 ILIKE '%' || search || '%' +-- OR NULL, +-- ownr_ph2 ILIKE '%' || search || '%' +-- OR NULL, +-- ownr_addr1 ILIKE '%' || search || '%' +-- OR NULL; +-- END +-- IF; +-- END +-- $function$; diff --git a/hasura/migrations/1633647205750_run_sql_migration/up.sql b/hasura/migrations/1633647205750_run_sql_migration/up.sql new file mode 100644 index 000000000..8891a1471 --- /dev/null +++ b/hasura/migrations/1633647205750_run_sql_migration/up.sql @@ -0,0 +1,49 @@ +CREATE +OR REPLACE FUNCTION public.search_owners (search text) RETURNS SETOF owners LANGUAGE plpgsql STABLE AS $function$ +BEGIN + IF search = '' +THEN + RETURN query + SELECT + * + FROM + owners; +ELSE + RETURN query + SELECT + * + FROM + owners + WHERE + ( + ownr_fn || ' ' || ownr_ln + ) + ILIKE '%' || search || '%' + OR ownr_ln ILIKE '%' || search || '%' + OR ownr_fn ILIKE '%' || search || '%' + OR ownr_fn ILIKE '%' || search || '%' + OR ownr_co_nm ILIKE '%' || search || '%' + OR ownr_ph1 ILIKE '%' || search || '%' + OR ownr_ph2 ILIKE '%' || search || '%' + OR ownr_addr1 ILIKE '%' || search || '%' + ORDER BY +(ownr_fn || ' ' || ownr_ln) ILIKE '%' || search || '%' + OR NULL, + ownr_ln ILIKE '%' || search || '%' + OR NULL, + ownr_fn ILIKE '%' || search || '%' + OR NULL, + ownr_co_nm ILIKE '%' || search || '%' + OR NULL, + ownr_fn ILIKE '%' || search || '%' + OR NULL, + ownr_ph1 ILIKE '%' || search || '%' + OR NULL, + ownr_ph2 ILIKE '%' || search || '%' + OR NULL, + ownr_addr1 ILIKE '%' || search || '%' + OR NULL; +END +IF; +END +$function$;