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

Fixed importing multi color filaments in spool create form

Browse Source
This commit is contained in:
Donkie
2024-08-09 17:04:40 +02:00
parent eb4e1a950a
commit 9469f47f09
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/src/pages/filaments/functions.ts
View File

@@ -10,12 +10,14 @@ import { IFilament } from "./model";
export async function createFilamentFromExternal(externalFilament: ExternalFilament): Promise<IFilament> { export async function createFilamentFromExternal(externalFilament: ExternalFilament): Promise<IFilament> {
const vendor = await getOrCreateVendorFromExternal(externalFilament.manufacturer); const vendor = await getOrCreateVendorFromExternal(externalFilament.manufacturer);
let color_hex = undefined; let color_hex: string | undefined = undefined;
let multi_color_hexes: string | undefined = undefined;
let multi_color_direction: string | undefined = undefined;
if (externalFilament.color_hex) { if (externalFilament.color_hex) {
color_hex = externalFilament.color_hex; color_hex = externalFilament.color_hex;
} else if (externalFilament.color_hexes && externalFilament.color_hexes.length > 0) { } else if (externalFilament.color_hexes && externalFilament.color_hexes.length > 0) {
// TODO: Support for multi-color filaments multi_color_hexes = externalFilament.color_hexes.join(",")
color_hex = externalFilament.color_hexes[0]; multi_color_direction = externalFilament.multi_color_direction
} }
const body: Omit<IFilament, "id" | "registered" | "extra"> & { vendor_id: number } = { const body: Omit<IFilament, "id" | "registered" | "extra"> & { vendor_id: number } = {
@@ -27,6 +29,8 @@ export async function createFilamentFromExternal(externalFilament: ExternalFilam
weight: externalFilament.weight, weight: externalFilament.weight,
spool_weight: externalFilament.spool_weight || undefined, spool_weight: externalFilament.spool_weight || undefined,
color_hex: color_hex, color_hex: color_hex,
multi_color_hexes: multi_color_hexes,
multi_color_direction: multi_color_direction,
settings_extruder_temp: externalFilament.extruder_temp || undefined, settings_extruder_temp: externalFilament.extruder_temp || undefined,
settings_bed_temp: externalFilament.bed_temp || undefined, settings_bed_temp: externalFilament.bed_temp || undefined,
external_id: externalFilament.id, external_id: externalFilament.id,