Added base logic for seeing jobs to supplement. Supplement import not yet working.

bodyshop_translations.babel

@@ -4299,6 +4299,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>existing_jobs</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>lines</name>
                                         <definition_loaded>false</definition_loaded>
@@ -4341,6 +4362,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>override_header</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>parts</name>
                                         <definition_loaded>false</definition_loaded>
@@ -5634,6 +5676,27 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>create_new</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>existing_owners</name>
                                         <definition_loaded>false</definition_loaded>

client/src/components/jobs-available-new/jobs-available-new.component.jsx

@@ -141,7 +141,8 @@ export default function JobsAvailableComponent({
     estData.data.available_jobs_by_pk &&
     estData.data.available_jobs_by_pk.est_data &&
     estData.data.available_jobs_by_pk.est_data.owner &&
-    estData.data.available_jobs_by_pk.est_data.owner.data
+    estData.data.available_jobs_by_pk.est_data.owner.data &&
+    !estData.data.available_jobs_by_pk.issupplement
       ? estData.data.available_jobs_by_pk.est_data.owner.data
       : null;
 
@@ -164,7 +165,7 @@ export default function JobsAvailableComponent({
           return (
             <div>
               <Input.Search
-                placeholder="Search..."
+                placeholder="Search...//TODO Implement Search"
                 onSearch={value => {
                   console.log(value);
                 }}

client/src/components/jobs-available-new/jobs-available-new.container.jsx

@@ -29,14 +29,7 @@ export default withRouter(function JobsAvailableContainer({
 
   const onModalOk = () => {
     setModalVisible(false);
-    console.log("selectedOwner", selectedOwner);
     setInsertLoading(true);
-    console.log(
-      "logitest",
-      estData.data &&
-        estData.data.available_jobs_by_pk &&
-        estData.data.available_jobs_by_pk.est_data
-    );
 
     if (
       !(

client/src/components/jobs-available-supplement/jobs-available-supplement.component.jsx

@@ -3,13 +3,24 @@ import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { alphaSort } from "../../utils/sorters";
 import { DateTimeFormatter } from "../../utils/DateFormatter";
+import JobsFindModalContainer from "../jobs-find-modal/jobs-find-modal.container";
+
 export default function JobsAvailableSupplementComponent({
   loading,
   data,
   refetch,
   deleteJob,
+  updateJob,
+  onModalOk,
+  onModalCancel,
+  modalVisible,
+  setModalVisible,
+  selectedJob,
+  setSelectedJob,
   deleteAllNewJobs,
-  estDataLazyLoad
+  loadEstData,
+  estData,
+  importOptionsState
 }) {
   const { t } = useTranslation();
 
@@ -127,7 +138,8 @@ export default function JobsAvailableSupplementComponent({
           </Button>
           <Button
             onClick={() => {
-              alert("Add");
+              loadEstData({ variables: { id: record.id } });
+              setModalVisible(true);
             }}
           >
             <Icon type="plus" />
@@ -140,54 +152,67 @@ export default function JobsAvailableSupplementComponent({
   ];
 
   return (
-    <Table
+    <div>
-      loading={loading}
+      <JobsFindModalContainer
-      title={() => {
+        loading={estData.loading}
-        return (
+        error={estData.error}
-          <div>
+        selectedJob={selectedJob}
-            <Input.Search
+        setSelectedJob={setSelectedJob}
-              placeholder="Search..."
+        importOptionsState={importOptionsState}
-              onSearch={value => {
+        visible={modalVisible}
-                console.log(value);
+        onOk={onModalOk}
-              }}
+        onCancel={onModalCancel}
-              enterButton
+        
-            />
+      />
-            <Button
+      <Table
-              onClick={() => {
+        loading={loading}
-                refetch();
+        title={() => {
-              }}
+          return (
-            >
+            <div>
-              <Icon type="sync" />
+              <Input.Search
-            </Button>
+                placeholder="Search..."
-            <Button
+                onSearch={value => {
-              onClick={() => {
+                  console.log(value);
-                deleteAllNewJobs()
+                }}
-                  .then(r => {
+                enterButton
-                    notification["success"]({
+              />
-                      message: t("jobs.successes.all_deleted", {
+              <Button
-                        count: r.data.delete_available_jobs.affected_rows
+                onClick={() => {
-                      })
+                  refetch();
+                }}
+              >
+                <Icon type="sync" />
+              </Button>
+              <Button
+                onClick={() => {
+                  deleteAllNewJobs()
+                    .then(r => {
+                      notification["success"]({
+                        message: t("jobs.successes.all_deleted", {
+                          count: r.data.delete_available_jobs.affected_rows
+                        })
+                      });
+                      refetch();
+                    })
+                    .catch(r => {
+                      notification["error"]({
+                        message: t("jobs.errors.deleted") + " " + r.message
+                      });
                     });
-                    refetch();
+                }}
-                  })
+              >
-                  .catch(r => {
+                Delete All
-                    notification["error"]({
+              </Button>
-                      message: t("jobs.errors.deleted") + " " + r.message
+            </div>
-                    });
+          );
-                  });
+        }}
-              }}
+        size="small"
-            >
+        pagination={{ position: "top" }}
-              Delete All
+        columns={columns.map(item => ({ ...item }))}
-            </Button>
+        rowKey="id"
-          </div>
+        dataSource={data && data.available_jobs}
-        );
+        onChange={handleTableChange}
-      }}
+      />
-      size="small"
+    </div>
-      pagination={{ position: "top" }}
-      columns={columns.map(item => ({ ...item }))}
-      rowKey="id"
-      dataSource={data && data.available_jobs}
-      onChange={handleTableChange}
-    />
   );
 }

client/src/components/jobs-available-supplement/jobs-available-supplement.container.jsx

@@ -1,12 +1,21 @@
-import React from "react";
+import { notification } from "antd";
+import React, { useState } from "react";
 import { useMutation, useQuery } from "react-apollo";
-import { DELETE_ALL_AVAILABLE_SUPPLEMENT_JOBS, QUERY_AVAILABLE_SUPPLEMENT_JOBS } from "../../graphql/available-jobs.queries";
+import { useTranslation } from "react-i18next";
+import { withRouter } from "react-router-dom";
+import {
+  DELETE_ALL_AVAILABLE_SUPPLEMENT_JOBS,
+  QUERY_AVAILABLE_SUPPLEMENT_JOBS
+} from "../../graphql/available-jobs.queries";
+import { UPDATE_JOB } from "../../graphql/jobs.queries";
 import AlertComponent from "../alert/alert.component";
 import JobsAvailableSupplementComponent from "./jobs-available-supplement.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
 
-export default function JobsAvailableSupplementContainer({
+export default withRouter(function JobsAvailableSupplementContainer({
   deleteJob,
-  estDataLazyLoad
+  estDataLazyLoad,
+  history
 }) {
   const { loading, error, data, refetch } = useQuery(
     QUERY_AVAILABLE_SUPPLEMENT_JOBS,
@@ -14,17 +23,96 @@ export default function JobsAvailableSupplementContainer({
       fetchPolicy: "network-only"
     }
   );
+  const { t } = useTranslation();
+
   const [deleteAllNewJobs] = useMutation(DELETE_ALL_AVAILABLE_SUPPLEMENT_JOBS);
 
+  const [modalVisible, setModalVisible] = useState(false);
+  const [selectedJob, setSelectedJob] = useState(null);
+  const [insertLoading, setInsertLoading] = useState(false);
+  const [updateJob] = useMutation(UPDATE_JOB);
+  const [loadEstData, estData] = estDataLazyLoad;
+const importOptionsState = useState({overrideHeaders: false,})
+
+  const onModalOk = () => {
+    setModalVisible(false);
+    setInsertLoading(true);
+
+    if (
+      !(
+        estData.data &&
+        estData.data.available_jobs_by_pk &&
+        estData.data.available_jobs_by_pk.est_data
+      )
+    ) {
+      //We don't have the right data. Error!
+      setInsertLoading(false);
+      notification["error"]({
+        message: t("jobs.errors.creating", { error: "No job data present." })
+      });
+    } else {
+      updateJob({
+        variables: {
+          job: estData.data.available_jobs_by_pk.est_data //STRAIGHT DATA PLACE, SHOULD REMOVE
+        }
+      })
+        .then(r => {
+          notification["success"]({
+            message: t("jobs.successes.created"),
+            onClick: () => {
+              console.log("r", r);
+              history.push(
+                `/manage/jobs/${r.data.update_jobs.returning[0].id}`
+              );
+            }
+          });
+          //Job has been inserted. Clean up the available jobs record.
+          deleteJob({
+            variables: { id: estData.data.available_jobs_by_pk.id }
+          }).then(r => {
+            refetch();
+            setInsertLoading(false);
+          });
+        })
+        .catch(r => {
+          //error while inserting
+          notification["error"]({
+            message: t("jobs.errors.creating", { error: r.message })
+          });
+          refetch();
+          setInsertLoading(false);
+        });
+    }
+  };
+
+  const onModalCancel = () => {
+    setModalVisible(false);
+    setSelectedJob(null);
+  };
+
   if (error) return <AlertComponent type="error" message={error.message} />;
   return (
-    <JobsAvailableSupplementComponent
+    <LoadingSpinner
-      loading={loading}
+      loading={insertLoading}
-      data={data}
+      message={t("jobs.labels.creating_new_job")}
-      refetch={refetch}
+    >
-      deleteJob={deleteJob}
+      <JobsAvailableSupplementComponent
-      deleteAllNewJobs={deleteAllNewJobs}
+        loading={loading}
-      estDataLazyLoad={estDataLazyLoad}
+        data={data}
-    />
+        refetch={refetch}
+        deleteJob={deleteJob}
+        updateJob={updateJob}
+        onModalOk={onModalOk}
+        onModalCancel={onModalCancel}
+        modalVisible={modalVisible}
+        setModalVisible={setModalVisible}
+        selectedJob={selectedJob}
+        setSelectedJob={setSelectedJob}
+        deleteAllNewJobs={deleteAllNewJobs}
+        loadEstData={loadEstData}
+        estData={estData}
+        importOptionsState={importOptionsState}
+      />
+    </LoadingSpinner>
   );
-}
+});

client/src/components/jobs-find-modal/jobs-find-modal.component.jsx

@@ -0,0 +1,172 @@
+import { Checkbox, Divider, Table } from "antd";
+import React from "react";
+import { useTranslation } from "react-i18next";
+import { Link } from "react-router-dom";
+import PhoneFormatter from "../../utils/PhoneFormatter";
+
+export default function JobsFindModalComponent({
+  selectedJob,
+  setSelectedJob,
+  jobsList,
+  jobsListLoading,
+  importOptionsState
+}) {
+  const { t } = useTranslation();
+
+  const [importOptions, setImportOptions] = importOptionsState;
+
+  const columns = [
+    {
+      title: t("jobs.fields.ro_number"),
+      dataIndex: "ro_number",
+      key: "ro_number",
+      width: "8%",
+      render: (text, record) => (
+        <span>
+          <Link to={"/manage/jobs/" + record.id}>
+            {record.ro_number ? record.ro_number : "EST-" + record.est_number}
+          </Link>
+        </span>
+      )
+    },
+    {
+      title: t("jobs.fields.owner"),
+      dataIndex: "owner",
+      key: "owner",
+      ellipsis: true,
+
+      width: "25%",
+
+      render: (text, record) => {
+        return record.owner ? (
+          <Link to={"/manage/owners/" + record.owner.id}>
+            {record.ownr_fn} {record.ownr_ln}
+          </Link>
+        ) : (
+          // t("jobs.errors.noowner")
+          <span>{`${record.ownr_fn} ${record.ownr_ln}`}</span>
+        );
+      }
+    },
+    {
+      title: t("jobs.fields.ownr_ph1"),
+      dataIndex: "ownr_ph1",
+      key: "ownr_ph1",
+      width: "12%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.ownr_ph1 ? (
+          <PhoneFormatter>{record.ownr_ph1}</PhoneFormatter>
+        ) : (
+          t("general.labels.unknown")
+        );
+      }
+    },
+    {
+      title: t("jobs.fields.status"),
+      dataIndex: "status",
+      key: "status",
+      width: "10%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.status || t("general.labels.na");
+      }
+    },
+
+    {
+      title: t("jobs.fields.vehicle"),
+      dataIndex: "vehicle",
+      key: "vehicle",
+      width: "15%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.vehicle ? (
+          <Link to={"/manage/vehicles/" + record.vehicle.id}>
+            {record.vehicle.v_model_yr} {record.vehicle.v_make_desc}{" "}
+            {record.vehicle.v_model_desc}
+          </Link>
+        ) : (
+          t("jobs.errors.novehicle")
+        );
+      }
+    },
+    {
+      title: t("vehicles.fields.plate_no"),
+      dataIndex: "plate_no",
+      key: "plate_no",
+      width: "8%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.vehicle.plate_no ? (
+          <span>{record.vehicle.plate_no}</span>
+        ) : (
+          t("general.labels.unknown")
+        );
+      }
+    },
+    {
+      title: t("jobs.fields.clm_no"),
+      dataIndex: "clm_no",
+      key: "clm_no",
+      width: "12%",
+      ellipsis: true,
+      render: (text, record) => {
+        return record.clm_no ? (
+          <span>{record.clm_no}</span>
+        ) : (
+          t("general.labels.unknown")
+        );
+      }
+    }
+  ];
+
+  const handleOnRowClick = record => {
+    if (record) {
+      if (record.id) {
+        setSelectedJob(record.id);
+        return;
+      }
+    }
+    setSelectedJob(null);
+  };
+
+  return (
+    <div>
+      <Table
+        title={() => t("jobs.labels.existing_jobs")}
+        size="small"
+        pagination={{ position: "bottom" }}
+        columns={columns.map(item => ({ ...item }))}
+        rowKey="id"
+        loading={jobsListLoading}
+        dataSource={jobsList}
+        rowSelection={{
+          onSelect: props => {
+            setSelectedJob(props.id);
+          },
+          type: "radio",
+          selectedRowKeys: [selectedJob]
+        }}
+        onRow={(record, rowIndex) => {
+          return {
+            onClick: event => {
+              handleOnRowClick(record);
+            }
+          };
+        }}
+      />
+      <Divider />
+      <Checkbox
+        defaultChecked={importOptions.overrideHeader}
+        onChange={e =>
+          setImportOptions({
+            ...importOptions,
+            overrideHeader: e.target.checked
+          })
+        }
+      >
+        {t("jobs.labels.override_header")}
+      </Checkbox>
+    </div>
+  );
+}

client/src/components/jobs-find-modal/jobs-find-modal.container.jsx

@@ -0,0 +1,46 @@
+import { Modal } from "antd";
+import React from "react";
+import { useQuery } from "react-apollo";
+import { useTranslation } from "react-i18next";
+import { QUERY_ALL_OPEN_JOBS } from "../../graphql/jobs.queries";
+import AlertComponent from "../alert/alert.component";
+import LoadingSpinner from "../loading-spinner/loading-spinner.component";
+import JobsFindModalComponent from "./jobs-find-modal.component";
+
+export default function JobsFindModalContainer({
+  loading,
+  error,
+  selectedJob,
+  setSelectedJob,
+  importOptionsState,
+  ...modalProps
+}) {
+  const { t } = useTranslation();
+
+  const jobsList = useQuery(QUERY_ALL_OPEN_JOBS, {
+    fetchPolicy: "network-only"
+  });
+
+  return (
+    <Modal
+      title={t("jobs.labels.existing_jobs")}
+      width={"80%"}
+      okButtonProps={{ disabled: selectedJob ? false : true }}
+      {...modalProps}
+    >
+      {loading ? <LoadingSpinner /> : null}
+      {error ? <AlertComponent message={error.message} type="error" /> : null}
+      {true ? (
+        <JobsFindModalComponent
+          selectedJob={selectedJob}
+          setSelectedJob={setSelectedJob}
+          importOptionsState={importOptionsState}
+          jobsListLoading={jobsList.loading}
+          jobsList={
+            jobsList.data && jobsList.data.jobs ? jobsList.data.jobs : null
+          }
+        />
+      ) : null}
+    </Modal>
+  );
+}

client/src/components/owner-find-modal/owner-find-modal.component.jsx

@@ -118,7 +118,8 @@ export default function OwnerFindModalComponent({
         checked={selectedOwner ? false : true}
         onClick={() => setSelectedOwner(null)}
       >
-        Create a new Owner record for this job.
+        
+        {t("owners.labels.create_new")}
       </Checkbox>
     </div>
   );

client/src/components/owner-find-modal/owner-find-modal.container.jsx

@@ -35,6 +35,7 @@ export default function OwnerFindModalContainer({
     <Modal
       title={t("owners.labels.existing_owners")}
       width={"80%"}
+      okButtonProps={{ disabled: selectedOwner ? false : true }}
       {...modalProps}
     >
       {loading ? <LoadingSpinner /> : null}

client/src/graphql/available-jobs.queries.js

@@ -75,6 +75,7 @@ export const QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK = gql`
   query QUERY_AVAILABLE_NEW_JOBS_EST_DATA_BY_PK($id: uuid!) {
     available_jobs_by_pk(id: $id) {
       id
+      issupplement
       est_data
     }
   }

client/src/translations/en_us/common.json

@@ -269,8 +269,10 @@
 				},
 				"creating_new_job": "Creating new job...",
 				"documents": "Documents",
+				"existing_jobs": "Existing Jobs",
 				"lines": "Estimate Lines",
 				"notes": "Notes",
+				"override_header": "Override estimate header on import?",
 				"parts": "Parts",
 				"rates": "Rates",
 				"vehicle_info": "Vehicle"
@@ -359,6 +361,7 @@
 				"preferred_contact": "Preferred Contact Method"
 			},
 			"labels": {
+				"create_new": "Create a new owner record.",
 				"existing_owners": "Existing Owners"
 			},
 			"successes": {

client/src/translations/es/common.json

@@ -269,8 +269,10 @@
 				},
 				"creating_new_job": "Creando nuevo trabajo ...",
 				"documents": "documentos",
+				"existing_jobs": "Empleos existentes",
 				"lines": "Líneas estimadas",
 				"notes": "Notas",
+				"override_header": "¿Anular encabezado estimado al importar?",
 				"parts": "Partes",
 				"rates": "Tarifas",
 				"vehicle_info": "Vehículo"
@@ -359,6 +361,7 @@
 				"preferred_contact": "Método de Contacto Preferido"
 			},
 			"labels": {
+				"create_new": "Crea un nuevo registro de propietario.",
 				"existing_owners": "Propietarios existentes"
 			},
 			"successes": {

client/src/translations/fr/common.json

@@ -269,8 +269,10 @@
 				},
 				"creating_new_job": "Création d'un nouvel emploi ...",
 				"documents": "Les documents",
+				"existing_jobs": "Emplois existants",
 				"lines": "Estimer les lignes",
 				"notes": "Remarques",
+				"override_header": "Remplacer l'en-tête d'estimation à l'importation?",
 				"parts": "les pièces",
 				"rates": "Les taux",
 				"vehicle_info": "Véhicule"
@@ -359,6 +361,7 @@
 				"preferred_contact": "Méthode de contact préférée"
 			},
 			"labels": {
+				"create_new": "Créez un nouvel enregistrement de propriétaire.",
 				"existing_owners": "Propriétaires existants"
 			},
 			"successes": {