From 49cbe0d172169006f93000969720b405216d0272 Mon Sep 17 00:00:00 2001
From: 8ctopus <hello@octopuslabs.io>
Date: Fri, 13 Dec 2024 09:10:01 +0400
Subject: [PATCH 1/2] Cleanup html table output

---
 .../Resources/views/statsTable.html.twig      | 31 +++++++++----------
 1 file changed, 15 insertions(+), 16 deletions(-)

diff --git a/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig b/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig
index 271066d..5d11090 100644
--- a/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig
+++ b/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig
@@ -1,30 +1,29 @@
 <table class="stats-table">
     <thead>
     <tr>
-        {% for key, name in headers %}
-            <th class="stats-table-{{ key }}">
-                {% if metaData[key].description is defined %}<abbr title="{{ metaData[key].description }}">{% endif %}
-                    {{ name }}
-                    {% if metaData[key].description is defined %}</abbr>{% endif %}
-            </th>
-        {% endfor %}
+{% for key, name in headers %}
+        <th class="stats-table-{{ key }}">
+{% if metaData[key].description is defined %}            <abbr title="{{ metaData[key].description }}">{% endif %}
+            {{ name }}
+{% if metaData[key].description is defined %}            </abbr>{% endif %}
+        </th>
+{% endfor %}
     </tr>
     </thead>
     <tbody>
-    {% for line in data %}
+{% for line in data %}
         <tr>
-            {% for key, value in line %}
-                <td class="stats-table-{{ key }}">{{ value }}</td>
-            {% endfor %}
+{% for key, value in line %}
+            <td class="stats-table-{{ key }}">{{ value }}</td>
+{% endfor %}
         </tr>
-    {% endfor %}
+{% endfor %}
     </tbody>
-
     <tfoot>
     <tr>
-        {% for key, value in aggregations %}
-            <th class="stats-table-{{ key }}">{{ value }}</th>
-        {% endfor %}
+{% for key, value in aggregations %}
+        <th class="stats-table-{{ key }}">{{ value }}</th>
+{% endfor %}
     </tr>
     </tfoot>
 </table>
\ No newline at end of file

From f5fd6477deda915e3a31ee9043ca754d6fc2d194 Mon Sep 17 00:00:00 2001
From: 8ctopus <hello@octopuslabs.io>
Date: Mon, 23 Dec 2024 21:01:25 +0400
Subject: [PATCH 2/2] Fix html table header Update html table tests

---
 .../Resources/views/statsTable.html.twig      |  6 +-
 .../Dumper/Fixtures/template/custom.html.twig | 22 +++---
 tests/Tests/Dumper/Fixtures/test-custom.html  | 54 ++++++-------
 tests/Tests/Dumper/Fixtures/test.html         | 75 +++++++++----------
 4 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig b/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig
index 5d11090..5a8ad41 100644
--- a/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig
+++ b/lib/IgraalOSL/StatsTable/Resources/views/statsTable.html.twig
@@ -3,9 +3,11 @@
     <tr>
 {% for key, name in headers %}
         <th class="stats-table-{{ key }}">
-{% if metaData[key].description is defined %}            <abbr title="{{ metaData[key].description }}">{% endif %}
+{% if metaData[key].description is defined %}
+            <abbr title="{{ metaData[key].description }}">{{ name }}</abbr>
+{% else %}
             {{ name }}
-{% if metaData[key].description is defined %}            </abbr>{% endif %}
+{% endif %}
         </th>
 {% endfor %}
     </tr>
diff --git a/tests/Tests/Dumper/Fixtures/template/custom.html.twig b/tests/Tests/Dumper/Fixtures/template/custom.html.twig
index 9182927..119eb81 100644
--- a/tests/Tests/Dumper/Fixtures/template/custom.html.twig
+++ b/tests/Tests/Dumper/Fixtures/template/custom.html.twig
@@ -2,27 +2,27 @@
     <thead>
         <tr><th colspan="{{ headers|length }}">{{ title }}</th></tr>
         <tr>
