@@ -31,7 +31,7 @@ const JobSearchSelect = (
|
|||||||
const [
|
const [
|
||||||
callIdSearch,
|
callIdSearch,
|
||||||
{
|
{
|
||||||
//loading: idLoading,
|
loading: idLoading,
|
||||||
error: idError,
|
error: idError,
|
||||||
data: idData
|
data: idData
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
|
|||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
|
|
||||||
const data = useMemo(() => {
|
const data = useMemo(() => {
|
||||||
|
|
||||||
return [
|
return [
|
||||||
{
|
{
|
||||||
key: t("jobs.labels.subtotal"),
|
key: t("jobs.labels.subtotal"),
|
||||||
@@ -165,6 +166,8 @@ export function JobTotalsTableTotals({ bodyshop, job }) {
|
|||||||
bold: true
|
bold: true
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
// TODO: was removed by Patrick during a CI bug fix.
|
||||||
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
||||||
}, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
|
}, [job.job_totals, job.cieca_pft, t, bodyshop.md_responsibility_centers]);
|
||||||
|
|
||||||
const columns = [
|
const columns = [
|
||||||
|
|||||||
@@ -90,7 +90,8 @@ function TaskListComponent({
|
|||||||
relationshipType,
|
relationshipType,
|
||||||
relationshipId,
|
relationshipId,
|
||||||
onlyMine,
|
onlyMine,
|
||||||
parentJobId
|
parentJobId,
|
||||||
|
showRo = true,
|
||||||
}) {
|
}) {
|
||||||
const {t} = useTranslation();
|
const {t} = useTranslation();
|
||||||
|
|
||||||
@@ -126,18 +127,23 @@ function TaskListComponent({
|
|||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (showRo) {
|
||||||
|
columns.push(
|
||||||
|
{
|
||||||
|
title: t("tasks.fields.job.ro_number"),
|
||||||
|
dataIndex: ["job", "ro_number"],
|
||||||
|
key: "job.ro_number",
|
||||||
|
width: '8%',
|
||||||
|
render: (text, record) =>
|
||||||
|
record.job
|
||||||
|
? <Link
|
||||||
|
to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number || t("general.labels.na")}</Link>
|
||||||
|
: t("general.labels.na")
|
||||||
|
}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
columns.push(
|
columns.push(
|
||||||
{
|
|
||||||
title: t("tasks.fields.job.ro_number"),
|
|
||||||
dataIndex: ["job", "ro_number"],
|
|
||||||
key: "job.ro_number",
|
|
||||||
width: '8%',
|
|
||||||
render: (text, record) =>
|
|
||||||
record.job
|
|
||||||
? <Link
|
|
||||||
to={`/manage/jobs/${record.job.id}`}>{record.job.ro_number || t("general.labels.na")}</Link>
|
|
||||||
: t("general.labels.na")
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
title: t("tasks.fields.jobline"),
|
title: t("tasks.fields.jobline"),
|
||||||
dataIndex: ["jobline", "id"],
|
dataIndex: ["jobline", "id"],
|
||||||
|
|||||||
@@ -23,7 +23,8 @@ export default function TaskListContainer({
|
|||||||
relationshipId,
|
relationshipId,
|
||||||
currentUser,
|
currentUser,
|
||||||
onlyMine,
|
onlyMine,
|
||||||
parentJobId
|
parentJobId,
|
||||||
|
showRo = true
|
||||||
}) {
|
}) {
|
||||||
const {t} = useTranslation();
|
const {t} = useTranslation();
|
||||||
const searchParams = queryString.parse(useLocation().search);
|
const searchParams = queryString.parse(useLocation().search);
|
||||||
@@ -190,6 +191,7 @@ export default function TaskListContainer({
|
|||||||
relationshipType={relationshipType}
|
relationshipType={relationshipType}
|
||||||
relationshipId={relationshipId}
|
relationshipId={relationshipId}
|
||||||
onlyMine={onlyMine}
|
onlyMine={onlyMine}
|
||||||
|
showRo={showRo}
|
||||||
parentJobId={parentJobId}
|
parentJobId={parentJobId}
|
||||||
/>
|
/>
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -412,7 +412,7 @@ export function JobsDetailPage({
|
|||||||
children: <TaskListContainer currentUser={currentUser} bodyshop={bodyshop}
|
children: <TaskListContainer currentUser={currentUser} bodyshop={bodyshop}
|
||||||
relationshipType={'jobid'} relationshipId={job.id}
|
relationshipType={'jobid'} relationshipId={job.id}
|
||||||
query={QUERY_JOB_TASKS_PAGINATED}
|
query={QUERY_JOB_TASKS_PAGINATED}
|
||||||
titleTranslation='tasks.titles.job_tasks'/>
|
titleTranslation='tasks.titles.job_tasks' showRo={false}/>
|
||||||
},
|
},
|
||||||
]}
|
]}
|
||||||
/>
|
/>
|
||||||
|
|||||||
Reference in New Issue
Block a user