up historique

This commit is contained in:
Tykayn 2025-06-21 11:28:31 +02:00 committed by tykayn
parent ad4170db14
commit c274fd6a63
12 changed files with 448 additions and 616 deletions

View file

@ -66,7 +66,7 @@
Statistiques des villes (nombre de commerces)
</div>
<div class="card-body">
<canvas id="statsBubbleChart" style="min-height: 400px; width: 100%;"></canvas>
<canvas id="statsBubbleChart" style="min-height: 400px; width: 100%;" data-stats="{{ stats|raw }}"></canvas>
</div>
</div>
</div>
@ -110,7 +110,7 @@
</tr>
</thead>
<tbody>
{% for stat in stats %}
{% for stat in stats_list %}
<tr>
<td><a href="{{ path('app_admin_stats', {'insee_code': stat.zone}) }}" title="Voir les statistiques de cette ville">
{{ stat.name }}
@ -121,8 +121,8 @@
</a></td>
<td>{{ stat.zone }}</td>
<td>{{ stat.completionPercent }}%</td>
<td>{{ stat.placesCount }}</td>
<td>{{ (stat.placesCount / (stat.population or 1 ))|round(2) }}</td>
<td>{{ stat.places|length }}</td>
<td>{{ (stat.places|length / (stat.population or 1 ))|round(2) }}</td>
<td>
<div class="btn-group" role="group">
<a href="{{ path('app_admin_stats', {'insee_code': stat.zone}) }}" class="btn btn-sm btn-primary" title="Voir les statistiques de cette ville">
@ -158,113 +158,5 @@
{% block javascripts %}
{{ parent() }}
{# Les scripts sont maintenant gérés par Webpack Encore via app.js #}
<script>
document.addEventListener('DOMContentLoaded', function() {
const statsDataRaw = [
{% for stat in stats %}
{% if stat.placesCount > 0 and stat.name is not null and stat.population > 0 %}
{
label: '{{ (stat.name ~ " (" ~ stat.zone ~ ")")|e('js') }}',
placesCount: {{ stat.placesCount }},
completion: {{ stat.completionPercent|default(0) }},
x: {{ stat.population }},
y: {{ (stat.placesCount / stat.population * 1000)|round(2) }}
},
{% endif %}
{% endfor %}
];
const ctx = document.getElementById('statsBubbleChart');
if (ctx && statsDataRaw.length > 0) {
const statsData = statsDataRaw.map(d => ({
...d,
r: Math.sqrt(d.placesCount) * 2.5 // Utilise la racine carrée pour la taille, avec un facteur d'échelle
}));
new Chart(ctx.getContext('2d'), {
type: 'bubble',
data: {
datasets: [{
label: 'Commerces par ville',
data: statsData,
backgroundColor: statsData.map(d => `hsla(120, 60%, 70%, ${d.completion / 120 + 0.2})`),
borderColor: 'hsl(120, 60%, 40%)',
borderWidth: 1,
}]
},
options: {
responsive: true,
maintainAspectRatio: false,
plugins: {
legend: {
display: false
},
tooltip: {
callbacks: {
label: function(context) {
const data = context.dataset.data[context.dataIndex];
let label = data.label || '';
if (label) {
label += ': ';
}
label += `${data.placesCount} commerces, ${data.y} pour 1000 hab., ${data.completion}% complétion`;
return label;
}
}
}
},
scales: {
x: {
type: 'logarithmic',
title: {
display: true,
text: 'Population (échelle log)'
}
},
y: {
title: {
display: true,
text: 'Commerces pour 1000 habitants'
}
}
}
}
});
}
// La fonction est maintenant globale grâce à l'import dans app.js
if (typeof colorizePercentageCells === 'function') {
colorizePercentageCells('td:nth-child(3)');
}
// Gérer le formulaire de labourage
const labourageForm = document.getElementById('labourerForm');
const citySearchInput = document.getElementById('citySearch');
const selectedZipCodeInput = document.getElementById('selectedZipCode');
const labourageBtn = labourageForm.querySelector('button[type="submit"]');
const originalBtnHtml = labourageBtn.innerHTML;
if (labourageForm && citySearchInput && typeof setupCitySearch === 'function') {
setupCitySearch('citySearch', 'citySuggestions', function (suggestion) {
// Afficher le spinner et désactiver le bouton
labourageBtn.innerHTML = '<span class="spinner-border spinner-border-sm" role="status" aria-hidden="true"></span> Chargement...';
labourageBtn.disabled = true;
citySearchInput.disabled = true;
if (suggestion.insee) {
window.location.href = `/admin/labourer/${suggestion.insee}`;
} else if (suggestion.postcode) {
// Moins probable, mais en solution de repli
window.location.href = `/admin/labourer/${suggestion.postcode}`;
}
});
labourageForm.addEventListener('submit', function(e) {
e.preventDefault();
alert("Veuillez rechercher et sélectionner une ville directement dans la liste de suggestions.");
});
}
});
</script>
{# Le script du graphique est maintenant dans assets/app.js #}
{% endblock %}