@@ -168,12 +168,13 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<Table {...tableProps} dataSource={dataSource} rowKey="id">
|
<Table {...tableProps} sticky scroll={{ x: "max-content" }} dataSource={dataSource} rowKey="id">
|
||||||
{SortedColumn({
|
{SortedColumn({
|
||||||
id: "id",
|
id: "id",
|
||||||
i18ncat: "filament",
|
i18ncat: "filament",
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 70,
|
||||||
})}
|
})}
|
||||||
{FilteredQueryColumn({
|
{FilteredQueryColumn({
|
||||||
id: "vendor.name",
|
id: "vendor.name",
|
||||||
@@ -196,12 +197,14 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
filterValueQuery: useSpoolmanMaterials(),
|
filterValueQuery: useSpoolmanMaterials(),
|
||||||
|
width: 110,
|
||||||
})}
|
})}
|
||||||
{SortedColumn({
|
{SortedColumn({
|
||||||
id: "price",
|
id: "price",
|
||||||
i18ncat: "filament",
|
i18ncat: "filament",
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 80,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "density",
|
id: "density",
|
||||||
@@ -210,6 +213,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 2,
|
decimals: 2,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 100,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "diameter",
|
id: "diameter",
|
||||||
@@ -218,6 +222,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 2,
|
decimals: 2,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 100,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "weight",
|
id: "weight",
|
||||||
@@ -226,6 +231,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 1,
|
decimals: 1,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 100,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "spool_weight",
|
id: "spool_weight",
|
||||||
@@ -234,6 +240,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 1,
|
decimals: 1,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 100,
|
||||||
})}
|
})}
|
||||||
{FilteredQueryColumn({
|
{FilteredQueryColumn({
|
||||||
id: "article_number",
|
id: "article_number",
|
||||||
@@ -241,6 +248,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
filterValueQuery: useSpoolmanArticleNumbers(),
|
filterValueQuery: useSpoolmanArticleNumbers(),
|
||||||
|
width: 130,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "settings_extruder_temp",
|
id: "settings_extruder_temp",
|
||||||
@@ -249,6 +257,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 0,
|
decimals: 0,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 100,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "settings_bed_temp",
|
id: "settings_bed_temp",
|
||||||
@@ -257,6 +266,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 0,
|
decimals: 0,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 100,
|
||||||
})}
|
})}
|
||||||
{DateColumn({
|
{DateColumn({
|
||||||
id: "registered",
|
id: "registered",
|
||||||
@@ -269,6 +279,7 @@ export const FilamentList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
i18ncat: "filament",
|
i18ncat: "filament",
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 150,
|
||||||
})}
|
})}
|
||||||
<Table.Column
|
<Table.Column
|
||||||
title={t("table.actions")}
|
title={t("table.actions")}
|
||||||
|
|||||||
@@ -227,6 +227,8 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
>
|
>
|
||||||
<Table
|
<Table
|
||||||
{...tableProps}
|
{...tableProps}
|
||||||
|
sticky
|
||||||
|
scroll={{ x: "max-content" }}
|
||||||
dataSource={dataSource}
|
dataSource={dataSource}
|
||||||
rowKey="id"
|
rowKey="id"
|
||||||
// Make archived rows greyed out
|
// Make archived rows greyed out
|
||||||
@@ -248,6 +250,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
i18ncat: "spool",
|
i18ncat: "spool",
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 70,
|
||||||
})}
|
})}
|
||||||
{SpoolIconColumn({
|
{SpoolIconColumn({
|
||||||
id: "combined_name",
|
id: "combined_name",
|
||||||
@@ -264,6 +267,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
filterValueQuery: useSpoolmanMaterials(),
|
filterValueQuery: useSpoolmanMaterials(),
|
||||||
|
width: 120,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "used_weight",
|
id: "used_weight",
|
||||||
@@ -272,6 +276,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 1,
|
decimals: 1,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 110,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "remaining_weight",
|
id: "remaining_weight",
|
||||||
@@ -281,6 +286,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
defaultText: t("unknown"),
|
defaultText: t("unknown"),
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 110,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "used_length",
|
id: "used_length",
|
||||||
@@ -289,6 +295,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
decimals: 1,
|
decimals: 1,
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 120,
|
||||||
})}
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "remaining_length",
|
id: "remaining_length",
|
||||||
@@ -298,6 +305,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
defaultText: t("unknown"),
|
defaultText: t("unknown"),
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 120,
|
||||||
})}
|
})}
|
||||||
{FilteredQueryColumn({
|
{FilteredQueryColumn({
|
||||||
id: "location",
|
id: "location",
|
||||||
@@ -305,6 +313,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
filterValueQuery: useSpoolmanLocations(),
|
filterValueQuery: useSpoolmanLocations(),
|
||||||
|
width: 120,
|
||||||
})}
|
})}
|
||||||
{FilteredQueryColumn({
|
{FilteredQueryColumn({
|
||||||
id: "lot_nr",
|
id: "lot_nr",
|
||||||
@@ -312,6 +321,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
filterValueQuery: useSpoolmanLotNumbers(),
|
filterValueQuery: useSpoolmanLotNumbers(),
|
||||||
|
width: 120,
|
||||||
})}
|
})}
|
||||||
{DateColumn({
|
{DateColumn({
|
||||||
id: "first_used",
|
id: "first_used",
|
||||||
@@ -336,6 +346,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
i18ncat: "spool",
|
i18ncat: "spool",
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 150,
|
||||||
})}
|
})}
|
||||||
<Table.Column
|
<Table.Column
|
||||||
title={t("table.actions")}
|
title={t("table.actions")}
|
||||||
|
|||||||
3
client/src/pages/vendors/list.tsx
vendored
3
client/src/pages/vendors/list.tsx
vendored
@@ -114,12 +114,13 @@ export const VendorList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
</>
|
</>
|
||||||
)}
|
)}
|
||||||
>
|
>
|
||||||
<Table {...tableProps} dataSource={dataSource} rowKey="id">
|
<Table {...tableProps} sticky scroll={{ x: "max-content" }} dataSource={dataSource} rowKey="id">
|
||||||
{SortedColumn({
|
{SortedColumn({
|
||||||
id: "id",
|
id: "id",
|
||||||
i18ncat: "vendor",
|
i18ncat: "vendor",
|
||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
|
width: 70,
|
||||||
})}
|
})}
|
||||||
{SortedColumn({
|
{SortedColumn({
|
||||||
id: "name",
|
id: "name",
|
||||||
|
|||||||
Reference in New Issue
Block a user