Remove internal filament management, integrate FilamentDB, add job detail page
Filament removal:
- Deleted app/models/filament.py, routers/filaments.py, templates/filaments.html
- Migration 0009: drops filaments table and filament_id FK from print_jobs
- Removed Filaments from sidebar and all internal references
FilamentDB integration (read-only):
- app/filamentdb.py: GET /reports/stock with 5-min in-memory cache
- available_materials() / available_colors() populate job form dropdowns
- Falls back to static constants if FilamentDB unreachable
- Dashboard filament count now from FilamentDB rolls_in_stock
- FILAMENTDB_URL added to .env.install; httpx added to requirements
Job detail page (/jobs/{id}):
- Two cards: Job info (customer, material, printer, bracket, timing, cost)
and File & Geometry (bounding box + volume from stl_cache)
- Log timeline with Add Entry modal
- Filename in jobs list links to detail page
Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
Martin Hohenberg
@@ -50,8 +50,7 @@
|
||||
<li><a href="/printers" class="nav-link {% if active == 'printers' %}active{% endif %}"><i class="bi bi-printer me-2"></i>Printers</a></li>
|
||||
<li><a href="/jobs" class="nav-link {% if active == 'jobs' %}active{% endif %}"><i class="bi bi-list-task me-2"></i>Jobs</a></li>
|
||||
<li><a href="/brackets" class="nav-link {% if active == 'brackets' %}active{% endif %}"><i class="bi bi-collection me-2"></i>Brackets</a></li>
|
||||
<li><a href="/filaments" class="nav-link {% if active == 'filaments' %}active{% endif %}"><i class="bi bi-record-circle me-2"></i>Filaments</a></li>
|
||||
<li><a href="/todos" class="nav-link {% if active == 'todos' %}active{% endif %}"><i class="bi bi-check2-square me-2"></i>To-Do</a></li>
|
||||
<li><a href="/todos" class="nav-link {% if active == 'todos' %}active{% endif %}"><i class="bi bi-check2-square me-2"></i>To-Do</a></li>
|
||||
<li><a href="/pricing" class="nav-link {% if active == 'pricing' %}active{% endif %}"><i class="bi bi-currency-euro me-2"></i>Pricing</a></li>
|
||||
</ul>
|
||||
</nav>
|
||||
|
||||
@@ -1,52 +0,0 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Filaments — POPS{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<h5 class="text-white mb-4">Filament Inventory</h5>
|
||||
<div class="card">
|
||||
{% if filaments %}
|
||||
<table class="table table-dark table-hover mb-0 align-middle">
|
||||
<thead>
|
||||
<tr class="text-secondary small">
|
||||
<th class="fw-normal">Brand</th>
|
||||
<th class="fw-normal">Material</th>
|
||||
<th class="fw-normal">Color</th>
|
||||
<th class="fw-normal">Remaining</th>
|
||||
<th class="fw-normal text-end">Price / kg</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% for f in filaments %}
|
||||
{% set pct = (f.weight_remaining_g / f.weight_total_g * 100) | int if f.weight_total_g else 0 %}
|
||||
<tr>
|
||||
<td class="fw-medium text-white">{{ f.brand or '—' }}</td>
|
||||
<td><span class="badge bg-secondary">{{ f.material.value }}</span></td>
|
||||
<td>
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
{% if f.color_hex %}
|
||||
<span style="display:inline-block;width:12px;height:12px;border-radius:3px;background:{{ f.color_hex }};border:1px solid #444"></span>
|
||||
{% endif %}
|
||||
{{ f.color or '—' }}
|
||||
</div>
|
||||
</td>
|
||||
<td style="min-width:160px">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<div class="progress flex-grow-1" style="height:6px">
|
||||
<div class="progress-bar {% if pct < 20 %}bg-danger{% elif pct < 50 %}bg-warning{% else %}bg-success{% endif %}"
|
||||
style="width:{{ pct }}%"></div>
|
||||
</div>
|
||||
<span class="text-secondary small" style="min-width:70px">{{ f.weight_remaining_g | int }}g / {{ f.weight_total_g | int }}g</span>
|
||||
</div>
|
||||
</td>
|
||||
<td class="text-secondary small text-end">
|
||||
{% if f.price_per_kg_eur %}€ {{ "%.2f"|format(f.price_per_kg_eur) }}{% else %}—{% endif %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% else %}
|
||||
<div class="card-body text-secondary">No filaments in inventory yet.</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
151
app/templates/job_detail.html
Normal file
151
app/templates/job_detail.html
Normal file
@@ -0,0 +1,151 @@
|
||||
{% extends "base.html" %}
|
||||
{% block title %}Job {{ job.job_uuid[:8] if job.job_uuid else job.id }} — POPS{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="d-flex align-items-center gap-3 mb-4">
|
||||
<a href="{{ '/brackets/' ~ job.bracket.id if job.bracket else '/jobs' }}" class="text-secondary text-decoration-none">
|
||||
<i class="bi bi-arrow-left"></i>
|
||||
</a>
|
||||
<div class="flex-grow-1">
|
||||
<div class="d-flex align-items-center gap-2">
|
||||
<h5 class="text-white mb-0">{{ job.file_name or job.name }}</h5>
|
||||
{% set s = job.status.value %}
|
||||
{% if s == 'printing' %}<span class="badge bg-primary">printing</span>
|
||||
{% elif s == 'done' %}<span class="badge bg-success">done</span>
|
||||
{% elif s == 'failed' %}<span class="badge bg-danger">failed</span>
|
||||
{% elif s == 'cancelled' %}<span class="badge bg-warning text-dark">cancelled</span>
|
||||
{% else %}<span class="badge bg-secondary">queued</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="text-secondary small font-monospace mt-1">{{ job.job_uuid or '—' }}</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="row g-3 mb-4">
|
||||
|
||||
{# ── Job info ── #}
|
||||
<div class="col-md-6">
|
||||
<div class="card h-100">
|
||||
<div class="card-header text-secondary small text-uppercase fw-normal" style="border-color:#21262d">Job</div>
|
||||
<div class="card-body">
|
||||
<table class="table table-dark table-sm mb-0" style="font-size:.875rem">
|
||||
<tbody>
|
||||
<tr><td class="text-secondary border-0" style="width:40%">Customer</td>
|
||||
<td class="border-0">{{ job.customer or '—' }}</td></tr>
|
||||
<tr><td class="text-secondary">Material</td>
|
||||
<td>{{ job.job_material or '—' }}{% if job.job_color %} · {{ job.job_color }}{% endif %}</td></tr>
|
||||
<tr><td class="text-secondary">Printer</td>
|
||||
<td>{{ job.printer.name if job.printer else '—' }}</td></tr>
|
||||
<tr><td class="text-secondary">Bracket</td>
|
||||
<td>{% if job.bracket %}<a href="/brackets/{{ job.bracket.id }}" class="text-white">{{ job.bracket.name }}</a>{% else %}—{% endif %}</td></tr>
|
||||
<tr><td class="text-secondary">Created</td>
|
||||
<td>{{ job.created_at.strftime('%d.%m.%Y %H:%M') }}</td></tr>
|
||||
{% if job.started_at %}
|
||||
<tr><td class="text-secondary">Started</td>
|
||||
<td>{{ job.started_at.strftime('%d.%m.%Y %H:%M') }}</td></tr>
|
||||
{% endif %}
|
||||
{% if job.finished_at %}
|
||||
<tr><td class="text-secondary">Finished</td>
|
||||
<td>{{ job.finished_at.strftime('%d.%m.%Y %H:%M') }}</td></tr>
|
||||
{% endif %}
|
||||
{% if job.duration_minutes %}
|
||||
<tr><td class="text-secondary">Duration</td>
|
||||
<td>{{ job.duration_minutes }} min</td></tr>
|
||||
{% endif %}
|
||||
{% if job.cost_eur %}
|
||||
<tr><td class="text-secondary">Cost</td>
|
||||
<td>€ {{ "%.2f"|format(job.cost_eur) }}</td></tr>
|
||||
{% endif %}
|
||||
{% if job.notes %}
|
||||
<tr><td class="text-secondary">Notes</td>
|
||||
<td>{{ job.notes }}</td></tr>
|
||||
{% endif %}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{# ── STL geometry ── #}
|
||||
<div class="col-md-6">
|
||||
<div class="card h-100">
|
||||
<div class="card-header text-secondary small text-uppercase fw-normal" style="border-color:#21262d">
|
||||
File & Geometry
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% if job.file_name %}
|
||||
<div class="text-white mb-3 font-monospace" style="font-size:.85rem">{{ job.file_name }}</div>
|
||||
{% endif %}
|
||||
{% if stl %}
|
||||
<table class="table table-dark table-sm mb-0" style="font-size:.875rem">
|
||||
<tbody>
|
||||
<tr><td class="text-secondary border-0">Bounding box</td>
|
||||
<td class="border-0">
|
||||
{{ stl.cube_x|round(1) }} × {{ stl.cube_y|round(1) }} × {{ stl.cube_z|round(1) }} mm
|
||||
</td></tr>
|
||||
<tr><td class="text-secondary">Volume</td>
|
||||
<td>{{ stl.volume_ccm }} cm³</td></tr>
|
||||
</tbody>
|
||||
</table>
|
||||
{% elif job.file_name and job.file_name.endswith('.gcode') %}
|
||||
<p class="text-secondary small mb-0">Geometry not available for gcode files.</p>
|
||||
{% elif job.file_name %}
|
||||
<p class="text-secondary small mb-0">Not yet analysed — will be computed on next upload.</p>
|
||||
{% else %}
|
||||
<p class="text-secondary small mb-0">No file attached.</p>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
{# ── Log ── #}
|
||||
<div class="d-flex align-items-center justify-content-between mb-3">
|
||||
<h6 class="text-white mb-0">Log</h6>
|
||||
<button class="btn btn-sm btn-outline-primary" data-bs-toggle="modal" data-bs-target="#addLogModal">
|
||||
<i class="bi bi-plus-lg me-1"></i>Add entry
|
||||
</button>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
{% if job.logs %}
|
||||
<table class="table table-dark table-hover mb-0 align-middle">
|
||||
<tbody>
|
||||
{% for entry in job.logs %}
|
||||
<tr>
|
||||
<td class="text-secondary small" style="width:140px;white-space:nowrap">
|
||||
{{ entry.created_at.strftime('%d.%m.%Y %H:%M') }}
|
||||
</td>
|
||||
<td>{{ entry.message }}</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
</table>
|
||||
{% else %}
|
||||
<div class="card-body text-secondary">No log entries.</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
|
||||
{# ── Add log entry modal ── #}
|
||||
<div class="modal fade" id="addLogModal" tabindex="-1">
|
||||
<div class="modal-dialog">
|
||||
<div class="modal-content bg-dark border-secondary">
|
||||
<form method="POST" action="/jobs/{{ job.id }}/log">
|
||||
<div class="modal-header border-secondary">
|
||||
<h6 class="modal-title text-white">Add Log Entry</h6>
|
||||
<button type="button" class="btn-close btn-close-white" data-bs-dismiss="modal"></button>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<textarea name="message" class="form-control bg-dark border-secondary text-white"
|
||||
rows="3" placeholder="What happened?" required autofocus></textarea>
|
||||
</div>
|
||||
<div class="modal-footer border-secondary">
|
||||
<button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Cancel</button>
|
||||
<button type="submit" class="btn btn-primary btn-sm">Add</button>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -46,7 +46,7 @@
|
||||
{{ j.job_uuid[:8] if j.job_uuid else '—' }}
|
||||
</td>
|
||||
<td class="text-white">{{ j.customer or '—' }}</td>
|
||||
<td class="text-secondary">{{ j.file_name or '—' }}</td>
|
||||
<td><a href="/jobs/{{ j.id }}" class="text-secondary text-decoration-none">{{ j.file_name or j.name or '—' }}</a></td>
|
||||
<td class="text-secondary">{{ j.printer.name if j.printer else '—' }}</td>
|
||||
<td class="text-secondary">
|
||||
{% if j.job_material %}{{ j.job_material }}{% if j.job_color %} · {{ j.job_color }}{% endif %}{% else %}—{% endif %}
|
||||
|
||||
Reference in New Issue
Block a user