Grotti 3.5.2: Zu wenig Rest blockiert den Start nicht mehr, und ein anlaufender Druck wird nicht als Neustart neu eingereiht.
This commit is contained in:
1 parent
5166ed6530
commit
d1eb87ba25
13 files changed
+98
-77
No files matched your search
@@ -160,7 +160,7 @@
|
||||
{% endif %}
|
||||
<form method="dialog"><button class="ghost" value="cancel">Schließen</button></form>
|
||||
</dialog>
|
||||
<script src="{{ url_for('static', filename='api.js') }}?v=32"></script>
|
||||
<script src="{{ url_for('static', filename='api.js') }}?v=33"></script>
|
||||
<script src="{{ url_for('static', filename='ui.js') }}?v=6"></script>
|
||||
<script>
|
||||
async function doLogout() {
|
||||
@@ -315,9 +315,9 @@ function runLineHtml({ name, progress, remain, filename, tipExtra, cancelId, hos
|
||||
const pct = Math.max(0, Math.min(100, Math.round((Number(progress) || 0) * 100)));
|
||||
const finish = remain > 0 ? finishClock(remain) : "";
|
||||
const bits = [name];
|
||||
if (pct > 0 || remain > 0) bits.push(pct + " %");
|
||||
if (finish) bits.push(finish);
|
||||
if (tipExtra) bits.push(tipExtra);
|
||||
else if (pct > 0 || remain > 0) bits.push(pct + " %");
|
||||
if (finish) bits.push(finish);
|
||||
const tip = [
|
||||
filename ? jobLabel(filename) : "",
|
||||
remain > 0 ? "noch " + hours(remain) : "",
|
||||
@@ -375,9 +375,10 @@ function renderLiveChips({ actionItems, running, activeSends, alertCount, etaTex
|
||||
const pct = Math.max(0, Math.min(100, Math.round((Number(p.progress) || 0) * 100)));
|
||||
const finish = p.remain > 0 ? finishClock(p.remain) : "";
|
||||
const pausedFil = p.state === "paused" && (p.filament_empty || p.pause_reason);
|
||||
const starting = p.starting || p.state === "starting";
|
||||
const label = [
|
||||
shortPrinter(p.name || p.host),
|
||||
pausedFil ? "Material!" : (pct ? pct + "%" : ""),
|
||||
pausedFil ? "Material!" : (starting ? "startet" : (pct ? pct + "%" : "")),
|
||||
finish,
|
||||
].filter(Boolean).join(" · ");
|
||||
const tip = [p.name || "", p.pause_reason || ""].filter(Boolean).join(" — ");
|
||||
@@ -479,6 +480,7 @@ async function refreshJetzt() {
|
||||
progress: p.progress,
|
||||
remain: p.remain,
|
||||
filename: p.filename,
|
||||
tipExtra: (p.starting || p.state === "starting") ? "wird gestartet" : "",
|
||||
cancelId: p.queue_id,
|
||||
})).join(""),
|
||||
);
|
||||
|
||||
Reference in new issue
Block a user