jessikitty/bus-manager
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added reports to top left admin menu bar

Browse Source 
Combined summary pages
Changed admin panel to index
This commit is contained in:
John Mullins
2023-08-31 11:59:32 +10:00
parent 3568613607
commit 6caf62e72f
8 changed files with 151 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
busManager/coord/templates/reports/bus_summary.html
+48 -11
View File
@@ -1,24 +1,61 @@
<style>
td {
text-align: left;
padding-inline: 5px;
background-color: #ffffff;
border: 1px solid #dddfe1;
}
</style>
<h1>Routes Overview</h1>
<table>
<tr>
<th>Route Name</th>
<th>Driver</th>
<th>Route Travellers</th>
<th>Shuttle</th>
<th>Shuttle Travellers</th>
<th>Seating Max</th>
</tr>
{% for route in routes %}
<tr>
<td>{{ route.bus.route_name }}</td>
<td>
{% for driver in route.drivers %}
{{ driver }}<br>
{% endfor %}
</td>
<td>{{ route.traveller_count }}</td>
<td>{{ route.shuttle_name }}</td>
<td>{{ route.shuttle_count }}</td>
{% if route.over_capacity %}
<td style="color:red"><b>{{ route.seating_capacity }}</b></td>
{% else %}
<td>{{ route.seating_capacity }}</td>
{% endif %}
</tr>
{% endfor %}
</table>
<p style="page-break-after: always">
{% for route in routes %}
<h1>{{ route.bus.company }}</h1>
<table>
<tr>
<th>Route name</th>
<th>Driver</th>
</tr>
<tr>
<td>{{ route.bus.route_name }}</td>
<td>{{ route.drivers }}</td>
</tr>
</table>
<h1>{{ route.bus.company }} - {{ route.bus }}</h1>
{% for driver in route.drivers %}
<p><b>Driver:</b> {{ driver }} ({{ driver.phone_number }})</p>
{% endfor %}
<table>
<tr>
<th>Stop #</th>
<th>Address</th>
<th>AM Time</th>
<th>PM Time</th>
</tr>
{% for stop in route.stops %}
<tr>
<td>{{ stop.get_stop_number }}</td>
<td>{{ stop.address }}</td>
<td>{{ stop.am_time }}</td>
<td>{{ stop.pm_time }}</td>
</tr>
{% endfor %}
</table>
busManager/coord/templates/reports/emergency_contacts.html
+22 -22
View File
@@ -23,29 +23,29 @@
{% for route in routes %}
<h1 style="font-size: 2.5em">{{ route.bus.company }} - {{ route.bus }}</h1>
{% for driver in route.drivers %}
<p><b>Driver:</b> {{ driver }} ({{ driver.phone_number }})</p>
{% endfor %}
<table class="traveller">
{% for driver in route.drivers %}
<p><b>Driver:</b> {{ driver }} ({{ driver.phone_number }})</p>
{% endfor %}
<table class="traveller">
<tr>
<th style="width: 25%">Student</th>
<th style="width: 25%">Parent A</th>
<th style="width: 25%">Parent B</th>
<th style="width: 25%">Emergency Contact A</th>
<th style="width: 25%">Emergency Contact B</th>
<th style="width: 40%">Driver notes</th>
</tr>
{% for traveller in route.travellers %}
<tr>
<th style="width: 25%">Student</th>
<th style="width: 25%">Parent A</th>
<th style="width: 25%">Parent B</th>
<th style="width: 25%">Emergency Contact A</th>
<th style="width: 25%">Emergency Contact B</th>
<th style="width: 40%">Driver notes</th>
<td>{{ traveller.traveller.last_name }}, {{ traveller.traveller.first_name }} ({{ traveller.traveller.school.shortName }})</td>
<td>{{ traveller.parent_a }}</td>
<td>{{ traveller.parent_b }}</td>
<td>{{ traveller.contact_a }}</td>
<td>{{ traveller.contact_b }}</td>
<td>{{ traveller.note }}</td>
</tr>
{% for traveller in route.travellers %}
<tr>
<td>{{ traveller.traveller.last_name }}, {{ traveller.traveller.first_name }} ({{ traveller.traveller.school.shortName }})</td>
<td>{{ traveller.parent_a }}</td>
<td>{{ traveller.parent_b }}</td>
<td>{{ traveller.contact_a }}</td>
<td>{{ traveller.contact_b }}</td>
<td>{{ traveller.note }}</td>
</tr>
{% endfor %}
</table>
<br>
{% endfor %}
</table>
<br>
<p style="page-break-after: always">
{% endfor %}