started working on services
This commit is contained in:
joachim lusiardi
@@ -1,3 +1,22 @@
|
||||
{% macro alert_level(km_left) -%}
|
||||
{% if km_left < 0 %}
|
||||
alert-danger
|
||||
{% elif km_left < 300 %}
|
||||
alert-warning
|
||||
{% else %}
|
||||
alert-success
|
||||
{% endif %}
|
||||
{%- endmacro %}
|
||||
|
||||
{% macro service_warning() -%}
|
||||
<div class="alert {{ alert_level(data.service_info['km_left']) }} alert-dismissible" role="alert">
|
||||
<button type="button" class="close" data-dismiss="alert" aria-label="Close">
|
||||
<span aria-hidden="true">×</span>
|
||||
</button>
|
||||
Service required in {{ data.service_info['km_left'] }} km. Tasks: {{ data.service_info['tasks'] }}.
|
||||
</div>
|
||||
{%- endmacro %}
|
||||
|
||||
<!doctype html>
|
||||
<!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
|
||||
<!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang=""> <![endif]-->
|
||||
@@ -38,7 +57,7 @@
|
||||
<span class="icon-bar"></span>
|
||||
<span class="icon-bar"></span>
|
||||
</button>
|
||||
<a class="navbar-brand" href="{{ url_for('getPitStops') }}">Rollerverbrauch</a>
|
||||
<a class="navbar-brand" href="{{ url_for('get_pit_stops') }}">Rollerverbrauch</a>
|
||||
</div>
|
||||
<div id="navbar" class="collapse navbar-collapse">
|
||||
<ul class="nav navbar-nav">
|
||||
|
||||
@@ -1,13 +1,16 @@
|
||||
{% extends "layout.html" %}
|
||||
|
||||
{% block navigation %}
|
||||
<li><a href='{{ url_for('createPitStopForm') }}' class="active">Create Pitstop</a></li>
|
||||
<li><a href='{{ url_for('getStatistics') }}'>Statistics</a></li>
|
||||
<li><a href='{{ url_for('create_pit_stop_form') }}' class="active">Create Pitstop</a></li>
|
||||
<li><a href='{{ url_for('get_statistics') }}'>Statistics</a></li>
|
||||
<li><a href='{{ url_for('get_services') }}'>Services</a></li>
|
||||
{% endblock %}
|
||||
|
||||
|
||||
{% block body %}
|
||||
<form class='form-horizontal' id='createPitStop' action="{{ url_for('createPitStop') }}" method='post'>
|
||||
{{ service_warning() }}
|
||||
|
||||
<form class='form-horizontal' id='createPitStop' action="{{ url_for('create_pit_stop') }}" method='post'>
|
||||
|
||||
<!-- Text input-->
|
||||
<div class="form-group {% if data.error['date'] %}has-error{% endif %}">
|
||||
@@ -39,8 +42,8 @@
|
||||
<!-- Button (Double) -->
|
||||
<div class="form-group">
|
||||
<div class="controls">
|
||||
<button id="buttonLogId" name="buttonLogId" class="btn btn-success" onclick="document.getElementById('createPitStop').submit();">Log Pitstop</button>
|
||||
<button id="buttonAbortId" name="buttonAbortId" class="btn btn-warning" onclick="window.location.href='{{ url_for('getPitStops') }}'" type="button" >Abort</button>
|
||||
<button id="buttonLogId" name="buttonLogId" class="btn btn-success" onclick="document.getElementById('create_pit_stop').submit();">Log Pitstop</button>
|
||||
<button id="buttonAbortId" name="buttonAbortId" class="btn btn-warning" onclick="window.location.href='{{ url_for('get_pit_stops') }}'" type="button" >Abort</button>
|
||||
</div>
|
||||
</div>
|
||||
</form>
|
||||
|
||||
@@ -1,12 +1,14 @@
|
||||
{% extends "layout.html" %}
|
||||
|
||||
{% block navigation %}
|
||||
<li><a href='{{ url_for('createPitStopForm') }}'>Create Pitstop</a></li>
|
||||
<li><a href='{{ url_for('getStatistics') }}'>Statistics</a></li>
|
||||
<li><a href='{{ url_for('create_pit_stop_form') }}'>Create Pitstop</a></li>
|
||||
<li><a href='{{ url_for('get_statistics') }}'>Statistics</a></li>
|
||||
<li><a href='{{ url_for('get_services') }}'>Services</a></li>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{{ service_warning() }}
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered table-condensed">
|
||||
<tr>
|
||||
@@ -35,7 +37,7 @@
|
||||
</td>
|
||||
<td>
|
||||
{{pitstop.litres}} l<br />
|
||||
{% if pitstop.average %}{{pitstop.average}}{% else %} --{% endif %} l/100km
|
||||
{% if pitstop.average %}{{pitstop.average | round(2)}}{% else %} --{% endif %} l/100km
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
|
||||
60
app/templates/services.html
Normal file
60
app/templates/services.html
Normal file
@@ -0,0 +1,60 @@
|
||||
{% extends "layout.html" %}
|
||||
|
||||
{% block navigation %}
|
||||
<li><a href='{{ url_for('create_pit_stop_form') }}'>Create Pitstop</a></li>
|
||||
<li><a href='{{ url_for('get_statistics') }}' class="active">Statistics</a></li>
|
||||
<li><a href='{{ url_for('get_services') }}' class="active">Services</a></li>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{{ service_warning() }}
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered table-condensed">
|
||||
<tr>
|
||||
<th>
|
||||
Odometer<br />
|
||||
(planned)
|
||||
</th>
|
||||
<th>
|
||||
Odometer<br />
|
||||
(done)
|
||||
</th>
|
||||
<th>
|
||||
Date<br />
|
||||
(done)
|
||||
</th>
|
||||
<th>
|
||||
Tasks
|
||||
</th>
|
||||
</tr>
|
||||
{% for service in data['services'] %}
|
||||
<tr class='pitstop'>
|
||||
<td>
|
||||
{{service.odometer_planned}} km
|
||||
</td>
|
||||
<td>
|
||||
{% if service.odometer_done %}
|
||||
{{service.odometer_done}} km
|
||||
{% else %}
|
||||
-- km
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
{% if service.date %}
|
||||
{{service.date}}
|
||||
{% else %}
|
||||
--
|
||||
{% endif %}
|
||||
</td>
|
||||
<td>
|
||||
|
||||
{% for task in service.tasks.split(',') %}
|
||||
{{task}} <br />
|
||||
{% endfor %}
|
||||
</td>
|
||||
</tr>
|
||||
{% endfor %}
|
||||
</table>
|
||||
</div>
|
||||
{% endblock %}
|
||||
@@ -1,12 +1,14 @@
|
||||
{% extends "layout.html" %}
|
||||
|
||||
{% block navigation %}
|
||||
<li><a href='{{ url_for('createPitStopForm') }}'>Create Pitstop</a></li>
|
||||
<li><a href='{{ url_for('getStatistics') }}' class="active">Statistics</a></li>
|
||||
<li><a href='{{ url_for('create_pit_stop_form') }}'>Create Pitstop</a></li>
|
||||
<li><a href='{{ url_for('get_statistics') }}' class="active">Statistics</a></li>
|
||||
<li><a href='{{ url_for('get_services') }}'>Services</a></li>
|
||||
{% endblock %}
|
||||
|
||||
{% block body %}
|
||||
{{ service_warning() }}
|
||||
|
||||
<div class="table-responsive">
|
||||
<table class="table table-striped table-bordered table-condensed">
|
||||
<tr>
|
||||
@@ -15,23 +17,23 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Logged Distance:</th>
|
||||
<td>{{ data.distance }} km</td>
|
||||
<td>{{ data.distance | round(2) }} km</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Distance:</th>
|
||||
<td>{{ data.averageDistance }} km</td>
|
||||
<td>{{ data.averageDistance | round(2) }} km</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Litres fuelled:</th>
|
||||
<td>{{ data.litres }} l</td>
|
||||
<td>{{ data.litres | round(2) }} l</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Litres fuelled:</th>
|
||||
<td>{{ data.averageListresFuelled }} l</td>
|
||||
<td>{{ data.averageListresFuelled | round(2) }} l</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<th>Average Litres used:</th>
|
||||
<td>{{ data.averageListresUsed }} l/100km</td>
|
||||
<td>{{ data.averageListresUsed | round(2) }} l/100km</td>
|
||||
</tr>
|
||||
</table>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user