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

Merged in release/2023-12-01 (pull request #1087)

Browse Source 
Release/2023 12 01

Approved-by: Allan Carr
This commit is contained in:
Dave Richer
2023-11-29 21:27:34 +00:00
committed by Allan Carr
parent 85b1875a22 ed0136090c
commit 2a2f8e51b3
4 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
View File

@@ -34,10 +34,8 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
title: t("jobs.fields.ro_number"), title: t("jobs.fields.ro_number"),
dataIndex: "ro_number", dataIndex: "ro_number",
key: "ro_number", key: "ro_number",
sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number), sorter: true, //(a, b) => alphaSort(a.ro_number, b.ro_number),
sortOrder: sortcolumn === "ro_number" && sortorder, sortOrder: sortcolumn === "ro_number" && sortorder,
render: (text, record) => ( render: (text, record) => (
<Link to={"/manage/jobs/" + record.id}> <Link to={"/manage/jobs/" + record.id}>
{record.ro_number || t("general.labels.na")} {record.ro_number || t("general.labels.na")}

4
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -44,9 +44,9 @@ export function JobsList({bodyshop,}) {
{ {
[sortcolumn || "ro_number"]: [sortcolumn || "ro_number"]:
sortorder && sortorder !== "false" sortorder && sortorder !== "false"
? sortorder === "descend" ? (sortorder === "descend"
? "desc" ? "desc"
: "asc" : "asc")
: "desc", : "desc",
}, },
], ],

2
client/src/graphql/jobs.queries.js
View File

@@ -12,7 +12,7 @@ export const QUERY_ALL_ACTIVE_JOBS_PAGINATED = gql`
offset: $offset offset: $offset
limit: $limit limit: $limit
where: { status: { _in: $statuses }, converted: { _eq: $isConverted } } where: { status: { _in: $statuses }, converted: { _eq: $isConverted } }
order_by: { created_at: desc } order_by: $order
) { ) {
iouparent iouparent
ownr_fn ownr_fn

4
client/src/pages/jobs-all/jobs-all.container.jsx
View File

@@ -40,9 +40,9 @@ export function AllJobs({ setBreadcrumbs, setSelectedHeader }) {
{ {
[sortcolumn || "ro_number"]: [sortcolumn || "ro_number"]:
sortorder && sortorder !== "false" sortorder && sortorder !== "false"
? sortorder === "descend" ? (sortorder === "descend"
? "desc" ? "desc"
: "asc" : "asc")
: "desc", : "desc",
}, },
], ],