Uploads and viewing from bills.

2022-05-05 15:46:58 -07:00
parent 5461aae6f6
commit a1e4f3827d
17 changed files with 341 additions and 52 deletions
--- a/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
+++ b/client/src/components/bill-detail-edit/bill-detail-edit.container.jsx
@@ -12,27 +12,29 @@ import moment from "moment";
 import queryString from "query-string";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
-import { useLocation, useHistory } from "react-router-dom";
+import { connect } from "react-redux";
+import { useHistory, useLocation } from "react-router-dom";
+import { createStructuredSelector } from "reselect";
 import {
  DELETE_BILL_LINE,
  INSERT_NEW_BILL_LINES,
  UPDATE_BILL_LINE,
 } from "../../graphql/bill-lines.queries";
 import { QUERY_BILL_BY_PK, UPDATE_BILL } from "../../graphql/bills.queries";
+import { insertAuditTrail } from "../../redux/application/application.actions";
+import { setModalContext } from "../../redux/modals/modals.actions";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import AlertComponent from "../alert/alert.component";
 import BillFormContainer from "../bill-form/bill-form.container";
-import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
-import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
-import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
-import { connect } from "react-redux";
-import { createStructuredSelector } from "reselect";
-import { setModalContext } from "../../redux/modals/modals.actions";
-import { insertAuditTrail } from "../../redux/application/application.actions";
-import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillMarkExportedButton from "../bill-mark-exported-button/bill-mark-exported-button.component";
+import BillReeportButtonComponent from "../bill-reexport-button/bill-reexport-button.component";
+import JobDocumentsGallery from "../jobs-documents-gallery/jobs-documents-gallery.container";
+import JobsDocumentsLocalGallery from "../jobs-documents-local-gallery/jobs-documents-local-gallery.container";
+import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";

 const mapStateToProps = createStructuredSelector({
-  //currentUser: selectCurrentUser
+  bodyshop: selectBodyshop,
 });
 const mapDispatchToProps = (dispatch) => ({
  setPartsOrderContext: (context) =>
@@ -49,6 +51,7 @@ export default connect(
 export function BillDetailEditcontainer({
  setPartsOrderContext,
  insertAuditTrail,
+  bodyshop,
 }) {
  const search = queryString.parse(useLocation().search);
  const history = useHistory();
@@ -265,12 +268,21 @@ export function BillDetailEditcontainer({
            layout="vertical"
          >
            <BillFormContainer form={form} billEdit disabled={exported} />
-            <JobDocumentsGallery
-              jobId={data ? data.bills_by_pk.jobid : null}
-              billId={search.billid}
-              documentsList={data ? data.bills_by_pk.documents : []}
-              billsCallback={refetch}
-            />
+
+            {bodyshop.uselocalmediaserver ? (
+              <JobsDocumentsLocalGallery
+                job={{ id: data ? data.bills_by_pk.jobid : null }}
+                invoice_number={data ? data.bills_by_pk.invoice_number : null}
+                vendorid={data ? data.bills_by_pk.vendorid : null}
+              />
+            ) : (
+              <JobDocumentsGallery
+                jobId={data ? data.bills_by_pk.jobid : null}
+                billId={search.billid}
+                documentsList={data ? data.bills_by_pk.documents : []}
+                billsCallback={refetch}
+              />
+            )}
          </Form>
        </>
      )}
--- a/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
+++ b/client/src/components/bill-enter-modal/bill-enter-modal.container.jsx
@@ -24,6 +24,7 @@ import AuditTrailMapping from "../../utils/AuditTrailMappings";
 import BillFormContainer from "../bill-form/bill-form.container";
 import { CalculateBillTotal } from "../bill-form/bill-form.totals.utility";
 import { handleUpload } from "../documents-upload/documents-upload.utility";
+import { handleUpload as handleLocalUpload } from "../documents-local-upload/documents-local-upload.utility";

 const mapStateToProps = createStructuredSelector({
  billEnterModal: selectBillEnterModal,
@@ -210,19 +211,33 @@ function BillEnterModalContainer({
    /////////////////////////
    if (upload && upload.length > 0) {
      //insert Each of the documents?
-      upload.forEach((u) => {
-        handleUpload(
-          { file: u.originFileObj },
-          {
-            bodyshop: bodyshop,
-            uploaded_by: currentUser.email,
-            jobId: values.jobid,
-            billId: billId,
-            tagsArray: null,
-            callback: null,
-          }
-        );
-      });
+
+      if (bodyshop.uselocalmediaserver) {
+        upload.forEach((u) => {
+          handleLocalUpload({
+            ev: { file: u.originFileObj },
+            context: {
+              jobid: values.jobid,
+              invoice_number: remainingValues.invoice_number,
+              vendorid: remainingValues.vendorid,
+            },
+          });
+        });
+      } else {
+        upload.forEach((u) => {
+          handleUpload(
+            { file: u.originFileObj },
+            {
+              bodyshop: bodyshop,
+              uploaded_by: currentUser.email,
+              jobId: values.jobid,
+              billId: billId,
+              tagsArray: null,
+              callback: null,
+            }
+          );
+        });
+      }
    }
    ///////////////////////////
    setLoading(false);
--- a/client/src/components/documents-local-upload/documents-local-upload.component.jsx
+++ b/client/src/components/documents-local-upload/documents-local-upload.component.jsx
@@ -20,6 +20,8 @@ export function DocumentsLocalUploadComponent({
  currentUser,
  bodyshop,
  job,
+  vendorid,
+  invoice_number,
  callbackAfterUpload,
 }) {
  const { t } = useTranslation();
@@ -45,6 +47,8 @@ export function DocumentsLocalUploadComponent({
          ev,
          context: {
            jobid: job.id,
+            vendorid,
+            invoice_number,
            callback: callbackAfterUpload,
          },
        })
--- a/client/src/components/documents-local-upload/documents-local-upload.utility.js
+++ b/client/src/components/documents-local-upload/documents-local-upload.utility.js
@@ -5,7 +5,7 @@ import normalizeUrl from "normalize-url";

 export const handleUpload = async ({ ev, context }) => {
  const { onError, onSuccess, onProgress, file } = ev;
-  const { jobid, callbackAfterUpload } = context;
+  const { jobid, invoice_number, vendorid, callbackAfterUpload } = context;

  var options = {
    headers: { "X-Requested-With": "XMLHttpRequest" },
@@ -17,11 +17,19 @@ export const handleUpload = async ({ ev, context }) => {
  const formData = new FormData();

  formData.append("jobid", jobid);
+  if (invoice_number) {
+    formData.append("invoice_number", invoice_number);
+    formData.append("vendorid", vendorid);
+  }
  formData.append("file", file);
  const bodyshop = store.getState().user.bodyshop;

  const imexMediaServerResponse = await cleanAxios.post(
-    normalizeUrl(`${bodyshop.localmediaserverhttp}/jobs/upload`),
+    normalizeUrl(
+      `${bodyshop.localmediaserverhttp}/${
+        invoice_number ? "bills" : "jobs"
+      }/upload`
+    ),
    formData,
    {
      ...options,
@@ -33,13 +41,14 @@ export const handleUpload = async ({ ev, context }) => {
      onError(imexMediaServerResponse.statusText);
    }
  } else {
-    onSuccess(file);
+    onSuccess && onSuccess(file);
    store.dispatch(
      addMediaForJob({
        jobid,
        media: imexMediaServerResponse.data.map((d) => {
          return {
            ...d,
+            selected: false,
            src: normalizeUrl(`${bodyshop.localmediaserverhttp}/${d.src}`),
            thumbnail: normalizeUrl(
              `${bodyshop.localmediaserverhttp}/${d.thumbnail}`
--- a/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
+++ b/client/src/components/jobs-documents-gallery/jobs-documents-gallery.component.jsx
@@ -1,5 +1,5 @@
-import { FileExcelFilled, EditFilled, SyncOutlined } from "@ant-design/icons";
-import { Card, Col, Row, Space, Button } from "antd";
+import { EditFilled, FileExcelFilled, SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Col, Row, Space } from "antd";
 import React, { useEffect, useState } from "react";
 import Gallery from "react-grid-gallery";
 import { useTranslation } from "react-i18next";
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.container.jsx
@@ -1,22 +1,35 @@
-import React, { useEffect } from "react";
 import { SyncOutlined } from "@ant-design/icons";
+import { Button, Card, Space } from "antd";
+import React, { useEffect } from "react";
+import Gallery from "react-grid-gallery";
+import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import { selectBodyshop } from "../../redux/user/user.selectors";
+import {
+  getBillMedia,
+  getJobMedia,
+  toggleMediaSelected,
+} from "../../redux/media/media.actions";
 import { selectAllMedia } from "../../redux/media/media.selectors";
-import { getJobMedia } from "../../redux/media/media.actions";
-import { Button, Card, Space } from "antd";
-import { useTranslation } from "react-i18next";
-import Gallery from "react-grid-gallery";
+import { selectBodyshop } from "../../redux/user/user.selectors";
 import DocumentsLocalUploadComponent from "../documents-local-upload/documents-local-upload.component";
-import { Link } from "react-router-dom";
+import JobsDocumentsLocalGalleryReassign from "./jobs-documents-local-gallery.reassign.component";
+
 const mapStateToProps = createStructuredSelector({
  bodyshop: selectBodyshop,
  allMedia: selectAllMedia,
 });
+
 const mapDispatchToProps = (dispatch) => ({
  getJobMedia: (id) => dispatch(getJobMedia(id)),
+  getBillMedia: ({ jobid, invoice_number }) => {
+    console.log(jobid);
+    dispatch(getBillMedia({ jobid, invoice_number }));
+  },
+  toggleMediaSelected: ({ jobid, filename }) =>
+    dispatch(toggleMediaSelected({ jobid, filename })),
 });
+
 export default connect(
  mapStateToProps,
  mapDispatchToProps
@@ -24,23 +37,39 @@ export default connect(

 export function JobsDocumentsLocalGallery({
  bodyshop,
+  toggleMediaSelected,
  getJobMedia,
+  getBillMedia,
  allMedia,
  job,
+  invoice_number,
+  vendorid,
 }) {
  const { t } = useTranslation();
  useEffect(() => {
    if (job) {
-      getJobMedia(job.id);
+      if (invoice_number) {
+        getBillMedia({ jobid: job.id, invoice_number });
+      } else {
+        getJobMedia(job.id);
+      }
    }
-  }, [job, getJobMedia]);
+  }, [job, invoice_number, getJobMedia, getBillMedia]);

  return (
    <div>
      <Space wrap>
+        {JSON.stringify({ jobid: job.id, invoice_number, vendorid }, null, 4) ||
+          "NO JOB ID"}
        <Button
          onClick={() => {
-            getJobMedia(job.id);
+            if (job) {
+              if (invoice_number) {
+                getBillMedia({ jobid: job.id, invoice_number });
+              } else {
+                getJobMedia(job.id);
+              }
+            }
          }}
        >
          <SyncOutlined />
@@ -50,15 +79,22 @@ export function JobsDocumentsLocalGallery({
        >
          <Button>{t("documents.labels.openinexplorer")}</Button>
        </a>
+        <JobsDocumentsLocalGalleryReassign jobid={job.id} />
      </Space>
      <Card>
-        <DocumentsLocalUploadComponent job={job} />
+        <DocumentsLocalUploadComponent
+          job={job}
+          invoice_number={invoice_number}
+          vendorid={vendorid}
+        />
      </Card>
      <Card title={t("jobs.labels.documents-images")}>
        <Gallery
          images={(allMedia && allMedia[job.id]) || []}
-          enableImageSelection={false}
          backdropClosesModal={true}
+          onSelectImage={(index, image) => {
+            toggleMediaSelected({ jobid: job.id, filename: image.filename });
+          }}
          onClickImage={(props) => {
            window.open(
              props.target.src,
--- a/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx
+++ b/client/src/components/jobs-documents-local-gallery/jobs-documents-local-gallery.reassign.component.jsx
@@ -0,0 +1,92 @@
+import { Button, Form, Popover, Space } from "antd";
+import React, { useState } from "react";
+import { useTranslation } from "react-i18next";
+import { connect } from "react-redux";
+import { createStructuredSelector } from "reselect";
+import { getJobMedia } from "../../redux/media/media.actions";
+import { selectAllMedia } from "../../redux/media/media.selectors";
+import { selectBodyshop } from "../../redux/user/user.selectors";
+import cleanAxios from "../../utils/CleanAxios";
+import JobSearchSelect from "../job-search-select/job-search-select.component";
+
+const mapStateToProps = createStructuredSelector({
+  allMedia: selectAllMedia,
+  bodyshop: selectBodyshop,
+});
+const mapDispatchToProps = (dispatch) => ({
+  getJobMedia: (id) => dispatch(getJobMedia(id)),
+
+  //setUserLanguage: language => dispatch(setUserLanguage(language))
+});
+export default connect(
+  mapStateToProps,
+  mapDispatchToProps
+)(JobsDocumentsLocalGalleryReassign);
+
+export function JobsDocumentsLocalGalleryReassign({
+  bodyshop,
+  jobid,
+  allMedia,
+  getJobMedia,
+}) {
+  const { t } = useTranslation();
+  const [form] = Form.useForm();
+
+  const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
+
+  const handleFinish = async ({ jobid: newJobid }) => {
+    setLoading(true);
+    const selectedDocuments = allMedia[jobid].filter((m) => m.isSelected);
+
+    await cleanAxios.post(`${bodyshop.localmediaserverhttp}/jobs/move`, {
+      from_jobid: jobid,
+      jobid: newJobid,
+      files: selectedDocuments.map((f) => f.filename),
+    });
+
+    getJobMedia(jobid);
+    setVisible(false);
+    setLoading(false);
+  };
+
+  const popContent = (
+    <div>
+      <Form onFinish={handleFinish} layout="vertical" form={form}>
+        <Form.Item
+          label={t("documents.labels.newjobid")}
+          style={{ width: "20rem" }}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={"jobid"}
+        >
+          <JobSearchSelect />
+        </Form.Item>
+      </Form>
+      <Space>
+        <Button type="primary" onClick={() => form.submit()}>
+          {t("general.actions.submit")}
+        </Button>
+        <Button onClick={() => setVisible(false)}>
+          {t("general.actions.cancel")}
+        </Button>
+      </Space>
+    </div>
+  );
+
+  return (
+    <Popover content={popContent} visible={visible}>
+      <Button
+        //disabled={selectedImages.length < 1}
+        onClick={() => setVisible(true)}
+        loading={loading}
+      >
+        {t("documents.actions.reassign")}
+      </Button>
+    </Popover>
+  );
+}