|
@@ -5645,6 +5645,12 @@ function PrinterCard({
|
|
|
subtype: spoolmanSpool.subtype,
|
|
subtype: spoolmanSpool.subtype,
|
|
|
brand: spoolmanSpool.brand ?? null,
|
|
brand: spoolmanSpool.brand ?? null,
|
|
|
color_name: spoolmanSpool.color_name ?? null,
|
|
color_name: spoolmanSpool.color_name ?? null,
|
|
|
|
|
+ // The spool's own swatch (#2967). Spoolman carries the
|
|
|
|
|
+ // extra stops but has no effect field at all, so those
|
|
|
|
|
+ // rolls gradient and never shimmer.
|
|
|
|
|
+ rgba: spoolmanSpool.rgba ?? null,
|
|
|
|
|
+ extra_colors: spoolmanSpool.extra_colors ?? null,
|
|
|
|
|
+ effect_type: spoolmanSpool.effect_type ?? null,
|
|
|
remainingWeightGrams: spoolmanSpool.label_weight
|
|
remainingWeightGrams: spoolmanSpool.label_weight
|
|
|
? Math.max(0, Math.round(spoolmanSpool.label_weight - spoolmanSpool.weight_used))
|
|
? Math.max(0, Math.round(spoolmanSpool.label_weight - spoolmanSpool.weight_used))
|
|
|
: undefined,
|
|
: undefined,
|
|
@@ -5673,6 +5679,10 @@ function PrinterCard({
|
|
|
subtype: assignment.spool.subtype,
|
|
subtype: assignment.spool.subtype,
|
|
|
brand: assignment.spool.brand,
|
|
brand: assignment.spool.brand,
|
|
|
color_name: assignment.spool.color_name,
|
|
color_name: assignment.spool.color_name,
|
|
|
|
|
+ // The spool's own swatch (#2967).
|
|
|
|
|
+ rgba: assignment.spool.rgba ?? null,
|
|
|
|
|
+ extra_colors: assignment.spool.extra_colors ?? null,
|
|
|
|
|
+ effect_type: assignment.spool.effect_type ?? null,
|
|
|
remainingWeightGrams: Math.max(0, Math.round(assignment.spool.label_weight - assignment.spool.weight_used)),
|
|
remainingWeightGrams: Math.max(0, Math.round(assignment.spool.label_weight - assignment.spool.weight_used)),
|
|
|
} : null,
|
|
} : null,
|
|
|
onAssignSpool: () => setAssignSpoolModal({
|
|
onAssignSpool: () => setAssignSpoolModal({
|
|
@@ -6035,6 +6045,12 @@ function PrinterCard({
|
|
|
subtype: spoolmanSpool.subtype,
|
|
subtype: spoolmanSpool.subtype,
|
|
|
brand: spoolmanSpool.brand ?? null,
|
|
brand: spoolmanSpool.brand ?? null,
|
|
|
color_name: spoolmanSpool.color_name ?? null,
|
|
color_name: spoolmanSpool.color_name ?? null,
|
|
|
|
|
+ // The spool's own swatch (#2967). Spoolman carries the
|
|
|
|
|
+ // extra stops but has no effect field at all, so those
|
|
|
|
|
+ // rolls gradient and never shimmer.
|
|
|
|
|
+ rgba: spoolmanSpool.rgba ?? null,
|
|
|
|
|
+ extra_colors: spoolmanSpool.extra_colors ?? null,
|
|
|
|
|
+ effect_type: spoolmanSpool.effect_type ?? null,
|
|
|
remainingWeightGrams: spoolmanSpool.label_weight
|
|
remainingWeightGrams: spoolmanSpool.label_weight
|
|
|
? Math.max(0, Math.round(spoolmanSpool.label_weight - spoolmanSpool.weight_used))
|
|
? Math.max(0, Math.round(spoolmanSpool.label_weight - spoolmanSpool.weight_used))
|
|
|
: undefined,
|
|
: undefined,
|
|
@@ -6063,6 +6079,10 @@ function PrinterCard({
|
|
|
subtype: assignment.spool.subtype,
|
|
subtype: assignment.spool.subtype,
|
|
|
brand: assignment.spool.brand,
|
|
brand: assignment.spool.brand,
|
|
|
color_name: assignment.spool.color_name,
|
|
color_name: assignment.spool.color_name,
|
|
|
|
|
+ // The spool's own swatch (#2967).
|
|
|
|
|
+ rgba: assignment.spool.rgba ?? null,
|
|
|
|
|
+ extra_colors: assignment.spool.extra_colors ?? null,
|
|
|
|
|
+ effect_type: assignment.spool.effect_type ?? null,
|
|
|
remainingWeightGrams: Math.max(0, Math.round(assignment.spool.label_weight - assignment.spool.weight_used)),
|
|
remainingWeightGrams: Math.max(0, Math.round(assignment.spool.label_weight - assignment.spool.weight_used)),
|
|
|
} : null,
|
|
} : null,
|
|
|
onAssignSpool: () => setAssignSpoolModal({
|
|
onAssignSpool: () => setAssignSpoolModal({
|
|
@@ -6310,6 +6330,12 @@ function PrinterCard({
|
|
|
subtype: spoolmanSpool.subtype,
|
|
subtype: spoolmanSpool.subtype,
|
|
|
brand: spoolmanSpool.brand ?? null,
|
|
brand: spoolmanSpool.brand ?? null,
|
|
|
color_name: spoolmanSpool.color_name ?? null,
|
|
color_name: spoolmanSpool.color_name ?? null,
|
|
|
|
|
+ // The spool's own swatch (#2967). Spoolman carries the
|
|
|
|
|
+ // extra stops but has no effect field at all, so those
|
|
|
|
|
+ // rolls gradient and never shimmer.
|
|
|
|
|
+ rgba: spoolmanSpool.rgba ?? null,
|
|
|
|
|
+ extra_colors: spoolmanSpool.extra_colors ?? null,
|
|
|
|
|
+ effect_type: spoolmanSpool.effect_type ?? null,
|
|
|
remainingWeightGrams: spoolmanSpool.label_weight
|
|
remainingWeightGrams: spoolmanSpool.label_weight
|
|
|
? Math.max(0, Math.round(spoolmanSpool.label_weight - spoolmanSpool.weight_used))
|
|
? Math.max(0, Math.round(spoolmanSpool.label_weight - spoolmanSpool.weight_used))
|
|
|
: undefined,
|
|
: undefined,
|
|
@@ -6338,6 +6364,10 @@ function PrinterCard({
|
|
|
subtype: assignment.spool.subtype,
|
|
subtype: assignment.spool.subtype,
|
|
|
brand: assignment.spool.brand,
|
|
brand: assignment.spool.brand,
|
|
|
color_name: assignment.spool.color_name,
|
|
color_name: assignment.spool.color_name,
|
|
|
|
|
+ // The spool's own swatch (#2967).
|
|
|
|
|
+ rgba: assignment.spool.rgba ?? null,
|
|
|
|
|
+ extra_colors: assignment.spool.extra_colors ?? null,
|
|
|
|
|
+ effect_type: assignment.spool.effect_type ?? null,
|
|
|
remainingWeightGrams: Math.max(0, Math.round(assignment.spool.label_weight - assignment.spool.weight_used)),
|
|
remainingWeightGrams: Math.max(0, Math.round(assignment.spool.label_weight - assignment.spool.weight_used)),
|
|
|
} : null,
|
|
} : null,
|
|
|
onAssignSpool: () => setAssignSpoolModal({
|
|
onAssignSpool: () => setAssignSpoolModal({
|