first step for statistics
This commit is contained in:
parent
43e3f9c98b
commit
4ea42a7efd
|
|
@ -17,94 +17,68 @@
|
|||
<h3>{{vehicle.name}}</h3>
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered table-condensed">
|
||||
<tr>
|
||||
<th>Number of Pitstops:</th>
|
||||
<td>{{ vehicle.pitstop_count }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Logged Distance:</th>
|
||||
<td>{{ vehicle.overall_distance | round(2) }} km</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Distance:</th>
|
||||
<td>{{ vehicle.average_distance | round(2) }} km</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Litres fuelled:</th>
|
||||
<td>{{ vehicle.overall_litres | round(2) }} l</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Litres fuelled:</th>
|
||||
<td>{{ vehicle.average_litres_fuelled | round(2) }} l</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Litres used:</th>
|
||||
<td>{{ vehicle.average_litres_used | round(2) }} l/100km</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Logged Costs:</th>
|
||||
<td>{{ vehicle.overall_costs | round(2) }} €</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
<ul id="consumable_tabs" class="nav nav-tabs" data-tabs="tabs">
|
||||
{% for consumable in vehicle.consumables %}
|
||||
<li class="{% if loop.first %}active{% endif %}">
|
||||
<a href="#v{{vehicle.id}}_c{{consumable.id}}" id="i{{vehicle.id}}_c{{consumable.id}}" data-toggle="tab" >
|
||||
{{ consumable.name }}
|
||||
</a>
|
||||
</li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div id="consumable_tabs-content" class="tab-content">
|
||||
{% for consumable in vehicle.consumables %}
|
||||
<div class="tab-pane {% if loop.first %}active{% endif %}" id="v{{vehicle.id}}_c{{consumable.id}}">
|
||||
<table class="table table-striped table-bordered table-condensed">
|
||||
<tr>
|
||||
<th>Average Costs per Litre:</th>
|
||||
<td>{{ vehicle.average_costs_per_litre | round(2) }} €/l</td>
|
||||
<th>Average Distance:</th>
|
||||
<td>{{ consumable.average_distance | round(2) }} km</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Amount fuelled:</th>
|
||||
<td>{{ consumable.amount | round(2) }} {{ consumable.unit }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Amount fuelled:</th>
|
||||
<td>{{ consumable.average_amount_fuelled | round(2) }} {{ consumable.unit }}</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Amount used:</th>
|
||||
<td>{{ consumable.average_amount_used | round(2) }} {{ consumable.unit }}/100km</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
<ul id="charts_tabs" class="nav nav-tabs" data-tabs="tabs">
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
<ul id="charts_tabs" class="nav nav-tabs" data-tabs="tabs">
|
||||
<li class="active">
|
||||
<a href="#v{{vehicle.id}}_c3" id="i{{vehicle.id}}_c3" data-toggle="tab">
|
||||
Consumption
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#v{{vehicle.id}}_c1" id="i{{vehicle.id}}_c1" data-toggle="tab">
|
||||
Fuelled litres
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#v{{vehicle.id}}_c2" id="i{{vehicle.id}}_c2" data-toggle="tab">
|
||||
<a href="#v{{vehicle.id}}_codometer" id="i{{vehicle.id}}_codometer" data-toggle="tab" >
|
||||
Odometer
|
||||
</a>
|
||||
</li>
|
||||
{% for consumable in vehicle.consumables %}
|
||||
<li>
|
||||
<a href="#v{{vehicle.id}}_c4" id="i{{vehicle.id}}_c4" data-toggle="tab">
|
||||
Costs per litre
|
||||
<a href="#v{{vehicle.id}}_c{{consumable.id}}_consumption" id="i{{vehicle.id}}_c{{consumable.id}}_consumption" data-toggle="tab" >
|
||||
{{ consumable.name }} consumption
|
||||
</a>
|
||||
</li>
|
||||
<li>
|
||||
<a href="#v{{vehicle.id}}_c5" id="i{{vehicle.id}}_c5" data-toggle="tab">
|
||||
Costs
|
||||
</a>
|
||||
</li>
|
||||
</ul>
|
||||
<div id="charts_tabs-content" class="tab-content">
|
||||
<div class="tab-pane active" id="v{{vehicle.id}}_c3">
|
||||
{% if vehicle.pitstop_count > 1 %}
|
||||
<div id="averageUsageDiv{{vehicle.id}}" style="width:100%; height:500px;"></div>
|
||||
<script type="text/javascript">
|
||||
{{ chartScript('averageUsageDiv'+vehicle.id|str, vehicle.average_litres, 'l/100 km') }}
|
||||
</script>
|
||||
{% else %}
|
||||
<div class="alert alert-warning" role="alert">
|
||||
not enough data: <a href="{{ url_for('select_consumable_for_new_pitstop', vid=vehicle.id) }}">log a pitstop</a>?
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="tab-pane " id="v{{vehicle.id}}_c1">
|
||||
{% if vehicle.pitstop_count > 0 %}
|
||||
<div id="fuelledChartDiv{{vehicle.id}}" style="width:100%; height:500px;"></div>
|
||||
<script type="text/javascript">
|
||||
{{ chartScript('fuelledChartDiv'+vehicle.id|str, vehicle.litres, 'l') }}
|
||||
</script>
|
||||
{% else %}
|
||||
<div class="alert alert-warning" role="alert">
|
||||
not enough data: <a href="{{ url_for('select_consumable_for_new_pitstop', vid=vehicle.id) }}">log a pitstop</a>?
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="tab-pane " id="v{{vehicle.id}}_c2">
|
||||
{% if vehicle.pitstop_count > 0 %}
|
||||
{% endfor %}
|
||||
</ul>
|
||||
<div id="charts_tabs-content" class="tab-content">
|
||||
<div class="tab-pane active" id="v{{vehicle.id}}_codometer">
|
||||
{% if vehicle.odometers|length > 0 %}
|
||||
<div id="odometerChartDiv{{vehicle.id}}" style="width:100%; height:500px;"></div>
|
||||
<script type="text/javascript">
|
||||
{{ chartScript('odometerChartDiv'+vehicle.id|str, vehicle.odometers, 'km') }}
|
||||
|
|
@ -115,31 +89,22 @@
|
|||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="tab-pane " id="v{{vehicle.id}}_c4">
|
||||
{% if vehicle.pitstop_count > 0 %}
|
||||
<div id="costsPerLitre{{vehicle.id}}" style="width:100%; height:500px;"></div>
|
||||
{% for consumable in vehicle.consumables %}
|
||||
<div class="tab-pane active" id="v{{vehicle.id}}_c{{consumable.id}}_consumption">
|
||||
{% if consumable.average_amount|length > 0 %}
|
||||
<div id="consumptionChartDiv{{vehicle.id}}_c{{consumable.id}}" style="width:100%; height:500px;"></div>
|
||||
<script type="text/javascript">
|
||||
{{ chartScript('costsPerLitre'+vehicle.id|str, vehicle.costsPerLitre, '€/l') }}
|
||||
{{ chartScript('consumptionChartDiv'+vehicle.id|str+'_c'+consumable.id|str, consumable.average_amount, consumable.unit+'/100km') }}
|
||||
</script>
|
||||
{% else %}
|
||||
<div class="alert alert-warning" role="alert">
|
||||
not enough data: <a href="{{ url_for('select_consumable_for_new_pitstop', vid=vehicle.id) }}">log a pitstop</a>?
|
||||
not enough data: <a href="{{ url_for('create_pit_stop_form', vid=vehicle.id, cid=consumable.id) }}">log a pitstop</a>?
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
<div class="tab-pane " id="v{{vehicle.id}}_c5">
|
||||
{% if vehicle.pitstop_count > 0 %}
|
||||
<div id="costs{{vehicle.id}}" style="width:100%; height:500px;"></div>
|
||||
<script type="text/javascript">
|
||||
{{ chartScript('costs'+vehicle.id|str, vehicle.costs, '€') }}
|
||||
</script>
|
||||
{% else %}
|
||||
<div class="alert alert-warning" role="alert">
|
||||
not enough data: <a href="{{ url_for('select_consumable_for_new_pitstop', vid=vehicle.id) }}">log a pitstop</a>?
|
||||
</div>
|
||||
{% endif %}
|
||||
</div>
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
||||
</div>
|
||||
{% endfor %}
|
||||
</div>
|
||||
|
|
@ -153,6 +118,18 @@
|
|||
$('a[href="' + window.location.hash + '"]').click()
|
||||
}
|
||||
});
|
||||
jQuery(document).ready(function ($) {
|
||||
$('#consumable_tabs').tab();
|
||||
if(window.location.hash != "") {
|
||||
$('a[href="' + window.location.hash + '"]').click()
|
||||
}
|
||||
});
|
||||
jQuery(document).ready(function ($) {
|
||||
$('#charts_tabs').tab();
|
||||
if(window.location.hash != "") {
|
||||
$('a[href="' + window.location.hash + '"]').click()
|
||||
}
|
||||
});
|
||||
|
||||
</script>
|
||||
|
||||
|
|
|
|||
|
|
@ -5,52 +5,85 @@ from dis import code_info
|
|||
from rollerverbrauch.entities import \
|
||||
Pitstop
|
||||
|
||||
|
||||
class ConsumableStats:
|
||||
def __init__(self, vehicle, consumable):
|
||||
self.name = consumable.name
|
||||
self.id = consumable.id
|
||||
self.unit = consumable.unit
|
||||
self.amount = 0
|
||||
self.average_distance = 0
|
||||
self.average_amount_fuelled = 0
|
||||
self.average_amount_used = 0
|
||||
self.average_amount = []
|
||||
|
||||
pitstops = [stop for stop in vehicle.pitstops if stop.consumable_id == consumable.id]
|
||||
pitstop_count = len(pitstops)
|
||||
|
||||
if pitstop_count > 0:
|
||||
for pitstop in pitstops:
|
||||
self.amount += pitstop.amount
|
||||
self.average_amount_fuelled = self.amount / pitstop_count
|
||||
|
||||
if pitstop_count > 1:
|
||||
overall_distance = vehicle.pitstops[-1].odometer - vehicle.pitstops[0].odometer
|
||||
self.average_distance = overall_distance / (pitstop_count - 1)
|
||||
self.average_amount_used = 100 * (self.amount - pitstops[0].amount) / overall_distance
|
||||
for index in range(1, pitstop_count):
|
||||
last_ps = pitstops[index - 1]
|
||||
current_ps = pitstops[index]
|
||||
self.average_amount.append(
|
||||
StatsEvent(
|
||||
current_ps.date,
|
||||
round(100 * current_ps.amount/(current_ps.odometer - last_ps.odometer), 2)))
|
||||
|
||||
class VehicleStats:
|
||||
def __init__(self, vehicle):
|
||||
self.name = vehicle.name
|
||||
self.id = vehicle.id
|
||||
self.pitstop_count = len(vehicle.pitstops)
|
||||
self.overall_distance = 0
|
||||
self.average_distance = 0
|
||||
self.overall_litres = 0
|
||||
self.average_litres_fuelled = 0
|
||||
self.average_litres_used = 0
|
||||
self.litres = []
|
||||
self.average_litres = []
|
||||
self.odometers = []
|
||||
self.costsPerLitre = []
|
||||
self.costs = []
|
||||
self.overall_costs = 0
|
||||
self.average_costs_per_litre = 0
|
||||
cost_count = 0;
|
||||
self.consumables = []
|
||||
self.odometers = []
|
||||
|
||||
if self.pitstop_count > 0:
|
||||
for consumable in vehicle.consumables:
|
||||
self.consumables.append(ConsumableStats(vehicle, consumable))
|
||||
|
||||
# self.overall_litres = 0
|
||||
#
|
||||
# self.litres = []
|
||||
# self.average_litres = []
|
||||
# self.costsPerLitre = []
|
||||
# self.costs = []
|
||||
# self.average_costs_per_litre = 0
|
||||
# cost_count = 0;
|
||||
|
||||
pitstop_count = len(vehicle.pitstops)
|
||||
|
||||
if pitstop_count > 0:
|
||||
for pitstop in vehicle.pitstops:
|
||||
self.overall_litres += pitstop.litres
|
||||
self.litres.append(StatsEvent(pitstop.date, pitstop.litres))
|
||||
# self.overall_litres += pitstop.amount
|
||||
# self.litres.append(StatsEvent(pitstop.date, pitstop.amount))
|
||||
self.odometers.append(StatsEvent(pitstop.date, pitstop.odometer))
|
||||
self.costsPerLitre.append(StatsEvent(pitstop.date, pitstop.costs / pitstop.litres))
|
||||
self.costs.append(StatsEvent(pitstop.date, pitstop.costs))
|
||||
# self.costsPerLitre.append(StatsEvent(pitstop.date, pitstop.costs / pitstop.amount))
|
||||
# self.costs.append(StatsEvent(pitstop.date, pitstop.costs))
|
||||
self.overall_costs += pitstop.costs
|
||||
self.average_costs_per_litre += (pitstop.costs / pitstop.litres)
|
||||
if pitstop.costs > 0:
|
||||
cost_count += 1
|
||||
self.average_litres_fuelled = self.overall_litres / self.pitstop_count
|
||||
if cost_count > 0:
|
||||
self.average_costs_per_litre = self.average_costs_per_litre / cost_count
|
||||
else:
|
||||
self.average_costs_per_litre = 0
|
||||
# self.average_costs_per_litre += (pitstop.costs / pitstop.amount)
|
||||
# if pitstop.costs > 0:
|
||||
# cost_count += 1
|
||||
# if cost_count > 0:
|
||||
# self.average_costs_per_litre = self.average_costs_per_litre / cost_count
|
||||
# else:
|
||||
# self.average_costs_per_litre = 0
|
||||
|
||||
if self.pitstop_count > 1:
|
||||
if pitstop_count > 1:
|
||||
self.overall_distance = vehicle.pitstops[-1].odometer - vehicle.pitstops[0].odometer
|
||||
self.average_distance = self.overall_distance / (self.pitstop_count - 1)
|
||||
self.average_litres_used = 100 * (self.overall_litres - vehicle.pitstops[0].litres) / self.overall_distance
|
||||
for index in range(1, self.pitstop_count):
|
||||
last_ps = vehicle.pitstops[index - 1]
|
||||
current_ps = vehicle.pitstops[index]
|
||||
self.average_litres.append(StatsEvent(
|
||||
current_ps.date,
|
||||
round(100 * current_ps.litres/(current_ps.odometer - last_ps.odometer), 2)))
|
||||
# for index in range(1, self.pitstop_count):
|
||||
# last_ps = vehicle.pitstops[index - 1]
|
||||
# current_ps = vehicle.pitstops[index]
|
||||
# self.average_litres.append(StatsEvent(
|
||||
# current_ps.date,
|
||||
# round(100 * current_ps.litres/(current_ps.odometer - last_ps.odometer), 2)))
|
||||
|
||||
|
||||
class StatsEvent:
|
||||
|
|
|
|||
Loading…
Reference in New Issue