jlusiardi/rollerverbrauch
1
0
Fork 0
Code Issues 2 Pull Requests Projects Releases 12 Wiki Activity

Merge branch 'issue_5_more_consumable_material' into pycharm

Browse Source 
Conflicts:
	app/__init__.py
	app/rollerverbrauch/templates/createPitStopForm.html
	app/rollerverbrauch/templates/newPitStopForm.html
	app/rollerverbrauch/templates/selectVehice.html
	app/rollerverbrauch/templates/selectVehicle.html
	app/templates/newPitStopForm.html
	app/templates/selectVehice.html
This commit is contained in:
Joachim Lusiardi
2016-07-16 19:29:25 +02:00
parent 738bcb9f89 1516ac2c51
commit fdb8993ac3
20 changed files with 877 additions and 355 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/templates/account.html
View File

@@ -36,7 +36,8 @@
{{ vehicle.name }}
</td>
<td>
{{ vehicle.pitstops | length }} pitstops
{{ vehicle.pitstops | length }} pitstops<br />
{{ vehicle.consumables | length }} consumables
</td>
<td>
<a href="{{ url_for('edit_vehicle', vid=vehicle.id) }}" class="btn btn-primary " role="button">