Compare commits

...

3 Commits

Author SHA1 Message Date
Allan Carr
05cd60c2a1 IO-3592 WIP Summary Reports
Signed-off-by: Allan Carr <allan@imexsystems.ca>
2026-03-09 17:57:55 -07:00
Dave Richer
b9b3e2c2aa Merged in hotfix/2026-03-09 (pull request #3109)
hotfix/2026-03-09 - Eula
2026-03-09 17:00:49 +00:00
Dave
7e5363f911 hotfix/2026-03-09 - Eula 2026-03-09 12:33:20 -04:00
5 changed files with 42 additions and 5 deletions

View File

@@ -25,6 +25,7 @@ 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);
@@ -36,7 +37,9 @@ const Eula = ({ currentEula, currentUser, acceptEula }) => {
);
useEffect(() => {
handleScroll({ target: markdownCardRef.current });
if (markdownCardRef.current) {
handleScroll({ target: markdownCardRef.current });
}
}, [handleScroll]);
const handleChange = useCallback(() => {

View File

@@ -3372,8 +3372,10 @@
"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",
"work_in_progress_payables": "Work in Progress - Payables"
"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)"
}
},
"schedule": {

View File

@@ -3373,7 +3373,9 @@
"work_in_progress_committed_labour": "",
"work_in_progress_jobs": "",
"work_in_progress_labour": "",
"work_in_progress_payables": ""
"work_in_progress_labour_summary": "",
"work_in_progress_payables": "",
"work_in_progress_payables_summary": ""
}
},
"schedule": {

View File

@@ -3373,7 +3373,9 @@
"work_in_progress_committed_labour": "",
"work_in_progress_jobs": "",
"work_in_progress_labour": "",
"work_in_progress_payables": ""
"work_in_progress_labour_summary": "",
"work_in_progress_payables": "",
"work_in_progress_payables_summary": ""
}
},
"schedule": {

View File

@@ -1717,6 +1717,20 @@ 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: "",
@@ -1746,6 +1760,20 @@ 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: "",