From 98019055f1353b82fefccab63c76e66a9c64f3b5 Mon Sep 17 00:00:00 2001
From: John Mullins <john.mullins@education.vic.gov.au>
Date: Wed, 12 Jun 2024 11:08:47 +1000
Subject: [PATCH] Formating changes for roll reports

---
 .../coord/templates/reports/bus_roll.html     | 62 ++++++++++---------
 .../coord/templates/reports/school_roll.html  |  4 +-
 2 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/busManager/coord/templates/reports/bus_roll.html b/busManager/coord/templates/reports/bus_roll.html
index 4777fc2..7fea2a0 100644
--- a/busManager/coord/templates/reports/bus_roll.html
+++ b/busManager/coord/templates/reports/bus_roll.html
@@ -43,38 +43,40 @@
                 <td>{{ stop.pm }}</td>
             </tr>
         </table>
-        <table class="traveller">
-            <tr>
-                <th style="width: 100%; text-align: left">Student</th>
-                <th style="width: 10%">Fare</th>
-                <th style="width: 8%">Mon AM</th>
-                <th style="width: 8%">Mon PM</th>
-                <th style="width: 8%">Tue AM</th>
-                <th style="width: 8%">Tue PM</th>
-                <th style="width: 8%">Wed AM</th>
-                <th style="width: 8%">Wed PM</th>
-                <th style="width: 8%">Thu AM</th>
-                <th style="width: 8%">Thu PM</th>
-                <th style="width: 8%">Fri AM</th>
-                <th style="width: 8%">Fri PM</th>
-            </tr>
-            {% for traveller in stop.travellers %}
+        {% if stop.travellers %}
+            <table class="traveller">
                 <tr>
-                    <td style="padding-top: 3px; padding-left: 2px; text-align: left">{{ traveller.display }}</td>
-                    <td style="padding-top: 3px; text-align: center"><b>{{ traveller.isFared }}</b></td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
-                    <td>    </td>
+                    <th style="width: 100%; text-align: left">Student</th>
+                    <th style="width: 10%">Fare</th>
+                    <th style="width: 8%">Mon AM</th>
+                    <th style="width: 8%">Mon PM</th>
+                    <th style="width: 8%">Tue AM</th>
+                    <th style="width: 8%">Tue PM</th>
+                    <th style="width: 8%">Wed AM</th>
+                    <th style="width: 8%">Wed PM</th>
+                    <th style="width: 8%">Thu AM</th>
+                    <th style="width: 8%">Thu PM</th>
+                    <th style="width: 8%">Fri AM</th>
+                    <th style="width: 8%">Fri PM</th>
                 </tr>
-            {% endfor %}
-        </table>
+                {% for traveller in stop.travellers %}
+                    <tr>
+                        <td style="padding-top: 3px; padding-left: 2px; text-align: left">{{ traveller.display }}</td>
+                        <td style="padding-top: 3px; text-align: center"><b>{{ traveller.isFared }}</b></td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                        <td>    </td>
+                    </tr>
+                {% endfor %}
+            </table>
+        {% endif %}
         <br>
     {% endfor %}
     {% if route.route_stops %}
diff --git a/busManager/coord/templates/reports/school_roll.html b/busManager/coord/templates/reports/school_roll.html
index 40e2ed7..3068167 100644
--- a/busManager/coord/templates/reports/school_roll.html
+++ b/busManager/coord/templates/reports/school_roll.html
@@ -18,8 +18,8 @@
                 <th style="width: 5%">Fare</th>
                 <th style="width: 30%">Shuttle</th>
                 <th style="width: 30%">Stop</th>
-                <th style="width: 8%">AM Time</th>
-                <th style="width: 8%">PM Time</th>
+                <th style="width: 8%">Pickup</th>
+                <th style="width: 8%">Drop off</th>
             </tr>
             {% for traveller in route.travellers %}
                 <tr>