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

Removed job close date. IO-629

Browse Source
This commit is contained in:
Patrick Fic
2021-02-08 11:36:09 -08:00
parent 1d091ac98d
commit 8ef2eac7e4
22 changed files with 1639 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
client/src/components/contract-form/contract-form.component.jsx
View File

@@ -104,9 +104,14 @@ export default function ContractFormComponent({
</Form.Item>
)}
</LayoutFormRow>
<div>
<ContractFormJobPrefill jobId={selectedJobState[0]} form={form} />
</div>
{selectedJobState && (
<div>
<ContractFormJobPrefill
jobId={selectedJobState && selectedJobState[0]}
form={form}
/>
</div>
)}
<LayoutFormRow>
<Form.Item
label={t("contracts.fields.driver_dlnumber")}

8
client/src/components/job-detail-cards/job-detail-cards.dates.component.jsx
View File

@@ -22,7 +22,6 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
data.date_open ||
data.date_scheduled ||
data.date_invoiced ||
data.date_closed ||
data.date_exported
) ? (
<div>{t("jobs.errors.nodates")}</div>
@@ -97,13 +96,6 @@ export default function JobDetailCardsDatesComponent({ loading, data }) {
</Timeline.Item>
) : null}
{data.date_closed ? (
<Timeline.Item>
<label>{t("jobs.fields.date_closed")}: </label>
<DateFormatter>{data.date_closed}</DateFormatter>
</Timeline.Item>
) : null}
{data.date_exported ? (
<Timeline.Item>
<label>{t("jobs.fields.date_exported")}: </label>

14
client/src/components/jobs-detail-dates/jobs-detail-dates.component.jsx
View File

@@ -1,4 +1,4 @@
import { DatePicker, Form } from "antd";
import { DatePicker, Form, Tooltip } from "antd";
import React from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -36,9 +36,11 @@ export function JobsDetailDatesComponent({ jobRO, job }) {
>
<FormDatePicker disabled={jobRO} />
</Form.Item>
<Form.Item label={t("jobs.fields.scheduled_in")} name="scheduled_in">
<DateTimePicker disabled={jobRO} />
</Form.Item>
<Tooltip title={t("jobs.labels.scheduledinchange")}>
<Form.Item label={t("jobs.fields.scheduled_in")} name="scheduled_in">
<DateTimePicker disabled={true || jobRO} />
</Form.Item>
</Tooltip>
<Form.Item label={t("jobs.fields.actual_in")} name="actual_in">
<DateTimePicker disabled={jobRO} />
</Form.Item>
@@ -73,9 +75,7 @@ export function JobsDetailDatesComponent({ jobRO, job }) {
<Form.Item label={t("jobs.fields.date_invoiced")} name="date_invoiced">
<DateTimePicker disabled={jobRO} />
</Form.Item>
<Form.Item label={t("jobs.fields.date_closed")} name="date_closed">
<DateTimePicker />
</Form.Item>
<Form.Item label={t("jobs.fields.date_exported")} name="date_exported">
<DateTimePicker disabled={jobRO} />
</Form.Item>

2
client/src/components/jobs-detail-header-actions/jobs-detail-header-actions.duplicate.util.js
View File

@@ -45,7 +45,7 @@ export default function DuplicateJob(
delete newJob.date_estimated;
delete newJob.date_scheduled;
delete newJob.date_invoiced;
delete newJob.date_closed;
delete newJob.date_exported;
delete newJob.date_delivered;
delete newJob.scheduled_completion;

11
client/src/components/schedule-job-modal/schedule-job-modal.container.jsx
View File

@@ -85,6 +85,17 @@ export function ScheduleJobModalContainer({
}
}
if (existingAppointments.data.appointments.length > 0) {
console.log("Cancelling all previous appts.");
await Promise.all(
existingAppointments.data.appointments.map((app) => {
return cancelAppointment({
variables: { appid: app.id },
});
})
);
}
const appt = await insertAppointment({
variables: {
app: {

5
client/src/graphql/jobs.queries.js
View File

@@ -466,7 +466,6 @@ export const GET_JOB_BY_PK = gql`
date_open
date_scheduled
date_invoiced
date_closed
date_exported
status
owner_owing
@@ -602,7 +601,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
date_invoiced
date_open
date_exported
date_closed
date_scheduled
date_estimated
@@ -658,7 +657,7 @@ export const QUERY_TECH_JOB_DETAILS = gql`
date_invoiced
date_open
date_exported
date_closed
date_scheduled
date_estimated
employee_body

8
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -10,7 +10,7 @@ import Axios from "axios";
import Dinero from "dinero.js";
import moment from "moment";
import queryString from "query-string";
import React, { lazy, Suspense, useState } from "react";
import React, { lazy, Suspense, useState, useEffect } from "react";
import { useTranslation } from "react-i18next";
import { FaHardHat, FaRegStickyNote, FaShieldAlt } from "react-icons/fa";
import { connect } from "react-redux";
@@ -94,6 +94,12 @@ export function JobsDetailPage({
// size: "small",
};
useEffect(() => {
console.log("Resetting jobs form as job has changed.");
form.resetFields();
form.resetFields();
}, [form, job]);
const handleFinish = async (values) => {
setLoading(true);
//const newTotals = CalculateJob({ ...job, ...values }, bodyshop.shoprates);

1
client/src/translations/en_us/common.json
View File

@@ -1155,6 +1155,7 @@
"sale_labor": "Sales - Labor",
"sale_parts": "Sales - Parts",
"sales": "Sales",
"scheduledinchange": "The scheduled in is based off the latest appointment. To change this date, please schedule or reschedule the job. ",
"state_tax_amt": "State/Provincial Taxes",
"subletstotal": "Sublets Total",
"subtotal": "Subtotal",

1
client/src/translations/es/common.json
View File

@@ -1155,6 +1155,7 @@
"sale_labor": "",
"sale_parts": "",
"sales": "",
"scheduledinchange": "",
"state_tax_amt": "",
"subletstotal": "",
"subtotal": "",

1
client/src/translations/fr/common.json
View File

@@ -1155,6 +1155,7 @@
"sale_labor": "",
"sale_parts": "",
"sales": "",
"scheduledinchange": "",
"state_tax_amt": "",
"subletstotal": "",
"subtotal": "",