Add technician side to part dispatching.

client/src/components/job-detail-lines/job-lines-expander.component.jsx

@@ -8,7 +8,18 @@ import CurrencyFormatter from "../../utils/CurrencyFormatter";
 import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 
-export default function JobLinesExpander({ jobline, jobid }) {
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(mapStateToProps, mapDispatchToProps)(JobLinesExpander);
+
+export function JobLinesExpander({ jobline, jobid, bodyshop }) {
   const { t } = useTranslation();
   const { loading, error, data } = useQuery(GET_JOB_LINE_ORDERS, {
     fetchPolicy: "network-only",
@@ -23,7 +34,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
 
   return (
     <Row>
-      <Col md={24} lg={12}>
+      <Col md={24} lg={8}>
         <Typography.Title level={4}>
           {t("parts_orders.labels.parts_orders")}
         </Typography.Title>
@@ -49,7 +60,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
-      <Col md={24} lg={12}>
+      <Col md={24} lg={8}>
         <Typography.Title level={4}>{t("bills.labels.bills")}</Typography.Title>
         <Timeline>
           {data.billlines.length > 0 ? (
@@ -71,7 +82,7 @@ export default function JobLinesExpander({ jobline, jobid }) {
                   </Col>
                   <Col span={4}>
                     <span>
-                    {`${t("billlines.fields.actual_cost")}: `}
+                      {`${t("billlines.fields.actual_cost")}: `}
                       <CurrencyFormatter>{line.actual_cost}</CurrencyFormatter>
                     </span>
                   </Col>
@@ -89,6 +100,37 @@ export default function JobLinesExpander({ jobline, jobid }) {
           )}
         </Timeline>
       </Col>
+      <Col md={24} lg={8}>
+        <Typography.Title level={4}>
+          {t("parts_dispatch.labels.parts_dispatch")}
+        </Typography.Title>
+        <Timeline>
+          {data.parts_dispatch_lines.length > 0 ? (
+            data.parts_dispatch_lines.map((line) => (
+              <Timeline.Item key={line.id}>
+                <Space split={<Divider type="vertical" />} wrap>
+                  <Link to={`/manage/jobs/${jobid}?partsorderid=${line.id}`}>
+                    {line.parts_dispatch.number}
+                  </Link>
+                  {
+                    bodyshop.employees.find(
+                      (e) => e.id === line.parts_dispatch.employeeid
+                    )?.first_name
+                  }
+                  <Space>
+                    {t("parts_dispatch_lines.fields.accepted_at")}
+                    <DateFormatter>{line.accepted_at}</DateFormatter>
+                  </Space>
+                </Space>
+              </Timeline.Item>
+            ))
+          ) : (
+            <Timeline.Item>
+              {t("parts_orders.labels.notyetordered")}
+            </Timeline.Item>
+          )}
+        </Timeline>
+      </Col>
     </Row>
   );
 }

client/src/components/job-line-location-popup/job-line-location-popup.component.jsx

@@ -1,4 +1,4 @@
-import { notification, Select } from "antd";
+import { notification, Select, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import { useMutation } from "@apollo/client";
 import { useTranslation } from "react-i18next";
@@ -75,7 +75,10 @@ export function JobLineLocationPopup({ bodyshop, jobline, disabled }) {
       style={{ width: "100%", minHeight: "2rem", cursor: "pointer" }}
       onClick={() => !disabled && setEditing(true)}
     >
-      {jobline.location}
+      <Space wrap>
+        {jobline.location}
+        {jobline.parts_dispatch_lines.length > 0 && "-Disp"}
+      </Space>
     </div>
   );
 }

client/src/components/parts-dispatch-expander/parts-dispatch-expander.component.jsx

@@ -1,10 +1,35 @@
-import { Button, Card, Col, Row, Table } from "antd";
+import { useMutation } from "@apollo/client";
+import { Button, Card, Col, Row, Table, notification } from "antd";
+import moment from "moment-business-days";
 import React from "react";
 import { useTranslation } from "react-i18next";
+import { UPDATE_PARTS_DISPATCH_LINE } from "../../graphql/parts-dispatch.queries";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
 
 export default function PartsDispatchExpander({ dispatch, job }) {
   const { t } = useTranslation();
+  const [updateDispatchLine] = useMutation(UPDATE_PARTS_DISPATCH_LINE);
+
+  const handleAccept = async ({ partsDispatchLineId }) => {
+    const accepted_at = moment();
+    const result = await updateDispatchLine({
+      variables: { id: partsDispatchLineId, line: { accepted_at } },
+      optimisticResponse: {
+        update_parts_dispatch_lines_by_pk: {
+          accepted_at,
+          id: partsDispatchLineId,
+        },
+      },
+    });
+    if (result.errors) {
+      notification.open({
+        type: "error",
+        message: t("parts_dispatch.errors.accepting", {
+          error: JSON.stringify(result.errors),
+        }),
+      });
+    }
+  };
 
   const columns = [
     {
@@ -32,7 +57,11 @@ export default function PartsDispatchExpander({ dispatch, job }) {
         record.accepted_at ? (
           <DateTimeFormatter>{record.accepted_at}</DateTimeFormatter>
         ) : (
-          <Button>{t("parts_dispatch.actions.accept")}</Button>
+          <Button
+            onClick={() => handleAccept({ partsDispatchLineId: record.id })}
+          >
+            {t("parts_dispatch.actions.accept")}
+          </Button>
         ),
     },
   ];