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

New reports

Browse Source 
Added per term fare paid to traveller model
Fixed parent in emergency contacts report
This commit is contained in:
John Mullins
2023-08-28 11:41:31 +10:00
parent cc706420a5
commit f9981aadf0
7 changed files with 133 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
busManager/coord/templates/reports/bus_numbers.html
+23 -2
View File
@@ -1,13 +1,34 @@
<style>
td {
text-align: left;
padding-inline: 5px;
background-color: #ffffff;
border: 1px solid #dddfe1;
}
</style>
<h1>Bus Numbers</h1>
<table>
<tr>
<th>Route Name</th>
<th>Number of Students</th>
<th>Driver</th>
<th>Route Travellers</th>
<th>Shuttle</th>
<th>Shuttle Travellers</th>
<th>Seating Max</th>
</tr>
{% for bus in buses %}
<tr>
<td>{{ bus.route_name }}</td>
<td>{{ bus.num_travellers }}</td>
<td>{{ bus.drivers }}</td>
<td>{{ bus.route_travellers }}</td>
<td>{{ bus.shuttle }}</td>
<td>{{ bus.shuttle_travellers }}</td>
{% if bus.over_capacity %}
<td style="color:red"><b>{{ bus.seating_capacity }}</b></td>
{% else %}
<td>{{ bus.seating_capacity }}</td>
{% endif %}
</tr>
{% endfor %}
</table>
busManager/coord/templates/reports/bus_roll_old.html
-33
View File
@@ -1,33 +0,0 @@
{% for route in routes %}
<h1>{{ route.route_name }}</h1>
{% for stop in route.stops %}
<tr>
<th>Stop Number</th>
<th>Address</th>
<th>Pickup Time</th>
<th>Drop-off Time</th>
</tr>
<tr>
<th>{{ stop.stop_num }}</th>
<th>{{ stop.name }}</th>
<th>{{ stop.am }}</th>
<th>{{ stop.pm }}</th>
</tr>
{% for traveller in stop.travellers %}
<tr>
<th>Student</th>
<th>Mon AM</th>
<th>Mon PM</th>
<th>Tue AM</th>
<th>Tue PM</th>
</tr>
<tr>
<th>{{ traveller.traveller }}</th>
<th>{{ traveller.mon_am }}</th>
<th>{{ traveller.mon_pm }}</th>
<th>{{ traveller.tue_am }}</th>
<th>{{ traveller.tue_pm }}</th>
</tr>
{% endfor %}
{% endfor %}
{% endfor %}
busManager/coord/templates/reports/bus_summary.html
+26
View File
@@ -0,0 +1,26 @@
{% 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>
<table>
<tr>
<th>Stop #</th>
<th>Address</th>
</tr>
{% for stop in route.stops %}
<tr>
<td>{{ stop.get_stop_number }}</td>
<td>{{ stop.address }}</td>
</tr>
{% endfor %}
</table>
<p style="page-break-after: always">
{% endfor %}