admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added job recalc when saving a line edit. BOD-385

Browse Source
This commit is contained in:
Patrick Fic
2020-10-05 12:27:08 -07:00
parent d9212dd016
commit 8592c98b93
11 changed files with 48 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/components/job-detail-lines/job-lines.component.jsx
View File

@@ -40,6 +40,7 @@ export function JobLinesComponent({
setSelectedLines,
job,
setJobLineEditContext,
form,
}) {
const [state, setState] = useState({
sortedInfo: {},
@@ -259,7 +260,7 @@ export function JobLinesComponent({
disabled={jobRO}
onClick={() => {
setJobLineEditContext({
actions: { refetch: refetch },
actions: { refetch: refetch, submit: form && form.submit },
context: record,
});
}}

3
client/src/components/job-detail-lines/job-lines.container.jsx
View File

@@ -1,7 +1,7 @@
import React, { useState } from "react";
import JobLinesComponent from "./job-lines.component";
function JobLinesContainer({ job, joblines, refetch }) {
function JobLinesContainer({ job, joblines, refetch, form }) {
const [searchText, setSearchText] = useState("");
const [selectedLines, setSelectedLines] = useState([]);
@@ -39,6 +39,7 @@ function JobLinesContainer({ job, joblines, refetch }) {
selectedLines={selectedLines}
setSelectedLines={setSelectedLines}
job={job}
form={form}
/>
);
}

10
client/src/components/job-lines-upsert-modal/job-lines-upsert-modal.container.jsx
View File

@@ -1,6 +1,6 @@
import { useMutation } from "@apollo/react-hooks";
import { notification } from "antd";
import React, { useState } from "react";
import { useMutation } from "@apollo/react-hooks";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -27,6 +27,7 @@ function JobLinesUpsertModalContainer({
const [insertJobLine] = useMutation(INSERT_NEW_JOB_LINE);
const [updateJobLine] = useMutation(UPDATE_JOB_LINE);
const [loading, setLoading] = useState(false);
const handleFinish = (values) => {
setLoading(true);
if (!jobLineEditModal.context.id) {
@@ -70,7 +71,12 @@ function JobLinesUpsertModalContainer({
}),
});
});
if (jobLineEditModal.actions.refetch) jobLineEditModal.actions.refetch();
if (jobLineEditModal.actions.submit) {
jobLineEditModal.actions.submit();
} else {
if (jobLineEditModal.actions.refetch)
jobLineEditModal.actions.refetch();
}
toggleModalVisible();
}
setLoading(false);

14
client/src/components/jobs-documents-gallery/jobs-documents-gallery.delete.component.jsx
View File

@@ -1,18 +1,14 @@
import { QuestionCircleOutlined } from "@ant-design/icons";
import { useMutation } from "@apollo/react-hooks";
import { Button, notification, Popconfirm } from "antd";
import axios from "axios";
import React, { useState } from "react";
import { useTranslation } from "react-i18next";
import axios from "axios";
import { useMutation } from "@apollo/react-hooks";
import { DELETE_DOCUMENT } from "../../graphql/documents.queries";
import { cleanAxios } from "../../App/App.container";
import { logImEXEvent } from "../../firebase/firebase.utils";
import { QuestionCircleOutlined } from "@ant-design/icons";
import { axiosAuthInterceptorId } from "../../App/App.container";
import { DELETE_DOCUMENT } from "../../graphql/documents.queries";
//Context: currentUserEmail, bodyshop, jobid, invoiceid
var cleanAxios = axios.create();
cleanAxios.interceptors.request.eject(axiosAuthInterceptorId);
export default function JobsDocumentsDeleteButton({
galleryImages,
deletionCallback,

2
client/src/components/vehicle-tag-popover/vehicle-tag-popover.component.jsx
View File

@@ -35,7 +35,7 @@ export default function VehicleTagPopoverComponent({ job }) {
</Col>
<Col span={12}>
<Descriptions
title={t("owners.labels.fromowner")}
title={t("vehicles.labels.fromvehicle")}
size="small"
column={1}
>