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

- updates from lifecyle component.

Browse Source 
Signed-off-by: Dave Richer <dave@imexsystems.ca>
This commit is contained in:
Dave Richer
2024-01-26 17:46:37 -05:00
parent 86c3806e28
commit 76b25a716c
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/src/components/job-lifecycle/job-lifecycle.component.jsx
View File

@@ -1,5 +1,5 @@
import React, {useCallback, useEffect, useState} from 'react'; import React, {useCallback, useEffect, useState} from 'react';
import moment from "moment"; import day from '../../utils/day';
import axios from 'axios'; import axios from 'axios';
import {Badge, Card, Space, Table, Tag} from 'antd'; import {Badge, Card, Space, Table, Tag} from 'antd';
import {gql, useQuery} from "@apollo/client"; import {gql, useQuery} from "@apollo/client";
@@ -69,7 +69,7 @@ export function JobLifecycleComponent({job, statuses, ...rest}) {
dataIndex: 'start', dataIndex: 'start',
key: 'start', key: 'start',
render: (text) => DateTimeFormatterFunction(text), render: (text) => DateTimeFormatterFunction(text),
sorter: (a, b) => moment(a.start).unix() - moment(b.start).unix(), sorter: (a, b) => day(a.start).unix() - day(b.start).unix(),
}, },
{ {
title: t('job_lifecycle.columns.relative_start'), title: t('job_lifecycle.columns.relative_start'),
@@ -87,7 +87,7 @@ export function JobLifecycleComponent({job, statuses, ...rest}) {
} }
return isEmpty(a.end) ? 1 : -1; return isEmpty(a.end) ? 1 : -1;
} }
return moment(a.end).unix() - moment(b.end).unix(); return day(a.end).unix() - day(b.end).unix();
}, },
render: (text) => isEmpty(text) ? t('job_lifecycle.content.not_available') : DateTimeFormatterFunction(text) render: (text) => isEmpty(text) ? t('job_lifecycle.content.not_available') : DateTimeFormatterFunction(text)
}, },

2
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -310,7 +310,7 @@ export function JobsDetailPage({
key: 'lifecycle', key: 'lifecycle',
icon: <BarsOutlined />, icon: <BarsOutlined />,
label: t('menus.jobsdetail.lifecycle'), label: t('menus.jobsdetail.lifecycle'),
children: <span><BarsOutlined />{t('menus.jobsdetail.lifecycle')}</span> children: <JobLifecycleComponent job={job} statuses={bodyshop.md_ro_statuses} />,
}, },
{ {
key: "dates", key: "dates",

2
client/src/utils/DateFormatter.jsx
View File

@@ -18,7 +18,7 @@ export function DateTimeFormatter(props) {
: null; : null;
} }
export function DateTimeFormatterFunction(date) { export function DateTimeFormatterFunction(date) {
return moment(date).format("MM/DD/YYYY hh:mm a"); return dayjs(date).format("MM/DD/YYYY hh:mm a");
} }
export function TimeFormatter(props) { export function TimeFormatter(props) {
return props.children return props.children