carte des villes et ajout de ville sur accueil
This commit is contained in:
Tykayn
tykayn
parent
56f62c45bb
commit
a2936841f9
8 changed files with 601 additions and 30 deletions
|
|
@ -484,9 +484,9 @@
|
|||
['has', 'completion'],
|
||||
[
|
||||
'rgb',
|
||||
['-', 255, ['*', ['get', 'completion'], 2.55]],
|
||||
0,
|
||||
['*', ['get', 'completion'], 2.55],
|
||||
80
|
||||
0
|
||||
],
|
||||
'#cccccc'
|
||||
],
|
||||
|
|
|
|||
28
templates/public/add_city.html.twig
Normal file
28
templates/public/add_city.html.twig
Normal file
|
|
@ -0,0 +1,28 @@
|
|||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block title %}Ajouter ma ville{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="container mt-4">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<h1><i class="bi bi-plus-circle"></i> Ajouter ma ville</h1>
|
||||
<a href="{{ path('app_public_index') }}" class="btn btn-secondary">
|
||||
<i class="bi bi-arrow-left"></i> Retour à l'accueil
|
||||
</a>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h3><i class="bi bi-geo-alt"></i> Labourage d'une nouvelle ville</h3>
|
||||
<p class="mb-0">Entrez le code INSEE de votre ville pour l'ajouter à notre base de données</p>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
{% include 'public/labourage-form.html.twig' %}
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
153
templates/public/followup_graph.html.twig
Normal file
153
templates/public/followup_graph.html.twig
Normal file
|
|
@ -0,0 +1,153 @@
|
|||
{% extends 'base.html.twig' %}
|
||||
|
||||
{% block title %}Graphe thématique : {{ theme_label }} - {{ stats.name }}{% endblock %}
|
||||
|
||||
{% block stylesheets %}
|
||||
{{ parent() }}
|
||||
<link href='{{ asset('js/maplibre/maplibre-gl.css') }}' rel='stylesheet'/>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
<div class="container mt-4">
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<div class="d-flex justify-content-between align-items-center mb-4">
|
||||
<div>
|
||||
<h1><i class="bi {{ icons[theme]|default('bi-question-circle') }}"></i> {{ theme_label }}</h1>
|
||||
<p class="text-muted mb-0">{{ stats.name }} ({{ stats.zone }})</p>
|
||||
</div>
|
||||
<div>
|
||||
<a href="{{ path('app_admin_stats', {'insee_code': stats.zone}) }}" class="btn btn-info me-2">
|
||||
<i class="bi bi-bar-chart"></i> Voir la page de la ville
|
||||
</a>
|
||||
<a href="{{ path('app_public_index') }}" class="btn btn-secondary">
|
||||
<i class="bi bi-arrow-left"></i> Retour à l'accueil
|
||||
</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h3><i class="bi bi-graph-up"></i> Évolution du {{ theme_label|lower }}</h3>
|
||||
<p class="mb-0">Suivi de la progression du nombre d'objets et du taux de complétion</p>
|
||||
</div>
|
||||
<div class="card-body">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<h5>Nombre d'objets</h5>
|
||||
<canvas id="countChart" height="300"></canvas>
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<h5>Taux de complétion (%)</h5>
|
||||
<canvas id="completionChart" height="300"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="mt-4">
|
||||
<div class="alert alert-info">
|
||||
<i class="bi bi-info-circle"></i>
|
||||
<strong>Informations :</strong> Ces graphiques montrent l'évolution du {{ theme_label|lower }} dans {{ stats.name }} au fil du temps.
|
||||
Le taux de complétion indique le pourcentage d'objets correctement renseignés.
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
{% endblock %}
|
||||
|
||||
{% block javascripts %}
|
||||
{{ parent() }}
|
||||
<script src="https://cdn.jsdelivr.net/npm/chart.js@4.4.0/dist/chart.umd.min.js"></script>
|
||||
<script src="https://cdn.jsdelivr.net/npm/chartjs-adapter-date-fns@3.0.0"></script>
|
||||
<script>
|
||||
document.addEventListener('DOMContentLoaded', function() {
|
||||
const countData = {{ count_data|raw }};
|
||||
const completionData = {{ completion_data|raw }};
|
||||
|
||||
// Graphique du nombre d'objets
|
||||
const countCtx = document.getElementById('countChart').getContext('2d');
|
||||
new Chart(countCtx, {
|
||||
type: 'line',
|
||||
data: {
|
||||
labels: countData.map(d => d.date),
|
||||
datasets: [{
|
||||
label: 'Nombre d\'objets',
|
||||
data: countData.map(d => d.value),
|
||||
borderColor: 'rgb(54, 162, 235)',
|
||||
backgroundColor: 'rgba(54, 162, 235, 0.1)',
|
||||
tension: 0.3,
|
||||
fill: false
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
plugins: {
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Évolution du nombre d\'objets'
|
||||
}
|
||||
},
|
||||
scales: {
|
||||
y: {
|
||||
beginAtZero: true,
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Nombre d\'objets'
|
||||
}
|
||||
},
|
||||
x: {
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Date'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
// Graphique du taux de complétion
|
||||
const completionCtx = document.getElementById('completionChart').getContext('2d');
|
||||
new Chart(completionCtx, {
|
||||
type: 'line',
|
||||
data: {
|
||||
labels: completionData.map(d => d.date),
|
||||
datasets: [{
|
||||
label: 'Taux de complétion (%)',
|
||||
data: completionData.map(d => d.value),
|
||||
borderColor: 'rgb(75, 192, 192)',
|
||||
backgroundColor: 'rgba(75, 192, 192, 0.1)',
|
||||
tension: 0.3,
|
||||
fill: false
|
||||
}]
|
||||
},
|
||||
options: {
|
||||
responsive: true,
|
||||
plugins: {
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Évolution du taux de complétion'
|
||||
}
|
||||
},
|
||||
scales: {
|
||||
y: {
|
||||
beginAtZero: true,
|
||||
max: 100,
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Taux de complétion (%)'
|
||||
}
|
||||
},
|
||||
x: {
|
||||
title: {
|
||||
display: true,
|
||||
text: 'Date'
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
</script>
|
||||
{% endblock %}
|
||||
|
|
@ -130,14 +130,38 @@
|
|||
<br>Nous vous enverrons un lien unique pour cela par email, et si vous en avez besoin, nous pouvons
|
||||
vous aider.
|
||||
</p>
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<label class="label" for="researchShop">
|
||||
<i class="bi bi-search bi-2x"></i> Rechercher un commerce, écrivez son nom et la ville
|
||||
</label>
|
||||
<input class="form-control" type="text" id="researchShop" placeholder="Mon commerce, Paris">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="resultsList"></div>
|
||||
<div id="proposeLink" class="d-none"></div>
|
||||
<div id="proposeMail" class="d-none">
|
||||
<input type="email" id="emailInput" class="form-control"
|
||||
placeholder="mon_email_de_commerce@exemple.com">
|
||||
<button type="submit" class="btn btn-primary p-4 d-block"><i class="bi bi-envelope"></i> Envoyer
|
||||
</button>
|
||||
</div>
|
||||
<div id="emailForm"></div>
|
||||
|
||||
|
||||
{% if citiesForMap is not empty %}
|
||||
<div class="row mb-4">
|
||||
<div class="col-12">
|
||||
<div class="card">
|
||||
<div class="card-header">
|
||||
<h3><i class="bi bi-geo-alt"></i> Carte des villes disponibles</h3>
|
||||
<p class="mb-0">Cliquez sur un marqueur pour voir les statistiques de la ville</p>
|
||||
<div class="card-header d-flex justify-content-between align-items-center">
|
||||
<div>
|
||||
<h3><i class="bi bi-geo-alt"></i> Carte des villes disponibles</h3>
|
||||
<p class="mb-0">Cliquez sur un marqueur pour voir les statistiques de la ville</p>
|
||||
</div>
|
||||
<a href="{{ path('app_public_add_city') }}" class="btn btn-success">
|
||||
<i class="bi bi-plus-circle"></i> Ajouter ma ville
|
||||
</a>
|
||||
</div>
|
||||
<div class="card-body p-0">
|
||||
<div class="map-container">
|
||||
|
|
@ -163,24 +187,7 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
|
||||
<div class="row">
|
||||
<div class="col-12">
|
||||
<label class="label" for="researchShop">
|
||||
<i class="bi bi-search bi-2x"></i> Rechercher un commerce, écrivez son nom et la ville
|
||||
</label>
|
||||
<input class="form-control" type="text" id="researchShop" placeholder="Mon commerce, Paris">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div id="resultsList"></div>
|
||||
<div id="proposeLink" class="d-none"></div>
|
||||
<div id="proposeMail" class="d-none">
|
||||
<input type="email" id="emailInput" class="form-control"
|
||||
placeholder="mon_email_de_commerce@exemple.com">
|
||||
<button type="submit" class="btn btn-primary p-4 d-block"><i class="bi bi-envelope"></i> Envoyer
|
||||
</button>
|
||||
</div>
|
||||
<div id="emailForm"></div>
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
|
@ -311,6 +318,31 @@
|
|||
`)
|
||||
)
|
||||
.addTo(map);
|
||||
|
||||
// Ajouter le nom de la ville comme label
|
||||
const label = new maplibregl.Marker({
|
||||
element: (() => {
|
||||
const el = document.createElement('div');
|
||||
el.className = 'city-label';
|
||||
el.style.cssText = `
|
||||
background: rgba(255, 255, 255, 0.9);
|
||||
border: 1px solid #ccc;
|
||||
border-radius: 4px;
|
||||
padding: 2px 6px;
|
||||
font-size: 11px;
|
||||
font-weight: bold;
|
||||
color: #333;
|
||||
white-space: nowrap;
|
||||
pointer-events: none;
|
||||
margin-top: -25px;
|
||||
margin-left: 15px;
|
||||
`;
|
||||
el.textContent = properties.name;
|
||||
return el;
|
||||
})()
|
||||
})
|
||||
.setLngLat(feature.geometry.coordinates)
|
||||
.addTo(map);
|
||||
});
|
||||
|
||||
// Ajouter les contrôles de navigation
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue