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

Removed whiteboard from front page. Added dates fields. Added rates fields. Started refactoring lines page.

Browse Source
This commit is contained in:
Patrick Fic
2020-01-30 10:19:37 -08:00
parent 951737bffb
commit 457ec16fdc
18 changed files with 1013 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,7 +7,7 @@ import {
FaRegStickyNote,
FaShieldAlt
} from "react-icons/fa";
import JobsLines from '../../components/job-detail-lines/job-lines.component'
import JobsLinesContainer from "../../components/job-detail-lines/job-lines.container";
import JobsDetailClaims from "../../components/jobs-detail-claims/jobs-detail-claims.component";
import JobsDetailFinancials from "../../components/jobs-detail-financial/jobs-detail-financial.component";
import JobsDetailHeader from "../../components/jobs-detail-header/jobs-detail-header.component";
@@ -15,6 +15,7 @@ import JobsDetailInsurance from "../../components/jobs-detail-insurance/jobs-det
import JobsDocumentsContainer from "../../components/jobs-documents/jobs-documents.container";
import JobNotesContainer from "../../components/jobs-notes/jobs-notes.container";
import JobDetailFormContext from "./jobs-detail.page.context";
import JobsDetailDatesComponent from "../../components/jobs-detail-dates/jobs-detail-dates.component";
export default function JobsDetailPage({
job,
@@ -94,7 +95,7 @@ export default function JobsDetailPage({
}
key="repairdata"
>
<JobsLines job={job} />
<JobsLinesContainer jobId={job.id} />
</Tabs.TabPane>
<Tabs.TabPane
@@ -142,7 +143,7 @@ export default function JobsDetailPage({
}
key="dates"
>
Dates
<JobsDetailDatesComponent job={job} />}
</Tabs.TabPane>
<Tabs.TabPane
@@ -152,7 +153,7 @@ export default function JobsDetailPage({
{t("jobs.labels.documents")}
</span>
}
key="#documents"
key="documents"
>
<JobsDocumentsContainer jobId={job.id} />
</Tabs.TabPane>
@@ -163,7 +164,7 @@ export default function JobsDetailPage({
{t("jobs.labels.notes")}
</span>
}
key="#notes"
key="notes"
>
<JobNotesContainer jobId={job.id} />
</Tabs.TabPane>

16
client/src/pages/jobs-detail/jobs-detail.page.container.jsx
View File

@@ -4,7 +4,11 @@ import { useMutation, useQuery } from "react-apollo";
import { useTranslation } from "react-i18next";
import AlertComponent from "../../components/alert/alert.component";
import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
import { CONVERT_JOB_TO_RO, GET_JOB_BY_PK, UPDATE_JOB } from "../../graphql/jobs.queries";
import {
CONVERT_JOB_TO_RO,
GET_JOB_BY_PK,
UPDATE_JOB
} from "../../graphql/jobs.queries";
import JobsDetailPage from "./jobs-detail.page.component";
import JobDetailFormContext from "./jobs-detail.page.context";
@@ -21,11 +25,13 @@ function JobsDetailPageContainer({ match, form }) {
useEffect(() => {
document.title = loading
? "..."
? t("titles.app")
: error
? t("titles.app")
: t("titles.jobsdetail", {
ro_number: data.jobs_by_pk.ro_number
ro_number: data.jobs_by_pk.converted
? data.jobs_by_pk.ro_number
: `EST ${data.jobs_by_pk.est_number}`
});
}, [loading, data, t, error]);
@@ -54,7 +60,7 @@ function JobsDetailPageContainer({ match, form }) {
};
if (loading) return <SpinComponent />;
if (error) return <AlertComponent message={error.message} type='error' />;
if (error) return <AlertComponent message={error.message} type="error" />;
return data.jobs_by_pk ? (
<JobDetailFormContext.Provider value={form}>
@@ -68,7 +74,7 @@ function JobsDetailPageContainer({ match, form }) {
/>
</JobDetailFormContext.Provider>
) : (
<AlertComponent message={t("jobs.errors.noaccess")} type='error' />
<AlertComponent message={t("jobs.errors.noaccess")} type="error" />
);
}
export default Form.create({ name: "JobsDetailPageContainer" })(