tonym/spoolman2
1
0
Fork 0
Code Issues 19 Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Client: Date time zones now handled correctly

Browse Source
This commit is contained in:
Donkie
2023-05-18 13:38:38 +02:00
parent 60ea450ce2
commit 646ade1721
7 changed files with 70 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/index.html
View File

@@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<link rel="icon" href="favicon.svg" /> <link rel="icon" href="/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1" /> <meta name="viewport" content="width=device-width, initial-scale=1" />
<meta name="theme-color" content="#DC7734" /> <meta name="theme-color" content="#DC7734" />
<meta name="description" content="Spoolman UI" /> <meta name="description" content="Spoolman UI" />

10
client/src/pages/filaments/list.tsx
View File

@@ -9,6 +9,10 @@ import {
} from "@refinedev/antd"; } from "@refinedev/antd";
import { Table, Space } from "antd"; import { Table, Space } from "antd";
import { NumberFieldUnit } from "../../components/numberField"; import { NumberFieldUnit } from "../../components/numberField";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
dayjs.extend(utc);
export const FilamentList: React.FC<IResourceComponentsProps> = () => { export const FilamentList: React.FC<IResourceComponentsProps> = () => {
const { tableProps } = useTable({ const { tableProps } = useTable({
@@ -90,7 +94,11 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
dataIndex={["registered"]} dataIndex={["registered"]}
title="Registered" title="Registered"
render={(value) => ( render={(value) => (
<DateField value={value} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(value).local()}
title={dayjs.utc(value).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
)} )}
/> />
<Table.Column dataIndex={["comment"]} title="Comment" /> <Table.Column dataIndex={["comment"]} title="Comment" />

10
client/src/pages/filaments/show.tsx
View File

@@ -3,6 +3,10 @@ import { IResourceComponentsProps, useShow } from "@refinedev/core";
import { Show, NumberField, DateField, TextField } from "@refinedev/antd"; import { Show, NumberField, DateField, TextField } from "@refinedev/antd";
import { Typography } from "antd"; import { Typography } from "antd";
import { NumberFieldUnit } from "../../components/numberField"; import { NumberFieldUnit } from "../../components/numberField";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
dayjs.extend(utc);
const { Title } = Typography; const { Title } = Typography;
@@ -17,7 +21,11 @@ export const FilamentShow: React.FC<IResourceComponentsProps> = () => {
<Title level={5}>Id</Title> <Title level={5}>Id</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>Registered</Title> <Title level={5}>Registered</Title>
<DateField value={record?.registered} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(record?.registered).local()}
title={dayjs.utc(record?.registered).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
<Title level={5}>Name</Title> <Title level={5}>Name</Title>
<TextField value={record?.name} /> <TextField value={record?.name} />
<Title level={5}>Vendor</Title> <Title level={5}>Vendor</Title>

16
client/src/pages/spools/list.tsx
View File

@@ -10,6 +10,10 @@ import {
} from "@refinedev/antd"; } from "@refinedev/antd";
import { Table, Space } from "antd"; import { Table, Space } from "antd";
import { NumberFieldUnit } from "../../components/numberField"; import { NumberFieldUnit } from "../../components/numberField";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
dayjs.extend(utc);
export const SpoolList: React.FC<IResourceComponentsProps> = () => { export const SpoolList: React.FC<IResourceComponentsProps> = () => {
const { tableProps } = useTable({ const { tableProps } = useTable({
@@ -68,14 +72,22 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
dataIndex={["first_used"]} dataIndex={["first_used"]}
title="First Used" title="First Used"
render={(value) => ( render={(value) => (
<DateField value={value} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(value).local()}
title={dayjs.utc(value).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
)} )}
/> />
<Table.Column <Table.Column
dataIndex={["last_used"]} dataIndex={["last_used"]}
title="Last Used" title="Last Used"
render={(value) => ( render={(value) => (
<DateField value={value} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(value).local()}
title={dayjs.utc(value).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
)} )}
/> />
<Table.Column dataIndex={["comment"]} title="Comment" /> <Table.Column dataIndex={["comment"]} title="Comment" />

22
client/src/pages/spools/show.tsx
View File

@@ -3,6 +3,10 @@ import { IResourceComponentsProps, useShow } from "@refinedev/core";
import { Show, NumberField, DateField, TextField } from "@refinedev/antd"; import { Show, NumberField, DateField, TextField } from "@refinedev/antd";
import { Typography } from "antd"; import { Typography } from "antd";
import { NumberFieldUnit } from "../../components/numberField"; import { NumberFieldUnit } from "../../components/numberField";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
dayjs.extend(utc);
const { Title } = Typography; const { Title } = Typography;
@@ -17,11 +21,23 @@ export const SpoolShow: React.FC<IResourceComponentsProps> = () => {
<Title level={5}>Id</Title> <Title level={5}>Id</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>Registered</Title> <Title level={5}>Registered</Title>
<DateField value={record?.registered} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(record?.registered).local()}
title={dayjs.utc(record?.registered).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
<Title level={5}>First Used</Title> <Title level={5}>First Used</Title>
<DateField value={record?.first_used} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(record?.first_used).local()}
title={dayjs.utc(record?.first_used).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
<Title level={5}>Last Used</Title> <Title level={5}>Last Used</Title>
<DateField value={record?.last_used} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(record?.last_used).local()}
title={dayjs.utc(record?.last_used).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
<Title level={5}>Filament</Title> <Title level={5}>Filament</Title>
{/* {filamentIsLoading ? ( {/* {filamentIsLoading ? (
<>Loading...</> <>Loading...</>

10
client/src/pages/vendors/list.tsx vendored
View File

@@ -8,6 +8,10 @@ import {
DateField, DateField,
} from "@refinedev/antd"; } from "@refinedev/antd";
import { Table, Space } from "antd"; import { Table, Space } from "antd";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
dayjs.extend(utc);
export const VendorList: React.FC<IResourceComponentsProps> = () => { export const VendorList: React.FC<IResourceComponentsProps> = () => {
const { tableProps } = useTable({ const { tableProps } = useTable({
@@ -23,7 +27,11 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
dataIndex={["registered"]} dataIndex={["registered"]}
title="Registered" title="Registered"
render={(value) => ( render={(value) => (
<DateField value={value} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(value).local()}
title={dayjs.utc(value).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
)} )}
/> />
<Table.Column dataIndex={["comment"]} title="Comment" /> <Table.Column dataIndex={["comment"]} title="Comment" />

10
client/src/pages/vendors/show.tsx vendored
View File

@@ -2,6 +2,10 @@ import React from "react";
import { IResourceComponentsProps, useShow } from "@refinedev/core"; import { IResourceComponentsProps, useShow } from "@refinedev/core";
import { Show, NumberField, DateField, TextField } from "@refinedev/antd"; import { Show, NumberField, DateField, TextField } from "@refinedev/antd";
import { Typography } from "antd"; import { Typography } from "antd";
import dayjs from "dayjs";
import utc from "dayjs/plugin/utc";
dayjs.extend(utc);
const { Title } = Typography; const { Title } = Typography;
@@ -16,7 +20,11 @@ export const VendorShow: React.FC<IResourceComponentsProps> = () => {
<Title level={5}>Id</Title> <Title level={5}>Id</Title>
<NumberField value={record?.id ?? ""} /> <NumberField value={record?.id ?? ""} />
<Title level={5}>Registered</Title> <Title level={5}>Registered</Title>
<DateField value={record?.registered} format="YYYY-MM-DD HH:mm:ss" /> <DateField
value={dayjs.utc(record?.registered).local()}
title={dayjs.utc(record?.registered).local().format()}
format="YYYY-MM-DD HH:mm:ss"
/>
<Title level={5}>Name</Title> <Title level={5}>Name</Title>
<TextField value={record?.name} /> <TextField value={record?.name} />
<Title level={5}>Comment</Title> <Title level={5}>Comment</Title>