public_git/bambuddy
1
0
Fork 0
mirror of https://github.com/maziggy/bambuddy.git synced 2026-10-21 10:15:04 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add currency symbol, hide projected cost for no costs configured, add cost rounding to decimal point, fixed isExternal logic

Browse Source
This commit is contained in:
Matteo Parenti
2026-02-20 11:36:26 +01:00
parent 071c2c702a
commit 9f19e8a2ff
7 changed files with 40 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frontend/src/components/PrintModal/FilamentMapping.tsx
+18 -6
View File
@@ -46,9 +46,7 @@ export function FilamentMapping({
const map = new Map<number, number | null>();
for (const assignment of assignments || []) {
const isExternal = assignment.ams_id === 255;
const globalTrayId = isExternal
? 254 + assignment.tray_id
: getGlobalTrayId(assignment.ams_id, assignment.tray_id, false);
const globalTrayId = getGlobalTrayId(assignment.ams_id, assignment.tray_id, isExternal);
map.set(globalTrayId, assignment.spool?.cost_per_kg ?? null);
}
return map;
@@ -216,9 +214,23 @@ export function FilamentMapping({
)}
</div>
))}
<div className="text-xs text-bambu-gray">
{t('printModal.totalCost')} <span className="text-white">{currencySymbol}{totalCost.toFixed(2)}</span>
</div>
{(() => {
// Check if any tray has a configured cost_per_kg
const hasAnyCost = Array.from(trayCostMap.values()).some((v) => v != null && v > 0);
if (totalCost > 0 || hasAnyCost) {
return (
<div className="text-xs text-bambu-gray">
{t('printModal.totalCost')} <span className="text-white">{currencySymbol}{totalCost.toFixed(2)}</span>
</div>
);
} else {
return (
<div className="text-xs text-bambu-gray">
{t('printModal.totalCost')} <span className="text-white">N/A</span>
</div>
);
}
})()}
{hasTypeMismatch && (
<p className="text-xs text-orange-400 mt-2">Required filament type not found in printer.</p>
)}