tykayn/osm-commerces
1
0
Fork 0
mirror of https://forge.chapril.org/tykayn/osm-commerces synced 2025-10-09 17:02:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

up décompte de suivi des lieux et arbres

Browse source
This commit is contained in:
Tykayn 2025-06-30 15:51:51 +02:00 • committed by tykayn
parent 6c457986ad
commit 949dc71fb8
4 changed files with 65 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/Controller/FollowUpController.php
View file

@ -86,13 +86,22 @@ class FollowUpController extends AbstractController
$followups = $followups->toArray();
usort($followups, fn($a, $b) => $a->getDate() <=> $b->getDate());
$series = [];
$all_points = [];
foreach ($followups as $fu) {
$series[$fu->getName()][] = [
'date' => $fu->getDate()->format('c'),
'value' => $fu->getMeasure(),
'name' => $fu->getName(),
];
$all_points[] = [
'date' => $fu->getDate()->format('c'),
'type' => $fu->getName(),
'name' => $fu->getName(),
'value' => $fu->getMeasure(),
];
}
usort($all_points, fn($a, $b) => strcmp($b['date'], $a['date']));
$all_points = array_slice($all_points, 0, 20);
// Tri par date dans chaque série
foreach ($series as &$points) {
usort($points, function($a, $b) {
@ -103,6 +112,7 @@ class FollowUpController extends AbstractController
return $this->render('admin/followup_graph.html.twig', [
'stats' => $stats,
'series' => $series,
'all_points' => $all_points,
'followup_labels' => FollowUpService::getFollowUpThemes(),
'followup_icons' => FollowUpService::getFollowUpIcons(),
'followup_overpass' => FollowUpService::getFollowUpOverpassQueries(),

26
src/Service/FollowUpService.php
View file

@ -183,20 +183,24 @@ class FollowUpService
});
} elseif ($type === 'tree') {
$completed = array_filter($data['objects'], function($el) {
// Complet si le tag "species" ou "ref" est présent
return !empty($el['tags']['species'] ?? null) || !empty($el['tags']['ref'] ?? null);
$tags = $el['tags'] ?? [];
$hasTaxonomy = !empty($tags['species'] ?? null)
|| !empty($tags['genus'] ?? null)
|| !empty($tags['taxon'] ?? null)
|| !empty($tags['taxon:binomial'] ?? null);
$hasLeaf = !empty($tags['leaf_type'] ?? null)
|| !empty($tags['leaf_cycle'] ?? null)
|| !empty($tags['leaf_shape'] ?? null)
|| !empty($tags['leaf_color'] ?? null)
|| !empty($tags['leaf_fall'] ?? null);
return $hasTaxonomy && $hasLeaf;
});
}
if ($type === 'lieux') {
// Si le type est "lieux", on utilise la méthode completionPercent() de $stats
if (method_exists($stats, 'getCompletionPercent')) {
$completion = $stats->getCompletionPercent();
} else {
$completion = 0;
}
if ($type === 'places') {
$completion = $stats->getCompletionPercent();
} else {
$completion = count($data['objects']) > 0 ? round(count($completed) / count($data['objects']) * 100) : 0;
}
$completion = count($data['objects']) > 0 ? round(count($completed) / count($data['objects']) * 100) : 0;
$followupCompletion = new CityFollowUp();
$followupCompletion->setName($type . '_completion')
->setMeasure($completion)