From 349b45ef83e4b73f29fea460f7165c3841c800b0 Mon Sep 17 00:00:00 2001 From: Tykayn Date: Tue, 9 Sep 2025 15:56:30 +0200 Subject: [PATCH] fix routes --- .gitignore | 1 + src/Controller/WikiController.php | 26 +++++++------ templates/admin/wiki.html.twig | 62 +++++++++++++++++++++++++++++++ templates/base.html.twig | 6 +++ wiki_compare/wiki_pages.csv | 4 +- 5 files changed, 85 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 25d2ccb..3086334 100644 --- a/.gitignore +++ b/.gitignore @@ -37,3 +37,4 @@ public/*.json html_cache/* /html_cache/ +activate \ No newline at end of file diff --git a/src/Controller/WikiController.php b/src/Controller/WikiController.php index 843d794..75363d3 100644 --- a/src/Controller/WikiController.php +++ b/src/Controller/WikiController.php @@ -137,14 +137,14 @@ class WikiController extends AbstractController $alignedSections = []; // First, process common sections (they already have both en and fr) -// if (isset($sectionComparison['common']) && is_array($sectionComparison['common'])) { -// foreach ($sectionComparison['common'] as $section) { -// $alignedSections[] = [ -// 'en' => $section['en'], -// 'fr' => $section['fr'] -// ]; -// } -// } + if (isset($sectionComparison['common']) && is_array($sectionComparison['common'])) { + foreach ($sectionComparison['common'] as $section) { + $alignedSections[] = [ + 'en' => $section['en'], + 'fr' => $section['fr'] + ]; + } + } // Then, process English-only sections and add empty placeholders for French if (isset($sectionComparison['en_only']) && is_array($sectionComparison['en_only'])) { @@ -162,8 +162,8 @@ class WikiController extends AbstractController ]; } } -// -// // Finally, process French-only sections (these will be shown at the end) + + // Finally, process French-only sections (these will be shown at the end) if (isset($sectionComparison['fr_only']) && is_array($sectionComparison['fr_only'])) { foreach ($sectionComparison['fr_only'] as $section) { $alignedSections[] = [ @@ -1040,7 +1040,8 @@ EOT; $globalMetrics = $entry['global_metrics']; // Format date for display - $formattedDate = (new \DateTime($date))->format('Y-m-d'); + $formattedDate = is_string($date) && !empty($date) && $date !== '0' ? + (new \DateTime($date))->format('Y-m-d') : 'N/A'; $metrics['dates'][] = $formattedDate; // Get average staleness score @@ -1061,7 +1062,8 @@ EOT; // Process history entries foreach ($historyEntries as $date => $entry) { // Format date for display - $formattedDate = (new \DateTime($date))->format('Y-m-d'); + $formattedDate = is_string($date) && !empty($date) && $date !== '0' ? + (new \DateTime($date))->format('Y-m-d') : 'N/A'; // If date already exists in metrics, use the same index $dateIndex = array_search($formattedDate, $metrics['dates']); diff --git a/templates/admin/wiki.html.twig b/templates/admin/wiki.html.twig index 076b08b..d71ef4c 100644 --- a/templates/admin/wiki.html.twig +++ b/templates/admin/wiki.html.twig @@ -13,12 +13,74 @@

+
+
+

Pages ayant le plus besoin de mise à jour

+
+ {% set top_pages = [] %} + {% for key, languages in wiki_pages|slice(0, 5) %} + {% if languages['en'] is defined and languages['fr'] is defined %} + {% set score = languages['en'].staleness_score|default(0) %} + {% if score > 20 %} + {% set top_pages = top_pages|merge([{'key': key, 'score': score, 'url': path('app_admin_wiki_compare', {'key': key})}]) %} + {% endif %} + {% endif %} + {% endfor %} + + {% for page in top_pages|sort((a, b) => b.score <=> a.score)|slice(0, 3) %} +
+
+
+
{{ page.key }}
+

Score de décrépitude: + + {{ page.score }} + +

+ Comparer +
+
+
+ {% endfor %} +
+
+
+

Liste des pages wiki

+ +
+ {% set count = 0 %} + {% for key, languages in wiki_pages %} + {% if languages['en'] is defined and languages['fr'] is defined and count < 3 %} +
+
+ + {{ key }} +
+
{{ key }}
+ {% set score = languages['en'].staleness_score|default(0) %} +{#

Score de décrépitude: #} +{# #} +{# {{ score }}#} +{# #} +{#

#} +
+ +
+
+ {% set count = count + 1 %} + {% endif %} + {% endfor %} +

+ Ces pages sont celles qui ont le plus besoin d'une mise à jour +

+
+ {% if wiki_pages_stats is defined %}

Statistiques des pages wiki

diff --git a/templates/base.html.twig b/templates/base.html.twig index a0c4dd6..071fdd8 100644 --- a/templates/base.html.twig +++ b/templates/base.html.twig @@ -46,6 +46,12 @@ Tableau de bord +
  • + + + Classements de pages + +
  • diff --git a/wiki_compare/wiki_pages.csv b/wiki_compare/wiki_pages.csv index d4d00c6..21eed6e 100644 --- a/wiki_compare/wiki_pages.csv +++ b/wiki_compare/wiki_pages.csv @@ -10,8 +10,8 @@ Tag:harassment_prevention=ask_angela,en,https://wiki.openstreetmap.org/wiki/Tag: Tag:harassment_prevention=ask_angela,fr,https://wiki.openstreetmap.org/wiki/FR:Tag:harassment_prevention=ask_angela,2025-09-01,20,873,166,15,42.56,https://wiki.openstreetmap.org/w/images/thumb/1/15/2024-06-27T08.40.50_ask_angela_lyon.jpg/200px-2024-06-27T08.40.50_ask_angela_lyon.jpg Key:harassment_prevention,en,https://wiki.openstreetmap.org/wiki/Key:harassment_prevention,2024-08-10,12,196,69,14,66.72,https://wiki.openstreetmap.org/w/images/thumb/7/76/Osm_element_node.svg/30px-Osm_element_node.svg.png Key:harassment_prevention,fr,https://wiki.openstreetmap.org/wiki/FR:Key:harassment_prevention,2025-07-03,15,328,83,14,66.72,https://wiki.openstreetmap.org/w/images/thumb/7/76/Osm_element_node.svg/30px-Osm_element_node.svg.png -Proposal process,en,https://wiki.openstreetmap.org/wiki/Proposal process,2025-08-13,46,5292,202,4,172.34,https://wiki.openstreetmap.org/w/images/thumb/c/c2/Save_proposal_first.png/761px-Save_proposal_first.png -Proposal process,fr,https://wiki.openstreetmap.org/wiki/FR:Proposal process,2023-09-22,15,0,0,0,172.34, +Proposal process,en,https://wiki.openstreetmap.org/wiki/Proposal process,2025-08-13,47,5286,214,4,172.64,https://wiki.openstreetmap.org/w/images/thumb/c/c2/Save_proposal_first.png/761px-Save_proposal_first.png +Proposal process,fr,https://wiki.openstreetmap.org/wiki/FR:Proposal process,2023-09-22,15,0,0,0,172.64, Outil de Manipulation et d'Organisation,en,https://wiki.openstreetmap.org/wiki/Outil de Manipulation et d'Organisation,2025-09-02,9,0,0,0,0.6, Outil de Manipulation et d'Organisation,fr,https://wiki.openstreetmap.org/wiki/FR:Outil de Manipulation et d'Organisation,2025-09-02,13,0,0,0,0.6, Automated_Edits_code_of_conduct,en,https://wiki.openstreetmap.org/wiki/Automated_Edits_code_of_conduct,2025-07-26,19,0,0,0,23.1,