fix: afficher les noms lisibles des types de jours et des véhicules

- Filtre Jinja2 day_type_fr (WORK→Travail, TT→Télétravail, etc.)
- Appliqué dans entry_list.html et dashboard.html
- Passage de vehicles au template dashboard pour afficher vehicle.name
- Mise à jour du test test_entry_list en conséquence
- Ajout du plan docs/plans/2026-03-11-bareme-kilometrique.md
This commit is contained in:
2026-03-11 20:27:07 +01:00
parent 68ae347311
commit 859d94bfb1
7 changed files with 351 additions and 10 deletions

View File

@@ -36,6 +36,23 @@ _MOIS_FR = ["", "janvier", "février", "mars", "avril", "mai", "juin",
"juillet", "août", "septembre", "octobre", "novembre", "décembre"]
_DAY_TYPE_LABELS = {
"WORK": "Travail",
"TT": "Télétravail",
"GARDE": "Garde",
"ASTREINTE": "Astreinte",
"FORMATION": "Formation",
"RTT": "RTT",
"CONGE": "Congé",
"MALADE": "Maladie",
"FERIE": "Férié",
}
def _day_type_fr(code):
return _DAY_TYPE_LABELS.get(code, code)
def _date_fr(d):
"""Formate une date en français : 'mercredi 11 mars 2026'."""
from datetime import date as date_type
@@ -64,6 +81,7 @@ def create_app(config_path=None):
db.init_app(app)
app.jinja_env.filters["date_fr"] = _date_fr
app.jinja_env.filters["day_type_fr"] = _day_type_fr
from app.routes.dashboard import bp as dashboard_bp
from app.routes.entries import bp as entries_bp

View File

@@ -54,6 +54,7 @@ def index():
today=today,
today_entry=today_entry,
journeys=journeys,
vehicles=vehicles,
week_actual_str=minutes_to_str(week_actual),
week_balance=week_balance,
week_balance_str=minutes_to_str(abs(week_balance)),

View File

@@ -19,7 +19,7 @@
</div>
<div class="flex items-center justify-between mt-3">
<span class="text-xs font-semibold px-2 py-0.5 rounded" style="background:var(--parchment); color:#6A6258; letter-spacing:0.06em;">
{{ today_entry.day_type }}{% if today_entry.motor_vehicle_id %} · {{ today_entry.motor_vehicle_id }}{% endif %}
{{ today_entry.day_type | day_type_fr }}{% if today_entry.motor_vehicle_id %} · {{ today_entry.motor_vehicle_id }}{% endif %}
</span>
<a href="/entries/{{ today_entry.id }}/edit"
class="text-xs font-semibold" style="color:var(--amber);">Modifier →</a>
@@ -55,7 +55,7 @@
<div class="space-y-2 mt-1">
{% for vehicle_id, km in month_km.items() %}
<div class="flex items-baseline justify-between">
<span class="text-xs" style="color:#8A8278;">{{ vehicle_id | capitalize }}</span>
<span class="text-xs" style="color:#8A8278;">{{ vehicles[vehicle_id].name if vehicle_id in vehicles else vehicle_id | capitalize }}</span>
<span class="font-data font-semibold text-sm" style="color:var(--ink);">{{ km }} <span class="font-normal text-xs" style="color:#9A9288;">km</span></span>
</div>
{% endfor %}

View File

@@ -30,7 +30,7 @@
<div class="flex-1 min-w-0">
<p class="font-semibold text-sm" style="color:var(--ink);">{{ entry.date | date_fr }}</p>
<div class="flex items-center gap-2 mt-0.5">
<span class="text-xs font-semibold" style="color:{{ dot_color }}; letter-spacing:0.06em;">{{ entry.day_type }}</span>
<span class="text-xs font-semibold" style="color:{{ dot_color }}; letter-spacing:0.06em;">{{ entry.day_type | day_type_fr }}</span>
{% if entry.time_slots %}
<span class="font-data text-xs" style="color:#8A8278;">{{ entry.total_hours_str() }}</span>
{% endif %}