diff --git a/app/config_loader.py b/app/config_loader.py index 688cdfa..5764f69 100644 --- a/app/config_loader.py +++ b/app/config_loader.py @@ -26,14 +26,16 @@ def journey_has_motor(journey_profile_id: str | None) -> bool: def get_bareme(year: int, cv: int) -> list[dict]: bareme = current_app.config.get("TOML", {}).get("bareme_kilometrique", {}) year_data = bareme.get(str(year), {}) - if cv <= 5: + if cv <= 3: + key = "cv_3" + elif cv == 4: + key = "cv_4" + elif cv == 5: key = "cv_5" - elif cv <= 7: - key = "cv_6_7" - elif cv <= 9: - key = "cv_8_9" + elif cv == 6: + key = "cv_6" else: - key = "cv_10_11" + key = "cv_7plus" return year_data.get(key, {}).get("tranches", []) diff --git a/app/routes/reports.py b/app/routes/reports.py index 6111d43..9ad956a 100644 --- a/app/routes/reports.py +++ b/app/routes/reports.py @@ -36,7 +36,8 @@ def index(): cv = vehicle.get("cv") if cv: tranches = get_bareme(year, cv) - frais_reels[vehicle_id] = round(compute_frais_reels(km, tranches), 2) + electric = vehicle.get("fuel") == "electric" + frais_reels[vehicle_id] = round(compute_frais_reels(km, tranches, electric=electric), 2) return render_template( "reports.html",