Grotti 3.6.0: Lauf-Identität nach Filament-Pause, robustere Queue, Projekte/Aufträge list-first und API-Polish.
This commit is contained in:
1 parent
d1eb87ba25
commit
2b1e36634a
53 files changed
+4254
-636
No files matched your search
@@ -110,9 +110,14 @@ function costBreakdownHtml(energy, filamentCost) {
|
||||
function render(data) {
|
||||
const run = data.run;
|
||||
const name = (run.filename || "").split("/").pop() || "ohne Datei";
|
||||
document.getElementById("bericht-sub").textContent =
|
||||
(run.printer_name || run.printer_host) + " · " + name
|
||||
+ (run.chargen_nr ? " · " + run.chargen_nr : "");
|
||||
const subBits = [
|
||||
run.printer_host
|
||||
? linkTo("drucker", run.printer_host, run.printer_name || run.printer_host)
|
||||
: escapeHtml(run.printer_name || ""),
|
||||
run.file_id ? linkTo("datei", run.file_id, name) : escapeHtml(name),
|
||||
run.chargen_nr ? escapeHtml(run.chargen_nr) : "",
|
||||
].filter(Boolean);
|
||||
document.getElementById("bericht-sub").innerHTML = subBits.join(" · ");
|
||||
|
||||
const planned = Number(run.weight_planned_g) || 0;
|
||||
const used = Number(run.weight_used_g) || 0;
|
||||
@@ -128,7 +133,7 @@ function render(data) {
|
||||
|
||||
const spoolRows = (data.spools || []).map((s) => `
|
||||
<tr>
|
||||
<td>${escapeHtml(s.name)}${s.ace_slot ? " · ACE " + s.ace_slot : ""}</td>
|
||||
<td>${s.spool_id ? linkTo("spule", s.spool_id, s.name) : escapeHtml(s.name)}${s.ace_slot ? " · ACE " + s.ace_slot : ""}</td>
|
||||
<td>${escapeHtml(s.material_type || "")}</td>
|
||||
<td class="num">${grams(s.weight_planned_g)}</td>
|
||||
<td class="num">${grams(s.weight_g)}${s.is_estimate ? ' <span class="tag">Schätzwert</span>' : ""}</td>
|
||||
@@ -161,7 +166,8 @@ function render(data) {
|
||||
<p>Kosten <b>${euro(cost)}</b> (Filament ${euro(run.filament_cost)} · Strom ${euro(energyEuro)}${energyHint ? " · " + energyHint : ""})${run.cost_per_part != null ? " · <b>" + euro(run.cost_per_part) + "</b>/Teil" : ""}</p>
|
||||
${run.pieces_ok || run.pieces_bad ? `<p>Stück <b>${run.pieces_ok || 0}</b> gut${run.pieces_bad ? " · " + run.pieces_bad + " schlecht" : ""}</p>` : ""}
|
||||
${run.message ? "<p class=\"msg\">" + escapeHtml(run.message) + "</p>" : ""}
|
||||
${data.project ? "<p class=\"tiny\">Projekt: " + escapeHtml(data.project.name) + "</p>" : ""}
|
||||
${data.project ? "<p class=\"tiny\">Projekt: " + linkTo("projekt", data.project.id, data.project.name) + "</p>" : ""}
|
||||
${run.order_id ? "<p class=\"tiny\">Auftrag: " + linkTo("auftrag", run.order_id, "#" + run.order_id) + "</p>" : ""}
|
||||
</div>
|
||||
${costBreakdownHtml(energy, run.filament_cost)}
|
||||
</div>
|
||||
|
||||
Reference in new issue
Block a user