IO-1957 Add efficiencies to timetickets scoreboard
This commit is contained in:
@@ -41451,6 +41451,27 @@
|
|||||||
</translation>
|
</translation>
|
||||||
</translations>
|
</translations>
|
||||||
</concept_node>
|
</concept_node>
|
||||||
|
<concept_node>
|
||||||
|
<name>efficiencyoverperiod</name>
|
||||||
|
<definition_loaded>false</definition_loaded>
|
||||||
|
<description></description>
|
||||||
|
<comment></comment>
|
||||||
|
<default_text></default_text>
|
||||||
|
<translations>
|
||||||
|
<translation>
|
||||||
|
<language>en-US</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>es-MX</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
<translation>
|
||||||
|
<language>fr-CA</language>
|
||||||
|
<approved>false</approved>
|
||||||
|
</translation>
|
||||||
|
</translations>
|
||||||
|
</concept_node>
|
||||||
<concept_node>
|
<concept_node>
|
||||||
<name>jobs</name>
|
<name>jobs</name>
|
||||||
<definition_loaded>false</definition_loaded>
|
<definition_loaded>false</definition_loaded>
|
||||||
|
|||||||
@@ -37,7 +37,6 @@ export function ScheduleCalendarHeaderComponent({
|
|||||||
...otherProps
|
...otherProps
|
||||||
}) {
|
}) {
|
||||||
const ATSToday = useMemo(() => {
|
const ATSToday = useMemo(() => {
|
||||||
console.log("eeee", events);
|
|
||||||
if (!events) return [];
|
if (!events) return [];
|
||||||
return _.groupBy(
|
return _.groupBy(
|
||||||
events.filter(
|
events.filter(
|
||||||
|
|||||||
@@ -80,6 +80,7 @@ export default function ScoreboardTimeTickets() {
|
|||||||
totalThisMonth: 0,
|
totalThisMonth: 0,
|
||||||
totalLastMonth: 0,
|
totalLastMonth: 0,
|
||||||
totalOverPeriod: 0,
|
totalOverPeriod: 0,
|
||||||
|
actualTotalOverPeriod: 0,
|
||||||
employees: {},
|
employees: {},
|
||||||
};
|
};
|
||||||
data.fixedperiod.forEach((ticket) => {
|
data.fixedperiod.forEach((ticket) => {
|
||||||
@@ -92,6 +93,7 @@ export default function ScoreboardTimeTickets() {
|
|||||||
totalThisMonth: 0,
|
totalThisMonth: 0,
|
||||||
totalLastMonth: 0,
|
totalLastMonth: 0,
|
||||||
totalOverPeriod: 0,
|
totalOverPeriod: 0,
|
||||||
|
actualTotalOverPeriod: 0,
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -182,6 +184,9 @@ export default function ScoreboardTimeTickets() {
|
|||||||
ret.employees[ticket.employee.employee_number].totalOverPeriod =
|
ret.employees[ticket.employee.employee_number].totalOverPeriod =
|
||||||
ret.employees[ticket.employee.employee_number].totalOverPeriod +
|
ret.employees[ticket.employee.employee_number].totalOverPeriod +
|
||||||
ticket.productivehrs;
|
ticket.productivehrs;
|
||||||
|
ret.employees[ticket.employee.employee_number].actualTotalOverPeriod =
|
||||||
|
ret.employees[ticket.employee.employee_number].actualTotalOverPeriod +
|
||||||
|
(ticket.actualhrs || 0);
|
||||||
|
|
||||||
if (!totals.employees[ticket.employee.employee_number])
|
if (!totals.employees[ticket.employee.employee_number])
|
||||||
totals.employees[ticket.employee.employee_number] = {
|
totals.employees[ticket.employee.employee_number] = {
|
||||||
@@ -219,7 +224,7 @@ export default function ScoreboardTimeTickets() {
|
|||||||
roundObject(ret);
|
roundObject(ret);
|
||||||
roundObject(totals);
|
roundObject(totals);
|
||||||
roundObject(ret2);
|
roundObject(ret2);
|
||||||
console.log(ret);
|
|
||||||
return {
|
return {
|
||||||
fixed: ret,
|
fixed: ret,
|
||||||
timeperiod: {
|
timeperiod: {
|
||||||
@@ -231,6 +236,8 @@ export default function ScoreboardTimeTickets() {
|
|||||||
};
|
};
|
||||||
}, [fixedPeriods, data, startDate, endDate]);
|
}, [fixedPeriods, data, startDate, endDate]);
|
||||||
|
|
||||||
|
console.log(calculatedData);
|
||||||
|
|
||||||
if (error) return <AlertComponent message={error.message} type="error" />;
|
if (error) return <AlertComponent message={error.message} type="error" />;
|
||||||
if (loading) return <LoadingSpinner />;
|
if (loading) return <LoadingSpinner />;
|
||||||
return (
|
return (
|
||||||
|
|||||||
@@ -19,7 +19,6 @@ export default connect(
|
|||||||
|
|
||||||
export function ScoreboardTicketsStats({ data, bodyshop }) {
|
export function ScoreboardTicketsStats({ data, bodyshop }) {
|
||||||
const { t } = useTranslation();
|
const { t } = useTranslation();
|
||||||
console.log(data);
|
|
||||||
const columns = [
|
const columns = [
|
||||||
{
|
{
|
||||||
title: t("employees.fields.employee_number"),
|
title: t("employees.fields.employee_number"),
|
||||||
@@ -57,6 +56,16 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
|
|||||||
key: "totalOverPeriod",
|
key: "totalOverPeriod",
|
||||||
sorter: (a, b) => a.totalOverPeriod - b.totalOverPeriod,
|
sorter: (a, b) => a.totalOverPeriod - b.totalOverPeriod,
|
||||||
},
|
},
|
||||||
|
{
|
||||||
|
title: t("scoreboard.labels.efficiencyoverperiod"),
|
||||||
|
dataIndex: "efficiencyoverperiod",
|
||||||
|
key: "efficiencyoverperiod",
|
||||||
|
render: (text, record) =>
|
||||||
|
`${(
|
||||||
|
(record.totalOverPeriod / (record.actualTotalOverPeriod || 1)) *
|
||||||
|
100
|
||||||
|
).toFixed(1)} %`,
|
||||||
|
},
|
||||||
];
|
];
|
||||||
|
|
||||||
const tableData = data
|
const tableData = data
|
||||||
@@ -112,6 +121,7 @@ export function ScoreboardTicketsStats({ data, bodyshop }) {
|
|||||||
<Col md={24} lg={20}>
|
<Col md={24} lg={20}>
|
||||||
<Table
|
<Table
|
||||||
columns={columns}
|
columns={columns}
|
||||||
|
rowKey='employee_number'
|
||||||
dataSource={tableData}
|
dataSource={tableData}
|
||||||
id="employee_number"
|
id="employee_number"
|
||||||
scroll={{ y: "300px" }}
|
scroll={{ y: "300px" }}
|
||||||
|
|||||||
@@ -79,6 +79,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
|
|||||||
date
|
date
|
||||||
id
|
id
|
||||||
rate
|
rate
|
||||||
|
actualhrs
|
||||||
productivehrs
|
productivehrs
|
||||||
memo
|
memo
|
||||||
jobid
|
jobid
|
||||||
|
|||||||
@@ -2461,6 +2461,7 @@
|
|||||||
"calendarperiod": "Periods based on calendar weeks/months.",
|
"calendarperiod": "Periods based on calendar weeks/months.",
|
||||||
"dailyactual": "Actual (D)",
|
"dailyactual": "Actual (D)",
|
||||||
"dailytarget": "Daily",
|
"dailytarget": "Daily",
|
||||||
|
"efficiencyoverperiod": "Efficiency over Selected Dates",
|
||||||
"jobs": "Jobs",
|
"jobs": "Jobs",
|
||||||
"lastmonth": "Last Month",
|
"lastmonth": "Last Month",
|
||||||
"lastweek": "Last Week",
|
"lastweek": "Last Week",
|
||||||
|
|||||||
@@ -2461,6 +2461,7 @@
|
|||||||
"calendarperiod": "",
|
"calendarperiod": "",
|
||||||
"dailyactual": "",
|
"dailyactual": "",
|
||||||
"dailytarget": "",
|
"dailytarget": "",
|
||||||
|
"efficiencyoverperiod": "",
|
||||||
"jobs": "",
|
"jobs": "",
|
||||||
"lastmonth": "",
|
"lastmonth": "",
|
||||||
"lastweek": "",
|
"lastweek": "",
|
||||||
|
|||||||
@@ -2461,6 +2461,7 @@
|
|||||||
"calendarperiod": "",
|
"calendarperiod": "",
|
||||||
"dailyactual": "",
|
"dailyactual": "",
|
||||||
"dailytarget": "",
|
"dailytarget": "",
|
||||||
|
"efficiencyoverperiod": "",
|
||||||
"jobs": "",
|
"jobs": "",
|
||||||
"lastmonth": "",
|
"lastmonth": "",
|
||||||
"lastweek": "",
|
"lastweek": "",
|
||||||
|
|||||||
Reference in New Issue
Block a user