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

Merge pull request 'Zeige Preisentwicklung von Consumables' (#7) from PR_7 into prepare2022 

Reviewed-on: http://gitea.lusiardi.de/jlusiardi/rollerverbrauch/pulls/7
This commit is contained in:
jlusiardi 2022-05-13 16:32:16 +02:00
parent a9338805e2 79e5fdf56b
commit 158c419747
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/templates/statistics.html
View File

@ -164,6 +164,7 @@
<ul id="consumable_{{vehicle.id}}_{{consumable.id}}_tabs" class="nav nav-tabs" data-tabs="tabs"> <ul id="consumable_{{vehicle.id}}_{{consumable.id}}_tabs" class="nav nav-tabs" data-tabs="tabs">
{{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_consumption', 'Consumption', true) }} {{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_consumption', 'Consumption', true) }}
{{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_amount', 'Amount', false) }} {{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_amount', 'Amount', false) }}
{{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_price', 'Price', false) }}
</ul> </ul>
<div id="consumable_{{vehicle.id}}_{{consumable.id}}_content" class="tab-content "> <div id="consumable_{{vehicle.id}}_{{consumable.id}}_content" class="tab-content ">
{{ tab_pane( {{ tab_pane(
@ -188,6 +189,17 @@
false false
) )
}} }}
{{ tab_pane(
vehicle.id|string + '_' + consumable.id|string + '_price',
chart(
consumable.price,
'ref_' + vehicle.id|string + '_' + consumable.id|string + '_price',
'€ / '+consumable.unit,
url_for('create_pit_stop_form', vid=vehicle.id, cid=consumable.id)
),
false
)
}}
</div> </div>
{{ tab_script('vehicle_' + vehicle.id|string + '_' + consumable.id|string + '_tabs') }} {{ tab_script('vehicle_' + vehicle.id|string + '_' + consumable.id|string + '_tabs') }}
</div> </div>

2
app/tools.py
View File

@ -27,6 +27,7 @@ class ConsumableStats:
self.average_amount_used = 0 self.average_amount_used = 0
self.average_amount = [] self.average_amount = []
self.amounts = [] self.amounts = []
self.price = []
pitstops = [ pitstops = [
stop for stop in vehicle.pitstops if stop.consumable_id == consumable.id stop for stop in vehicle.pitstops if stop.consumable_id == consumable.id
@ -37,6 +38,7 @@ class ConsumableStats:
for pitstop in pitstops: for pitstop in pitstops:
self.overall_amount += pitstop.amount self.overall_amount += pitstop.amount
self.amounts.append(StatsEvent(pitstop.date, pitstop.amount)) self.amounts.append(StatsEvent(pitstop.date, pitstop.amount))
self.price.append(StatsEvent(pitstop.date, pitstop.costs/pitstop.amount))
self.average_amount_fuelled = self.overall_amount / pitstop_count self.average_amount_fuelled = self.overall_amount / pitstop_count
if pitstop_count > 1: if pitstop_count > 1:
overall_distance = ( overall_distance = (