-            {% for key, name in headers %}
-                <th class="stats-table-{{ key }}">{{ name }}</th>
-            {% endfor %}
+{% for key, name in headers %}
+            <th class="stats-table-{{ key }}">{{ name }}</th>
+{% endfor %}
         </tr>
     </thead>
 
     <tbody>
-    {% for line in data %}
+{% for line in data %}
         <tr>
-            {% for key, value in line %}
-                <td class="stats-table-{{ key }}">{{ value }}</td>
-            {% endfor %}
+{% for key, value in line %}
+            <td class="stats-table-{{ key }}">{{ value }}</td>
+{% endfor %}
         </tr>
-    {% endfor %}
+{% endfor %}
     </tbody>
 
     <tfoot>
         <tr>
-            {% for key, value in aggregations %}
-                <th class="stats-table-{{ key }}">{{ value }}</th>
-            {% endfor %}
+{% for key, value in aggregations %}
+            <th class="stats-table-{{ key }}">{{ value }}</th>
+{% endfor %}
         </tr>
     </tfoot>
 </table>
\ No newline at end of file
diff --git a/tests/Tests/Dumper/Fixtures/test-custom.html b/tests/Tests/Dumper/Fixtures/test-custom.html
index 8c46605..90a8622 100644
--- a/tests/Tests/Dumper/Fixtures/test-custom.html
+++ b/tests/Tests/Dumper/Fixtures/test-custom.html
@@ -2,38 +2,38 @@
     <thead>
         <tr><th colspan="5">My title test</th></tr>
         <tr>
-                            <th class="stats-table-date">Date</th>
-                            <th class="stats-table-hits">Nb de visites</th>
-                            <th class="stats-table-subscribers">Nb inscrits</th>
-                            <th class="stats-table-ratio">Taux de transfo</th>
-                            <th class="stats-table-revenues">Revenus g&#xE9;n&#xE9;r&#xE9;s</th>
-                    </tr>
+            <th class="stats-table-date">Date</th>
+            <th class="stats-table-hits">Nb de visites</th>
+            <th class="stats-table-subscribers">Nb inscrits</th>
+            <th class="stats-table-ratio">Taux de transfo</th>
+            <th class="stats-table-revenues">Revenus g&#xE9;n&#xE9;r&#xE9;s</th>
+        </tr>
     </thead>
 
     <tbody>
-            <tr>
-                            <td class="stats-table-date">2014-01-01</td>
-                            <td class="stats-table-hits">10</td>
-                            <td class="stats-table-subscribers">2</td>
-                            <td class="stats-table-ratio">20%</td>
-                            <td class="stats-table-revenues">45,32&#x20AC;</td>
-                    </tr>
-            <tr>
-                            <td class="stats-table-date">2014-01-01</td>
-                            <td class="stats-table-hits">20</td>
-                            <td class="stats-table-subscribers">7</td>
-                            <td class="stats-table-ratio">35%</td>
-                            <td class="stats-table-revenues">80,75&#x20AC;</td>
-                    </tr>
-        </tbody>
+        <tr>
+            <td class="stats-table-date">2014-01-01</td>
+            <td class="stats-table-hits">10</td>
+            <td class="stats-table-subscribers">2</td>
+            <td class="stats-table-ratio">20%</td>
+            <td class="stats-table-revenues">45,32&#x20AC;</td>
+        </tr>
+        <tr>
+            <td class="stats-table-date">2014-01-01</td>
+            <td class="stats-table-hits">20</td>
+            <td class="stats-table-subscribers">7</td>
+            <td class="stats-table-ratio">35%</td>
+            <td class="stats-table-revenues">80,75&#x20AC;</td>
+        </tr>
+    </tbody>
 
     <tfoot>
         <tr>
