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

Revert "Release/2026 02 27 (pull request #3070)"

Browse Source
This commit is contained in:
Patrick Fic
2026-03-04 16:18:44 +00:00
parent 522f2b9e26
commit c9e41ba72a
204 changed files with 5497 additions and 7715 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
View File

@@ -1,6 +1,5 @@
import { EditFilled } from "@ant-design/icons";
import { Alert, Card, Col, Row, Space, Typography } from "antd";
import ResponsiveTable from "../responsive-table/responsive-table.component";
import { Alert, Card, Col, Row, Space, Table, Typography } from "antd";
import { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
@@ -197,9 +196,8 @@ export function LaborAllocationsTable({
<Row gutter={[16, 16]}>
<Col span={24}>
<Card title={t("jobs.labels.laborallocations")}>
<ResponsiveTable
<Table
columns={columns}
mobileColumnKeys={["line_desc", "total", "cost_center", "hrs_claimed"]}
rowKey={(record) => `${record.cost_center} ${record.mod_lbr_ty}`}
pagination={false}
onChange={handleTableChange}
@@ -217,22 +215,16 @@ export function LaborAllocationsTable({
x: true
}}
summary={() => (
<ResponsiveTable.Summary.Row>
<ResponsiveTable.Summary.Cell>
<Table.Summary.Row>
<Table.Summary.Cell>
<Typography.Title level={4} style={{ margin: 0, lineHeight: 1 }}>
{t("general.labels.totals")}
</Typography.Title>
</ResponsiveTable.Summary.Cell>
<ResponsiveTable.Summary.Cell align="right">
{summary.hrs_total.toFixed(1)}
</ResponsiveTable.Summary.Cell>
<ResponsiveTable.Summary.Cell align="right">
{summary.hrs_claimed.toFixed(1)}
</ResponsiveTable.Summary.Cell>
<ResponsiveTable.Summary.Cell align="right">
{summary.adjustments.toFixed(1)}
</ResponsiveTable.Summary.Cell>
<ResponsiveTable.Summary.Cell align="right">
</Table.Summary.Cell>
<Table.Summary.Cell align="right">{summary.hrs_total.toFixed(1)}</Table.Summary.Cell>
<Table.Summary.Cell align="right">{summary.hrs_claimed.toFixed(1)}</Table.Summary.Cell>
<Table.Summary.Cell align="right">{summary.adjustments.toFixed(1)}</Table.Summary.Cell>
<Table.Summary.Cell align="right">
<Typography.Text
style={{
fontWeight: "bold",
@@ -241,8 +233,8 @@ export function LaborAllocationsTable({
>
{(Math.abs(summary.difference) < 0.05 ? 0 : summary.difference).toFixed(1)}
</Typography.Text>
</ResponsiveTable.Summary.Cell>
</ResponsiveTable.Summary.Row>
</Table.Summary.Cell>
</Table.Summary.Row>
)}
/>
</Card>
@@ -250,9 +242,8 @@ export function LaborAllocationsTable({
{convertedLines && convertedLines.length > 0 && (
<Col span={24}>
<Card title={t("jobs.labels.convertedtolabor")}>
<ResponsiveTable
<Table
columns={convertedTableCols}
mobileColumnKeys={["line_desc", "total", "cost_center", "hrs_claimed"]}
rowKey="id"
pagination={false}
dataSource={hasTimeTicketAccess ? convertedLines : []}

25
client/src/components/labor-allocations-table/labor-allocations-table.payroll.component.jsx
View File

@@ -1,5 +1,4 @@
import { Alert, Button, Card, Col, Row, Space, Typography } from "antd";
import ResponsiveTable from "../responsive-table/responsive-table.component";
import { Alert, Button, Card, Col, Row, Space, Table, Typography } from "antd";
import { SyncOutlined } from "@ant-design/icons";
import axios from "axios";
import _ from "lodash";
@@ -252,9 +251,8 @@ export function PayrollLaborAllocationsTable({
</Space>
}
>
<ResponsiveTable
<Table
columns={columns}
mobileColumnKeys={["line_desc", "employeeid", "mod_lbr_ty", "rate"]}
rowKey={(record) => `${record.employeeid} ${record.mod_lbr_ty}`}
pagination={false}
onChange={handleTableChange}
@@ -272,16 +270,16 @@ export function PayrollLaborAllocationsTable({
})
}}
summary={() => (
<ResponsiveTable.Summary.Row>
<ResponsiveTable.Summary.Cell>
<Table.Summary.Row>
<Table.Summary.Cell>
<Typography.Title level={4}>{t("general.labels.totals")}</Typography.Title>
</ResponsiveTable.Summary.Cell>
<ResponsiveTable.Summary.Cell></ResponsiveTable.Summary.Cell>
<ResponsiveTable.Summary.Cell>{summary.hrs_total.toFixed(5)}</ResponsiveTable.Summary.Cell>
<ResponsiveTable.Summary.Cell>{summary.hrs_claimed.toFixed(5)}</ResponsiveTable.Summary.Cell>
</Table.Summary.Cell>
<Table.Summary.Cell></Table.Summary.Cell>
<Table.Summary.Cell>{summary.hrs_total.toFixed(5)}</Table.Summary.Cell>
<Table.Summary.Cell>{summary.hrs_claimed.toFixed(5)}</Table.Summary.Cell>
<ResponsiveTable.Summary.Cell>{summary.difference.toFixed(5)}</ResponsiveTable.Summary.Cell>
</ResponsiveTable.Summary.Row>
<Table.Summary.Cell>{summary.difference.toFixed(5)}</Table.Summary.Cell>
</Table.Summary.Row>
)}
/>
</Card>
@@ -289,9 +287,8 @@ export function PayrollLaborAllocationsTable({
{convertedLines && convertedLines.length > 0 && (
<Col span={24}>
<Card title={t("jobs.labels.convertedtolabor")}>
<ResponsiveTable
<Table
columns={convertedTableCols}
mobileColumnKeys={["line_desc", "employeeid", "mod_lbr_ty", "rate"]}
rowKey="id"
pagination={false}
dataSource={convertedLines}