feat: système de projets (Option A) — grouper plusieurs runs sous un projet
Deploy via Portainer / deploy (push) Successful in 0s
Deploy via Portainer / deploy (push) Successful in 0s
This commit is contained in:
Jo
@@ -87,6 +87,9 @@
|
||||
<a href="{{ url_for('profiles') }}" class="{% if 'profile' in request.endpoint %}active{% endif %}">
|
||||
<i class="bi bi-bookmark-star"></i> Templates
|
||||
</a>
|
||||
<a href="{{ url_for('projects') }}" class="{% if request.endpoint in ['projects','new_project','edit_project','project_detail'] %}active{% endif %}">
|
||||
<i class="bi bi-folder2-open"></i> Projets
|
||||
</a>
|
||||
<a href="{{ url_for('planning') }}" class="{% if request.endpoint in ['planning','printers_page','working_schedule','calendar_blocks'] %}active{% endif %}">
|
||||
<i class="bi bi-calendar3"></i> Planning
|
||||
</a>
|
||||
|
||||
+14
-2
@@ -46,7 +46,7 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="row g-3 mb-3">
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-4">
|
||||
<label class="form-label fw-semibold">Client</label>
|
||||
<select name="client_id" id="clientSelect" class="form-select">
|
||||
<option value="">Sans client</option>
|
||||
@@ -55,7 +55,19 @@
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-4">
|
||||
<label class="form-label fw-semibold">Projet</label>
|
||||
<select name="project_id" id="projectSelect" class="form-select">
|
||||
<option value="">— Sans projet —</option>
|
||||
{% for p in projects %}
|
||||
<option value="{{ p.id }}"
|
||||
{% if request.args.get('project_id')|int == p.id %}selected{% endif %}>
|
||||
{{ p.name }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label fw-semibold">Matiere (filament)</label>
|
||||
<select name="material_id" id="materialSelect" class="form-select">
|
||||
<option value="">Prix global (parametres)</option>
|
||||
|
||||
@@ -0,0 +1,134 @@
|
||||
{% extends 'base.html' %}
|
||||
{% block title %}{{ project.name }}{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="page-header d-flex justify-content-between align-items-center">
|
||||
<div>
|
||||
<a href="{{ url_for('projects') }}" class="text-muted text-decoration-none small">
|
||||
<i class="bi bi-arrow-left"></i> Projets
|
||||
</a>
|
||||
<h1 class="mt-1">{{ project.name }}</h1>
|
||||
<span class="text-muted small">{{ project.client_name or 'Sans client' }}</span>
|
||||
{% if project.deadline %}
|
||||
<span class="badge bg-secondary ms-2">Livraison : {{ project.deadline }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="d-flex gap-2">
|
||||
<a href="{{ url_for('new_job') }}?project_id={{ project.id }}" class="btn btn-outline-secondary">
|
||||
<i class="bi bi-plus-circle me-1"></i>Ajouter un run
|
||||
</a>
|
||||
<a href="{{ url_for('edit_project', id=project.id) }}" class="btn btn-outline-secondary">
|
||||
<i class="bi bi-pencil me-1"></i>Modifier
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Totaux -->
|
||||
<div class="row g-3 mb-4">
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="label">Runs</div>
|
||||
<div class="value">{{ jobs|length }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="label">Pièces totales</div>
|
||||
<div class="value">{{ total_pieces }}</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="label">CA total commande</div>
|
||||
<div class="value" style="color:#ff6b35">{{ "%.2f"|format(total_revenue) }} €</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="stat-card">
|
||||
<div class="label">Prix moyen / pièce</div>
|
||||
<div class="value">
|
||||
{% if total_pieces > 0 %}{{ "%.2f"|format(total_revenue / total_pieces) }} €{% else %}—{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
{% if project.notes %}
|
||||
<div class="alert alert-light border mb-4"><i class="bi bi-sticky me-2"></i>{{ project.notes }}</div>
|
||||
{% endif %}
|
||||
|
||||
<!-- Liste des runs -->
|
||||
<div class="card">
|
||||
<div class="card-header py-3 d-flex justify-content-between align-items-center">
|
||||
<span><i class="bi bi-list-ul me-2"></i>Runs d'impression</span>
|
||||
</div>
|
||||
{% if jobs %}
|
||||
<div class="table-responsive">
|
||||
<table class="table table-hover mb-0">
|
||||
<thead class="table-light">
|
||||
<tr>
|
||||
<th>Nom du run</th>
|
||||
<th>Matière</th>
|
||||
<th class="text-center">Pièces/plateau</th>
|
||||
<th class="text-center">Qté commandée</th>
|
||||
<th class="text-center">Plateaux</th>
|
||||
<th class="text-end">Prix/pièce</th>
|
||||
<th class="text-end">Total run</th>
|
||||
<th></th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{% set ns = namespace(total_plateaux=0) %}
|
||||
{% for j in jobs %}
|
||||
{% set qty = j.order_qty or 1 %}
|
||||
{% set ppp = j.pieces_per_plate or 1 %}
|
||||
{% set nb_p = ((qty + ppp - 1) // ppp) %}
|
||||
{% set ns.total_plateaux = ns.total_plateaux + nb_p %}
|
||||
<tr>
|
||||
<td>
|
||||
<a href="{{ url_for('job_detail', id=j.id) }}" class="fw-semibold text-decoration-none">
|
||||
{{ j.name }}
|
||||
</a>
|
||||
<div class="small text-muted">{{ j.created_at[:10] }}</div>
|
||||
</td>
|
||||
<td>
|
||||
{% if j.material_name %}
|
||||
<span class="badge bg-secondary">{{ j.material_type }}</span> {{ j.material_name }}
|
||||
{% else %}<span class="text-muted">—</span>{% endif %}
|
||||
</td>
|
||||
<td class="text-center">{{ ppp }}</td>
|
||||
<td class="text-center fw-semibold">{{ qty }}</td>
|
||||
<td class="text-center">{{ nb_p }}</td>
|
||||
<td class="text-end">{{ "%.2f"|format(j.final_price) }} €</td>
|
||||
<td class="text-end fw-bold" style="color:#ff6b35">{{ "%.2f"|format(j.final_price * qty) }} €</td>
|
||||
<td>
|
||||
<a href="{{ url_for('job_detail', id=j.id) }}" class="btn btn-sm btn-outline-secondary">
|
||||
<i class="bi bi-eye"></i>
|
||||
</a>
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</tbody>
|
||||
<tfoot class="table-light fw-bold">
|
||||
<tr>
|
||||
<td colspan="3">Total</td>
|
||||
<td class="text-center">{{ total_pieces }}</td>
|
||||
<td class="text-center">{{ ns.total_plateaux }}</td>
|
||||
<td class="text-end">
|
||||
{% if total_pieces > 0 %}{{ "%.2f"|format(total_revenue / total_pieces) }} € moy.{% endif %}
|
||||
</td>
|
||||
<td class="text-end" style="color:#ff6b35">{{ "%.2f"|format(total_revenue) }} €</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
</tfoot>
|
||||
</table>
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="card-body text-center text-muted py-4">
|
||||
<i class="bi bi-printer fs-2 d-block mb-2"></i>
|
||||
Aucun run encore.
|
||||
<a href="{{ url_for('new_job') }}">Créer un calcul</a> et l'associer à ce projet.
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,56 @@
|
||||
{% extends 'base.html' %}
|
||||
{% block title %}{% if project %}Modifier{% else %}Nouveau{% endif %} projet{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="page-header">
|
||||
<a href="{{ url_for('projects') }}" class="text-muted text-decoration-none small">
|
||||
<i class="bi bi-arrow-left"></i> Projets
|
||||
</a>
|
||||
<h1 class="mt-1">{% if project %}Modifier {{ project.name }}{% else %}Nouveau projet{% endif %}</h1>
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="card">
|
||||
<div class="card-body">
|
||||
<form method="POST">
|
||||
<div class="mb-3">
|
||||
<label class="form-label fw-semibold">Nom du projet *</label>
|
||||
<input type="text" name="name" class="form-control" required
|
||||
value="{{ project.name if project else '' }}"
|
||||
placeholder="ex: Commande BlokGrip Q3 2026">
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label fw-semibold">Client</label>
|
||||
<select name="client_id" class="form-select">
|
||||
<option value="">— Sans client —</option>
|
||||
{% for c in clients %}
|
||||
<option value="{{ c.id }}"
|
||||
{% if project and project.client_id == c.id %}selected{% endif %}>
|
||||
{{ c.name }}
|
||||
</option>
|
||||
{% endfor %}
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label class="form-label fw-semibold">Date limite de livraison</label>
|
||||
<input type="date" name="deadline" class="form-control"
|
||||
value="{{ project.deadline if project and project.deadline else '' }}">
|
||||
</div>
|
||||
<div class="mb-4">
|
||||
<label class="form-label fw-semibold">Notes</label>
|
||||
<textarea name="notes" class="form-control" rows="3"
|
||||
placeholder="Description, contraintes, références...">{{ project.notes if project else '' }}</textarea>
|
||||
</div>
|
||||
<div class="d-flex gap-2">
|
||||
<button type="submit" class="btn" style="background:#ff6b35;color:#fff">
|
||||
<i class="bi bi-save me-1"></i>Enregistrer
|
||||
</button>
|
||||
<a href="{{ url_for('projects') }}" class="btn btn-outline-secondary">Annuler</a>
|
||||
</div>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -0,0 +1,71 @@
|
||||
{% extends 'base.html' %}
|
||||
{% block title %}Projets{% endblock %}
|
||||
|
||||
{% block content %}
|
||||
<div class="page-header d-flex justify-content-between align-items-center">
|
||||
<div>
|
||||
<h1><i class="bi bi-folder2-open me-2 text-secondary"></i>Projets</h1>
|
||||
<p class="text-muted small mt-1">Regroupez plusieurs impressions (runs) sous un même projet client.</p>
|
||||
</div>
|
||||
<a href="{{ url_for('new_project') }}" class="btn" style="background:#ff6b35;color:#fff">
|
||||
<i class="bi bi-plus-lg me-1"></i>Nouveau projet
|
||||
</a>
|
||||
</div>
|
||||
|
||||
{% if projects %}
|
||||
<div class="row g-3">
|
||||
{% for p in projects %}
|
||||
<div class="col-md-6">
|
||||
<div class="card h-100">
|
||||
<div class="card-body">
|
||||
<div class="d-flex justify-content-between align-items-start mb-2">
|
||||
<div>
|
||||
<h5 class="mb-0">
|
||||
<a href="{{ url_for('project_detail', id=p.id) }}" class="text-decoration-none text-dark">
|
||||
{{ p.name }}
|
||||
</a>
|
||||
</h5>
|
||||
<small class="text-muted">{{ p.client_name or 'Sans client' }}</small>
|
||||
</div>
|
||||
{% if p.deadline %}
|
||||
<span class="badge bg-secondary">{{ p.deadline }}</span>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="d-flex gap-4 mt-3">
|
||||
<div>
|
||||
<div class="small text-muted">Runs</div>
|
||||
<div class="fw-bold">{{ p.job_count }}</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="small text-muted">Pièces totales</div>
|
||||
<div class="fw-bold">{{ p.total_pieces }}</div>
|
||||
</div>
|
||||
<div>
|
||||
<div class="small text-muted">CA total</div>
|
||||
<div class="fw-bold" style="color:#ff6b35">{{ "%.2f"|format(p.total_revenue) }} €</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card-footer bg-transparent d-flex gap-2 py-2">
|
||||
<a href="{{ url_for('project_detail', id=p.id) }}" class="btn btn-sm btn-outline-secondary">
|
||||
<i class="bi bi-eye"></i> Voir
|
||||
</a>
|
||||
<a href="{{ url_for('edit_project', id=p.id) }}" class="btn btn-sm btn-outline-secondary">
|
||||
<i class="bi bi-pencil"></i> Modifier
|
||||
</a>
|
||||
<form method="POST" action="{{ url_for('delete_project', id=p.id) }}"
|
||||
onsubmit="return confirm('Supprimer ce projet ? Les jobs seront conservés mais détachés.')">
|
||||
<button class="btn btn-sm btn-outline-danger"><i class="bi bi-trash"></i></button>
|
||||
</form>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
{% else %}
|
||||
<div class="text-center text-muted py-5">
|
||||
<i class="bi bi-folder2 fs-1 d-block mb-3"></i>
|
||||
Aucun projet. <a href="{{ url_for('new_project') }}">Créer le premier</a>.
|
||||
</div>
|
||||
{% endif %}
|
||||
{% endblock %}
|
||||
Reference in New Issue
Block a user