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

Client: Better datetime field support

Browse Source
This commit is contained in:
Donkie
2023-05-14 20:06:44 +02:00
parent 43919ac90e
commit caa25ccf93
10 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
client/src/pages/filaments/edit.tsx
View File

@@ -44,7 +44,7 @@ export const FilamentEdit: React.FC<IResourceComponentsProps> = () => {
value: value ? dayjs(value) : undefined, value: value ? dayjs(value) : undefined,
})} })}
> >
<DatePicker disabled format="lll" /> <DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Name" label="Name"

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

@@ -87,7 +87,9 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
<Table.Column <Table.Column
dataIndex={["registered"]} dataIndex={["registered"]}
title="Registered" title="Registered"
render={(value: any) => <DateField value={value} />} render={(value) => (
<DateField value={value} format="YYYY-MM-DD HH:mm:ss" />
)}
/> />
<Table.Column dataIndex={["comment"]} title="Comment" /> <Table.Column dataIndex={["comment"]} title="Comment" />
<Table.Column <Table.Column

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

@@ -16,7 +16,7 @@ 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="lll" /> <DateField value={record?.registered} 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>

4
client/src/pages/spools/create.tsx
View File

@@ -28,7 +28,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps> = () => {
value: value ? dayjs(value) : undefined, value: value ? dayjs(value) : undefined,
})} })}
> >
<DatePicker format="lll" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Last Used" label="Last Used"
@@ -42,7 +42,7 @@ export const SpoolCreate: React.FC<IResourceComponentsProps> = () => {
value: value ? dayjs(value) : undefined, value: value ? dayjs(value) : undefined,
})} })}
> >
<DatePicker format="lll" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Filament" label="Filament"

6
client/src/pages/spools/edit.tsx
View File

@@ -44,7 +44,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
value: value ? dayjs(value) : undefined, value: value ? dayjs(value) : undefined,
})} })}
> >
<DatePicker disabled format="lll" /> <DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="First Used" label="First Used"
@@ -58,7 +58,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
value: value ? dayjs(value) : undefined, value: value ? dayjs(value) : undefined,
})} })}
> >
<DatePicker format="lll" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Last Used" label="Last Used"
@@ -72,7 +72,7 @@ export const SpoolEdit: React.FC<IResourceComponentsProps> = () => {
value: value ? dayjs(value) : undefined, value: value ? dayjs(value) : undefined,
})} })}
> >
<DatePicker format="lll" /> <DatePicker showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Filament" label="Filament"

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

@@ -42,12 +42,16 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
<Table.Column <Table.Column
dataIndex={["first_used"]} dataIndex={["first_used"]}
title="First Used" title="First Used"
render={(value: any) => <DateField value={value} format="lll" />} render={(value) => (
<DateField value={value} 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: any) => <DateField value={value} format="lll" />} render={(value) => (
<DateField value={value} format="YYYY-MM-DD HH:mm:ss" />
)}
/> />
<Table.Column dataIndex="location" title="Location" /> <Table.Column dataIndex="location" title="Location" />
<Table.Column dataIndex="lot_nr" title="Lot Nr" /> <Table.Column dataIndex="lot_nr" title="Lot Nr" />

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

@@ -16,11 +16,11 @@ 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="lll" /> <DateField value={record?.registered} 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="lll" /> <DateField value={record?.first_used} 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="lll" /> <DateField value={record?.last_used} format="YYYY-MM-DD HH:mm:ss" />
<Title level={5}>Filament</Title> <Title level={5}>Filament</Title>
{/* {filamentIsLoading ? ( {/* {filamentIsLoading ? (
<>Loading...</> <>Loading...</>

2
client/src/pages/vendors/edit.tsx vendored
View File

@@ -34,7 +34,7 @@ export const VendorEdit: React.FC<IResourceComponentsProps> = () => {
value: value ? dayjs(value) : undefined, value: value ? dayjs(value) : undefined,
})} })}
> >
<DatePicker disabled format="lll" /> <DatePicker disabled showTime format="YYYY-MM-DD HH:mm:ss" />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label="Name" label="Name"

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

@@ -22,7 +22,9 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
<Table.Column <Table.Column
dataIndex={["registered"]} dataIndex={["registered"]}
title="Registered" title="Registered"
render={(value: any) => <DateField value={value} format="lll" />} render={(value) => (
<DateField value={value} format="YYYY-MM-DD HH:mm:ss" />
)}
/> />
<Table.Column dataIndex={["comment"]} title="Comment" /> <Table.Column dataIndex={["comment"]} title="Comment" />
<Table.Column <Table.Column

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

@@ -16,7 +16,7 @@ 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="lll" /> <DateField value={record?.registered} 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>