+
+
{
+ return (
+
+ {
+ console.log(value);
+ }}
+ enterButton
+ />
+
+
-
- );
- }}
- size="small"
- pagination={{ position: "top" }}
- columns={columns.map(item => ({ ...item }))}
- rowKey="id"
- dataSource={data && data.available_jobs}
- onChange={handleTableChange}
- />
+ }}
+ >
+ Delete All
+
+
+ );
+ }}
+ size="small"
+ pagination={{ position: "top" }}
+ columns={columns.map(item => ({ ...item }))}
+ rowKey="id"
+ dataSource={data && data.available_jobs}
+ onChange={handleTableChange}
+ />
+
);
}
diff --git a/client/src/components/jobs-available-supplement/jobs-available-supplement.container.jsx b/client/src/components/jobs-available-supplement/jobs-available-supplement.container.jsx
index 306ba3a3d..37590bf4c 100644
--- a/client/src/components/jobs-available-supplement/jobs-available-supplement.container.jsx
+++ b/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 ;
return (
-
+
+
+
);
-}
+});
diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.component.jsx
new file mode 100644
index 000000000..f284e5b15
--- /dev/null
+++ b/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) => (
+
+
+ {record.ro_number ? record.ro_number : "EST-" + record.est_number}
+
+
+ )
+ },
+ {
+ title: t("jobs.fields.owner"),
+ dataIndex: "owner",
+ key: "owner",
+ ellipsis: true,
+
+ width: "25%",
+
+ render: (text, record) => {
+ return record.owner ? (
+
+ {record.ownr_fn} {record.ownr_ln}
+
+ ) : (
+ // t("jobs.errors.noowner")
+ {`${record.ownr_fn} ${record.ownr_ln}`}
+ );
+ }
+ },
+ {
+ title: t("jobs.fields.ownr_ph1"),
+ dataIndex: "ownr_ph1",
+ key: "ownr_ph1",
+ width: "12%",
+ ellipsis: true,
+ render: (text, record) => {
+ return record.ownr_ph1 ? (
+ {record.ownr_ph1}
+ ) : (
+ 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 ? (
+
+ {record.vehicle.v_model_yr} {record.vehicle.v_make_desc}{" "}
+ {record.vehicle.v_model_desc}
+
+ ) : (
+ 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 ? (
+ {record.vehicle.plate_no}
+ ) : (
+ 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 ? (
+ {record.clm_no}
+ ) : (
+ t("general.labels.unknown")
+ );
+ }
+ }
+ ];
+
+ const handleOnRowClick = record => {
+ if (record) {
+ if (record.id) {
+ setSelectedJob(record.id);
+ return;
+ }
+ }
+ setSelectedJob(null);
+ };
+
+ return (
+
+
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);
+ }
+ };
+ }}
+ />
+
+
+ setImportOptions({
+ ...importOptions,
+ overrideHeader: e.target.checked
+ })
+ }
+ >
+ {t("jobs.labels.override_header")}
+
+
+ );
+}
diff --git a/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx b/client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
new file mode 100644
index 000000000..7825d40a6
--- /dev/null
+++ b/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 (
+
+ {loading ? : null}
+ {error ? : null}
+ {true ? (
+
+ ) : null}
+
+ );
+}
diff --git a/client/src/components/owner-find-modal/owner-find-modal.component.jsx b/client/src/components/owner-find-modal/owner-find-modal.component.jsx
index c9631e54b..49bbf385e 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.component.jsx
+++ b/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")}
);
diff --git a/client/src/components/owner-find-modal/owner-find-modal.container.jsx b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
index 26d9fc3be..9e223f3fd 100644
--- a/client/src/components/owner-find-modal/owner-find-modal.container.jsx
+++ b/client/src/components/owner-find-modal/owner-find-modal.container.jsx
@@ -35,6 +35,7 @@ export default function OwnerFindModalContainer({
{loading ? : null}
diff --git a/client/src/graphql/available-jobs.queries.js b/client/src/graphql/available-jobs.queries.js
index cd23481fd..a35c45bce 100644
--- a/client/src/graphql/available-jobs.queries.js
+++ b/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
}
}
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index b93fd4c25..48f4db41f 100644
--- a/client/src/translations/en_us/common.json
+++ b/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": {
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 78066a6f7..5778c5d11 100644
--- a/client/src/translations/es/common.json
+++ b/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": {
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 159b39982..4371cd8f2 100644
--- a/client/src/translations/fr/common.json
+++ b/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": {