diff --git a/src/Controller/FraicheurController.php b/src/Controller/FraicheurController.php index fca887a..367d77e 100644 --- a/src/Controller/FraicheurController.php +++ b/src/Controller/FraicheurController.php @@ -230,6 +230,23 @@ class FraicheurController extends AbstractController ksort($villesByBinBudget); ksort($villesByBinEcart); + // Remplir les bins vides pour l'histogramme budget par lieu (pas de 5000€) + if (!empty($histogramBudgetParLieu)) { + $minBin = min(array_map('intval', array_keys($histogramBudgetParLieu))); + $maxBin = max(array_map('intval', array_keys($histogramBudgetParLieu))); + for ($bin = $minBin; $bin <= $maxBin; $bin += 5000) { + $binStr = (string)$bin; + if (!isset($histogramBudgetParLieu[$binStr])) { + $histogramBudgetParLieu[$binStr] = 0; + } + if (!isset($villesByBinBudgetParLieu[$binStr])) { + $villesByBinBudgetParLieu[$binStr] = []; + } + } + ksort($histogramBudgetParLieu); + ksort($villesByBinBudgetParLieu); + } + ksort($histogramBudgetParLieu); ksort($villesByBinBudgetParLieu); $budgetData = [ diff --git a/templates/public/dashboard.html.twig b/templates/public/dashboard.html.twig index 7b8aa51..b769e23 100644 --- a/templates/public/dashboard.html.twig +++ b/templates/public/dashboard.html.twig @@ -168,7 +168,7 @@ {{ stat.completionPercent }}% {{ stat.placesCount }} {{ (stat.placesCount / (stat.population or 1 ))|round(2) }} - {% if stat.budgetAnnuel %}{{ stat.budgetAnnuel|number_format(0, '.', ' ') }} €{% else %}-{% endif %} + {% if stat.budgetAnnuel %}{{ (stat.budgetAnnuel / 1000000)|number_format(1, '.', ' ') }} M€{% else %}-{% endif %} {% if stat.budgetAnnuel and stat.population %}{{ (stat.budgetAnnuel / stat.population)|number_format(0, '.', ' ') }} €{% else %}-{% endif %} {% if stat.budgetAnnuel and stat.placesCount %}{{ (stat.budgetAnnuel / stat.placesCount)|number_format(0, '.', ' ') }} €{% else %}-{% endif %} {{ stat.osmDataDateAvg|date('Y-m-d H:i') }}