Client: Added material column in spool table
This commit is contained in:
@@ -53,6 +53,7 @@
|
|||||||
"id": "Id",
|
"id": "Id",
|
||||||
"filament_name": "Filament",
|
"filament_name": "Filament",
|
||||||
"filament": "Filament",
|
"filament": "Filament",
|
||||||
|
"material": "Material",
|
||||||
"used_weight": "Used Weight",
|
"used_weight": "Used Weight",
|
||||||
"remaining_weight": "Remaining Weight",
|
"remaining_weight": "Remaining Weight",
|
||||||
"used_length": "Used Length",
|
"used_length": "Used Length",
|
||||||
|
|||||||
@@ -53,6 +53,7 @@
|
|||||||
"id": "Id",
|
"id": "Id",
|
||||||
"filament_name": "Filament",
|
"filament_name": "Filament",
|
||||||
"filament": "Filament",
|
"filament": "Filament",
|
||||||
|
"material": "Material",
|
||||||
"used_weight": "Använd vikt",
|
"used_weight": "Använd vikt",
|
||||||
"remaining_weight": "Återstående vikt",
|
"remaining_weight": "Återstående vikt",
|
||||||
"used_length": "Använd längd",
|
"used_length": "Använd längd",
|
||||||
|
|||||||
@@ -35,6 +35,7 @@ dayjs.extend(utc);
|
|||||||
|
|
||||||
interface ISpoolCollapsed extends ISpool {
|
interface ISpoolCollapsed extends ISpool {
|
||||||
filament_name: string;
|
filament_name: string;
|
||||||
|
material?: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
||||||
@@ -75,6 +76,7 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
const allColumns: (keyof ISpoolCollapsed & string)[] = [
|
const allColumns: (keyof ISpoolCollapsed & string)[] = [
|
||||||
"id",
|
"id",
|
||||||
"filament_name",
|
"filament_name",
|
||||||
|
"material",
|
||||||
"used_weight",
|
"used_weight",
|
||||||
"remaining_weight",
|
"remaining_weight",
|
||||||
"used_length",
|
"used_length",
|
||||||
@@ -120,7 +122,11 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
filament_name =
|
filament_name =
|
||||||
element.filament.name ?? element.filament.id.toString();
|
element.filament.name ?? element.filament.id.toString();
|
||||||
}
|
}
|
||||||
return { ...element, filament_name };
|
return {
|
||||||
|
...element,
|
||||||
|
filament_name,
|
||||||
|
material: element.filament.material,
|
||||||
|
};
|
||||||
}),
|
}),
|
||||||
[tableProps.dataSource]
|
[tableProps.dataSource]
|
||||||
);
|
);
|
||||||
@@ -200,6 +206,12 @@ export const SpoolList: React.FC<IResourceComponentsProps> = () => {
|
|||||||
dataSource,
|
dataSource,
|
||||||
tableState,
|
tableState,
|
||||||
})}
|
})}
|
||||||
|
{FilteredColumn({
|
||||||
|
id: "material",
|
||||||
|
i18ncat: "spool",
|
||||||
|
dataSource,
|
||||||
|
tableState,
|
||||||
|
})}
|
||||||
{NumberColumn({
|
{NumberColumn({
|
||||||
id: "used_weight",
|
id: "used_weight",
|
||||||
i18ncat: "spool",
|
i18ncat: "spool",
|
||||||
|
|||||||
Reference in New Issue
Block a user