Merged in release/2024-02-02 (pull request #1274)

Release/2024 02 02

Approved-by: Patrick Fic

.circleci/config.yml

@@ -42,7 +42,7 @@ jobs:
   app-build:
     docker:
       - image: cimg/node:16.15.0
-
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:
@@ -83,7 +83,7 @@ jobs:
   test-app-build:
     docker:
       - image: cimg/node:16.15.0
-
+    resource_class: large
     working_directory: ~/repo/client
 
     steps:

client/src/components/bill-enter-modal/bill-enter-modal.container.jsx

@@ -94,6 +94,7 @@ function BillEnterModalContainer({
       location,
       outstanding_returns,
       inventory,
+      federal_tax_exempt,
       ...remainingValues
     } = values;
 

client/src/components/csi-response-form/csi-response-form.container.jsx

@@ -5,6 +5,7 @@ import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { useLocation } from "react-router-dom";
 import { QUERY_CSI_RESPONSE_BY_PK } from "../../graphql/csi.queries";
+import { DateFormatter } from "../../utils/DateFormatter";
 import AlertComponent from "../alert/alert.component";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 import LoadingSpinner from "../loading-spinner/loading-spinner.component";
@@ -44,6 +45,13 @@ export default function CsiResponseFormContainer() {
           readOnly
           componentList={data.csi_by_pk.csiquestion.config}
         />
+        {data.csi_by_pk.validuntil ? (
+          <>
+            {t("csi.fields.validuntil")}
+            {": "}
+            <DateFormatter>{data.csi_by_pk.validuntil}</DateFormatter>
+          </>
+        ) : null}
       </Form>
     </Card>
   );

client/src/components/csi-response-list-paginated/csi-response-list-paginated.component.jsx

@@ -5,9 +5,11 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { DateFormatter } from "../../utils/DateFormatter";
-import { alphaSort } from "../../utils/sorters";
+import { pageLimit } from "../../utils/config";
-import OwnerNameDisplay from "../owner-name-display/owner-name-display.component";
+import { alphaSort, dateSort } from "../../utils/sorters";
-import {pageLimit} from "../../utils/config";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
 
 export default function CsiResponseListPaginated({
   refetch,
@@ -16,23 +18,23 @@ export default function CsiResponseListPaginated({
   total,
 }) {
   const search = queryString.parse(useLocation().search);
-  const { responseid, page, sortcolumn, sortorder } = search;
+  const { responseid } = search;
   const history = useHistory();
+  const { t } = useTranslation();
   const [state, setState] = useState({
     sortedInfo: {},
     filteredInfo: { text: "" },
+    page: "",
   });
 
-  const { t } = useTranslation();
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
       dataIndex: "ro_number",
       key: "ro_number",
-      width: "8%",
       sorter: (a, b) => alphaSort(a.job.ro_number, b.job.ro_number),
-      sortOrder: sortcolumn === "ro_number" && sortorder,
+      sortOrder:
-
+        state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order,
       render: (text, record) => (
         <Link to={"/manage/jobs/" + record.job.id}>
           {record.job.ro_number || t("general.labels.na")}
@@ -41,15 +43,18 @@ export default function CsiResponseListPaginated({
     },
     {
       title: t("jobs.fields.owner"),
-      dataIndex: "owner",
+      dataIndex: "owner_name",
-      key: "owner",
+      key: "owner_name",
-      ellipsis: true,
+      sorter: (a, b) =>
-      sorter: (a, b) => alphaSort(a.job.ownr_ln, b.job.ownr_ln),
+        alphaSort(
-      width: "25%",
+          OwnerNameDisplayFunction(a.job),
-      sortOrder: sortcolumn === "owner" && sortorder,
+          OwnerNameDisplayFunction(b.job)
+        ),
+      sortOrder:
+        state.sortedInfo.columnKey === "owner_name" && state.sortedInfo.order,
       render: (text, record) => {
-        return record.job.owner ? (
+        return record.job.ownerid ? (
-          <Link to={"/manage/owners/" + record.job.owner.id}>
+          <Link to={"/manage/owners/" + record.job.ownerid}>
             <OwnerNameDisplay ownerObject={record.job} />
           </Link>
         ) : (
@@ -64,9 +69,9 @@ export default function CsiResponseListPaginated({
       dataIndex: "completedon",
       key: "completedon",
       ellipsis: true,
-      sorter: (a, b) => a.completedon - b.completedon,
+      sorter: (a, b) => dateSort(a.completedon, b.completedon),
-      width: "25%",
+      sortOrder:
-      sortOrder: sortcolumn === "completedon" && sortorder,
+        state.sortedInfo.columnKey === "completedon" && state.sortedInfo.order,
       render: (text, record) => {
         return record.completedon ? (
           <DateFormatter>{record.completedon}</DateFormatter>
@@ -76,11 +81,12 @@ export default function CsiResponseListPaginated({
   ];
 
   const handleTableChange = (pagination, filters, sorter) => {
-    setState({ ...state, filteredInfo: filters, sortedInfo: sorter });
+    setState({
-    search.page = pagination.current;
+      ...state,
-    search.sortcolumn = sorter.columnKey;
+      filteredInfo: filters,
-    search.sortorder = sorter.order;
+      sortedInfo: sorter,
-    history.push({ search: queryString.stringify(search) });
+      page: pagination.current,
+    });
   };
 
   const handleOnRowClick = (record) => {
@@ -108,7 +114,7 @@ export default function CsiResponseListPaginated({
         pagination={{
           position: "top",
           pageSize: pageLimit,
-          current: parseInt(page || 1),
+          current: parseInt(state.page || 1),
           total: total,
         }}
         columns={columns}
@@ -122,13 +128,6 @@ export default function CsiResponseListPaginated({
           selectedRowKeys: [responseid],
           type: "radio",
         }}
-        onRow={(record, rowIndex) => {
-          return {
-            onClick: (event) => {
-              handleOnRowClick(record);
-            }, // click row
-          };
-        }}
       />
     </Card>
   );

client/src/components/parts-queue-card/parts-queue-card.component.jsx

@@ -0,0 +1,77 @@
+import { useQuery } from "@apollo/client";
+import { Card, Divider, Drawer, Grid } from "antd";
+import queryString from "query-string";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Link, useHistory, useLocation } from "react-router-dom";
+import { QUERY_PARTS_QUEUE_CARD_DETAILS } from "../../graphql/jobs.queries";
+import AlertComponent from "../alert/alert.component";
+import JobsDetailHeader from "../jobs-detail-header/jobs-detail-header.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import PartsQueueJobLinesComponent from "./parts-queue-job-lines.component";
+
+export default function PartsQueueDetailCard() {
+  const selectedBreakpoint = Object.entries(Grid.useBreakpoint())
+    .filter((screen) => !!screen[1])
+    .slice(-1)[0];
+
+  const bpoints = {
+    xs: "100%",
+    sm: "100%",
+    md: "100%",
+    lg: "75%",
+    xl: "75%",
+    xxl: "60%",
+  };
+  const drawerPercentage = selectedBreakpoint
+    ? bpoints[selectedBreakpoint[0]]
+    : "100%";
+
+  const searchParams = queryString.parse(useLocation().search);
+  const { selected } = searchParams;
+  const history = useHistory();
+  const { loading, error, data } = useQuery(QUERY_PARTS_QUEUE_CARD_DETAILS, {
+    variables: { id: selected },
+    skip: !selected,
+    fetchPolicy: "network-only",
+    nextFetchPolicy: "network-only",
+  });
+
+  const { t } = useTranslation();
+  const handleDrawerClose = () => {
+    delete searchParams.selected;
+    history.push({
+      search: queryString.stringify({
+        ...searchParams,
+      }),
+    });
+  };
+
+  return (
+    <Drawer
+      visible={!!selected}
+      destroyOnClose
+      width={drawerPercentage}
+      placement="right"
+      onClose={handleDrawerClose}
+    >
+      {loading ? <LoadingSpinner /> : null}
+      {error ? <AlertComponent message={error.message} type="error" /> : null}
+      {data ? (
+        <Card
+          title={
+            <Link to={`/manage/jobs/${data.jobs_by_pk.id}`}>
+              {data.jobs_by_pk.ro_number || t("general.labels.na")}
+            </Link>
+          }
+        >
+          <JobsDetailHeader job={data ? data.jobs_by_pk : null} />
+          <Divider type="horizontal" />
+          <PartsQueueJobLinesComponent
+            jobLines={data.jobs_by_pk ? data.jobs_by_pk.joblines : null}
+          />
+        </Card>
+      ) : null}
+    </Drawer>
+  );
+}

client/src/components/parts-queue-card/parts-queue-job-lines.component.jsx

@@ -0,0 +1,208 @@
+import { Card, Table } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { selectJobReadOnly } from "../../redux/application/application.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
+import { alphaSort } from "../../utils/sorters";
+
+const mapStateToProps = createStructuredSelector({
+  bodyshop: selectBodyshop,
+  jobRO: selectJobReadOnly,
+});
+
+const mapDispatchToProps = (dispatch) => ({});
+
+export function PartsQueueJobLinesComponent({ jobRO, loading, jobLines }) {
+  const [state, setState] = useState({
+    sortedInfo: {},
+    filteredInfo: {},
+  });
+  const { t } = useTranslation();
+
+  const columns = [
+    {
+      title: "#",
+      dataIndex: "line_no",
+      key: "line_no",
+      sorter: (a, b) => a.line_no - b.line_no,
+      sortOrder:
+        state.sortedInfo.columnKey === "line_no" && state.sortedInfo.order,
+    },
+    {
+      title: t("joblines.fields.line_desc"),
+      dataIndex: "line_desc",
+      key: "line_desc",
+      sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
+      onCell: (record) => ({
+        className: record.manual_line && "job-line-manual",
+        style: {
+          ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {}),
+        },
+      }),
+      sortOrder:
+        state.sortedInfo.columnKey === "line_desc" && state.sortedInfo.order,
+      ellipsis: true,
+    },
+    {
+      title: t("joblines.fields.oem_partno"),
+      dataIndex: "oem_partno",
+      key: "oem_partno",
+      sorter: (a, b) => alphaSort(a.oem_partno, b.oem_partno),
+      sortOrder:
+        state.sortedInfo.columnKey === "oem_partno" && state.sortedInfo.order,
+      ellipsis: true,
+      render: (text, record) =>
+        `${record.oem_partno || ""} ${
+          record.alt_partno ? `(${record.alt_partno})` : ""
+        }`.trim(),
+    },
+    {
+      title: t("joblines.fields.part_type"),
+      dataIndex: "part_type",
+      key: "part_type",
+      filteredValue: state.filteredInfo.part_type || null,
+      sorter: (a, b) => alphaSort(a.part_type, b.part_type),
+      sortOrder:
+        state.sortedInfo.columnKey === "part_type" && state.sortedInfo.order,
+      filters: [
+        {
+          text: t("jobs.labels.partsfilter"),
+          value: [
+            "PAN",
+            "PAC",
+            "PAR",
+            "PAL",
+            "PAA",
+            "PAM",
+            "PAP",
+            "PAS",
+            "PASL",
+            "PAG",
+          ],
+        },
+        {
+          text: t("joblines.fields.part_types.PAN"),
+          value: ["PAN"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAP"),
+          value: ["PAP"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAL"),
+          value: ["PAL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAA"),
+          value: ["PAA"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAG"),
+          value: ["PAG"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAS"),
+          value: ["PAS"],
+        },
+        {
+          text: t("joblines.fields.part_types.PASL"),
+          value: ["PASL"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAC"),
+          value: ["PAC"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAR"),
+          value: ["PAR"],
+        },
+        {
+          text: t("joblines.fields.part_types.PAM"),
+          value: ["PAM"],
+        },
+      ],
+      onFilter: (value, record) => value.includes(record.part_type),
+      render: (text, record) =>
+        record.part_type
+          ? t(`joblines.fields.part_types.${record.part_type}`)
+          : null,
+    },
+    {
+      title: t("joblines.fields.part_qty"),
+      dataIndex: "part_qty",
+      key: "part_qty",
+    },
+    {
+      title: t("joblines.fields.act_price"),
+      dataIndex: "act_price",
+      key: "act_price",
+      sorter: (a, b) => a.act_price - b.act_price,
+      sortOrder:
+        state.sortedInfo.columnKey === "act_price" && state.sortedInfo.order,
+      ellipsis: true,
+      render: (text, record) => (
+        <CurrencyFormatter>
+          {record.db_ref === "900510" || record.db_ref === "900511"
+            ? record.prt_dsmk_m
+            : record.act_price}
+        </CurrencyFormatter>
+      ),
+    },
+    {
+      title: t("joblines.fields.location"),
+      dataIndex: "location",
+      key: "location",
+    },
+    {
+      title: t("joblines.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      sorter: (a, b) => alphaSort(a.status, b.status),
+      sortOrder:
+        state.sortedInfo.columnKey === "status" && state.sortedInfo.order,
+      filteredValue: state.filteredInfo.status || null,
+      filters:
+        (jobLines &&
+          jobLines
+            .map((l) => l.status)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Status*",
+                value: [s],
+              };
+            })) ||
+        [],
+      onFilter: (value, record) => value.includes(record.status),
+    },
+  ];
+
+  const handleTableChange = (pagination, filters, sorter) => {
+    setState((state) => ({
+      ...state,
+      filteredInfo: filters,
+      sortedInfo: sorter,
+    }));
+  };
+
+  return (
+    <Card title={t("jobs.labels.parts_lines")}>
+      <Table
+        columns={columns}
+        rowKey="id"
+        loading={loading}
+        pagination={false}
+        dataSource={jobLines}
+        onChange={handleTableChange}
+      />
+    </Card>
+  );
+}
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(PartsQueueJobLinesComponent);

client/src/components/parts-queue-list/parts-queue.list.component.jsx

@@ -8,30 +8,28 @@ import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { Link, useHistory, useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
-import AlertComponent from "../../components/alert/alert.component";
-import JobPartsQueueCount from "../../components/job-parts-queue-count/job-parts-queue-count.component";
-import JobRemoveFromPartsQueue from "../../components/job-remove-from-parst-queue/job-remove-from-parts-queue.component";
-import OwnerNameDisplay from "../../components/owner-name-display/owner-name-display.component";
-import ProductionListColumnComment from "../../components/production-list-columns/production-list-columns.comment.component";
 import { QUERY_PARTS_QUEUE } from "../../graphql/jobs.queries";
 import { selectBodyshop } from "../../redux/user/user.selectors";
 import { DateTimeFormatter, TimeAgoFormatter } from "../../utils/DateFormatter";
+import { onlyUnique } from "../../utils/arrayHelper";
+import { pageLimit } from "../../utils/config";
 import { alphaSort, dateSort } from "../../utils/sorters";
 import useLocalStorage from "../../utils/useLocalStorage";
-import {pageLimit} from "../../utils/config";
+import AlertComponent from "../alert/alert.component";
+import JobPartsQueueCount from "../job-parts-queue-count/job-parts-queue-count.component";
+import JobRemoveFromPartsQueue from "../job-remove-from-parst-queue/job-remove-from-parts-queue.component";
+import OwnerNameDisplay, {
+  OwnerNameDisplayFunction,
+} from "../owner-name-display/owner-name-display.component";
+import ProductionListColumnComment from "../production-list-columns/production-list-columns.comment.component";
 
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
 
-export function PartsQueuePageComponent({ bodyshop }) {
+export function PartsQueueListComponent({ bodyshop }) {
   const searchParams = queryString.parse(useLocation().search);
-  const {
+  const { selected, sortcolumn, sortorder, statusFilters } = searchParams;
-    //page,
-    sortcolumn,
-    sortorder,
-    statusFilters,
-  } = searchParams;
   const history = useHistory();
   const [filter, setFilter] = useLocalStorage("filter_parts_queue", null);
 
@@ -39,19 +37,8 @@ export function PartsQueuePageComponent({ bodyshop }) {
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
     variables: {
-      // offset: page ? (page - 1) * 25 : 0,
-      // limit: 25,
       statuses: (statusFilters && JSON.parse(statusFilters)) ||
         bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
-      order: [
-        {
-          [sortcolumn || "ro_number"]: sortorder
-            ? sortorder === "descend"
-              ? "desc"
-              : "asc"
-            : "desc",
-        },
-      ],
     },
   });
 
@@ -107,6 +94,19 @@ export function PartsQueuePageComponent({ bodyshop }) {
     history.push({ search: queryString.stringify(searchParams) });
   };
 
+  const handleOnRowClick = (record) => {
+    if (record) {
+      if (record.id) {
+        history.push({
+          search: queryString.stringify({
+            ...searchParams,
+            selected: record.id,
+          }),
+        });
+      }
+    }
+  };
+
   const columns = [
     {
       title: t("jobs.fields.ro_number"),
@@ -125,7 +125,8 @@ export function PartsQueuePageComponent({ bodyshop }) {
       title: t("jobs.fields.owner"),
       dataIndex: "ownr_ln",
       key: "ownr_ln",
-      sorter: (a, b) => alphaSort(a.ownr_ln, b.ownr_ln),
+      sorter: (a, b) =>
+        alphaSort(OwnerNameDisplayFunction(a), OwnerNameDisplayFunction(b)),
       sortOrder: sortcolumn === "ownr_ln" && sortorder,
       render: (text, record) => {
         return record.ownerid ? (
@@ -139,6 +140,56 @@ export function PartsQueuePageComponent({ bodyshop }) {
         );
       },
     },
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      ellipsis: true,
+      sorter: (a, b) =>
+        alphaSort(
+          `${a.v_model_yr || ""} ${a.v_make_desc || ""} ${
+            a.v_model_desc || ""
+          }`,
+          `${b.v_model_yr || ""} ${b.v_make_desc || ""} ${b.v_model_desc || ""}`
+        ),
+      sortOrder: sortcolumn === "vehicle" && sortorder,
+      render: (text, record) => {
+        return record.vehicleid ? (
+          <Link to={"/manage/vehicles/" + record.vehicleid}>
+            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+              record.v_model_desc || ""
+            }`}
+          </Link>
+        ) : (
+          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+            record.v_model_desc || ""
+          }`}</span>
+        );
+      },
+    },
+    {
+      title: t("jobs.fields.ins_co_nm_short"),
+      dataIndex: "ins_co_nm",
+      key: "ins_co_nm",
+      ellipsis: true,
+      sorter: (a, b) => alphaSort(a.ins_co_nm, b.ins_co_nm),
+      sortOrder: sortcolumn === "ins_co_nm" && sortorder,
+      filteredValue: filter?.ins_co_nm || null,
+      filters:
+        (jobs &&
+          jobs
+            .map((j) => j.ins_co_nm)
+            .filter(onlyUnique)
+            .map((s) => {
+              return {
+                text: s || "No Ins. Co.*",
+                value: [s],
+              };
+            })
+            .sort((a, b) => alphaSort(a.text, b.text))) ||
+        [],
+      onFilter: (value, record) => value.includes(record.ins_co_nm),
+    },
     {
       title: t("jobs.fields.status"),
       dataIndex: "status",
@@ -170,23 +221,16 @@ export function PartsQueuePageComponent({ bodyshop }) {
       ),
     },
     {
-      title: t("jobs.fields.vehicle"),
+      title: t("jobs.fields.scheduled_completion"),
-      dataIndex: "vehicle",
+      dataIndex: "scheduled_completion",
-      key: "vehicle",
+      key: "scheduled_completion",
       ellipsis: true,
-      render: (text, record) => {
+      sorter: (a, b) =>
-        return record.vehicleid ? (
+        dateSort(a.scheduled_completion, b.scheduled_completion),
-          <Link to={"/manage/vehicles/" + record.vehicleid}>
+      sortOrder: sortcolumn === "scheduled_completion" && sortorder,
-            {`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
+      render: (text, record) => (
-              record.v_model_desc || ""
+        <DateTimeFormatter>{record.scheduled_completion}</DateTimeFormatter>
-            }`}
+      ),
-          </Link>
-        ) : (
-          <span>{`${record.v_model_yr || ""} ${record.v_make_desc || ""} ${
-            record.v_model_desc || ""
-          }`}</span>
-        );
-      },
     },
     // {
     //   title: t("vehicles.fields.plate_no"),
@@ -198,14 +242,6 @@ export function PartsQueuePageComponent({ bodyshop }) {
     //     return record.plate_no ? record.plate_no : "";
     //   },
     // },
-    {
-      title: t("jobs.fields.clm_no"),
-      dataIndex: "clm_no",
-      key: "clm_no",
-      ellipsis: true,
-      sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
-      sortOrder: sortcolumn === "clm_no" && sortorder,
-    },
     // {
     //   title: t("jobs.fields.clm_total"),
     //   dataIndex: "clm_total",
@@ -307,9 +343,16 @@ export function PartsQueuePageComponent({ bodyshop }) {
         style={{ height: "100%" }}
         scroll={{ x: true }}
         onChange={handleTableChange}
+        rowSelection={{
+          onSelect: (record) => {
+            handleOnRowClick(record);
+          },
+          selectedRowKeys: [selected],
+          type: "radio",
+        }}
       />
     </Card>
   );
 }
 
-export default connect(mapStateToProps, null)(PartsQueuePageComponent);
+export default connect(mapStateToProps, null)(PartsQueueListComponent);

client/src/components/shop-csi-config-form/shop-csi-config-form.component.jsx

@@ -1,5 +1,5 @@
-import React from "react";
 import { Form } from "antd";
+import React from "react";
 import ConfigFormComponents from "../config-form-components/config-form-components.component";
 
 export default function ShopCsiConfigForm({ selectedCsi }) {
@@ -9,7 +9,7 @@ export default function ShopCsiConfigForm({ selectedCsi }) {
 
   return (
     <div>
-      The Config Form {readOnly}
+      {readOnly}
       {selectedCsi && (
         <Form form={form} onFinish={handleFinish}>
           <ConfigFormComponents

client/src/components/shop-csi-config/shop-csi-config.component.jsx

@@ -1,7 +1,7 @@
 import { CheckCircleFilled } from "@ant-design/icons";
+import { useQuery } from "@apollo/client";
 import { Button, Col, List, Row } from "antd";
 import React, { useState } from "react";
-import { useQuery } from "@apollo/client";
 import { useTranslation } from "react-i18next";
 import { GET_ALL_QUESTION_SETS } from "../../graphql/csi.queries";
 import { DateFormatter } from "../../utils/DateFormatter";
@@ -21,7 +21,6 @@ export default function ShopCsiConfig() {
   if (error) return <AlertComponent message={error.message} type="error" />;
   return (
     <div>
-      The Config Form
       <Row>
         <Col span={3}>
           <List
@@ -42,7 +41,8 @@ export default function ShopCsiConfig() {
             )}
           />
         </Col>
-        <Col span={21}>
+        <Col span={1} />
+        <Col span={20}>
           <ShopCsiConfigForm selectedCsi={selectedCsi} />
         </Col>
       </Row>

client/src/graphql/csi.queries.js

@@ -57,19 +57,15 @@ export const INSERT_CSI = gql`
 `;
 
 export const QUERY_CSI_RESPONSE_PAGINATED = gql`
-  query QUERY_CSI_RESPONSE_PAGINATED(
+  query QUERY_CSI_RESPONSE_PAGINATED {
-    $offset: Int
+    csi(order_by: { completedon: desc_nulls_last }) {
-    $limit: Int
-    $order: [csi_order_by!]!
-  ) {
-    csi(offset: $offset, limit: $limit, order_by: $order) {
       id
       completedon
       job {
         ownr_fn
         ownr_ln
+        ownerid
         ro_number
-
         id
       }
     }
@@ -83,6 +79,7 @@ export const QUERY_CSI_RESPONSE_PAGINATED = gql`
 export const QUERY_CSI_RESPONSE_BY_PK = gql`
   query QUERY_CSI_RESPONSE_BY_PK($id: uuid!) {
     csi_by_pk(id: $id) {
+      completedon
       relateddata
       valid
       validuntil

client/src/graphql/jobs.queries.js

@@ -108,12 +108,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
 `;
 
 export const QUERY_PARTS_QUEUE = gql`
-  query QUERY_PARTS_QUEUE(
+  query QUERY_PARTS_QUEUE($statuses: [String!]!, $offset: Int, $limit: Int) {
-    $statuses: [String!]!
-    $offset: Int
-    $limit: Int
-    $order: [jobs_order_by!]
-  ) {
     jobs_aggregate(where: { _and: [{ status: { _in: $statuses } }] }) {
       aggregate {
         count(distinct: true)
@@ -125,7 +120,7 @@ export const QUERY_PARTS_QUEUE = gql`
       }
       offset: $offset
       limit: $limit
-      order_by: $order
+      order_by: { ro_number: desc }
     ) {
       ownr_fn
       ownr_ln
@@ -142,7 +137,9 @@ export const QUERY_PARTS_QUEUE = gql`
       v_color
       vehicleid
       scheduled_in
+      scheduled_completion
       id
+      ins_co_nm
       clm_no
       ro_number
       status
@@ -2338,3 +2335,163 @@ export const MARK_JOB_AS_UNINVOICED = gql`
     }
   }
 `;
+
+export const QUERY_PARTS_QUEUE_CARD_DETAILS = gql`
+  query QUERY_JOB_CARD_DETAILS($id: uuid!) {
+    jobs_by_pk(id: $id) {
+      actual_completion
+      actual_delivery
+      actual_in
+      alt_transport
+      available_jobs {
+        id
+      }
+      area_of_damage
+      ca_gst_registrant
+      cccontracts {
+        agreementnumber
+        courtesycar {
+          id
+          make
+          model
+          year
+          plate
+          fleetnumber
+        }
+        id
+        scheduledreturn
+        start
+        status
+      }
+      clm_no
+      clm_total
+      comment
+      date_estimated
+      date_exported
+      date_invoiced
+      date_last_contacted
+      date_next_contact
+      date_open
+      date_repairstarted
+      date_scheduled
+      ded_amt
+      employee_body
+      employee_body_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_csr
+      employee_csr_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_prep
+      employee_prep_rel {
+        id
+        first_name
+        last_name
+      }
+      employee_refinish
+      employee_refinish_rel {
+        id
+        first_name
+        last_name
+      }
+      est_co_nm
+      est_ct_fn
+      est_ct_ln
+      est_ea
+      est_ph1
+      id
+      ins_co_nm
+      ins_ct_fn
+      ins_ct_ln
+      ins_ea
+      ins_ph1
+      inproduction
+      job_totals
+      joblines(
+        order_by: { line_no: asc }
+        where: {
+          part_type: {
+            _in: [
+              "PAN"
+              "PAC"
+              "PAR"
+              "PAL"
+              "PAA"
+              "PAM"
+              "PAP"
+              "PAG"
+            ]
+          }
+          removed: { _eq: false }
+        }
+      ) {
+        act_price
+        alt_partno
+        db_ref
+        id
+        line_desc
+        line_no
+        location
+        mod_lbr_ty
+        mod_lb_hrs
+        oem_partno
+        part_qty
+        part_type
+        prt_dsmk_m
+        status
+      }
+      lbr_adjustments
+      ownr_co_nm
+      ownr_ea
+      ownr_fn
+      ownr_ln
+      ownr_ph1
+      ownr_ph2
+      owner {
+        id
+        allow_text_message
+        preferred_contact
+        tax_number
+      }
+      owner_owing
+      plate_no
+      plate_st
+      po_number
+      production_vars
+      ro_number
+      scheduled_completion
+      scheduled_delivery
+      scheduled_in
+      special_coverage_policy
+      status
+      suspended
+      updated_at
+      vehicle {
+        id
+        jobs {
+          id
+          clm_no
+          ro_number
+        }
+        notes
+        plate_no
+        v_color
+        v_make_desc
+        v_model_desc
+        v_model_yr
+      }
+      vehicleid
+      v_color
+      v_make_desc
+      v_model_desc
+      v_model_yr
+      v_vin
+      voided
+    }
+  }
+`;

client/src/pages/csi/csi.container.page.jsx

@@ -1,88 +1,67 @@
-import { useQuery, useMutation } from "@apollo/client";
+// import { useMutation, useQuery } from "@apollo/client";
-import { Form, Layout, Typography, Button, Result } from "antd";
+import { Button, Form, Layout, Result, Typography } from "antd";
-import React, { useState } from "react";
+import axios from "axios";
+import React, { useCallback, useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
 import { useParams } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
 import ConfigFormComponents from "../../components/config-form-components/config-form-components.component";
 import LoadingSpinner from "../../components/loading-spinner/loading-spinner.component";
-import { QUERY_SURVEY, COMPLETE_SURVEY } from "../../graphql/csi.queries";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
 import { selectCurrentUser } from "../../redux/user/user.selectors";
+import { DateTimeFormat } from "./../../utils/DateFormatter";
 
 const mapStateToProps = createStructuredSelector({
   currentUser: selectCurrentUser,
 });
-const mapDispatchToProps = (dispatch) => ({
+const mapDispatchToProps = (dispatch) => ({});
-  //setUserLanguage: language => dispatch(setUserLanguage(language))
+
-});
 export default connect(mapStateToProps, mapDispatchToProps)(CsiContainerPage);
 
 export function CsiContainerPage({ currentUser }) {
   const { surveyId } = useParams();
   const [form] = Form.useForm();
+  const [axiosResponse, setAxiosResponse] = useState(null);
   const [submitting, setSubmitting] = useState({
     loading: false,
     submitted: false,
   });
-
-  const { loading, error, data } = useQuery(QUERY_SURVEY, {
-    variables: { surveyId },
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-  });
-
   const { t } = useTranslation();
-  const [completeSurvey] = useMutation(COMPLETE_SURVEY);
-  if (loading) return <LoadingSpinner />;
 
-  if (error || !!!data.csi_by_pk)
+  const getAxiosData = useCallback(async () => {
-    return (
+    try {
-      <div>
+      try {
-        <Result
+        window.$crisp.push(["do", "chat:hide"]);
-          status="error"
+      } catch {
-          title={t("csi.errors.notfoundtitle")}
+        console.log("Unable to attach to crisp instance. ");
-          subTitle={t("csi.errors.notfoundsubtitle")}
+      }
-        >
+      setSubmitting((prevSubmitting) => ({ ...prevSubmitting, loading: true }));
-          {error ? (
+      const response = await axios.post("/csi/lookup", { surveyId });
-            <div>ERROR: {error.graphQLErrors.map((e) => e.message)}</div>
+      setSubmitting((prevSubmitting) => ({
-          ) : null}
+        ...prevSubmitting,
-        </Result>
-      </div>
-    );
-
-  const handleFinish = async (values) => {
-    setSubmitting({ ...submitting, loading: true });
-
-    const result = await completeSurvey({
-      variables: {
-        surveyId,
-        survey: {
-          response: values,
-          valid: false,
-          completedon: new Date(),
-        },
-      },
-    });
-
-    if (!!!result.errors) {
-      setSubmitting({ ...submitting, loading: false, submitted: true });
-    } else {
-      setSubmitting({
-        ...submitting,
         loading: false,
-        error: JSON.stringify(result.errors),
+      }));
+      setAxiosResponse(response.data);
+    } catch (error) {
+      console.error(`Something went wrong...: ${error.message}`);
+      console.dir({
+        stack: error?.stack,
+        message: error?.message,
       });
     }
-  };
+  }, [setAxiosResponse, surveyId]);
 
-  const {
+  useEffect(() => {
-    relateddata: { bodyshop, job },
+    getAxiosData().catch((err) =>
-    csiquestion: { config: csiquestions },
+      console.error(
-  } = data.csi_by_pk;
+        `Something went wrong fetching axios data: ${err.message || ""}`
+      )
+    );
+  }, [getAxiosData]);
 
-  if (currentUser && currentUser.authorized)
+  // Return if authorized
+  if (currentUser && currentUser.authorized) {
     return (
       <Layout
         style={{ height: "100vh", display: "flex", flexDirection: "column" }}
@@ -94,85 +73,176 @@ export function CsiContainerPage({ currentUser }) {
         />
       </Layout>
     );
+  }
 
-  return (
+  if (submitting.loading) return <LoadingSpinner />;
-    <Layout
+
-      style={{ height: "100vh", display: "flex", flexDirection: "column" }}
+  const handleFinish = async (values) => {
-    >
+    try {
-      <div
+      setSubmitting({ ...submitting, loading: true, submitting: true });
-        style={{
+      const result = await axios.post("/csi/submit", { surveyId, values });
-          display: "flex",
+      console.log("result", result);
-          flexDirection: "column",
+      if (!!!result.errors && result.data.update_csi.affected_rows > 0) {
-          alignItems: "center",
+        setSubmitting({ ...submitting, loading: false, submitted: true });
-        }}
+      }
-      >
+    } catch (error) {
-        <div style={{ display: "flex", alignItems: "center", margin: "2em" }}>
+      console.error(`Something went wrong...: ${error.message}`);
-          {bodyshop.logo_img_path && bodyshop.logo_img_path.src ? (
+      console.dir({
-            <img src={bodyshop.logo_img_path.src} alt="Logo" />
+        stack: error?.stack,
-          ) : null}
+        message: error?.message,
-          <div style={{ margin: "2em" }}>
+      });
-            <strong>{bodyshop.shopname || ""}</strong>
+    }
-            <div>{`${bodyshop.address1 || ""}`}</div>
+  };
-            <div>{`${bodyshop.address2 || ""}`}</div>
+
-            <div>{`${bodyshop.city || ""} ${bodyshop.state || ""} ${
+  if (!axiosResponse || axiosResponse.csi_by_pk === null) {
-              bodyshop.zip_post || ""
+    // Do something here , this is where you would return a loading box or something
-            }`}</div>
+    return (
+      <>
+        <Layout style={{ display: "flex", flexDirection: "column" }}>
+          <Layout.Content
+            style={{
+              backgroundColor: "#fff",
+              margin: "2em 4em",
+              padding: "2em",
+              overflowY: "auto",
+              textAlign: "center",
+              display: "flex",
+              justifyContent: "center",
+              alignItems: "center",
+            }}
+          >
+            <Form>
+              <Result
+                status="error"
+                title={t("csi.errors.notfoundtitle")}
+                subTitle={t("csi.errors.notfoundsubtitle")}
+              />
+            </Form>
+          </Layout.Content>
+          <Layout.Footer>
+            {t("csi.labels.copyright")}{" "}
+            {t("csi.fields.surveyid", { surveyId: surveyId })}
+          </Layout.Footer>
+        </Layout>
+      </>
+    );
+  } else {
+    const {
+      relateddata: { bodyshop, job },
+      csiquestion: { config: csiquestions },
+    } = axiosResponse.csi_by_pk;
+
+    return (
+      <Layout style={{ display: "flex", flexDirection: "column" }}>
+        <div
+          style={{
+            display: "flex",
+            flexDirection: "column",
+            alignItems: "center",
+          }}
+        >
+          <div style={{ display: "flex", alignItems: "center", margin: "2em" }}>
+            {bodyshop.logo_img_path && bodyshop.logo_img_path.src ? (
+              <img
+                src={bodyshop.logo_img_path.src}
+                alt={bodyshop.shopname.concat(" Logo")}
+                height={bodyshop.logo_img_path.height}
+                width={bodyshop.logo_img_path.width}
+              />
+            ) : null}
+            <div style={{ margin: "2em", verticalAlign: "middle" }}>
+              <Typography.Title level={4} style={{ margin: 0 }}>
+                {bodyshop.shopname || ""}
+              </Typography.Title>
+              <Typography.Paragraph style={{ margin: 0 }}>
+                {`${bodyshop.address1 || ""}${bodyshop.address2 ? ", " : ""}${
+                  bodyshop.address2 || ""
+                }`.trim()}
+              </Typography.Paragraph>
+              <Typography.Paragraph style={{ margin: 0 }}>
+                {`${bodyshop.city || ""}${
+                  bodyshop.city && bodyshop.state ? ", " : ""
+                }${bodyshop.state || ""} ${bodyshop.zip_post || ""}`.trim()}
+              </Typography.Paragraph>
+            </div>
           </div>
+          <Typography.Title>{t("csi.labels.title")}</Typography.Title>
+          <strong>
+            {t("csi.labels.greeting", {
+              name: job.ownr_co_nm || job.ownr_fn || "",
+            })}
+          </strong>
+          <Typography.Paragraph>
+            {t("csi.labels.intro", { shopname: bodyshop.shopname || "" })}
+          </Typography.Paragraph>
         </div>
-        <Typography.Title>{t("csi.labels.title")}</Typography.Title>
-        <strong>{`Hi ${job.ownr_co_nm || job.ownr_fn || ""}!`}</strong>
-        <Typography.Paragraph>
-          {`At ${
-            bodyshop.shopname || ""
-          }, we value your feedback. We would love to
-          hear what you have to say. Please fill out the form below.`}
-        </Typography.Paragraph>
-      </div>
 
-      {submitting.error ? (
+        {submitting.error ? (
-        <AlertComponent message={submitting.error} type="error" />
+          <AlertComponent message={submitting.error} type="error" />
-      ) : null}
+        ) : null}
 
-      {submitting.submitted ? (
+        {submitting.submitted ? (
-        <Layout.Content
+          <Layout.Content
-          style={{
+            style={{
-            backgroundColor: "#fff",
+              backgroundColor: "#fff",
-            margin: "2em 4em",
+              margin: "2em 4em",
-            padding: "2em",
+              padding: "2em",
-            overflowY: "auto",
+              overflowY: "auto",
-          }}
+            }}
-        >
+          >
-          <Result
+            <Result
-            status="success"
+              status="success"
-            title={t("csi.successes.submitted")}
+              title={t("csi.successes.submitted")}
-            subTitle={t("csi.successes.submittedsub")}
+              subTitle={t("csi.successes.submittedsub")}
-          />
+            />
-        </Layout.Content>
+          </Layout.Content>
-      ) : (
+        ) : (
-        <Layout.Content
+          <Layout.Content
-          style={{
+            style={{
-            backgroundColor: "#fff",
+              backgroundColor: "#fff",
-            margin: "2em 4em",
+              margin: "2em 4em",
-            padding: "2em",
+              padding: "2em",
-            overflowY: "auto",
+              overflowY: "auto",
-          }}
+            }}
-        >
+          >
-          <Form form={form} onFinish={handleFinish}>
+            <Form form={form} onFinish={handleFinish}>
-            <ConfigFormComponents componentList={csiquestions} />
+              {axiosResponse.csi_by_pk.valid ? (
-            <Button
+                <>
-              loading={submitting.loading}
+                  <ConfigFormComponents componentList={csiquestions} />
-              type="primary"
+                  <Button
-              htmlType="submit"
+                    loading={submitting.loading}
-            >
+                    type="primary"
-              {t("general.actions.submit")}
+                    htmlType="submit"
-            </Button>
+                    style={{ float: "right" }}
-          </Form>
+                  >
-        </Layout.Content>
+                    {t("general.actions.submit")}
-      )}
+                  </Button>
-
+                </>
-      <Layout.Footer>
+              ) : (
-        {`Copyright ImEX.Online. Survey ID: ${surveyId}`}
+                <>
-      </Layout.Footer>
+                  <Result
-    </Layout>
+                    title={t("csi.errors.surveycompletetitle")}
-  );
+                    status="warning"
+                    subTitle={t("csi.errors.surveycompletesubtitle", {
+                      date: DateTimeFormat(axiosResponse.csi_by_pk.completedon),
+                    })}
+                  />
+                  <Typography.Paragraph
+                    type="secondary"
+                    style={{ textAlign: "center" }}
+                  >
+                    {t("csi.successes.submittedsub")}
+                  </Typography.Paragraph>
+                </>
+              )}
+            </Form>
+          </Layout.Content>
+        )}
+        <Layout.Footer>
+          {t("csi.labels.copyright")}{" "}
+          {t("csi.fields.surveyid", { surveyId: surveyId })}
+        </Layout.Footer>
+      </Layout>
+    );
+  }
 }

client/src/pages/parts-queue/parts-queue.page.container.jsx

@@ -1,12 +1,13 @@
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
+import PartsQueueDetailCard from "../../components/parts-queue-card/parts-queue-card.component";
+import PartsQueueList from "../../components/parts-queue-list/parts-queue.list.component";
 import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
-import PartsQueuePage from "./parts-queue.page.component";
 
 const mapDispatchToProps = (dispatch) => ({
   setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -26,7 +27,8 @@ export function PartsQueuePageContainer({ setBreadcrumbs, setSelectedHeader }) {
 
   return (
     <RbacWrapper action="jobs:partsqueue">
-      <PartsQueuePage />
+      <PartsQueueList />
+      <PartsQueueDetailCard />
     </RbacWrapper>
   );
 }

client/src/pages/shop-csi/shop-csi.container.page.jsx

@@ -1,22 +1,20 @@
-import { Row, Col } from "antd";
 import { useQuery } from "@apollo/client";
-import queryString from "query-string";
+import { Col, Row } from "antd";
 import React, { useEffect } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
-import { useLocation } from "react-router-dom";
 import { createStructuredSelector } from "reselect";
 import AlertComponent from "../../components/alert/alert.component";
 import CsiResponseFormContainer from "../../components/csi-response-form/csi-response-form.container";
 import CsiResponseListPaginated from "../../components/csi-response-list-paginated/csi-response-list-paginated.component";
+import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
 import { QUERY_CSI_RESPONSE_PAGINATED } from "../../graphql/csi.queries";
 import {
   setBreadcrumbs,
   setSelectedHeader,
 } from "../../redux/application/application.actions";
 import { selectBodyshop } from "../../redux/user/user.selectors";
-import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
+
-import {pageLimit} from "../../utils/config";
 const mapStateToProps = createStructuredSelector({
   bodyshop: selectBodyshop,
 });
@@ -33,28 +31,11 @@ export function ShopCsiContainer({
 }) {
   const { t } = useTranslation();
 
-  const searchParams = queryString.parse(useLocation().search);
-  const { page, sortcolumn, sortorder } = searchParams;
-
   const { loading, error, data, refetch } = useQuery(
     QUERY_CSI_RESPONSE_PAGINATED,
     {
       fetchPolicy: "network-only",
       nextFetchPolicy: "network-only",
-      variables: {
-        //search: search || "",
-        offset: page ? (page - 1) * pageLimit : 0,
-        limit: pageLimit,
-        order: [
-          {
-            [sortcolumn || "completedon"]: sortorder
-              ? sortorder === "descend"
-                ? "desc_nulls_last"
-                : "asc"
-              : "desc_nulls_last",
-          },
-        ],
-      },
     }
   );
 
@@ -73,12 +54,7 @@ export function ShopCsiContainer({
   if (error) return <AlertComponent message={error.message} type="error" />;
 
   return (
-    <RbacWrapper
+    <RbacWrapper action="csi:page">
-      action="csi:page"
-      // noauth={
-      //   <AlertComponent message="You don't have acess to see this screen." />
-      // }
-    >
       <Row gutter={16}>
         <Col span={10}>
           <CsiResponseListPaginated

client/src/translations/en_us/common.json

@@ -838,20 +838,27 @@
 				"creating": "Error creating survey {{message}}",
 				"notconfigured": "You do not have any current CSI Question Sets configured.",
 				"notfoundsubtitle": "We were unable to find a survey using the link you provided. Please ensure the URL is correct or reach out to your shop for more help.",
-				"notfoundtitle": "No survey found."
+				"notfoundtitle": "No survey found.",
+				"surveycompletetitle": "Survey previously completed",
+				"surveycompletesubtitle": "This survey was already completed on {{date}}."
 			},
 			"fields": {
 				"completedon": "Completed On",
-				"created_at": "Created At"
+				"created_at": "Created At",
+				"surveyid": "Survey ID {{surveyId}}",
+				"validuntil": "Valid Until"
 			},
 			"labels": {
-				"nologgedinuser": "Please log out of ImEX Online",
+				"nologgedinuser": "Please log out of $t(titles.app)",
-				"nologgedinuser_sub": "Users of ImEX Online cannot complete CSI surveys while logged in. Please log out and try again.",
+				"nologgedinuser_sub": "Users of $t(titles.app) cannot complete CSI surveys while logged in. Please log out and try again.",
 				"noneselected": "No response selected.",
-				"title": "Customer Satisfaction Survey"
+				"title": "Customer Satisfaction Survey",
+				"greeting": "Hi {{name}}!",
+				"intro": "At {{shopname}}, we value your feedback. We would love to hear what you have to say. Please fill out the form below.",
+				"copyright": "Copyright © $t(titles.app). All Rights Reserved."
 			},
 			"successes": {
-				"created": "CSI created successfully. ",
+				"created": "CSI created successfully.",
 				"submitted": "Your responses have been submitted successfully.",
 				"submittedsub": "Your input is highly appreciated."
 			}
@@ -1822,6 +1829,7 @@
 				"override_header": "Override estimate header on import?",
 				"ownerassociation": "Owner Association",
 				"parts": "Parts",
+				"parts_lines": "Parts Lines",
 				"parts_received": "Parts Rec.",
 				"parts_tax_rates": "Parts Tax rates",
 				"partsfilter": "Parts Only",

client/src/translations/es/common.json

@@ -838,17 +838,24 @@
 				"creating": "",
 				"notconfigured": "",
 				"notfoundsubtitle": "",
-				"notfoundtitle": ""
+				"notfoundtitle": "",
+				"surveycompletetitle": "",
+				"surveycompletesubtitle": ""
 			},
 			"fields": {
 				"completedon": "",
-				"created_at": ""
+				"created_at": "",
+				"surveyid": "",
+				"validuntil": ""
 			},
 			"labels": {
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
-				"title": ""
+				"title": "",
+				"greeting": "",
+				"intro": "",
+				"copyright": ""
 			},
 			"successes": {
 				"created": "",
@@ -1822,6 +1829,7 @@
 				"override_header": "¿Anular encabezado estimado al importar?",
 				"ownerassociation": "",
 				"parts": "Partes",
+				"parts_lines": "",
 				"parts_received": "",
 				"parts_tax_rates": "",
 				"partsfilter": "",

client/src/translations/fr/common.json

@@ -838,17 +838,24 @@
 				"creating": "",
 				"notconfigured": "",
 				"notfoundsubtitle": "",
-				"notfoundtitle": ""
+				"notfoundtitle": "",
+				"surveycompletetitle": "",
+				"surveycompletesubtitle": ""
 			},
 			"fields": {
 				"completedon": "",
-				"created_at": ""
+				"created_at": "",
+				"surveyid": "",
+				"validuntil": ""
 			},
 			"labels": {
 				"nologgedinuser": "",
 				"nologgedinuser_sub": "",
 				"noneselected": "",
-				"title": ""
+				"title": "",
+				"greeting": "",
+				"intro": "",
+				"copyright": ""
 			},
 			"successes": {
 				"created": "",
@@ -1822,6 +1829,7 @@
 				"override_header": "Remplacer l'en-tête d'estimation à l'importation?",
 				"ownerassociation": "",
 				"parts": "les pièces",
+				"parts_lines": "",
 				"parts_received": "",
 				"parts_tax_rates": "",
 				"partsfilter": "",

server.js

@@ -74,6 +74,7 @@ app.use('/adm', require("./server/routes/adminRoutes"));
 app.use('/tech', require("./server/routes/techRoutes"));
 app.use('/intellipay', require("./server/routes/intellipayRoutes"));
 app.use('/cdk', require("./server/routes/cdkRoutes"));
+app.use('/csi', require("./server/routes/csiRoutes"));
 
 // Default route for forbidden access
 app.get("/", (req, res) => {

server/csi/csi.js

@@ -0,0 +1,2 @@
+exports.lookup = require("./lookup").default;
+exports.submit = require("./submit").default;

server/csi/lookup.js

@@ -0,0 +1,24 @@
+const path = require("path");
+const queries = require("../graphql-client/queries");
+const logger = require("../utils/logger");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+
+const client = require("../graphql-client/graphql-client").client;
+
+exports.default = async (req, res) => {
+  try {
+    logger.log("csi-surveyID-lookup", "DEBUG", "csi", req.body.surveyId, null);
+    const gql_response = await client.request(queries.QUERY_SURVEY, {
+      surveyId: req.body.surveyId,
+    });
+    res.status(200).json(gql_response);
+  } catch (error) {
+    logger.log("csi-surveyID-lookup", "ERROR", "csi", req.body.surveyId, error);
+    res.status(400).json(error);
+  }
+};

server/csi/submit.js

@@ -0,0 +1,29 @@
+const path = require("path");
+const queries = require("../graphql-client/queries");
+const logger = require("../utils/logger");
+require("dotenv").config({
+  path: path.resolve(
+    process.cwd(),
+    `.env.${process.env.NODE_ENV || "development"}`
+  ),
+});
+
+const client = require("../graphql-client/graphql-client").client;
+
+exports.default = async (req, res) => {
+  try {
+    logger.log("csi-surveyID-submit", "DEBUG", "csi", req.body.surveyId, null);
+    const gql_response = await client.request(queries.COMPLETE_SURVEY, {
+      surveyId: req.body.surveyId,
+      survey: {
+        response: req.body.values,
+        valid: false,
+        completedon: new Date(),
+      },
+    });
+    res.status(200).json(gql_response);
+  } catch (error) {
+    logger.log("csi-surveyID-submit", "ERROR", "csi", req.body.surveyId, error);
+    res.status(400).json(error);
+  }
+};

server/graphql-client/queries.js

@@ -2156,3 +2156,23 @@ exports.ACTIVE_SHOP_BY_USER = `query ACTIVE_SHOP_BY_USER($user: String) {
     shopid
   }
 }`;
+
+exports.QUERY_SURVEY = `query QUERY_SURVEY($surveyId: uuid!) {
+  csi_by_pk(id: $surveyId) {
+    completedon
+    csiquestion {
+      id
+      config
+    }
+    id
+    relateddata
+    valid
+    validuntil
+  }
+}`;
+
+exports.COMPLETE_SURVEY = `mutation COMPLETE_SURVEY($surveyId: uuid!, $survey: csi_set_input) {
+    update_csi(where: { id: { _eq: $surveyId } }, _set: $survey) {
+      affected_rows
+    }
+  }`;

server/routes/csiRoutes.js

@@ -0,0 +1,8 @@
+const express = require("express");
+const router = express.Router();
+const { lookup, submit } = require("../csi/csi");
+
+router.post("/lookup", lookup);
+router.post("/submit", submit);
+
+module.exports = router;