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

fix décompte de notes

Browse source
This commit is contained in:
Tykayn 2025-06-29 11:00:13 +02:00 • committed by tykayn
parent 8136d8e0cb
commit 73e021c854
5 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/Controller/AdminController.php
View file

@ -94,8 +94,6 @@ final class AdminController extends AbstractController
->setSiret($this->motocultrice->find_siret($placeData['tags']) ?? '') ->setSiret($this->motocultrice->find_siret($placeData['tags']) ?? '')
->setAskedHumainsSupport(false) ->setAskedHumainsSupport(false)
->setLastContactAttemptDate(null) ->setLastContactAttemptDate(null)
->setNote($this->motocultrice->find_tag($placeData['tags'], 'note') ? true : false)
->setNoteContent($this->motocultrice->find_tag($placeData['tags'], 'note') ?? '')
->setPlaceCount(0) ->setPlaceCount(0)
// ->setOsmData($placeData['modified'] ?? null) // ->setOsmData($placeData['modified'] ?? null)
; ;
@ -575,8 +573,6 @@ final class AdminController extends AbstractController
->setSiret($this->motocultrice->find_siret($placeData['tags']) ?? '') ->setSiret($this->motocultrice->find_siret($placeData['tags']) ?? '')
->setAskedHumainsSupport(false) ->setAskedHumainsSupport(false)
->setLastContactAttemptDate(null) ->setLastContactAttemptDate(null)
->setNote($this->motocultrice->find_tag($placeData['tags'], 'note') ? true : false)
->setNoteContent($this->motocultrice->find_tag($placeData['tags'], 'note') ?? '')
->setPlaceCount(0) ->setPlaceCount(0)
// ->setOsmData($placeData['modified'] ?? null) // ->setOsmData($placeData['modified'] ?? null)
; ;

1
src/Entity/Place.php
View file

@ -314,6 +314,7 @@ class Place
} }
$this->setNoteContent($noteContent ? $noteContent : null); $this->setNoteContent($noteContent ? $noteContent : null);
$this->setHasNote($hasNote); $this->setHasNote($hasNote);
$this->setNote($noteContent);
} }
public function __construct() public function __construct()

7
src/Entity/Stats.php
View file

@ -223,10 +223,17 @@ class Stats
} }
if($place->getSiret()) { if($place->getSiret()) {
$this->avec_siret++; $this->avec_siret++;
$place_completions++;
} }
if($place->getName()) { if($place->getName()) {
$this->avec_name++; $this->avec_name++;
$place_completions++;
} }
if($place->getNoteContent()) {
$this->avec_note++;
// on ne compte pas les notes comme indice de complétion
}
$somme_completions += $place_completions / 6; $somme_completions += $place_completions / 6;
} }

3
src/Service/Motocultrice.php
View file

@ -12,7 +12,7 @@ class Motocultrice
public $overpass_base_places = ' public $overpass_base_places = '
( (
nw["amenity"~"^(cafe|bar|restaurant|library|cinema|fast_food|post_office|marketplace|community_centre|theatre|bank|townhall|animal_boarding|animal_breeding|animal_shelter|animal_training|archive|arts_centre|bicycle_rental|biergarten|boat_rental|boat_storage|bureau_de_change|canteen|car_rental|car_wash|casino|childcare|clinic|college|conference_centre|courthouse|coworking_space|crematorium|dancing_school|dentist|dive_centre|doctors)$"](area.searchArea); nw["amenity"~"^(cafe|bar|restaurant|library|cinema|fast_food|post_office|marketplace|community_centre|theatre|bank|townhall|animal_boarding|animal_breeding|animal_shelter|animal_training|archive|arts_centre|bicycle_rental|biergarten|boat_rental|boat_storage|bureau_de_change|canteen|car_rental|car_wash|casino|childcare|clinic|college|conference_centre|courthouse|coworking_space|crematorium|dancing_school|dentist|dive_centre|doctors)$"](area.searchArea);
nw["shop"](area.searchArea); nw["shop"]["shop"!~"vacant"](area.searchArea);
nw["tourism"~"^(hotel|hostel|motel|wilderness_hut|yes|chalet|gallery|guest_house|museum|zoo|theme_park|aquarium|alpine_hut|apartment)$"](area.searchArea); nw["tourism"~"^(hotel|hostel|motel|wilderness_hut|yes|chalet|gallery|guest_house|museum|zoo|theme_park|aquarium|alpine_hut|apartment)$"](area.searchArea);
nw["healthcare"](area.searchArea); nw["healthcare"](area.searchArea);
nw["information"="office"](area.searchArea); nw["information"="office"](area.searchArea);
@ -192,6 +192,7 @@ out meta;';
foreach ($data['elements'] as $element) { foreach ($data['elements'] as $element) {
if (isset($element['tags'])) { if (isset($element['tags'])) {
$places[] = [ $places[] = [
'id' => $element['id'], 'id' => $element['id'],
'type' => $element['type'], 'type' => $element['type'],

1
templates/admin/stats/row.html.twig
View file

@ -12,7 +12,6 @@
</td> </td>
<td> <td>
<a href="{{ path('app_admin_make_email_for_place', {'id': commerce.id}) }}"> <a href="{{ path('app_admin_make_email_for_place', {'id': commerce.id}) }}">
voir email
<i class="bi bi-envelope-fill"></i> <i class="bi bi-envelope-fill"></i>
</a> </a>
</td> </td>