-                            <th class="stats-table-date">Total</th>
-                            <th class="stats-table-hits">30</th>
-                            <th class="stats-table-subscribers">9</th>
-                            <th class="stats-table-ratio">30%</th>
-                            <th class="stats-table-revenues">126,08&#x20AC;</th>
-                    </tr>
+            <th class="stats-table-date">Total</th>
+            <th class="stats-table-hits">30</th>
+            <th class="stats-table-subscribers">9</th>
+            <th class="stats-table-ratio">30%</th>
+            <th class="stats-table-revenues">126,08&#x20AC;</th>
+        </tr>
     </tfoot>
 </table>
diff --git a/tests/Tests/Dumper/Fixtures/test.html b/tests/Tests/Dumper/Fixtures/test.html
index 259aab0..cc55a9b 100644
--- a/tests/Tests/Dumper/Fixtures/test.html
+++ b/tests/Tests/Dumper/Fixtures/test.html
@@ -2,47 +2,46 @@
 <table class="stats-table">
     <thead>
     <tr>
-                    <th class="stats-table-date">
-                <abbr title="Date of the stats">                    Date
-                    </abbr>            </th>
-                    <th class="stats-table-hits">
-                <abbr title="Number of hits">                    Nb de visites
-                    </abbr>            </th>
-                    <th class="stats-table-subscribers">
-                                    Nb inscrits
-                                </th>
-                    <th class="stats-table-ratio">
-                                    Taux de transfo
-                                </th>
-                    <th class="stats-table-revenues">
-                                    Revenus g&#xE9;n&#xE9;r&#xE9;s
-                                </th>
-            </tr>
+        <th class="stats-table-date">
+            <abbr title="Date of the stats">Date</abbr>
+        </th>
+        <th class="stats-table-hits">
+            <abbr title="Number of hits">Nb de visites</abbr>
+        </th>
+        <th class="stats-table-subscribers">
+            Nb inscrits
+        </th>
+        <th class="stats-table-ratio">
+            Taux de transfo
+        </th>
+        <th class="stats-table-revenues">
+            Revenus g&#xE9;n&#xE9;r&#xE9;s
+        </th>
+    </tr>
     </thead>
     <tbody>
-            <tr>
-                            <td class="stats-table-date">2014-01-01</td>
-                            <td class="stats-table-hits">10</td>
-                            <td class="stats-table-subscribers">2</td>
-                            <td class="stats-table-ratio">20%</td>
-                            <td class="stats-table-revenues">45,32&#x20AC;</td>
-                    </tr>
-            <tr>
-                            <td class="stats-table-date">2014-01-01</td>
-                            <td class="stats-table-hits">20</td>
-                            <td class="stats-table-subscribers">7</td>
-                            <td class="stats-table-ratio">35%</td>
-                            <td class="stats-table-revenues">80,75&#x20AC;</td>
-                    </tr>
-        </tbody>
-
+        <tr>
+            <td class="stats-table-date">2014-01-01</td>
+            <td class="stats-table-hits">10</td>
+            <td class="stats-table-subscribers">2</td>
+            <td class="stats-table-ratio">20%</td>
+            <td class="stats-table-revenues">45,32&#x20AC;</td>
+        </tr>
+        <tr>
+            <td class="stats-table-date">2014-01-01</td>
+            <td class="stats-table-hits">20</td>
+            <td class="stats-table-subscribers">7</td>
+            <td class="stats-table-ratio">35%</td>
+            <td class="stats-table-revenues">80,75&#x20AC;</td>
+        </tr>
+    </tbody>
     <tfoot>
     <tr>
-                    <th class="stats-table-date">Total</th>
-                    <th class="stats-table-hits">30</th>
-                    <th class="stats-table-subscribers">9</th>
-                    <th class="stats-table-ratio">30%</th>
-                    <th class="stats-table-revenues">126,08&#x20AC;</th>
-            </tr>
+        <th class="stats-table-date">Total</th>
+        <th class="stats-table-hits">30</th>
+        <th class="stats-table-subscribers">9</th>
+        <th class="stats-table-ratio">30%</th>
+        <th class="stats-table-revenues">126,08&#x20AC;</th>
+    </tr>
     </tfoot>
 </table>