Compare commits
1 Commits
feature/IO
...
feature/IO
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5b16394f9 |
@@ -25,7 +25,6 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
|
||||
|
||||
const handleScroll = useCallback(
|
||||
(e) => {
|
||||
if (!e.target) return;
|
||||
const bottom = e.target.scrollHeight - 100 <= e.target.scrollTop + e.target.clientHeight;
|
||||
if (bottom && !hasEverScrolledToBottom) {
|
||||
setHasEverScrolledToBottom(true);
|
||||
@@ -37,9 +36,7 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
|
||||
);
|
||||
|
||||
useEffect(() => {
|
||||
if (markdownCardRef.current) {
|
||||
handleScroll({ target: markdownCardRef.current });
|
||||
}
|
||||
handleScroll({ target: markdownCardRef.current });
|
||||
}, [handleScroll]);
|
||||
|
||||
const handleChange = useCallback(() => {
|
||||
|
||||
@@ -69,7 +69,9 @@ export function JobsAdminClass({ bodyshop, job }) {
|
||||
</Form>
|
||||
|
||||
<Popconfirm title={t("jobs.labels.changeclass")} onConfirm={() => form.submit()}>
|
||||
<Button loading={loading}>{t("general.actions.save")}</Button>
|
||||
<Button loading={loading} type="primary">
|
||||
{t("general.actions.save")}
|
||||
</Button>
|
||||
</Popconfirm>
|
||||
</div>
|
||||
);
|
||||
|
||||
@@ -157,7 +157,7 @@ export function JobsAdminDatesChange({ insertAuditTrail, job }) {
|
||||
</LayoutFormRow>
|
||||
</Form>
|
||||
|
||||
<Button loading={loading} onClick={() => form.submit()}>
|
||||
<Button loading={loading} type="primary" onClick={() => form.submit()}>
|
||||
{t("general.actions.save")}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -54,7 +54,7 @@ export default function JobAdminOwnerReassociate({ job }) {
|
||||
</Form.Item>
|
||||
</Form>
|
||||
<div>{t("jobs.labels.associationwarning")}</div>
|
||||
<Button loading={loading} onClick={() => form.submit()}>
|
||||
<Button loading={loading} type="primary" onClick={() => form.submit()}>
|
||||
{t("general.actions.save")}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -54,7 +54,7 @@ export default function JobAdminOwnerReassociate({ job }) {
|
||||
</Form.Item>
|
||||
</Form>
|
||||
<div>{t("jobs.labels.associationwarning")}</div>
|
||||
<Button loading={loading} onClick={() => form.submit()}>
|
||||
<Button loading={loading} type="primary" onClick={() => form.submit()}>
|
||||
{t("general.actions.save")}
|
||||
</Button>
|
||||
</div>
|
||||
|
||||
@@ -3372,10 +3372,8 @@
|
||||
"void_ros": "Void ROs",
|
||||
"work_in_progress_committed_labour": "Work in Progress - Committed Labor",
|
||||
"work_in_progress_jobs": "Work in Progress - Jobs",
|
||||
"work_in_progress_labour": "Work in Progress - Labor (Detail)",
|
||||
"work_in_progress_labour_summary": "Work in Progress - Labor (Summary)",
|
||||
"work_in_progress_payables": "Work in Progress - Payables (Detail)",
|
||||
"work_in_progress_payables_summary": "Work in Progress - Payables (Summary)"
|
||||
"work_in_progress_labour": "Work in Progress - Labor",
|
||||
"work_in_progress_payables": "Work in Progress - Payables"
|
||||
}
|
||||
},
|
||||
"schedule": {
|
||||
|
||||
@@ -3373,9 +3373,7 @@
|
||||
"work_in_progress_committed_labour": "",
|
||||
"work_in_progress_jobs": "",
|
||||
"work_in_progress_labour": "",
|
||||
"work_in_progress_labour_summary": "",
|
||||
"work_in_progress_payables": "",
|
||||
"work_in_progress_payables_summary": ""
|
||||
"work_in_progress_payables": ""
|
||||
}
|
||||
},
|
||||
"schedule": {
|
||||
|
||||
@@ -3373,9 +3373,7 @@
|
||||
"work_in_progress_committed_labour": "",
|
||||
"work_in_progress_jobs": "",
|
||||
"work_in_progress_labour": "",
|
||||
"work_in_progress_labour_summary": "",
|
||||
"work_in_progress_payables": "",
|
||||
"work_in_progress_payables_summary": ""
|
||||
"work_in_progress_payables": ""
|
||||
}
|
||||
},
|
||||
"schedule": {
|
||||
|
||||
@@ -1717,20 +1717,6 @@ export const TemplateList = (type, context) => {
|
||||
group: "jobs",
|
||||
featureNameRestricted: "timetickets"
|
||||
},
|
||||
work_in_progress_labour_summary: {
|
||||
title: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
|
||||
description: "",
|
||||
subject: i18n.t("reportcenter.templates.work_in_progress_labour_summary"),
|
||||
key: "work_in_progress_labour_summary",
|
||||
//idtype: "vendor",
|
||||
disabled: false,
|
||||
rangeFilter: {
|
||||
object: i18n.t("reportcenter.labels.objects.jobs"),
|
||||
field: i18n.t("jobs.fields.date_open")
|
||||
},
|
||||
group: "jobs",
|
||||
featureNameRestricted: "timetickets"
|
||||
},
|
||||
work_in_progress_committed_labour: {
|
||||
title: i18n.t("reportcenter.templates.work_in_progress_committed_labour"),
|
||||
description: "",
|
||||
@@ -1760,20 +1746,6 @@ export const TemplateList = (type, context) => {
|
||||
group: "jobs",
|
||||
featureNameRestricted: "bills"
|
||||
},
|
||||
work_in_progress_payables_summary: {
|
||||
title: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
|
||||
description: "",
|
||||
subject: i18n.t("reportcenter.templates.work_in_progress_payables_summary"),
|
||||
key: "work_in_progress_payables_summary",
|
||||
//idtype: "vendor",
|
||||
disabled: false,
|
||||
rangeFilter: {
|
||||
object: i18n.t("reportcenter.labels.objects.jobs"),
|
||||
field: i18n.t("jobs.fields.date_open")
|
||||
},
|
||||
group: "jobs",
|
||||
featureNameRestricted: "bills"
|
||||
},
|
||||
lag_time: {
|
||||
title: i18n.t("reportcenter.templates.lag_time"),
|
||||
description: "",
|
||||
|
||||
Reference in New Issue
Block a user