remove more code

Conflict between Consumable.vehicles and Vehicle.consumables resolved by
making the Consumable.vehicles a read only relationship since we add
consumables only to vehicles. Consumable.vehicles is used in the admin
view to check if a consumable can be deleted safely.

.gitattributes

@@ -0,0 +1 @@
+*.sh  text  eol=lf

.gitignore

@@ -1,4 +1,6 @@
 .idea/
+tests/results/
 **.DS_Store
 **.swp
 **.pyc
+*.sqlite

Dockerfile

@@ -1,12 +1,14 @@
-FROM debian8_python3
+FROM python:3
 
-COPY app/requirements.txt /requirements.txt
-RUN pip3 install -r /requirements.txt; \
-    mkdir /data
+COPY requirements.txt /requirements.txt
+RUN mkdir /data; \
+    pip3 install -r /requirements.txt; 
 
 ADD app /app
+ADD main.py /main.py
+ADD config.py /config.py
 
 VOLUME ["/data"]
-VOLUME ["/app/config]
+VOLUME ["/app/config"]
 EXPOSE 5000
-ENTRYPOINT python3 /app/main.py
+ENTRYPOINT python3 /main.py

README.md

@@ -5,15 +5,25 @@
 
 ## general configuration
 
-Look at *app/config/email.py.example** for the configuration of the 
+Look at *app/config/email.py.example* for the configuration of the
 parameters required for sending emails. Copy the file as *email.py* to
 a folder that will serve as configuration directory and fill in the 
 information. The directory will be used as volume during container 
 operation.
 
 ## start database
+
 `docker run --name pitstops_db -e MYSQL_ROOT_PASSWORD=$SOMESECUREPASSWORD$ -e MYSQL_DATABASE=pitstops -d mysql:latest`
 
+or
+
+`docker run --name pitstops_db -e MYSQL_ROOT_PASSWORD=$SOMESECUREPASSWORD$ -e MYSQL_DATABASE=pitstops -d mariadb:latest`
+
+## Database migrations
+### From *Cathrine* to *Master*:
+
+`ALTER TABLE pitstop ADD COLUMN costs DECIMAL(5,2) NOT NULL DEFAULT 0.0 AFTER vehicle_id;`
+
 ## run in development
 
 Include the development version of the code as volume, so the app gets
@@ -21,8 +31,6 @@ reloaded automatically. The sqlite file will be stored in *tmp* so it
 can be inspected with tools like *sqlite3*. The switch *DEBUG* enables
 debugging during development.
 
-`docker run --rm --name rollerverbrauch -ti -v $PWD/app:/app -v $PWD/../rollerverbrauch_config:/app/config -v /tmp/pitstops/:/data -e DEBUG=True -p 5000:5000 rollerverbrauch`
-
+`docker run --rm --name rollerverbrauch -ti -v $PWD/app:/app -v $PWD/data:/data -p 5000:5000 -e SECURITY_PASSWORD_SALT=XXX -e SECRET_KEY=XXX -e MAIL_SERVER=XXX -e MAIL_USERNAME=XXX -e MAIL_PASSWORD=XXX rollerverbrauch`
 ## run in production
-`docker run --name pitstops -d -v /data/pitstops/:/data -v /configs/pitstops/:/app/config -p 80:5000 rollerverbrauch`
-
+`docker run --name pitstops -tid -e PROXY_DATA=server_names:ps.lusiardi.de,port:5000 --link pitstops_db:database -e SECURITY_PASSWORD_SALT=XXX -e SECRET_KEY=XXX -e MAIL_SERVER=XXX -e MAIL_USERNAME=XXX -e MAIL_PASSWORD=XXX rollerverbrauch:catherine`

app/__init__.py

@@ -0,0 +1,103 @@
+from flask import Flask, make_response
+from flask import g
+from flask_mail import Mail
+from flask_security import Security, SQLAlchemyUserDatastore, user_registered
+from flask_sqlalchemy import SQLAlchemy
+import os
+from config import config
+from flask_security.forms import LoginForm
+from flask_limiter.util import get_remote_address
+
+from .forms import *
+
+
+app = Flask(__name__)
+app.config.from_object(config[os.getenv('FLASK_CONFIG') or 'default'])
+
+
+@app.errorhandler(429)
+def ratelimit_handler(e):
+    return make_response(
+            jsonify(error="ratelimit exceeded %s" % e.description)
+            , 429
+    )
+db = SQLAlchemy(app)
+mail = Mail(app)
+
+from .entities import *
+
+user_datastore = SQLAlchemyUserDatastore(db, User, Role)
+security = Security(app, user_datastore)
+
+# required to activate the filters
+from .filters import *
+from .tools import *
+from .routes import *
+
+
+@user_registered.connect_via(app)
+def user_registered_sighandler(application, user, confirm_token):
+    """
+    Called after a user was created
+    """
+    role = user_datastore.find_role('user')
+    user_datastore.add_role_to_user(user, role)
+    if user.email == application.config['ADMIN_MAIL']:
+        # if the user selected the preconfigured email for the admin account
+        role = user_datastore.find_role('admin')
+        user_datastore.add_role_to_user(user, role)
+    new_vehicle = Vehicle('default vehicle')
+    db.session.add(new_vehicle)
+    user.vehicles.append(new_vehicle)
+    db.session.commit()
+    tools.db_log_add(user)
+    tools.db_log_add(new_vehicle)
+
+
+@app.before_first_request
+def before_first_request():
+    db.create_all()
+
+    user_datastore.find_or_create_role(name='admin', description='Role for administrators')
+    user_datastore.find_or_create_role(name='user', description='Role for all users.')
+    db.session.commit()
+
+
+@app.before_request
+def before_request():
+    g.data = {}
+
+
+@app.route('/')
+def index():
+    if current_user.is_authenticated:
+        return redirect(url_for('get_pit_stops'))
+    else:
+        user_count = len(User.query.all())
+        consumables = Consumable.query.all()
+        per_consumable = {}
+        for consumable in consumables:
+            per_consumable[consumable.id] = {
+                'name': consumable.name,
+                'unit': consumable.unit,
+                'amount': 0
+            }
+        vehicles = Vehicle.query.all()
+        kilometers = 0
+        for vehicle in vehicles:
+            stats = tools.VehicleStats(vehicle)
+            for consumable in stats.consumables:
+                per_consumable[consumable.id]['amount'] += consumable.overall_amount
+            kilometers += stats.overall_distance
+        vehicle_count = len(vehicles)
+        pitstop_count = len(Pitstop.query.all())
+        data = {
+            'users': user_count,
+            'vehicles': vehicle_count,
+            'pitstops': pitstop_count,
+            'kilometers': kilometers,
+            'consumables': per_consumable
+        }
+
+        return render_template('index.html', login_user_form=LoginForm(), data=data)
+

app/entities.py

@@ -0,0 +1,196 @@
+from app import db
+from flask_security import UserMixin, RoleMixin
+
+roles_users = db.Table(
+    "roles_users",
+    db.Column("user_id", db.Integer(), db.ForeignKey("user.id")),
+    db.Column("role_id", db.Integer(), db.ForeignKey("role.id")),
+)
+
+vehicles_consumables = db.Table(
+    "vehicles_consumables",
+    db.Column("vehicle_id", db.Integer(), db.ForeignKey("vehicle.id")),
+    db.Column("consumable_id", db.Integer(), db.ForeignKey("consumable.id")),
+)
+
+
+class Role(db.Model, RoleMixin):
+    """
+    Entity to handle different roles for users: Typically user and admin exist
+    """
+
+    id = db.Column(db.Integer(), primary_key=True)
+    name = db.Column(db.String(80), unique=True)
+    description = db.Column(db.String(255))
+
+    def __str__(self):
+        return self.name
+
+    def __hash__(self):
+        return hash(self.name)
+
+
+class User(db.Model, UserMixin):
+    """
+    Entity to represent a user including login data and links to roles and vehicles.
+    """
+
+    id = db.Column(db.Integer, primary_key=True)
+    email = db.Column(db.String(255), unique=True)
+    password = db.Column(db.String(255))
+    active = db.Column(db.Boolean())
+    confirmed_at = db.Column(db.DateTime())
+    home_lat = db.Column(db.Numeric(8, 5), default=0)
+    home_long = db.Column(db.Numeric(8, 5), default=0)
+    home_zoom = db.Column(db.Integer(), default=0)
+
+    vehicles = db.relationship("Vehicle")
+    roles = db.relationship(
+        "Role", secondary=roles_users, backref=db.backref("users", lazy="dynamic")
+    )
+
+    def __repr__(self):
+        return '<User id="%r" email="%r" ' % (self.id, self.email)
+
+
+class Vehicle(db.Model):
+    """
+    Entity to represent a vehicle.
+    Attributes:
+     * name of the vehilce
+     * the id of the owner
+     * list of pitstops
+     * list of possible consumables
+    """
+
+    id = db.Column(db.Integer, primary_key=True)
+    owner_id = db.Column(db.Integer, db.ForeignKey("user.id"))
+    name = db.Column(db.String(255))
+    pitstops = db.relationship("Pitstop", order_by="asc(Pitstop.odometer)")
+    services = db.relationship("Service", order_by="asc(Service.odometer)")
+    regulars = db.relationship("RegularCost")
+    consumables = db.relationship("Consumable", secondary=vehicles_consumables)
+    is_active = db.Column(db.Boolean(), default=True)
+    # allow vehicle names to be duplicated between different owners but must still be uniq for each owner
+    __table_args__ = (db.UniqueConstraint("owner_id", "name", name="_owner_name_uniq"),)
+
+    def __init__(self, name):
+        self.name = name
+
+    def __repr__(self):
+        return '<Vehicle id="%r" owner_id="%r" name="%r" />' % (
+            self.id,
+            self.owner_id,
+            self.name,
+        )
+
+
+class Pitstop(db.Model):
+    """
+    Entity to represent a pitstop for a single consumable.
+    Attributes:
+     * the date of the pitstop
+     * the odometer of the pitstop
+     * the id of the fuelled consumable
+     * amount of consumable used
+     * the costs of the consumable
+     * the id of the vehicle that was refuelled
+    """
+
+    id = db.Column(db.Integer, primary_key=True)
+    date = db.Column(db.Date)
+    odometer = db.Column(db.Integer)
+    consumable_id = db.Column(db.Integer, db.ForeignKey("consumable.id"))
+    amount = db.Column(db.Numeric(5, 2))
+    costs = db.Column(db.Numeric(5, 2), default=0)
+    vehicle_id = db.Column(db.Integer, db.ForeignKey("vehicle.id"))
+    # short cut to access the fuelled consumable of the pitstop
+    consumable = db.relationship("Consumable")
+    # this uniqueness constraint makes sure that for each consumable and each
+    # vehicle only one pitstop exists at the same odometer
+    __table_args__ = (
+        db.UniqueConstraint(
+            "odometer",
+            "consumable_id",
+            "vehicle_id",
+            name="_odometer_consumable_vehicle_uniq",
+        ),
+    )
+
+    def __init__(self, odometer, amount, date, costs, consumable_id):
+        self.odometer = odometer
+        self.amount = amount
+        self.date = date
+        self.costs = costs
+        self.consumable_id = consumable_id
+
+    def __repr__(self):
+        return '<Pitstop odometer="%r" amount="%r" date="%r" vehicle_id="%r" consumable_id="%r">' % (
+            self.odometer,
+            self.amount,
+            self.date,
+            self.vehicle_id,
+            self.consumable_id,
+        )
+
+
+class RegularCost(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    vehicle_id = db.Column(db.Integer, db.ForeignKey("vehicle.id"))
+    description = db.Column(db.String(4096), unique=True)
+    costs = db.Column(db.Numeric(10, 2), default=0)
+    days = db.Column(db.String(1024))
+    start_at = db.Column(db.Date)
+    ends_at = db.Column(db.Date)
+
+    def __init__(self, vehicle_id, description, costs, days, start_at, ends_at):
+        self.vehicle_id = vehicle_id
+        self.description = description
+        self.costs = costs
+        self.days = days
+        self.start_at = start_at
+        self.ends_at = ends_at
+
+
+class Consumable(db.Model):
+    """
+    Entity to represent a material that be consumed by a vehilce.
+    Attributes:
+     * name (must be globally unique)
+     * unit
+    """
+
+    id = db.Column(db.Integer, primary_key=True)
+    name = db.Column(db.String(255), unique=True)
+    unit = db.Column(db.String(255))
+
+    vehicles = db.relationship("Vehicle", secondary=vehicles_consumables, viewonly=True)
+
+    def __init__(self, name, unit):
+        self.name = name
+        self.unit = unit
+
+    def __repr__(self):
+        return '<Consumable name="%s" unit="%s" />' % (self.name, self.unit)
+
+
+class Service(db.Model):
+    id = db.Column(db.Integer, primary_key=True)
+    date = db.Column(db.Date)
+    odometer = db.Column(db.Integer)
+    vehicle_id = db.Column(db.Integer, db.ForeignKey("vehicle.id"))
+    costs = db.Column(db.Numeric(10, 2), default=0)
+    description = db.Column(db.String(4096))
+
+    def __init__(self, date, odometer, vehicle_id, costs, description):
+        self.description = description
+        self.costs = costs
+        self.date = date
+        self.odometer = odometer
+        self.vehicle_id = vehicle_id
+
+    def __repr__(self):
+        return (
+            '<Service odometer="%r" date="%r" vehicle_id="%r" costs="%r" description="%r">'
+            % (self.odometer, self.date, self.vehicle_id, self.costs, self.description)
+        )

app/filters.py

@@ -1,5 +1,6 @@
-from rollerverbrauch import app
+from app import app
 import hashlib
+import markdown
 
 
 @app.template_filter('none_filter')
@@ -20,3 +21,8 @@ def md5_filter(value):
 @app.template_filter('str')
 def str_filter(value):
     return str(value)
+
+
+@app.template_filter('markdown')
+def md(value):
+    return markdown.markdown(value)

app/forms/__init__.py

@@ -0,0 +1,7 @@
+from .misc import *
+from .pitstop import *
+from .checks import *
+from .consumable import *
+from .service import *
+from .vehicle import *
+from .regular_cost import *

app/forms/checks.py

@@ -0,0 +1,174 @@
+from wtforms.validators import ValidationError
+from datetime import date
+
+
+def regular_costs_days_check(form, field):
+    """
+    Checks the input field to enter multiple days in the following format:
+      `01-15,07-15` for Jan 15th and July 15
+    """
+    days = form.days.data
+    for day in days.split(","):
+        day = day.strip()
+        if not day:
+            raise ValidationError("Missing Date after ','")
+        try:
+            m, d = day.split("-")
+            m_i = int(m)
+            d_i = int(d)
+        except Exception:
+            raise ValidationError("Malformed Date, must be 'Month-Day'")
+        try:
+            d = date(2021, m_i, d_i)
+        except Exception:
+            raise ValidationError("{}-{} is not a valid date".format(m, d))
+
+
+def odometer_date_check(form, field):
+    """
+    Checks that the entered date and odometer of the pit stop is conformant to
+    the existing pit stops. That means, if a pitstops date is between two
+    other pit stops, the odometer should be as well.
+
+    :param form:
+    :param field:
+    :return:
+    """
+    odometer = form.odometer.data
+    date = form.date.data
+    pitstops = form.pitstops
+
+    if len(pitstops) > 0:
+        if date < pitstops[0].date and odometer >= pitstops[0].odometer:
+            raise ValidationError(
+                "The new odometer value must be less than %i km"
+                % pitstops[0].odometer
+            )
+
+        if date >= pitstops[-1].date and odometer <= pitstops[-1].odometer:
+            raise ValidationError(
+                "The new odometer value must be greater than %i km"
+                % pitstops[-1].odometer
+            )
+
+    if len(pitstops) > 1:
+        for index in range(0, len(pitstops) - 1):
+            if pitstops[index].date <= date < pitstops[index + 1].date:
+                if (
+                    odometer <= pitstops[index].odometer
+                    or odometer >= pitstops[index + 1].odometer
+                ):
+                    raise ValidationError(
+                        "The new odometer value must be greater than %i km and less than %i km"
+                        % (
+                            pitstops[index].odometer,
+                            pitstops[index + 1].odometer,
+                        )
+                    )
+
+
+def edit_odometer_date_check(form, field):
+    """
+    This makes exactly the same checks as 'odometer_date_check' but the
+    odometers may be the same (to change only amount and price).
+
+    :param form:
+    :param field:
+    :return:
+    """
+    odometer = form.odometer.data
+    date = form.date.data
+    pitstops = form.pitstops
+
+    if len(pitstops) > 0:
+        if date < pitstops[0].date and odometer > pitstops[0].odometer:
+            raise ValidationError(
+                "The new odometer value must be less than %i km"
+                % pitstops[0].odometer
+            )
+
+        if date >= pitstops[-1].date and odometer < pitstops[-1].odometer:
+            raise ValidationError(
+                "The new odometer value must be greater than %i km"
+                % pitstops[-1].odometer
+            )
+
+    if len(pitstops) > 1:
+        for index in range(0, len(pitstops) - 1):
+            if pitstops[index].date <= date < pitstops[index + 1].date:
+                if (
+                    odometer < pitstops[index].odometer
+                    or odometer > pitstops[index + 1].odometer
+                ):
+                    raise ValidationError(
+                        "The new odometer value must be greater than %i km and less than %i km"
+                        % (
+                            pitstops[index].odometer,
+                            pitstops[index + 1].odometer,
+                        )
+                    )
+
+
+def date_check(form, field):
+    """
+    Checks that the date of the pitstop is not before the date of the latest
+    pitstop and not after today.
+
+    :param form: the form where the field is in
+    :param field: the field to check
+    :return: Nothing or a ValidationError if the limits are not kept
+    """
+    if field.data < form.last_pitstop.date:
+        raise ValidationError(
+            "The new date must not be before %s" % form.last_pitstop.date
+        )
+    if field.data > date.today():
+        raise ValidationError(
+            "The new date must not be after %s" % date.today()
+        )
+
+
+def odometer_check(form, field):
+    """
+
+    :param form:
+    :param field:
+    :return:
+    """
+    if (
+        not form.same_odometer_allowed
+        and field.data <= form.last_pitstop.odometer
+    ):
+        raise ValidationError(
+            "The new odometer value must be higher than %i km"
+            % form.last_pitstop.odometer
+        )
+    if form.same_odometer_allowed and field.data < form.last_pitstop.odometer:
+        raise ValidationError(
+            "The new odometer value must be higher than %i km"
+            % form.last_pitstop.odometer
+        )
+
+
+def litres_check(form, field):
+    if field.data is not None and field.data <= 0:
+        raise ValidationError("You must fuel at least 0.1 l")
+
+
+def costs_check(form, field):
+    if field.data is not None and field.data <= 0:
+        raise ValidationError("Costs must be above 0.01 €.")
+
+
+def edit_costs_check(form, field):
+    """
+    Costs must be given, if a default value was given to the form field.
+    :param form:
+    :param field:
+    :return:
+    """
+    costs_check_required = (
+        form.costs.default is not None and form.costs.default > 0
+    )
+    if costs_check_required and field.data is not None and field.data <= 0:
+        raise ValidationError("Costs must be above 0.01 €.")

app/forms/consumable.py

@@ -0,0 +1,24 @@
+from flask_wtf import FlaskForm
+from wtforms import SelectField, StringField, SubmitField
+from wtforms.validators import Length
+
+
+class SelectConsumableForm(FlaskForm):
+    consumable = SelectField('Consumable', coerce=int)
+    submit = SubmitField(label='Do it!')
+
+
+class CreateConsumableForm(FlaskForm):
+    name = StringField('Name', validators=[Length(1, 255)])
+    unit = StringField('Unit', validators=[Length(1, 255)])
+    submit = SubmitField(label='Do it!')
+
+
+class EditConsumableForm(FlaskForm):
+    name = StringField('Name', validators=[Length(1, 255)])
+    unit = StringField('Unit', validators=[Length(1, 255)])
+    submit = SubmitField(label='Do it!')
+
+
+class DeletConsumableForm(FlaskForm):
+    submit = SubmitField(label='Do it!')

app/forms/misc.py

@@ -0,0 +1,6 @@
+from flask_wtf import FlaskForm
+from wtforms import SubmitField
+
+
+class DeleteAccountForm(FlaskForm):
+    submit = SubmitField(label='Really delete my account!')

app/forms/pitstop.py

@@ -0,0 +1,93 @@
+from flask_wtf import FlaskForm
+from wtforms import DateField, IntegerField, DecimalField, SubmitField
+
+from .checks import *
+
+
+class DeletePitStopForm(FlaskForm):
+    submit = SubmitField(label='Really delete this pitstop!')
+
+
+class EditPitstopForm(FlaskForm):
+    date = DateField('Date of Pitstop')
+    odometer = IntegerField('Odometer (km)', validators=[edit_odometer_date_check])
+    litres = DecimalField('Litres (l)', places=2, validators=[litres_check])
+    costs = DecimalField('Costs (€, overall)', places=2, validators=[costs_check])
+    submit = SubmitField(label='Update it!')
+    same_odometer_allowed = True
+    pitstops = []
+
+    def set_pitstops(self, pitstops):
+        self.pitstops = pitstops
+
+    def set_consumable(self, consumable):
+        self.litres.label = '%s (%s)' % (consumable.name, consumable.unit)
+
+    def preinit_with_data(self):
+        if self.date.data:
+            self.date.default = self.date.data
+        if self.odometer.data:
+            self.odometer.default = self.odometer.data
+        if self.litres.data:
+            self.litres.default = self.litres.data
+        if self.costs.data:
+            self.costs.default = self.costs.data
+
+    def get_hint_messages(self):
+        messages = {
+            'litres': 'Litres must be higher than 0.01 L.',
+            'costs': 'Costs must be higher than 0.01 €.'
+        }
+        return messages
+
+
+class CreatePitstopForm(FlaskForm):
+    date = DateField('Date of Pitstop')
+    odometer = IntegerField('Odometer (km)', validators=[odometer_date_check])
+    litres = DecimalField('Litres (l)', places=2, validators=[litres_check])
+    costs = DecimalField('Costs (€, overall)', places=2, validators=[costs_check])
+    submit = SubmitField(label='Do it!')
+    same_odometer_allowed = True
+    pitstops = []
+
+    def set_pitstops(self, pitstops):
+        self.pitstops = pitstops
+
+    def set_consumable(self, consumable):
+        self.litres.label = '%s (%s)' % (consumable.name, consumable.unit)
+
+    def preinit_with_data(self):
+        if self.date.data:
+            self.date.default = self.date.data
+        else:
+            self.date.default = date.today()
+
+        if self.odometer.data:
+            self.odometer.default = self.odometer.data
+        elif len(self.pitstops) > 0:
+            self.odometer.default = self.pitstops[-1].odometer
+        else:
+            self.odometer.default = 0
+
+        if self.litres.data:
+            self.litres.default = self.litres.data
+        elif len(self.pitstops) > 0 and 'amount' in self.pitstops[-1].__dict__:
+            self.litres.default = self.pitstops[-1].amount
+        else:
+            self.litres.default = 0
+
+        if self.costs.data:
+            self.costs.default = self.costs.data
+        elif len(self.pitstops) > 0:
+            self.costs.default = self.pitstops[-1].costs
+        else:
+            self.costs.default = 0
+
+    def get_hint_messages(self):
+        messages = {
+            'litres': 'Litres must be higher than 0.01 L.',
+            'costs': 'Costs must be higher than 0.01 €.'
+        }
+        return messages
+
+

app/forms/regular_cost.py

@@ -0,0 +1,86 @@
+from flask_wtf import FlaskForm
+from wtforms import (
+    DateField,
+    IntegerField,
+    DecimalField,
+    SubmitField,
+    TextAreaField,
+    StringField,
+)
+from wtforms.validators import Length
+
+from .checks import *
+
+from wtforms.validators import Optional
+
+
+class DeleteRegularCostForm(FlaskForm):
+    submit = SubmitField(label="Really delete this regular cost!")
+
+
+class EndRegularCostForm(FlaskForm):
+    submit = SubmitField(label="Really end this regular cost!")
+
+
+class EditRegularCostForm(FlaskForm):
+    start_at = DateField("Date of first instance")
+    ends_at = DateField(
+        "Date of last instance", validators=[Optional(strip_whitespace=True)]
+    )
+
+    days = StringField("Days for instance", validators=[regular_costs_days_check])
+
+    costs = DecimalField("Costs (€, per instance)", places=2, validators=[costs_check])
+    description = TextAreaField("Description", validators=[Length(1, 4096)])
+    submit = SubmitField(label="Update it!")
+
+    def preinit_with_data(self):
+        if self.costs.data:
+            self.costs.default = self.costs.data
+        if self.start_at.data:
+            self.start_at.default = self.start_at.data
+        if self.ends_at.data:
+            self.ends_at.default = self.ends_at.data
+        if self.days.data:
+            self.days.default = self.days.data
+        if self.description.data:
+            self.description.default = self.description.data
+
+    def get_hint_messages(self):
+        messages = {"costs": "Costs must be higher than 0.01 €."}
+        return messages
+
+
+class CreateRegularCostForm(FlaskForm):
+    start_at = DateField("Date of first instance")
+    ends_at = DateField(
+        "Date of last instance", validators=[Optional(strip_whitespace=True)]
+    )
+
+    days = StringField("Days for instance", validators=[regular_costs_days_check])
+
+    costs = DecimalField("Costs (€, per instance)", places=2, validators=[costs_check])
+    description = TextAreaField("Description", validators=[Length(1, 4096)])
+    submit = SubmitField(label="Do it!")
+
+    def preinit_with_data(self):
+        if self.start_at.data:
+            self.start_at.default = self.start_at.data
+        else:
+            self.start_at.default = date.today()
+
+        if self.ends_at.data:
+            self.ends_at.default = self.ends_at.data
+        else:
+            self.ends_at.default = None
+
+        if self.days.data:
+            self.days.default = self.days.data
+
+        if self.costs.data:
+            self.costs.default = self.costs.data
+        else:
+            self.costs.default = 0
+
+        if self.description.data:
+            self.description.default = self.description.data

app/forms/service.py

@@ -0,0 +1,75 @@
+from flask_wtf import FlaskForm
+from wtforms import DateField, IntegerField, DecimalField, SubmitField, TextAreaField
+from wtforms.validators import Length
+
+from .checks import *
+
+
+class CreateServiceForm(FlaskForm):
+    date = DateField('Date of Service')
+    odometer = IntegerField('Odometer (km)', validators=[odometer_date_check])
+    costs = DecimalField('Costs (€, overall)', places=2, validators=[costs_check])
+    description = TextAreaField('Description', validators=[Length(1, 4096)])
+    submit = SubmitField(label='Do it!')
+    pitstops = []
+
+    def set_pitstops(self, pitstops):
+        self.pitstops = pitstops
+
+    def preinit_with_data(self):
+        if self.date.data:
+            self.date.default = self.date.data
+        else:
+            self.date.default = date.today()
+
+        if self.odometer.data:
+            self.odometer.default = self.odometer.data
+        elif len(self.pitstops) > 0:
+            self.odometer.default = self.pitstops[-1].odometer
+        else:
+            self.odometer.default = 0
+
+        if self.costs.data:
+            self.costs.default = self.costs.data
+        else:
+            self.costs.default = 0
+
+        if self.description.data:
+            self.description.default = self.description.data
+
+
+class DeleteServiceForm(FlaskForm):
+    submit = SubmitField(label='Really delete this service!')
+
+
+class EditServiceForm(FlaskForm):
+    date = DateField('Date of Service')
+    odometer = IntegerField('Odometer (km)', validators=[edit_odometer_date_check])
+    costs = DecimalField('Costs (€, overall)', places=2, validators=[costs_check])
+    description = TextAreaField('Description', validators=[Length(1, 4096)])
+    submit = SubmitField(label='Do it!')
+    same_odometer_allowed = True
+    pitstops = []
+
+    def set_pitstops(self, pitstops):
+        self.pitstops = pitstops
+
+    def preinit_with_data(self):
+        if self.date.data:
+            self.date.default = self.date.data
+
+        if self.odometer.data:
+            self.odometer.default = self.odometer.data
+
+        if self.costs.data:
+            self.costs.default = self.costs.data
+
+        if self.description.data:
+            self.description.default = self.description.data
+
+    def get_hint_messages(self):
+        messages = {
+            'litres': 'Litres must be higher than 0.01 L.',
+            'costs': 'Costs must be higher than 0.01 €.'
+        }
+        return messages

app/forms/vehicle.py

@@ -0,0 +1,25 @@
+from flask_wtf import FlaskForm
+from wtforms import (
+    StringField,
+    SubmitField,
+    SelectField,
+    SelectMultipleField,
+    BooleanField,
+)
+from wtforms.validators import Length
+
+
+class SelectVehicleForm(FlaskForm):
+    vehicle = SelectField("Vehicle", coerce=int)
+    submit = SubmitField(label="Do it!")
+
+
+class EditVehicleForm(FlaskForm):
+    name = StringField("Name", validators=[Length(1, 255)])
+    consumables = SelectMultipleField("Consumables", coerce=int, validators=[])
+    is_active = BooleanField("Is active")
+    submit = SubmitField(label="Do it!")
+
+
+class DeleteVehicleForm(FlaskForm):
+    submit = SubmitField(label="Do it!")

app/requirements.txt

@@ -1,5 +0,0 @@
-Flask
-Flask-SQLAlchemy
-Flask-Security
-Flask-WTF
-PyMySQL

app/rollerverbrauch/__init__.py

@@ -1,253 +0,0 @@
-from datetime import date
-from flask import Flask
-from flask import redirect, g
-from flask import render_template
-from flask import url_for
-from flask.ext.mail import Mail
-from flask.ext.security import Security, SQLAlchemyUserDatastore, \
-    UserMixin, RoleMixin, login_required, roles_required
-from flask.ext.security import user_registered
-from flask_security.core import current_user
-from flask_sqlalchemy import SQLAlchemy
-from flask.ext.security.forms import LoginForm
-
-app = Flask(__name__)
-app.config['SECURITY_PASSWORD_HASH'] = 'pbkdf2_sha512'
-app.config['SECURITY_REGISTERABLE'] = True
-app.config['SECURITY_CHANGEABLE'] = True
-app.config['SECURITY_RECOVERABLE'] = True
-app.config.from_envvar('config')
-app.config.from_object(__name__)
-
-db = SQLAlchemy(app)
-mail = Mail(app)
-
-import rollerverbrauch.tools as tools
-
-from rollerverbrauch.forms import \
-    CreatePitstopForm, \
-    EditVehicleForm, \
-    DeleteVehicleForm, \
-    SelectVehicleForm, \
-    DeleteAccountForm
-
-from rollerverbrauch.entities import \
-    User, \
-    Role, \
-    Pitstop, \
-    Vehicle
-
-# required to activate the filters
-import rollerverbrauch.filters
-
-
-user_datastore = SQLAlchemyUserDatastore(db, User, Role)
-security = Security(app, user_datastore)
-
-
-@user_registered.connect_via(app)
-def user_registered_sighandler(app, user, confirm_token):
-    """
-    Called after a user was created
-    """
-    role = user_datastore.find_role('user')
-    user_datastore.add_role_to_user(user, role)
-    new_vehicle = Vehicle('default vehicle')
-    db.session.add(new_vehicle)
-    user.vehicles.append(new_vehicle)
-    db.session.commit()
-    tools.db_log_add(user)
-    tools.db_log_add(new_vehicle)
-
-
-@app.before_first_request
-def before_first_request():
-    db.create_all()
-    user_datastore.find_or_create_role(name='admin', description='Role for administrators')
-    user_datastore.find_or_create_role(name='user', description='Role for all users.')
-    db.session.commit()
-
-
-@app.before_request
-def before_request():
-    g.data = {}
-
-
-@app.route('/')
-def index():
-    if current_user.is_authenticated:
-        return redirect(url_for('get_pit_stops'))
-    else:
-        user_count = len(User.query.all())
-        vehicles = Vehicle.query.all()
-        litres = 0
-        kilometers = 0
-        for vehicle in vehicles:
-            stats = tools.VehicleStats(vehicle)
-            litres += stats.overall_litres
-            kilometers += stats.overall_distance
-        vehicle_count = len(vehicles)
-        pitstop_count = len(Pitstop.query.all())
-        data = {
-            'users':user_count,
-            'vehicles': vehicle_count,
-            'pitstops': pitstop_count,
-            'litres': litres,
-            'kilometers': kilometers
-        }
-        return render_template('index.html', login_user_form=LoginForm(), data=data)
-
-
-@app.route('/account/edit_vehicle/<int:vid>', methods=['GET', 'POST'])
-@login_required
-def edit_vehicle(vid):
-    vehicle = Vehicle.query.filter(Vehicle.id == vid).first()
-    form = EditVehicleForm()
-
-    if form.validate_on_submit():
-        if not tools.check_vehicle_name_is_unique(current_user, form.name):
-            return render_template('editVehicleForm.html', form=form)
-        vehicle.name = form.name.data
-        db.session.commit()
-        tools.db_log_update(vehicle)
-        return redirect(url_for('get_account_page'))
-
-    form.name.default = vehicle.name
-    form.process()
-    return render_template('editVehicleForm.html', form=form)
-
-
-@app.route('/account/delete_vehicle/<int:vid>', methods=['GET', 'POST'])
-@login_required
-def delete_vehicle(vid):
-    vehicle = Vehicle.query.filter(Vehicle.id == vid).first()
-
-    # prevent deletion of foreign vehicles
-    if vehicle not in current_user.vehicles:
-        return redirect(url_for('get_account_page'))
-
-    form = DeleteVehicleForm()
-
-    if form.validate_on_submit():
-        db.session.delete(vehicle)
-        db.session.commit()
-        tools.db_log_delete(vehicle)
-        return redirect(url_for('get_account_page'))
-
-    return render_template('deleteVehicleForm.html', form=form, vehicle=vehicle)
-
-
-@app.route('/account/create_vehicle', methods=['GET', 'POST'])
-@login_required
-def create_vehicle():
-    form = EditVehicleForm()
-
-    if form.validate_on_submit():
-        vehicle_name = form.name.data
-        if not tools.check_vehicle_name_is_unique(current_user, form.name):
-            return render_template('createVehicleForm.html', form=form)
-        new_vehicle = Vehicle(vehicle_name)
-        db.session.add(new_vehicle)
-        current_user.vehicles.append(new_vehicle)
-        db.session.commit()
-        tools.db_log_add(new_vehicle)
-        return redirect(url_for('get_account_page'))
-
-    return render_template('createVehicleForm.html', form=form)
-
-
-@app.route('/pitstops/select_vehicle', methods=['GET', 'POST'])
-@login_required
-def select_vehicle_for_new_pitstop():
-    form = SelectVehicleForm()
-    form.vehicle.choices = [(g.id, g.name) for g in current_user.vehicles]
-
-    if form.validate_on_submit():
-        vehicle = Vehicle.query.filter(Vehicle.id == form.vehicle.data).first()
-        if vehicle not in current_user.vehicles:
-            return render_template('selectVehice.html', form=form)
-
-        return redirect(url_for('create_pit_stop_form', vid=form.vehicle.data))
-
-    return render_template('selectVehice.html', form=form)
-
-
-@app.route('/pitstops/create/<int:vid>', methods=['GET', 'POST'])
-@login_required
-def create_pit_stop_form(vid):
-    vehicle = Vehicle.query.filter(Vehicle.id == vid).first()
-    if vehicle not in current_user.vehicles:
-        return redirect(url_for('select_vehicle_for_new_pitstop'))
-
-    if len(vehicle.pitstops) > 0:
-        last_pitstop = vehicle.pitstops[-1]
-    else:
-        last_pitstop = Pitstop(0, 0, date(1970, 1, 1))
-
-    form = CreatePitstopForm()
-    form.set_pitstop(last_pitstop)
-
-    if form.validate_on_submit():
-        new_stop = Pitstop(form.odometer.data, form.litres.data, form.date.data)
-        db.session.add(new_stop)
-        vehicle.pitstops.append(new_stop)
-        db.session.commit()
-        tools.db_log_add(new_stop)
-        return redirect(url_for('get_pit_stops', _anchor= 'v' + str(vehicle.id)))
-
-    form.odometer.default = last_pitstop.odometer
-    form.litres.default = last_pitstop.litres
-    form.date.default = date.today()
-    form.process()
-    messages = {
-        'date': 'Date must be between %s and %s (including).' % (str(last_pitstop.date), str(date.today())),
-        'odometer': 'Odometer must be greater than %s km.' % (str(last_pitstop.odometer))
-    }
-    return render_template('newPitStopForm.html', form=form, vehicle=vehicle, messages = messages)
-
-
-@app.route('/pitstops', methods=['GET'])
-@login_required
-def get_pit_stops():
-    return render_template('pitstops.html', user=current_user)
-
-
-@app.route('/manual', methods=['GET'])
-@login_required
-def get_manual():
-    return render_template('manual.html', data=g.data)
-
-
-@app.route('/admin', methods=['GET'])
-@roles_required('admin')
-def get_admin_page():
-    g.data['users'] = User.query.all()
-    return render_template('admin.html', data=g.data)
-
-
-@app.route('/account', methods=['GET'])
-@login_required
-def get_account_page():
-    return render_template('account.html', data=g.data)
-
-
-@app.route('/statistics', methods=['GET'])
-@login_required
-def get_statistics():
-    stats = []
-    for vehicle in current_user.vehicles:
-        stats.append(tools.VehicleStats(vehicle))
-    return render_template('statistics.html', data=stats)
-
-
-@app.route('/account/delete', methods=['GET', 'POST'])
-@login_required
-def delete_account():
-    form = DeleteAccountForm()
-
-    if form.validate_on_submit():
-        user_datastore.delete_user(current_user)
-        db.session.commit()
-        return redirect(url_for('index'))
-
-    return render_template('deleteAccountForm.html', form=form)

app/rollerverbrauch/entities.py

@@ -1,69 +0,0 @@
-from rollerverbrauch import db
-from flask.ext.security import UserMixin, RoleMixin
-
-roles_users = db.Table('roles_users',
-                       db.Column('user_id', db.Integer(), db.ForeignKey('user.id')),
-                       db.Column('role_id', db.Integer(), db.ForeignKey('role.id')))
-
-
-class Role(db.Model, RoleMixin):
-    id = db.Column(db.Integer(), primary_key=True)
-    name = db.Column(db.String(80), unique=True)
-    description = db.Column(db.String(255))
-
-    def __str__(self):
-        return self.name
-
-    def __hash__(self):
-        return hash(self.name)
-
-
-class User(db.Model, UserMixin):
-    id = db.Column(db.Integer, primary_key=True)
-    email = db.Column(db.String(255), unique=True)
-    password = db.Column(db.String(255))
-    active = db.Column(db.Boolean())
-    confirmed_at = db.Column(db.DateTime())
-    vehicles = db.relationship(
-        'Vehicle'
-    )
-    roles = db.relationship(
-        'Role',
-        secondary=roles_users,
-        backref=db.backref('users', lazy='dynamic')
-    )
-
-    def __repr__(self):
-        return '<User id="%r" email="%r" ' % (self.id, self.email)
-
-
-class Vehicle(db.Model):
-    id = db.Column(db.Integer, primary_key=True)
-    owner_id = db.Column(db.Integer, db.ForeignKey('user.id'))
-    name = db.Column(db.String(255))
-    pitstops = db.relationship(
-        'Pitstop'
-    )
-    __table_args__ = (db.UniqueConstraint('owner_id', 'name', name='_owner_name_uniq'),)
-
-    def __init__(self, name):
-        self.name = name
-
-    def __repr__(self):
-        return '<Vehicle id="%r" owner_id="%r" name="%r" />' % (self.id, self.owner_id, self.name)
-
-
-class Pitstop(db.Model):
-    id = db.Column(db.Integer, primary_key=True)
-    date = db.Column(db.Date)
-    odometer = db.Column(db.Integer)
-    litres = db.Column(db.Numeric(5, 2))
-    vehicle_id = db.Column(db.Integer, db.ForeignKey('vehicle.id'))
-
-    def __init__(self, odometer, litres, date):
-        self.odometer = odometer
-        self.litres = litres
-        self.date = date
-
-    def __repr__(self):
-        return '<Pitstop odometer="%r" litres="%r" date="%r" vehicle_id="%r">' % (self.odometer, self.litres, self.date, self.vehicle_id)

app/rollerverbrauch/forms.py

@@ -1,50 +0,0 @@
-from flask_wtf import Form
-from wtforms import DateField, IntegerField, DecimalField, StringField, SelectField, SubmitField
-from wtforms.validators import ValidationError, Length
-from datetime import date
-
-
-def date_check(form, field):
-    if field.data < form.last_pitstop.date:
-        raise ValidationError('The new date must not be before %s' % form.last_pitstop.date)
-    if field.data > date.today():
-        raise ValidationError('The new date must not be after %s' % date.today())
-
-
-def odometer_check(form, field):
-    if field.data <= form.last_pitstop.odometer:
-        raise ValidationError('The new odometer value must be higher than %i km' % form.last_pitstop.odometer)
-
-
-def litres_check(form, field):
-    if field.data is not None and field.data <= 0:
-        raise ValidationError('You must fuel at least 0.1 l')
-
-
-class SelectVehicleForm(Form):
-    vehicle = SelectField('Vehicle', coerce=int)
-    submit = SubmitField(label='Do it!')
-
-
-class CreatePitstopForm(Form):
-    date = DateField('Date of Pitstop', validators=[date_check])
-    odometer = IntegerField('Odometer (km)', validators=[odometer_check])
-    litres = DecimalField('Litres (l)', places=2, validators=[litres_check])
-    submit = SubmitField(label='Do it!')
-    last_pitstop = None
-
-    def set_pitstop(self, last_pitstop):
-        self.last_pitstop = last_pitstop
-
-
-class EditVehicleForm(Form):
-    name = StringField('Name', validators=[Length(1, 255)])
-    submit = SubmitField(label='Do it!')
-
-
-class DeleteVehicleForm(Form):
-    submit = SubmitField(label='Do it!')
-
-
-class DeleteAccountForm(Form):
-    submit = SubmitField(label='Really delete my account!')

app/rollerverbrauch/static/normalize.min.css

@@ -1 +0,0 @@
-/*! normalize.css v3.0.2 | MIT License | git.io/normalize */html{font-family:sans-serif;-ms-text-size-adjust:100%;-webkit-text-size-adjust:100%}body{margin:0}article,aside,details,figcaption,figure,footer,header,hgroup,main,menu,nav,section,summary{display:block}audio,canvas,progress,video{display:inline-block;vertical-align:baseline}audio:not([controls]){display:none;height:0}[hidden],template{display:none}a{background-color:transparent}a:active,a:hover{outline:0}abbr[title]{border-bottom:1px dotted}b,strong{font-weight:700}dfn{font-style:italic}h1{font-size:2em;margin:.67em 0}mark{background:#ff0;color:#000}small{font-size:80%}sub,sup{font-size:75%;line-height:0;position:relative;vertical-align:baseline}sup{top:-.5em}sub{bottom:-.25em}img{border:0}svg:not(:root){overflow:hidden}figure{margin:1em 40px}hr{-moz-box-sizing:content-box;box-sizing:content-box;height:0}pre{overflow:auto}code,kbd,pre,samp{font-family:monospace,monospace;font-size:1em}button,input,optgroup,select,textarea{color:inherit;font:inherit;margin:0}button{overflow:visible}button,select{text-transform:none}button,html input[type=button],input[type=reset],input[type=submit]{-webkit-appearance:button;cursor:pointer}button[disabled],html input[disabled]{cursor:default}button::-moz-focus-inner,input::-moz-focus-inner{border:0;padding:0}input{line-height:normal}input[type=checkbox],input[type=radio]{box-sizing:border-box;padding:0}input[type=number]::-webkit-inner-spin-button,input[type=number]::-webkit-outer-spin-button{height:auto}input[type=search]{-webkit-appearance:textfield;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box}input[type=search]::-webkit-search-cancel-button,input[type=search]::-webkit-search-decoration{-webkit-appearance:none}fieldset{border:1px solid silver;margin:0 2px;padding:.35em .625em .75em}legend{border:0;padding:0}textarea{overflow:auto}optgroup{font-weight:700}table{border-collapse:collapse;border-spacing:0}td,th{padding:0}

app/rollerverbrauch/templates/admin.html

@@ -1,18 +0,0 @@
-{% extends "layout.html" %}
-
-{% block body %}
-<div class="col-md-2" ></div>
-<div class="col-md-8">
-    <div class="panel panel-default">
-        <div class="panel-body">
-		    <h3>Admin</h3>
-            We have {{ data.users|length }} users so far:
-            <ul>
-                {% for user in data.users %}
-                    <li>{{user.email}}</li>
-                {% endfor %}
-            </ul>
-        </div>
-    </div>
-</div>
-{% endblock %}

app/rollerverbrauch/templates/manual.html

@@ -1,31 +0,0 @@
-{% extends "layout.html" %}
-
-{% macro line(header, cell) -%}
-<tr>
-	<th>
-		{{ header }}
-	</th>
-	<td>
-		{{ cell }}
-	</td>
-</tr>
-{%- endmacro %}
-
-{% block body %}
-
-	<div class="table-responsive">
-		<table class="table table-striped table-bordered table-condensed">
-			{{ line('Reifenluftdruck (vorne)', '1,75 - 2,0 Bar') }}
-			{{ line('Reifenluftdruck (hinten)', '2,0 - 2,25 Bar') }}
-			{{ line('Scheinwerfer', '12V 35/35W HS1-Halogen-Glühlampe') }}
-			{{ line('Standlicht', '12V 5W Glassockel 9mm') }}
-			{{ line('Blinker vorne', '12V 10W Stecksockel 15mm') }}
-			{{ line('Rück-/Bremslicht', '12V/21/5W Stecksockel 15mm') }}
-			{{ line('Blinker hinten', '12V 10W Stecksockel 15mm') }}
-			{{ line('Tankinhalt', 'ca. 6,0 L') }}
-			{{ line('Motoröl', 'SAE 15W40') }}
-			{{ line('Getriebeöl', 'SAE 80/90 (0,12/0,09)') }}
-		</table>
-	</div>
-		
-{% endblock %}	

app/rollerverbrauch/templates/pitstops.html

@@ -1,92 +0,0 @@
- {% extends "layout.html" %}
-{% block body %}
-    <div id="content">
-        <ul id="tabs" class="nav nav-tabs" data-tabs="tabs">
-            {% for vehicle in current_user.vehicles %}
-                <li {% if loop.first %}class="active" {%endif %}>
-                    <a href="#v{{vehicle.id}}" id="i{{vehicle.id}}" data-toggle="tab">
-                        {{ vehicle.name }}
-                    </a>
-                </li>
-            {% endfor %}
-        </ul>
-        <div id="my-tab-content" class="tab-content">
-            {% for vehicle in current_user.vehicles %}
-                <div class="tab-pane {% if loop.first %}active{% endif %}" id="v{{vehicle.id}}">
-                    <h3>{{vehicle.name}}</h3>
-                    {% if vehicle.pitstops %}
-                        <div class="table-responsive">
-                            <table class="table table-striped table-bordered table-condensed">
-                                <tr>
-                                    <th>
-                                        Date<br/>
-                                        Days
-                                    </th>
-                                    <th>
-                                        Odometer<br/>
-                                        Distance
-                                    </th>
-                                    <th>
-                                        Litres<br/>
-                                        Average
-                                    </th>
-                                </tr>
-                                {% for pitstop in vehicle.pitstops|reverse %}
-                                    {% if not loop.last %}
-                                        {% set days = (pitstop.date - vehicle.pitstops[vehicle.pitstops|length - loop.index - 1].date).days %}
-                                        {% set distance = pitstop.odometer - vehicle.pitstops[vehicle.pitstops|length - loop.index - 1].odometer %}
-                                        {% set average = (pitstop.litres / distance) * 100 %}
-                                        <tr class='pitstop'>
-                                            <td>
-                                                {{pitstop.date}}<br/>
-                                                {{ days }} days
-                                            </td>
-                                            <td>
-                                                {{pitstop.odometer}} km<br/>
-                                                {{distance}} km
-                                            </td>
-                                            <td>
-                                                {{pitstop.litres}} l<br/>
-                                                {{average | round(2)}} l/100km
-                                            </td>
-                                        </tr>
-                                    {% else %}
-                                        <tr class='pitstop'>
-                                            <td>
-                                                {{pitstop.date}}<br/>
-                                                -- days
-                                            </td>
-                                            <td>
-                                                {{pitstop.odometer}} km<br/>
-                                                -- km
-                                            </td>
-                                            <td>
-                                                {{pitstop.litres}} l<br/>
-                                                -- l/100km
-                                            </td>
-                                        </tr>
-                                    {% endif %}
-                                {% endfor %}
-                            </table>
-                        </div>
-                    {% else %}
-                        <div class="alert alert-warning" role="alert">
-                            not enough data: <a href="{{ url_for('create_pit_stop_form', vid=vehicle.id) }}">log a pitstop</a>?
-                        </div>
-                    {% endif %}
-                </div>
-            {% endfor %}
-        </div>
-    </div>
-
-
-    <script type="text/javascript">
-        jQuery(document).ready(function ($) {
-            $('#tabs').tab();
-            if(window.location.hash != "") {
-                  $('a[href="' + window.location.hash + '"]').click()
-            }
-          });
-
-    </script>
-{% endblock %}

app/rollerverbrauch/templates/statistics.html

@@ -1,119 +0,0 @@
-{% extends "layout.html" %}
-
-{% block body %}
-    <div id="content">
-        <ul id="vehicle_tabs" class="nav nav-tabs" data-tabs="tabs">
-            {% for vehicle in data %}
-                <li {% if loop.first %}class="active" {%endif %}>
-                    <a href="#v{{vehicle.id}}" id="i{{vehicle.id}}" data-toggle="tab">
-                        {{ vehicle.name }}
-                    </a>
-                </li>
-            {% endfor %}
-        </ul>
-        <div id="vehicle_content" class="tab-content ">
-            {% for vehicle in data %}
-                <div class="tab-pane {% if loop.first %}active{% endif %}" id="v{{vehicle.id}}">
-                    <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>
-						</table>
-					</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">
-                                Odometer
-                            </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('create_pit_stop_form', 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('create_pit_stop_form', vid=vehicle.id) }}">log a pitstop</a>?
-                                </div>
-                            {% endif %}
-                        </div>
-                        <div class="tab-pane " id="v{{vehicle.id}}_c2">
-                            {% if vehicle.pitstop_count > 0 %}
-    					        <div id="odometerChartDiv{{vehicle.id}}" style="width:100%; height:500px;"></div>
-                                <script type="text/javascript">
-                                    {{ chartScript('odometerChartDiv'+vehicle.id|str, vehicle.odometers, 'km') }}
-                                </script>
-                            {% else %}
-                                <div class="alert alert-warning" role="alert">
-                                    not enough data: <a href="{{ url_for('create_pit_stop_form', vid=vehicle.id) }}">log a pitstop</a>?
-                                </div>
-                            {% endif %}
-                        </div>
-                    </div>
-                </div>
-            {% endfor %}
-        </div>
-    </div>
-
-
-    <script type="text/javascript">
-        jQuery(document).ready(function ($) {
-            $('#vehicle_tabs').tab();
-            if(window.location.hash != "") {
-                  $('a[href="' + window.location.hash + '"]').click()
-            }
-          });
-
-    </script>
-
-
-
-{% endblock %}

app/rollerverbrauch/tools.py

@@ -1,67 +0,0 @@
-import logging
-
-
-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 = []
-
-        if self.pitstop_count > 0:
-            for pitstop in vehicle.pitstops:
-                self.overall_litres += pitstop.litres
-                self.litres.append(StatsEvent(pitstop.date, pitstop.litres))
-                self.odometers.append(StatsEvent(pitstop.date, pitstop.odometer))
-            self.average_litres_fuelled = self.overall_litres / self.pitstop_count
-        if self.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)))
-
-
-class StatsEvent:
-    def __init__(self, date, value):
-        self.date = date
-        self.value = value
-
-
-def db_log_add(entity):
-    logging.info('db_add: %s' % str(entity))
-
-
-def db_log_delete(entity):
-    logging.info('db_delete: %s' % str(entity))
-
-
-def db_log_update(entity):
-    logging.info('db_update: %s' % str(entity))
-
-
-def check_vehicle_name_is_unique(current_user, name_field):
-    """
-    Checks if the vehicle name given in the name_field is unique for the vehicles of the current user. An error is added
-    to the field it the name is not unique.
-
-    :param current_user: the user currently logged in
-    :param name_field: the form field to enter the name to
-    :return: True if the name is unique, False otherwise.
-    """
-    vehicle_name = name_field.data
-    for vehicle in current_user.vehicles:
-        if vehicle.name == vehicle_name:
-            name_field.default = vehicle_name
-            name_field.errors.append('Vehicle "%s" already exists.' % vehicle_name)
-            return False
-    return True

app/routes/__init__.py

@@ -0,0 +1,6 @@
+from .account import *
+from .admin import *
+from .misc import *
+from .pitstop import *
+from .service import *
+from .regular_cost import *

app/routes/account.py

@@ -0,0 +1,140 @@
+from flask import url_for, redirect, render_template, request, jsonify
+from flask_security import login_required
+from flask_security.core import current_user
+from sqlalchemy.exc import IntegrityError
+import json
+
+from ..entities import Vehicle, Consumable
+from ..forms import EditVehicleForm, DeleteVehicleForm, DeleteAccountForm
+from ..tools import db_log_update, db_log_delete, db_log_add
+from .. import app, db, user_datastore
+
+
+@app.route("/account", methods=["GET"])
+@login_required
+def get_account_page():
+    return render_template(
+        "account.html",
+        map_pos=(current_user.home_lat, current_user.home_long, current_user.home_zoom),
+    )
+
+
+@app.route("/account/vehicle/edit/<int:vid>", methods=["GET", "POST"])
+@login_required
+def edit_vehicle(vid):
+    vehicle = Vehicle.query.filter(Vehicle.id == vid).first()
+
+    # prevent edit of foreign vehicles
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_account_page"))
+
+    form = EditVehicleForm()
+    form.consumables.choices = [(g.id, g.name) for g in Consumable.query.all()]
+
+    if not form.consumables.data:
+        form.consumables.default = [g.id for g in vehicle.consumables]
+
+    if form.name.data is not None:
+        form.name.default = form.name.data
+
+    if form.is_active.data is not None:
+        form.is_active.default = form.is_active.data
+
+    if form.validate_on_submit():
+        vehicle.name = form.name.data
+        vehicle.is_active = form.is_active.data
+        # we cannot delete consumables where there are pitstops for => report error
+        vehicle.consumables = []
+        for consumable_id in form.consumables.data:
+            consumable = Consumable.query.get(consumable_id)
+            if consumable is not None:
+                vehicle.consumables.append(consumable)
+        try:
+            db.session.commit()
+            db_log_update(vehicle)
+        except IntegrityError:
+            db.session.rollback()
+            form.name.errors.append('"%s" is not unique.' % (form.name.data))
+            return render_template("editVehicleForm.html", form=form)
+        return redirect(url_for("get_account_page"))
+
+    form.name.default = vehicle.name
+    form.is_active.default = vehicle.is_active
+    form.process()
+    return render_template("editVehicleForm.html", form=form, vehicle=vehicle)
+
+
+@app.route("/account/vehicle/delete/<int:vid>", methods=["GET", "POST"])
+@login_required
+def delete_vehicle(vid):
+    vehicle = Vehicle.query.filter(Vehicle.id == vid).first()
+
+    # prevent deletion of foreign vehicles
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_account_page"))
+
+    if len(current_user.vehicles) == 1:
+        return redirect(url_for("get_account_page"))
+
+    form = DeleteVehicleForm()
+
+    if form.validate_on_submit():
+        db.session.delete(vehicle)
+        db.session.commit()
+        db_log_delete(vehicle)
+        return redirect(url_for("get_account_page"))
+
+    return render_template("deleteVehicleForm.html", form=form, vehicle=vehicle)
+
+
+@app.route("/account/vehicle/create", methods=["GET", "POST"])
+@login_required
+def create_vehicle():
+    form = EditVehicleForm()
+    form.consumables.choices = [(g.id, g.name) for g in Consumable.query.all()]
+
+    if form.name.data is not None:
+        form.name.default = form.name.data
+
+    if form.consumables.data:
+        form.consumables.default = form.consumables.data
+    else:
+        form.consumables.default = []
+
+    if form.validate_on_submit():
+        if len(form.consumables.data) == 0:
+            form.consumables.errors.append("At least one consumable must be selected.")
+            return render_template("createVehicleForm.html", form=form)
+
+        vehicle_name = form.name.data
+        new_vehicle = Vehicle(vehicle_name)
+        for consumable_id in form.consumables.data:
+            consumable = Consumable.query.get(consumable_id)
+            if consumable is not None:
+                new_vehicle.consumables.append(consumable)
+        db.session.add(new_vehicle)
+        current_user.vehicles.append(new_vehicle)
+        try:
+            db.session.commit()
+            db_log_add(new_vehicle)
+        except IntegrityError:
+            db.session.rollback()
+            form.name.errors.append('"%s" is not unique.' % (form.name.data))
+            return render_template("createVehicleForm.html", form=form)
+        return redirect(url_for("get_account_page"))
+
+    return render_template("createVehicleForm.html", form=form)
+
+
+@app.route("/account/delete", methods=["GET", "POST"])
+@login_required
+def delete_account():
+    form = DeleteAccountForm()
+
+    if form.validate_on_submit():
+        user_datastore.delete_user(current_user)
+        db.session.commit()
+        return redirect(url_for("index"))
+
+    return render_template("deleteAccountForm.html", form=form)
+

app/routes/admin.py

@@ -0,0 +1,96 @@
+from flask import url_for, redirect, render_template
+from flask_security import login_required, roles_required
+from sqlalchemy.exc import IntegrityError
+
+from ..entities import User, Consumable
+from ..forms import CreateConsumableForm, DeletConsumableForm, EditConsumableForm
+from ..tools import db_log_update, db_log_delete, db_log_add
+from .. import app, db
+
+
+@app.route('/admin', methods=['GET'])
+@roles_required('admin')
+def get_admin_page():
+    users = User.query.all()
+    consumables = Consumable.query.all()
+    for consumable in consumables:
+        consumable.in_use = len(consumable.vehicles) > 0
+    return render_template('admin.html', users=users, consumables=consumables)
+
+
+@app.route('/admin/consumable/create', methods=['GET', 'POST'])
+@login_required
+def create_consumable():
+    form = CreateConsumableForm()
+
+    # preinitialize the defaults with potentially existing values from a try before
+    if form.name.data is not None:
+        form.name.default = form.name.data
+    if form.unit.data is not None:
+        form.unit.default = form.unit.data
+
+    if form.validate_on_submit():
+        new_consumable = Consumable(form.name.data, form.unit.data)
+        db.session.add(new_consumable)
+        try:
+            db.session.commit()
+            db_log_add(new_consumable)
+        except IntegrityError:
+            db.session.rollback()
+            form.name.errors.append('"%s" is not unique.' % (form.name.data))
+            return render_template('createConsumableForm.html', form=form)
+        return redirect(url_for('get_admin_page'))
+
+    return render_template('createConsumableForm.html', form=form)
+
+
+@app.route('/admin/consumable/delete/<int:cid>', methods=['GET', 'POST'])
+@login_required
+def delete_consumable(cid):
+    consumable = Consumable.query.filter(Consumable.id == cid).first()
+    if consumable is None:
+        return redirect(url_for('get_admin_page'))
+
+    form = DeletConsumableForm()
+
+    if form.validate_on_submit():
+        db.session.delete(consumable)
+        db.session.commit()
+        db_log_delete(consumable)
+        return redirect(url_for('get_admin_page'))
+
+    return render_template('deleteConsumableForm.html', form=form, consumable=consumable)
+
+
+@app.route('/admin/consumable/edit/<int:cid>', methods=['GET', 'POST'])
+@login_required
+def edit_consumable(cid):
+    consumable = Consumable.query.filter(Consumable.id == cid).first()
+    if consumable is None:
+        return redirect(url_for('get_admin_page'))
+
+    form = EditConsumableForm()
+
+    form.name.default = consumable.name
+    form.unit.default = consumable.unit
+
+    # preinitialize the defaults with potentially existing values from a try before
+    if form.name.data is not None:
+        form.name.default = form.name.data
+    if form.unit.data is not None:
+        form.unit.default = form.unit.data
+
+    if form.validate_on_submit():
+        consumable.name = form.name.data
+        consumable.unit = form.unit.data
+        try:
+            db.session.commit()
+            db_log_update(consumable)
+        except IntegrityError:
+            db.session.rollback()
+            form.name.errors.append('"%s" is not unique.' % (form.name.data))
+            return render_template('editConsumableForm.html', form=form)
+        return redirect(url_for('get_admin_page'))
+
+    return render_template('editConsumableForm.html', form=form)
+

app/routes/misc.py

@@ -0,0 +1,22 @@
+from flask import render_template
+from flask_security import login_required
+from flask_security.core import current_user
+
+from ..tools import VehicleStats
+from .. import app
+
+
+@app.route("/statistics", methods=["GET"])
+@login_required
+def get_statistics():
+    stats = []
+
+    def key(v):
+        return (not v.is_active, v.name)
+
+    vehicles = sorted(current_user.vehicles, key=key)
+    for vehicle in vehicles:
+        stats.append(VehicleStats(vehicle))
+    return render_template("statistics.html", data=stats)
+
+

app/routes/pitstop.py

@@ -0,0 +1,230 @@
+from flask import url_for, redirect, render_template, flash
+from flask_security import login_required
+from flask_security.core import current_user
+from sqlalchemy.exc import IntegrityError
+from datetime import date
+import types
+
+
+from ..entities import Vehicle, Consumable, Pitstop
+from ..forms import (
+    SelectVehicleForm,
+    SelectConsumableForm,
+    CreatePitstopForm,
+    EditPitstopForm,
+    DeletePitStopForm,
+)
+from ..tools import (
+    db_log_update,
+    db_log_delete,
+    db_log_add,
+    pitstop_service_key,
+    get_event_line_for_vehicle,
+    RegularCostInstance,
+    calculate_regular_cost_instances,
+    get_users_active_vehicle,
+)
+from .. import app, db
+
+
+@app.route("/pitstops/vehicle/select", methods=["GET", "POST"])
+@login_required
+def select_vehicle_for_new_pitstop():
+    active_vehicles = get_users_active_vehicle(current_user)
+    if len(active_vehicles) == 1:
+        return redirect(
+            url_for(
+                "select_consumable_for_new_pitstop", vid=active_vehicles[0].id
+            )
+        )
+
+    form = SelectVehicleForm()
+    form.vehicle.choices = [
+        (g.id, g.name) for g in active_vehicles
+    ]
+
+    if form.validate_on_submit():
+        return redirect(
+            url_for("select_consumable_for_new_pitstop", vid=form.vehicle.data)
+        )
+
+    return render_template("selectVehicle.html", form=form)
+
+
+@app.route("/pitstops/vehicle/<int:vid>/consumable/select", methods=["GET", "POST"])
+@login_required
+def select_consumable_for_new_pitstop(vid):
+    vehicle = Vehicle.query.get(vid)
+    if vehicle is None or vehicle not in current_user.vehicles:
+        return redirect(url_for("select_vehicle_for_new_pitstop"))
+
+    if len(vehicle.consumables) == 0:
+        flash("Please choose at least one consumable!", "warning")
+        return redirect(url_for("edit_vehicle", vid=vid))
+
+    if len(vehicle.consumables) == 1:
+        return redirect(
+            url_for("create_pit_stop_form", vid=vid, cid=vehicle.consumables[0].id)
+        )
+
+    form = SelectConsumableForm()
+    form.consumable.choices = [(g.id, g.name) for g in vehicle.consumables]
+
+    if form.validate_on_submit():
+        return redirect(
+            url_for("create_pit_stop_form", vid=vid, cid=form.consumable.data)
+        )
+
+    return render_template(
+        "selectConsumableForVehicle.html", vehicle=vehicle, form=form
+    )
+
+
+@app.route(
+    "/pitstops/vehicle/<int:vid>/consumable/<int:cid>/create", methods=["GET", "POST"]
+)
+@login_required
+def create_pit_stop_form(vid, cid):
+    vehicle = Vehicle.query.get(vid)
+    if vehicle is None or vehicle not in current_user.vehicles:
+        return redirect(url_for("select_vehicle_for_new_pitstop"))
+
+    consumable = Consumable.query.get(cid)
+    if consumable not in vehicle.consumables:
+        return redirect(url_for("select_consumable_for_new_pitstop", vid=vid))
+
+    form = CreatePitstopForm()
+
+    data = get_event_line_for_vehicle(vehicle)
+    if len(data) > 0:
+        form.set_pitstops(data)
+        form.same_odometer_allowed = (type(data[-1]) != Pitstop) or (
+            data[-1].consumable.id != cid
+        )
+    else:
+        form.set_pitstops([])
+        form.same_odometer_allowed = True
+
+    # set the label of the litres field to make the user comfortable
+    form.set_consumable(consumable)
+
+    # preinitialize the defaults with potentially existing values from a try before
+    form.preinit_with_data()
+
+    #
+    #   Validate should accept same odometer on different consumables
+    #
+    if form.validate_on_submit():
+        new_stop = Pitstop(
+            form.odometer.data, form.litres.data, form.date.data, form.costs.data, cid
+        )
+        db.session.add(new_stop)
+        vehicle.pitstops.append(new_stop)
+        try:
+            db.session.commit()
+            db_log_add(new_stop)
+        except IntegrityError:
+            db.session.rollback()
+            form.odometer.errors.append(
+                "Pitstop already present for %s at odometer %s km!"
+                % (consumable.name, form.odometer.data)
+            )
+            return render_template(
+                "createPitStopForm.html",
+                form=form,
+                vehicle=vehicle,
+                messages=form.get_hint_messages(),
+            )
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    form.process()
+    return render_template(
+        "createPitStopForm.html",
+        form=form,
+        vehicle=vehicle,
+        messages=form.get_hint_messages(),
+    )
+
+
+@app.route("/pitstops/delete/<int:pid>", methods=["GET", "POST"])
+@login_required
+def delete_pit_stop_form(pid):
+    pitstop = Pitstop.query.filter(Pitstop.id == pid).first()
+    if pitstop is None:
+        return redirect(url_for("get_pit_stops"))
+    vehicle = Vehicle.query.filter(Vehicle.id == pitstop.vehicle_id).first()
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_pit_stops"))
+
+    form = DeletePitStopForm()
+    if form.validate_on_submit():
+        db.session.delete(pitstop)
+        db.session.commit()
+        db_log_delete(pitstop)
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    return render_template("deletePitstopForm.html", form=form, pitstop=pitstop)
+
+
+@app.route("/pitstops/edit/<int:pid>", methods=["GET", "POST"])
+@login_required
+def edit_pit_stop_form(pid):
+    edit_pitstop = Pitstop.query.get(pid)
+    if edit_pitstop is None:
+        return redirect(url_for("get_pit_stops"))
+
+    vehicle = Vehicle.query.filter(Vehicle.id == edit_pitstop.vehicle_id).first()
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_pit_stops"))
+
+    form = EditPitstopForm()
+    data = get_event_line_for_vehicle(vehicle)
+    data = [x for x in data if x != edit_pitstop]
+    form.set_pitstops(data)
+    if not form.is_submitted():
+        form.odometer.default = edit_pitstop.odometer
+        form.litres.default = edit_pitstop.amount
+        form.date.default = edit_pitstop.date
+        form.costs.default = edit_pitstop.costs
+    if form.validate_on_submit():
+        edit_pitstop.costs = form.costs.data
+        edit_pitstop.date = form.date.data
+        edit_pitstop.amount = form.litres.data
+        edit_pitstop.odometer = form.odometer.data
+        db.session.commit()
+        db_log_update(edit_pitstop)
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    form.preinit_with_data()
+    form.process()
+    return render_template(
+        "editPitStopForm.html",
+        form=form,
+        vehicle=vehicle,
+        messages=form.get_hint_messages(),
+    )
+
+
+@app.route("/pitstops", methods=["GET"])
+@login_required
+def get_pit_stops():
+    user = {"vehicles": []}
+    for vehicle in current_user.vehicles:
+        data = []
+        for pitstop in vehicle.pitstops:
+            data.append(pitstop)
+        for service in vehicle.services:
+            data.append(service)
+        for regular_instance in calculate_regular_cost_instances(vehicle):
+            data.append(regular_instance)
+
+        data.sort(key=pitstop_service_key)
+        v = {
+            "id": vehicle.id,
+            "name": vehicle.name,
+            "data": data,
+            "regulars": vehicle.regulars,
+        }
+        user["vehicles"].append(v)
+
+    return render_template("pitstops.html", user=user)

app/routes/regular_cost.py

@@ -0,0 +1,161 @@
+from flask import url_for, redirect, render_template, flash
+from flask_security import login_required
+from flask_security.core import current_user
+from sqlalchemy.exc import IntegrityError
+from datetime import date
+
+from ..entities import Vehicle, Consumable, Pitstop, RegularCost
+from ..forms import (
+    SelectVehicleForm,
+    CreateRegularCostForm,
+    DeleteRegularCostForm,
+    EditRegularCostForm,
+    EndRegularCostForm,
+)
+from ..tools import (
+    db_log_update,
+    db_log_delete,
+    db_log_add,
+    pitstop_service_key,
+    get_event_line_for_vehicle,
+    get_users_active_vehicle,
+)
+from .. import app, db
+
+
+@app.route("/regular_costs/delete/<int:pid>", methods=["GET", "POST"])
+@login_required
+def delete_regular_form(pid):
+    regular_cost = RegularCost.query.filter(RegularCost.id == pid).first()
+    if regular_cost is None:
+        return redirect(url_for("get_pit_stops"))
+    vehicle = Vehicle.query.filter(Vehicle.id == regular_cost.vehicle_id).first()
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_pit_stops"))
+
+    form = DeleteRegularCostForm()
+    if form.validate_on_submit():
+        db.session.delete(regular_cost)
+        db.session.commit()
+        db_log_delete(regular_cost)
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    return render_template(
+        "deleteRegularCostForm.html", form=form, regular_cost=regular_cost
+    )
+
+
+@app.route("/regular_costs/vehicle/select", methods=["GET", "POST"])
+@login_required
+def select_vehicle_for_new_regular_cost():
+    active_vehicles = get_users_active_vehicle(current_user)
+    if len(active_vehicles) == 1:
+        return redirect(
+            url_for("create_regular_cost_for_vehicle", vid=active_vehicles[0].id)
+        )
+
+    form = SelectVehicleForm()
+    form.vehicle.choices = [(g.id, g.name) for g in active_vehicles]
+
+    if form.validate_on_submit():
+        return redirect(
+            url_for("create_regular_cost_for_vehicle", vid=form.vehicle.data)
+        )
+
+    return render_template("selectVehicle.html", form=form)
+
+
+@app.route("/regular_costs/vehicle/<int:vid>/create", methods=["GET", "POST"])
+@login_required
+def create_regular_cost_for_vehicle(vid):
+    vehicle = Vehicle.query.get(vid)
+    if vehicle is None or vehicle not in current_user.vehicles:
+        return redirect(url_for("get_account_page"))
+
+    form = CreateRegularCostForm()
+
+    form.preinit_with_data()
+
+    if form.validate_on_submit():
+        regular_cost = RegularCost(
+            vid,
+            form.description.data,
+            form.costs.data,
+            form.days.data,
+            form.start_at.data,
+            form.ends_at.data,
+        )
+        db.session.add(regular_cost)
+        vehicle.regulars.append(regular_cost)
+        db.session.commit()
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    form.process()
+    return render_template(
+        "createRegularCostForm.html", form=form, vehicle=vehicle, messages=[]
+    )
+
+
+@app.route("/regular_costs/edit/<int:pid>", methods=["GET", "POST"])
+@login_required
+def edit_regular_form(pid):
+    edit_regular = RegularCost.query.get(pid)
+    if edit_regular is None:
+        return redirect(url_for("get_pit_stops"))
+
+    vehicle = Vehicle.query.filter(Vehicle.id == edit_regular.vehicle_id).first()
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_pit_stops"))
+
+    form = EditRegularCostForm()
+    form.preinit_with_data()
+
+    if not form.is_submitted():
+        form.costs.default = edit_regular.costs
+        form.start_at.default = edit_regular.start_at
+        form.ends_at.default = edit_regular.ends_at
+        form.days.default = edit_regular.days
+        form.description.default = edit_regular.description
+
+    if form.validate_on_submit():
+        edit_regular.start_at = form.start_at.data
+        edit_regular.ends_at = form.ends_at.data
+        edit_regular.costs = form.costs.data
+        edit_regular.days = form.days.data
+        edit_regular.description = form.description.data
+        db.session.commit()
+        db_log_update(edit_regular)
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    form.preinit_with_data()
+    form.process()
+    return render_template(
+        "editRegularCostForm.html",
+        form=form,
+        vehicle=vehicle,
+        messages=form.get_hint_messages(),
+    )
+
+
+@app.route("/regular_costs/end/<int:pid>", methods=["GET", "POST"])
+@login_required
+def end_regular_form(pid):
+    edit_regular = RegularCost.query.get(pid)
+    if edit_regular is None:
+        return redirect(url_for("get_pit_stops"))
+
+    vehicle = Vehicle.query.filter(Vehicle.id == edit_regular.vehicle_id).first()
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_pit_stops"))
+
+    form = EndRegularCostForm()
+    if form.validate_on_submit():
+        edit_regular.ends_at = date.today()
+        db.session.commit()
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    return render_template(
+        "endRegularCostForm.html",
+        form=form,
+        vehicle=vehicle,
+    )

app/routes/service.py

@@ -0,0 +1,137 @@
+from flask import url_for, redirect, render_template
+from flask_security import login_required, current_user
+from datetime import date
+
+from ..entities import Vehicle, Service
+from ..forms import (
+    CreateServiceForm,
+    DeleteServiceForm,
+    EditServiceForm,
+    SelectVehicleForm,
+)
+from ..tools import (
+    db_log_update,
+    db_log_delete,
+    get_event_line_for_vehicle,
+    get_latest_pitstop_for_vehicle,
+    get_users_active_vehicle,
+)
+from .. import app, db
+
+
+@app.route("/service/vehicle/<int:vid>/create", methods=["GET", "POST"])
+@login_required
+def create_service_for_vehicle(vid):
+    vehicle = Vehicle.query.get(vid)
+    if vehicle is None or vehicle not in current_user.vehicles:
+        return redirect(url_for("get_account_page"))
+
+    form = CreateServiceForm()
+
+    data = get_event_line_for_vehicle(vehicle)
+    if len(data) > 0:
+        form.set_pitstops(data)
+        form.same_odometer_allowed = type(data[-1]) != Service
+    else:
+        form.set_pitstops([])
+        form.same_odometer_allowed = True
+
+    form.preinit_with_data()
+
+    if form.validate_on_submit():
+        new_service = Service(
+            form.date.data,
+            form.odometer.data,
+            vid,
+            form.costs.data,
+            form.description.data,
+        )
+        db.session.add(new_service)
+        vehicle.services.append(new_service)
+        db.session.commit()
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    form.process()
+    return render_template(
+        "createServiceForm.html", form=form, vehicle=vehicle, messages=[]
+    )
+
+
+@app.route("/service/delete/<int:sid>", methods=["GET", "POST"])
+@login_required
+def delete_service_form(sid):
+    service = Service.query.filter(Service.id == sid).first()
+    if service is None:
+        return redirect(url_for("get_pit_stops"))
+
+    vehicle = Vehicle.query.filter(Vehicle.id == service.vehicle_id).first()
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_pit_stops"))
+
+    form = DeleteServiceForm()
+    if form.validate_on_submit():
+        db.session.delete(service)
+        db.session.commit()
+        db_log_delete(service)
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    return render_template("deleteServiceForm.html", form=form, service=service)
+
+
+@app.route("/service/edit/<int:sid>", methods=["GET", "POST"])
+@login_required
+def edit_service_form(sid):
+    edit_service = Service.query.get(sid)
+    if edit_service is None:
+        return redirect(url_for("get_pit_stops"))
+
+    vehicle = Vehicle.query.filter(Vehicle.id == edit_service.vehicle_id).first()
+    if vehicle not in current_user.vehicles:
+        return redirect(url_for("get_pit_stops"))
+
+    data = get_event_line_for_vehicle(vehicle)
+    data = [x for x in data if x != edit_service]
+    form = EditServiceForm()
+    form.same_odometer_allowed = True
+    form.set_pitstops(data)
+
+    if not form.is_submitted():
+        form.odometer.default = edit_service.odometer
+        form.description.default = edit_service.description
+        form.date.default = edit_service.date
+        form.costs.default = edit_service.costs
+    if form.validate_on_submit():
+        edit_service.costs = form.costs.data
+        edit_service.date = form.date.data
+        edit_service.description = form.description.data
+        edit_service.odometer = form.odometer.data
+        db.session.commit()
+        db_log_update(edit_service)
+        return redirect(url_for("get_pit_stops", _anchor="v" + str(vehicle.id)))
+
+    form.preinit_with_data()
+    form.process()
+    return render_template(
+        "editServiceForm.html",
+        form=form,
+        vehicle=vehicle,
+        messages=form.get_hint_messages(),
+    )
+
+
+@app.route("/service/vehicle/select", methods=["GET", "POST"])
+@login_required
+def select_vehicle_for_new_service():
+    active_vehicles = get_users_active_vehicle(current_user)
+    if len(active_vehicles) == 1:
+        return redirect(
+            url_for("create_service_for_vehicle", vid=active_vehicles[0].id)
+        )
+
+    form = SelectVehicleForm()
+    form.vehicle.choices = [(g.id, g.name) for g in active_vehicles]
+
+    if form.validate_on_submit():
+        return redirect(url_for("create_service_for_vehicle", vid=form.vehicle.data))
+
+    return render_template("selectVehicle.html", form=form)

app/static/css/main.css

@@ -1,10 +1,19 @@
+.markdown > h1 {
+    font-size: 14px;
+    font-weight: bold;
+}
+
+.markdown {
+    text-align: left
+}
+
 body {
   padding-top: 50px;
 }
 
 .starter-template {
-  padding-top: 30px;
-  padding-bottom: 60px;
+  padding-top: 0px;
+//  padding-bottom: 60px;
   text-align: center;
 }
 
@@ -59,6 +68,14 @@ h3:after{
     text-align: left;
 }
 
+.alert {
+    margin-bottom:0px;
+}
+
+.topspace {
+    margin-top: 5px;
+}
+
 // for small devices
 @media only screen
 and (min-device-width : 320px)
@@ -76,3 +93,20 @@ and (max-device-width : 568px) {
         display:none;
     }
 }
+
+/*
+ * styling for sortable tables
+ */
+th.header {
+    background-image: url(../img/updown.gif);
+    background-repeat: no-repeat;
+    background-position: center right;
+}
+
+th.headerSortUp {
+    background-image: url(../img/down.gif);
+}
+
+th.headerSortDown {
+    background-image: url(../img/up.gif);
+}

app/static/js/main.js

@@ -12,7 +12,7 @@ function createChart(id, data, unit) {
             "axisAlpha": 0,
             "position": "left",
             "ignoreAxisWidth":true,
-//            "title": unit
+            "title": unit
         }],
         "balloon": {
             "borderThickness": 1,

app/templates/account.html

@@ -5,7 +5,7 @@
     <div class="panel panel-default">
         <div class="panel-heading">Password</div>
         <div class="panel-body">
-        	<a href='{{ url_for('security.change_password') }}' class="btn btn-primary " role="button">
+        	<a href="{{ url_for('security.change_password') }}" id="change_password" class="btn btn-primary " role="button">
                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> Change
             </a>
         </div>
@@ -13,7 +13,7 @@
     <div class="panel panel-default">
         <div class="panel-heading">Vehicles</div>
         <div class="panel-body">
-            <a href="{{ url_for('create_vehicle') }}" class="btn btn-primary " role="button">
+            <a href="{{ url_for('create_vehicle') }}" id="create_vehicle" class="btn btn-primary " role="button">
                 <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> create
             </a>
         </div>
@@ -33,17 +33,28 @@
                 {% for vehicle in current_user.vehicles %}
                     <tr>
                         <td>
-                            {{ vehicle.name }}
+                            {{ vehicle.name }}<br />
+                            {% if not vehicle.is_active %}
+                                (inactive)
+                            {% endif %}
                         </td>
                         <td>
-                            {{ vehicle.pitstops | length }} pitstops
+                            {{ vehicle.pitstops | length }} pitstops<br />
+                            {{ vehicle.services | length }} special expenses<br />
+                            {{ vehicle.consumables | length }} consumables
                         </td>
                         <td>
-                            <a href="{{ url_for('edit_vehicle', vid=vehicle.id) }}" class="btn btn-primary " role="button">
+                            <a href="{{ url_for('create_service_for_vehicle', vid=vehicle.id) }}" id="pitstop_{{loop.index}}" class="btn btn-primary " role="button">
+                                <span class="glyphicon glyphicon-wrench" aria-hidden="true"></span> add service
+                            </a>
+                            <a href="{{ url_for('select_consumable_for_new_pitstop', vid=vehicle.id) }}" id="pitstop_{{loop.index}}" class="btn btn-primary " role="button">
+                                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> add pitstop
+                            </a>
+                            <a href="{{ url_for('edit_vehicle', vid=vehicle.id) }}" id="edit_vehicle_{{loop.index}}" class="btn btn-primary " role="button">
                                 <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> edit
                             </a>
                             {% if current_user.vehicles | length > 1 %}
-                            <a href="{{ url_for('delete_vehicle', vid=vehicle.id) }}"  class="btn btn-primary btn-warning " role="button">
+                            <a href="{{ url_for('delete_vehicle', vid=vehicle.id) }}" id="delete_vehicle_{{loop.index}}" class="btn btn-primary btn-warning " role="button">
                                 <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete
                             </a>
                             {% else %}
@@ -58,7 +69,7 @@
     <div class="panel panel-default">
         <div class="panel-heading">Account</div>
         <div class="panel-body">
-        	<a href='{{ url_for('delete_account') }}' class="btn btn-primary " role="button">
+        	<a href="{{ url_for('delete_account') }}" id="delete_account" class="btn btn-primary " role="button">
                 <span class="glyphicon glyphicon-remove" aria-hidden="true"></span> Delete
             </a>
         </div>

app/templates/admin.html

@@ -0,0 +1,60 @@
+{% extends "layout.html" %}
+
+{% block body %}
+    <h3>Admin</h3>
+    <div class="panel panel-default">
+        <div class="panel-heading">Users</div>
+        <div class="panel-body">
+            We have {{ users|length }} users so far:
+            <ul>
+                {% for user in users %}
+                    <li>{{user.email}}</li>
+                {% endfor %}
+        </div>
+    </div>
+
+    <div class="panel panel-default">
+        <div class="panel-heading">Consumables</div>
+        <div class="panel-body">
+            <a href="{{ url_for('create_consumable') }}" id="create_consumable" class="btn btn-primary " role="button">
+                <span class="glyphicon glyphicon-plus" aria-hidden="true"></span> create
+            </a>
+        </div>
+        <table class="table table-striped table-bordered">
+            <tbody>
+                <tr>
+                    <th>
+                        Name
+                    </th>
+                    <th>
+                        Unit
+                    </th>
+                    <th>
+                        Used by
+                    </th>
+                    <th>
+                        Actions
+                    </th>
+                </tr>
+                {% for consumable in consumables %}
+                    <tr>
+                        <td id="name_{{loop.index}}">{{ consumable.name }}</td>
+                        <td id="unit_{{loop.index}}">{{ consumable.unit }}</td>
+                        <td id="count_{{loop.index}}">{{ consumable.vehicles | length }} vehicles</td>
+                        <td>
+                            {% if not consumable.in_use %}
+                                <a href="{{ url_for('delete_consumable', cid=consumable.id) }}" id="delete_consumable{{loop.index}}" class="btn btn-primary btn-warning " role="button">
+                                    <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete
+                                </a>
+                            {% endif %}
+                            <a href="{{ url_for('edit_consumable', cid=consumable.id) }}" id="edit_consumable{{loop.index}}" class="btn btn-primary " role="button">
+                                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> edit
+                            </a>
+                        </td>
+                    </tr>
+                {% endfor %}
+            </tbody>
+        </table>
+    </div>
+
+{% endblock %}

app/templates/createConsumableForm.html

@@ -0,0 +1,19 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>Create consumable</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.name) }}
+                {{ render_field_with_errors(form.unit) }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class="col-md-2" ></div>
+{% endblock %}

app/templates/createPitStopForm.html

@@ -0,0 +1,33 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>New Pitstop for '{{ vehicle.name }}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.date) }}
+                <span id="{{form.date.id}}_help" class="help-block">
+                    {{messages['date']}}
+                </span>
+                {{ render_field_with_errors(form.odometer) }}
+               <span id="{{form.odometer.id}}_help" class="help-block">
+                    {{messages['odometer']}}
+                </span>
+                {{ render_field_with_errors(form.litres) }}
+               <span id="{{form.litres.id}}_help" class="help-block">
+                    {{messages['litres']}}
+                </span>
+                {{ render_field_with_errors(form.costs) }}
+               <span id="{{form.costs.id}}_help" class="help-block">
+                    {{messages['costs']}}
+                </span>
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class="col-md-2" ></div>
+{% endblock %}

app/templates/createRegularCostForm.html

@@ -0,0 +1,39 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>New Regular Cost for '{{ vehicle.name }}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+
+                {{ render_field_with_errors(form.start_at) }}
+                <span id="{{form.start_at.id}}_help" class="help-block">
+                    {{messages['start_at']}}
+                </span>
+
+                {{ render_field_with_errors(form.ends_at) }}
+                <span id="{{form.ends_at.id}}_help" class="help-block">
+                    {{messages['ends_at']}}
+                </span>
+
+                {{ render_field_with_errors(form.days) }}
+                <span>Format as 'Month-Day' (e.g. 05-25) and separate with ','.</span>
+                <span id="{{form.days.id}}_help" class="help-block">
+                    {{messages['days']}}
+                </span>
+
+                {{ render_field_with_errors(form.costs) }}
+                <span id="{{form.costs.id}}_help" class="help-block">
+                     {{messages['costs']}}
+                </span>
+                {{ render_field_with_errors(form.description) }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class="col-md-2" ></div>
+{% endblock %}

app/templates/createServiceForm.html

@@ -0,0 +1,30 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>New Service for '{{ vehicle.name }}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.date) }}
+                <span id="{{form.date.id}}_help" class="help-block">
+                    {{messages['date']}}
+                </span>
+                {{ render_field_with_errors(form.odometer) }}
+               <span id="{{form.odometer.id}}_help" class="help-block">
+                    {{messages['odometer']}}
+                </span>
+                {{ render_field_with_errors(form.costs) }}
+               <span id="{{form.costs.id}}_help" class="help-block">
+                    {{messages['costs']}}
+               </span>
+               {{ render_field_with_errors(form.description) }}
+               {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class="col-md-2" ></div>
+{% endblock %}

app/templates/createVehicleForm.html

@@ -9,6 +9,7 @@
             <form class='form-horizontal' method="POST">
                 {{ form.hidden_tag() }}
                 {{ render_field_with_errors(form.name) }}
+                {{ render_field_with_errors(form.consumables) }}
                 {{ render_field_with_errors(form.submit) }}
             </form>
         </div>

app/templates/deleteConsumableForm.html

@@ -5,14 +5,14 @@
 <div class="col-md-8">
     <div class="panel panel-default">
         <div class="panel-body">
-            <h3>Edit vehicle</h3>
+            <h3>Delete consumable '{{consumable.name}}'?</h3>
             <form class='form-horizontal' method="POST">
                 {{ form.hidden_tag() }}
-                {{ render_field_with_errors(form.name) }}
                 {{ render_field_with_errors(form.submit) }}
+
             </form>
         </div>
     </div>
 </div>
-
+<div class="col-md-2" ></div>
 {% endblock %}

app/templates/deletePitstopForm.html

@@ -0,0 +1,42 @@
+{% extends 'layout.html' %}
+
+{% block body %}
+<div class='col-md-2' ></div>
+<div class='col-md-8'>
+    <div class='panel panel-default'>
+        <div class='panel-body'>
+            <h3>Delete pitstop?</h3>
+            <table style='width: 100%' class="table table-striped table-bordered table-condensed">
+                <tr>
+                    <th style='text-align:right'>Date of Pitstop</th>
+                    <td style='text-align: left'>{{ pitstop.date }}</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Odometer</th>
+                    <td style='text-align: left'>{{ pitstop.odometer }} km</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Litres</th>
+                    <td style='text-align: left'>{{ pitstop.amount }} {{ pitstop.consumable.unit }}</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Costs (overall)</th>
+                    <td style='text-align: left'>
+                        {% if pitstop.costs %}
+                            {{pitstop.costs}}
+                        {% else %}
+                            --
+                        {% endif %}
+                        €
+                    </td>
+                </tr>
+            </table>
+            <form class='form-horizontal' method='POST'>
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class='col-md-2' ></div>
+{% endblock %}

app/templates/deleteRegularCostForm.html

@@ -0,0 +1,46 @@
+{% extends 'layout.html' %}
+
+{% block body %}
+<div class='col-md-2' ></div>
+<div class='col-md-8'>
+    <div class='panel panel-default'>
+        <div class='panel-body'>
+            <h3>Delete Regular Cost?</h3>
+            <table style='width: 100%' class="table table-striped table-bordered table-condensed">                
+                <tr>
+                    <th style='text-align:right'>Description of regular cost</th>
+                    <td style='text-align: left'>{{ regular_cost.description }}</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Costs (per instance)</th>
+                    <td style='text-align: left'>
+                        {% if regular_cost.costs %}
+                            {{ regular_cost.costs }}
+                        {% else %}
+                            --
+                        {% endif %}
+                        €
+                    </td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Days for regular costs</th>
+                    <td style='text-align: left'>{{ regular_cost.days }}</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>regular costs starting from</th>
+                    <td style='text-align: left'>{{ regular_cost.start_at }}</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>regular costs ending at</th>
+                    <td style='text-align: left'>{{ regular_cost.ends_at }}</td>
+                </tr>
+            </table>
+            <form class='form-horizontal' method='POST'>
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class='col-md-2' ></div>
+{% endblock %}

app/templates/deleteServiceForm.html

@@ -0,0 +1,42 @@
+{% extends 'layout.html' %}
+
+{% block body %}
+<div class='col-md-2' ></div>
+<div class='col-md-8'>
+    <div class='panel panel-default'>
+        <div class='panel-body'>
+            <h3>Delete service?</h3>
+            <table style='width: 100%' class="table table-striped table-bordered table-condensed">
+                <tr>
+                    <th style='text-align:right'>Date of Pitstop</th>
+                    <td style='text-align: left'>{{ service.date }}</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Odometer</th>
+                    <td style='text-align: left'>{{ service.odometer }} km</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Description</th>
+                    <td style='text-align: left' class="markdown">{{ service.description  | markdown | safe}}</td>
+                </tr>
+                <tr>
+                    <th style='text-align:right'>Costs (overall)</th>
+                    <td style='text-align: left'>
+                        {% if service.costs %}
+                            {{service.costs}}
+                        {% else %}
+                            --
+                        {% endif %}
+                        €
+                    </td>
+                </tr>
+            </table>
+            <form class='form-horizontal' method='POST'>
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class='col-md-2' ></div>
+{% endblock %}

app/templates/deleteVehicleForm.html

@@ -8,7 +8,7 @@
             <h3>Delete vehicle '{{vehicle.name}}'?</h3>
             <form class='form-horizontal' method="POST">
                 {{ form.hidden_tag() }}
-                {{ render_field_with_errors(form.submit) }}
+                {{ render_field_with_errors(form.submit, include_cancel=True) }}
 
             </form>
         </div>

app/templates/editConsumableForm.html

@@ -0,0 +1,19 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>Edit consumable</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.name) }}
+                {{ render_field_with_errors(form.unit) }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class="col-md-2" ></div>
+{% endblock %}

app/templates/editPitStopForm.html

@@ -5,7 +5,7 @@
 <div class="col-md-8">
     <div class="panel panel-default">
         <div class="panel-body">
-            <h3>New Pitstop for '{{ vehicle.name }}'</h3>
+            <h3>Edit Pitstop for '{{ vehicle.name }}'</h3>
             <form class='form-horizontal' method="POST">
                 {{ form.hidden_tag() }}
                 {{ render_field_with_errors(form.date) }}
@@ -17,6 +17,10 @@
                     {{messages['odometer']}}
                 </span>
                 {{ render_field_with_errors(form.litres) }}
+                {{ render_field_with_errors(form.costs) }}
+               <span id="{{form.costs.id}}_help" class="help-block">
+                    {{messages['costs']}}
+                </span>
                 {{ render_field_with_errors(form.submit) }}
             </form>
         </div>

app/templates/editRegularCostForm.html

@@ -0,0 +1,39 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>Edit Regular Cost for '{{ vehicle.name }}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+
+                {{ render_field_with_errors(form.start_at) }}
+                <span id="{{form.start_at.id}}_help" class="help-block">
+                    {{messages['start_at']}}
+                </span>
+
+                {{ render_field_with_errors(form.ends_at) }}
+                <span id="{{form.ends_at.id}}_help" class="help-block">
+                    {{messages['ends_at']}}
+                </span>
+
+                {{ render_field_with_errors(form.days) }}
+                <span>Format as 'Month-Day' (e.g. 05-25) and separate with ','.</span>
+                <span id="{{form.days.id}}_help" class="help-block">
+                    {{messages['days']}}
+                </span>
+
+                {{ render_field_with_errors(form.costs) }}
+                <span id="{{form.costs.id}}_help" class="help-block">
+                     {{messages['costs']}}
+                </span>
+                {{ render_field_with_errors(form.description) }}
+
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock %}

app/templates/editServiceForm.html

@@ -0,0 +1,29 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>Edit Pitstop for '{{ vehicle.name }}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.date) }}
+                <span id="{{form.date.id}}_help" class="help-block">
+                    {{messages['date']}}
+                </span>
+                {{ render_field_with_errors(form.odometer) }}
+               <span id="{{form.odometer.id}}_help" class="help-block">
+                    {{messages['odometer']}}
+                </span>
+                {{ render_field_with_errors(form.description) }}
+                {{ render_field_with_errors(form.costs) }}
+               <span id="{{form.costs.id}}_help" class="help-block">
+                    {{messages['costs']}}
+                </span>
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock %}

app/templates/editVehicleForm.html

@@ -0,0 +1,20 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>Edit vehicle '{{vehicle.name}}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.name) }}
+                {{ render_field_with_errors(form.consumables) }}
+                {{ render_field_with_errors(form.is_active) }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+
+{% endblock %}

app/templates/endRegularCostForm.html

@@ -0,0 +1,16 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>Edit Regular Cost for '{{ vehicle.name }}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+{% endblock %}

app/templates/index.html

@@ -11,7 +11,13 @@
             <div class="panel-body" >
                 <h1>Join the pitstop community!</h1>
 
-                <p>There are already {{ data.users}} members with {{ data.vehicles }} vehicles who have logged {{ data.pitstops }} pitstops fuelling {{ data.litres }}l for {{ data.kilometers }}km.</p>
+                <p>There are already {{ data.users}} members with {{ data.vehicles }} vehicles who have logged {{ data.kilometers }}km in {{ data.pitstops }} pitstops. They fuelled</p>
+                <ul>
+                    {% for key in data.consumables %}
+                        {% set consumable = data.consumables[key] %}
+                        <li>{{consumable.amount}}{{consumable.unit}} of {{consumable.name}}</li>
+                    {% endfor %}
+                </ul>
 
                 <p>With pitstop community you can:</p>
                 <ul>

app/templates/layout.html

@@ -1,32 +1,31 @@
 {% macro navigation() -%}
 	{% if current_user.email %}
-		<li><a href='{{ url_for('select_vehicle_for_new_pitstop') }}'>Create Pitstop</a></li>
-		<li><a href='{{ url_for('get_statistics') }}'>Statistics</a></li>
-		<li><a href='{{ url_for('get_account_page') }}'>Account</a></li>
+		<li><a id='new_pitstop_link' href='{{ url_for('select_vehicle_for_new_pitstop') }}'>Create Pitstop</a></li>
+		<li><a id='new_service_link' href='{{ url_for('select_vehicle_for_new_service') }}'>Create Service</a></li>
+		<li><a id='new_service_link' href='{{ url_for('select_vehicle_for_new_regular_cost') }}'>Create Regular Cost</a></li>
+		<li><a id='statistics_limk' href='{{ url_for('get_statistics') }}'>Statistics</a></li>
+		<li><a id='account_link' href='{{ url_for('get_account_page') }}'>Account</a></li>
 		{% if current_user.has_role('admin') %}
-			<li><a href='{{ url_for('get_admin_page') }}'>Admin</a></li>
+			<li><a id='admin_link' href='{{ url_for('get_admin_page') }}'>Admin</a></li>
 		{% endif %}
-		<li><a href='{{ url_for('security.logout') }}'>Logout</a></li>
+		<li><a id='logout_link' href='{{ url_for('security.logout') }}'>Logout</a></li>
 	{% else %}
-		<li><a href='{{ url_for('security.login') }}'>Login</a></li>
-		<li><a href='{{ url_for('security.register') }}'>Register</a></li>
+		<li><a id='login_link' href='{{ url_for('security.login') }}'>Login</a></li>
+		<li><a id='register_link' href='{{ url_for('security.register') }}'>Register</a></li>
 	{% endif %}
 {%- endmacro %}
 
-{% macro render_field_with_errors(field) %}
+{% macro render_field_with_errors(field, include_cancel=True) %}
 <div class="form-group">
 	{% if field.type == 'SubmitField' %}
-        <div class="col-md-4" ></div>
-
-		<div class="col-sm-4" style="align:center">
+        <div class="col-md-3" ></div>
+		<div class="col-sm-6" style="align:center">
+            {% if include_cancel %}
+    			<input id="{{ field.id }}_cancel" name="{{ field.id }}_cancel" class="btn btn-default" type="submit" value="Cancel" onclick="window.history.go(-1)">
+            {% endif %}
 			<input id="{{ field.id }}" name="{{ field.id }}" class="btn btn-default" type="submit" value="{{ field.label.text }}">
 		</div>
-    <!--
-		<div class="col-sm-3" style="align:center">
-            <a class="btn btn-default" href="{{ g.data['back'] }}" role="button">Cancel</a>
-		</div>
-    -->
-        <div class="col-md-4" ></div>
+        <div class="col-md-3" ></div>
 	{% else %}
 		<label class="col-sm-6 control-label">
 			{{ field.label }}
@@ -35,11 +34,17 @@
 			{% if field.type == 'SelectField' %}
 				<select id="{{ field.id }}" name="{{ field.id }}" class="form-control">
 					{% for choice in field.choices %}
-						<option value="{{ choice[0] }}">{{ choice[1] }}</option>
+						<option value="{{ choice[0] }}" {% if choice[0] == field.default %}selected="selected"{%endif%}>{{ choice[1] }}</option>
+					{% endfor %}
+				</select>
+			{% elif field.type == 'SelectMultipleField' %}
+				<select id="{{ field.id }}" name="{{ field.id }}" class="form-control" multiple="multiple">
+					{% for choice in field.choices %}
+						<option value="{{ choice[0] }}" {% if choice[0] in field.default %}selected="selected"{%endif%}>{{ choice[1] }}</option>
 					{% endfor %}
 				</select>
 			{% elif field.type == 'BooleanField' %}
-				<input class="form-control" type="checkbox" id="{{ field.id }}" name="{{ field.id }}" value="{{ field.default|none_filter }}" aria-describedby="{{ field.id }}_help" />
+				<input class="form-control" type="checkbox" id="{{ field.id }}" name="{{ field.id }}" value="{{ field.id }}" aria-describedby="{{ field.id }}_help" {% if field.default %}checked{% endif %}/>
 			{% elif field.type == 'StringField' %}
 				<input class="form-control" type="text" id="{{ field.id }}" name="{{ field.id }}" value="{{ field.default|none_filter  }}" aria-describedby="{{ field.id }}_help" />
 			{% elif field.type == 'PasswordField' %}
@@ -50,6 +55,8 @@
 				<input class="form-control" type="number" id="{{ field.id }}" name="{{ field.id }}" value="{{ field.default|none_filter  }}" step="1" aria-describedby="{{ field.id }}_help" />
 			{% elif field.type == 'DecimalField' %}
 				<input class="form-control" type="number" id="{{ field.id }}" name="{{ field.id }}" value="{{ field.default|none_filter  }}" step="{{ 1 / 10 ** field.places}}" aria-describedby="{{ field.id }}_help" />
+			{% elif field.type == 'TextAreaField' %}
+				<textarea class="form-control" id="{{ field.id }}" name="{{ field.id }}">{{ field.default|none_filter  }}</textarea>
 			{% else %}
 				{{ field(**kwargs)|safe }}
 			{% endif %}
@@ -85,30 +92,6 @@
 {% endmacro %}
 
 
-{% macro chartScript(divId, data, unit)%}
-    {% set hash = divId | md5 %}
-
-    data_{{ hash }} = [{% for stop in data %}{
-                                "date": "{{stop.date}}",
-                                "value": {{stop.value}}
-                            }{% if not loop.last %},{%endif%}
-                            {% endfor%}
-                            ]
-    var chart_{{ hash }} = createChart('{{divId}}', data_{{ hash }}, '{{unit}}');
-
-    function zoom_chart_{{ hash }}() {
-        chart_{{ hash }}.zoomToIndexes(
-            chart_{{ hash }}.dataProvider.length - 40,
-            chart_{{ hash }}.dataProvider.length - 1
-        );
-    }
-
-    chart_{{ hash }}.addListener("rendered", zoom_chart_{{ hash }});
-
-    zoom_chart_{{ hash }}()
-
-{% endmacro %}
-
 
 <!doctype html>
 <!--[if lt IE 7]>      <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang=""> <![endif]-->
@@ -121,19 +104,19 @@
         <title>refuel journal</title>
         <meta name="description" content="">
         <meta name="viewport" content="width=device-width, initial-scale=1">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-57.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-60.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-72.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-76.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-114.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-120.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-144.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-152.png') }}">
-        <link rel="apple-touch-icon" href="{{ url_for('static', filename='apple-touch-icon-180.png') }}">
-		<link rel="icon" type="image/png" sizes="192x192" href="{{ url_for('static', filename='android-icon-192x192.png') }}">
-		<link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='favicon-32x32.png') }}">
-		<link rel="icon" type="image/png" sizes="96x96" href="{{ url_for('static', filename='favicon-96x96.png') }}">
-		<link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename='favicon-16x16.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-57.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-60.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-72.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-76.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-114.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-120.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-144.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-152.png') }}">
+        <link rel="apple-touch-icon" href="{{ url_for('static', filename='img/apple-touch-icon-180.png') }}">
+		<link rel="icon" type="image/png" sizes="192x192" href="{{ url_for('static', filename='img/android-icon-192x192.png') }}">
+		<link rel="icon" type="image/png" sizes="32x32" href="{{ url_for('static', filename='img/favicon-32x32.png') }}">
+		<link rel="icon" type="image/png" sizes="96x96" href="{{ url_for('static', filename='img/favicon-96x96.png') }}">
+		<link rel="icon" type="image/png" sizes="16x16" href="{{ url_for('static', filename='img/favicon-16x16.png') }}">
 
         <!-- Latest compiled and minified CSS -->
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css">
@@ -142,13 +125,16 @@
 		<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap-theme.min.css">
 
         <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.11.2/jquery.min.js"></script>
+		<script src="{{ url_for('static', filename='js/jquery.tablesorter.min.js') }}"></script>
+
 		<!-- Latest compiled and minified JavaScript -->
 		<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/js/bootstrap.min.js"></script>
-        <link rel="stylesheet" href="{{ url_for('static', filename='main.css') }}">
+        <link rel="stylesheet" href="{{ url_for('static', filename='css/main.css') }}">
 		<script src="https://www.amcharts.com/lib/3/amcharts.js"></script>
 		<script src="https://www.amcharts.com/lib/3/serial.js"></script>
 		<script src="https://www.amcharts.com/lib/3/themes/patterns.js"></script>
-		<script src="{{ url_for('static', filename='main.js') }}"></script>
+		<script src="https://openlayers.org/api/OpenLayers.js"></script>
+		<script src="{{ url_for('static', filename='js/main.js') }}"></script>
     </head>
     <body>
 	    <nav class="navbar navbar-inverse navbar-fixed-top">
@@ -169,13 +155,41 @@
 	        </div><!--/.nav-collapse -->
 	      </div>
 	    </nav>
-
-		<div class="container">
+		{% with messages = get_flashed_messages(with_categories=true) %}
+			{% if messages %}
+				{% for category, message in messages %}
+		<div class="row topspace">
+					<div class="col-md-4" ></div>
+					<div class="col-md-4">
+						<div class="alert alert-{{category}} alert-dismissible" role="alert">
+							<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+							{{ message }}
+						</div>
+					</div>
+					<div class="col-md-4" ></div>
+		</div>
+				{% endfor %}
+			{% endif %}
+		{% endwith %}
+		<div class="container topspace">
 			<div class="starter-template">
 				{% block body %}
 				{% endblock %}
 			</div>
 		</div>
+<div class="container topspace">
+    <div class="starter-template">
+        <div class="row">
+            <div class="col-md-12">
+                <div class="panel panel-default">
+                    <div class="panel-body">
+                        <a href="https://lusiardi.de/pages/impressum.html" target="_new">Impressum</a> - <a href="https://lusiardi.de/pages/datenschutzerklaerung.html" target="_new">Datenschutzerklärung</a>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
 {#
 	    <nav class="navbar navbar-inverse navbar-fixed-bottom">
 	      <div class="container">

app/templates/pitstops.html

@@ -0,0 +1,232 @@
+{% extends "layout.html" %}
+
+{% macro regular(field, vindex, loop) -%}
+<div class="panel panel-default">
+    <div class="panel-body">
+        <div style="text-align: left; font-size: 20px;">
+            <span class="glyphicon glyphicon-repeat" aria-hidden="true" style="border: 1px solid black; padding: 5px 5px 3px; border-radius: 5px;" />
+        </div>
+        <table class="table table-striped table-bordered table-condensed">
+            <tr>
+                <th>Description</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.description}}</td>
+            </tr>
+            <tr>
+                <th>Costs</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_cost">
+                    {% if field.costs %}
+                        {{field.costs}} €
+                    {% else %}
+                        -- €
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <th>From</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.start_at}}</td>
+            </tr>
+            <tr>
+                <th>To</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.ends_at}}</td>
+            </tr>
+            <tr>
+                <th>Days</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.days}}</td>
+            </tr>
+        </table>
+        {% if loop.first %}
+        {% endif %}
+            <a id="vehicle_{{vindex}}_edit_regular_{{loop.index}}" href="{{ url_for('edit_regular_form', pid=field.id) }}" class="btn btn-primary">
+                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> edit
+            </a>
+            <a id="vehicle_{{vindex}}_delete_regular_{{loop.index}}" href="{{ url_for('delete_regular_form', pid=field.id) }}" class="btn btn-primary btn-warning ">
+                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete
+            </a>
+    </div>
+</div>
+{%- endmacro %}
+
+{% macro regular_instance(field, vindex, loop) -%}
+<div class="panel panel-default">
+    <div class="panel-body">
+        <div style="text-align: left; font-size: 20px;">
+            <span class="glyphicon glyphicon-repeat" aria-hidden="true" style="border: 1px solid black; padding: 5px 5px 3px; border-radius: 5px;"></span>
+        </div>
+        <table class="table table-striped table-bordered table-condensed">
+            <tr>
+                <th>Date</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.date}}</td>
+            </tr>
+            <tr>
+                <th>Description</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.name}}</td>
+            </tr>
+            <tr>
+                <th>Costs</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_cost">
+                    {% if field.costs %}
+                        {{field.costs}} €
+                    {% else %}
+                        -- €
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+        {% if loop.first %}
+        {% endif %}
+            <a id="vehicle_{{vindex}}_edit_regular_{{loop.index}}" href="{{ url_for('edit_regular_form', pid=field.id) }}" class="btn btn-primary">
+                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> edit
+            </a>
+            <a id="vehicle_{{vindex}}_end_regular_{{loop.index}}" href="{{ url_for('end_regular_form', pid=field.id) }}" class="btn btn-primary">
+                <span class="glyphicon glyphicon-remove-sign" aria-hidden="true"></span> end series
+            </a>
+            <a id="vehicle_{{vindex}}_delete_regular_{{loop.index}}" href="{{ url_for('delete_regular_form', pid=field.id) }}" class="btn btn-primary btn-warning ">
+                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete
+            </a>
+    </div>
+</div>
+{%- endmacro %}
+
+{% macro pitstop(field, vindex, loop) -%}
+<div class="panel panel-default">
+    <div class="panel-body">
+        <div style="text-align: left; font-size: 20px;">
+            <span class="glyphicon glyphicon-filter" aria-hidden="true" style="border: 1px solid black; padding: 5px 5px 3px; border-radius: 5px;"></span>
+        </div>
+        <table class="table table-striped table-bordered table-condensed">
+            <tr>
+                <th>Date</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.date}}</td>
+            </tr>
+            <tr>
+                <th>Odometer</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_odo">{{field.odometer}} km</td>
+            </tr>
+            <tr>
+                <th>{{ field.consumable.name }}</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_anmount">{{field.amount}} {{ field.consumable.unit }}</td>
+            </tr>
+            <tr>
+                <th>Costs</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_cost">
+                    {% if field.costs %}
+                        {{field.costs}} €
+                    {% else %}
+                        -- €
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+        {% if loop.first %}
+        {% endif %}
+            <a id="vehicle_{{vindex}}_edit_pitstop_{{loop.index}}" href="{{ url_for('edit_pit_stop_form', pid=field.id) }}" class="btn btn-primary">
+                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> edit
+            </a>
+            <a id="vehicle_{{vindex}}_delete_pitstop_{{loop.index}}" href="{{ url_for('delete_pit_stop_form', pid=field.id) }}" class="btn btn-primary btn-warning ">
+                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete
+            </a>
+    </div>
+</div>
+{%- endmacro %}
+
+{% macro service(field, vindex, loop) -%}
+<div class="panel panel-default">
+    <div class="panel-body">
+        <div style="text-align: left; font-size: 20px;">
+            <span class="glyphicon glyphicon-wrench" aria-hidden="true" style="border: 1px solid black; padding: 5px 5px 3px; border-radius: 5px;"></span>
+        </div>
+        <table class="table table-striped table-bordered table-condensed">
+            <tr>
+                <th>Date</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_date">{{field.date}}</td>
+            </tr>
+            <tr>
+                <th>Odometer</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_desc">{{field.odometer}} km</td>
+            </tr>
+            <tr>
+                <th>Description</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_anmount" class="markdown">{{field.description | markdown | safe}}</td>
+            </tr>
+            <tr>
+                <th>Costs</th>
+                <td id="vehicle_{{vindex}}_pitstop_{{loop.index}}_cost">
+                    {% if field.costs %}
+                        {{field.costs}} €
+                    {% else %}
+                        -- €
+                    {% endif %}
+                </td>
+            </tr>
+        </table>
+        {% if loop.first %}
+        {% endif %}
+            <a id="vehicle_{{vindex}}_edit_pitstop_{{loop.index}}" href="{{ url_for('edit_service_form', sid=field.id) }}" class="btn btn-primary">
+                <span class="glyphicon glyphicon-pencil" aria-hidden="true"></span> edit
+            </a>
+            <a id="vehicle_{{vindex}}_delete_pitstop_{{loop.index}}" href="{{ url_for('delete_service_form', sid=field.id) }}" class="btn btn-primary btn-warning ">
+                <span class="glyphicon glyphicon-trash" aria-hidden="true"></span> delete
+            </a>
+    </div>
+</div>
+{%- endmacro %}
+
+
+{% block body %}
+    <div class="col-md-2" ></div>
+    <div class="col-md-8">
+        <ul id="tabs" class="nav nav-tabs" data-tabs="tabs">
+            {% for vehicle in user.vehicles %}
+                <li {% if loop.first %}class="active" {%endif %}>
+                    <a href="#v{{vehicle.id}}" id="i{{vehicle.id}}" data-toggle="tab">
+                        {{ vehicle.name }}
+                    </a>
+                </li>
+            {% endfor %}
+        </ul>
+        <div id="my-tab-content" class="tab-content">
+            {% for vehicle in user.vehicles %}
+                {% set vehicleloop = loop %}
+                <div class="tab-pane {% if loop.first %}active{% endif %}" id="v{{vehicle.id}}">
+                    <h3>{{vehicle.name}}</h3>
+                    {% if vehicle.data %}
+                        {% for data in vehicle.data|reverse %}
+                            {% if 'Pitstop' in data.__class__.__name__ %}
+                                {{ pitstop(data, vehicleloop.index, loop) }}
+                            {% endif %}
+                            {% if 'Service' in data.__class__.__name__ %}
+                                {{ service(data, vehicleloop.index, loop) }}
+                            {% endif %}
+                            {% if 'Regular' in data.__class__.__name__ %}
+                                {{ regular_instance(data, vehicleloop.index, loop) }}
+                            {% endif %}
+
+                        {% endfor %}
+                    {% 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 %}
+                    {% if vehicle.regulars %}
+                        <h4>Regular Costs</h4>
+                        {% for data in vehicle.regulars %}
+                            {{ regular(data, vehicleloop.index, loop) }}
+                        {% endfor %}
+                    {% endif %}
+                </div>
+            {% endfor %}
+        </div>
+    </div>
+    <div class="col-md-2" ></div>
+
+
+    <script type="text/javascript">
+        jQuery(document).ready(function ($) {
+            $('#tabs').tab();
+            if(window.location.hash != "") {
+                  $('a[href="' + window.location.hash + '"]').click()
+            }
+          });
+
+    </script>
+{% endblock %}

app/templates/selectConsumableForVehicle.html

@@ -0,0 +1,19 @@
+{% extends "layout.html" %}
+
+{% block body %}
+<div class="col-md-2" ></div>
+<div class="col-md-8">
+    <div class="panel panel-default">
+        <div class="panel-body">
+            <h3>Select Consumable for '{{ vehicle.name }}'</h3>
+            <form class='form-horizontal' method="POST">
+                {{ form.hidden_tag() }}
+                {{ render_field_with_errors(form.consumable) }}
+                {{ render_field_with_errors(form.submit) }}
+            </form>
+        </div>
+    </div>
+</div>
+<div class="col-md-2" ></div>
+{% endblock %}
+

app/templates/statistics.html

@@ -0,0 +1,214 @@
+{% extends "layout.html" %}
+
+{% macro chartScript(divId, data, unit)%}
+    {% set hash = divId | md5 %}
+
+    data_{{ hash }} = [{% for stop in data %}{
+                                "date": "{{stop.date}}",
+                                "value": {{stop.value}}
+                            }{% if not loop.last %},{%endif%}
+                            {% endfor%}
+                            ]
+    var chart_{{ hash }} = createChart('{{divId}}', data_{{ hash }}, '{{unit}}');
+
+    function zoom_chart_{{ hash }}() {
+        chart_{{ hash }}.zoomToIndexes(
+            chart_{{ hash }}.dataProvider.length - 40,
+            chart_{{ hash }}.dataProvider.length - 1
+        );
+    }
+
+    chart_{{ hash }}.addListener("rendered", zoom_chart_{{ hash }});
+
+    zoom_chart_{{ hash }}()
+{% endmacro %}
+
+{% macro nav_tab(id, text, active) %}
+    {#
+        Create a UI element to select the shown pane of a tabbed view
+
+        id:
+            id of the pane to select
+        text:
+            the text in the UI element
+        active:
+            boolean stating if the tab is active or not
+    #}
+    <li class="{% if active %}active{% endif %}">
+        <a href="#ref_{{id}}" id="id_{{id}}" data-toggle="tab" >
+            {{ text }}
+        </a>
+    </li>
+{% endmacro %}
+
+{% macro tab_pane(id, content, active) %}
+     <div class="tab-pane {% if active %}active{% endif %}" id="ref_{{ id }}">
+         {{ content }}
+     </div>
+{% endmacro %}
+
+{% macro chart(data, baseId, unit, link) %}
+    {% if data|length > 0 %}
+        {% set chartID = 'chart_' + baseId %}
+        <div id="{{ chartID }}" style="width:100%; height:500px;"></div>
+        <script type="text/javascript">
+            {{ chartScript(chartID, data, unit) }}
+        </script>
+    {% else %}
+        <div class="alert alert-warning" role="alert">
+            not enough data: <a href="{{ link }}">log a pitstop</a>?
+        </div>
+    {% endif %}
+{% endmacro %}
+
+{% macro print_consumable_table(consumable) %}
+    <table class="table table-striped table-bordered table-condensed">
+        <tr>
+            <th>Average Distance:</th>
+            <td>{{ consumable.average_distance | round(2) }} km</td>
+        </tr>
+        <tr>
+            <th>Amount fuelled:</th>
+            <td>{{ consumable.overall_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>
+{% endmacro %}
+
+{% macro print_vehicle_table(vehicle) %}
+    <h3>{{vehicle.name}}</h3>
+    <div class="table-responsive">
+        <table class="table table-striped table-bordered table-condensed">
+            <tr>
+                <th>Logged Distance:</th>
+                <td>{{ vehicle.overall_distance | round(2) }} km</td>
+            </tr>
+            <tr>
+                <th>Logged Costs:</th>
+                <td>{{ vehicle.overall_costs | round(2) }} €</td>
+            </tr>
+            <tr>
+                <th>Logged Costs per km:</th>
+                {% if vehicle.costs_per_distance != 'N/A' %}
+                    <td>{{ vehicle.costs_per_distance  | round(2) }} €/100km</td>
+                {% else %}
+                   <td>{{ vehicle.costs_per_distance }}</td>
+                {% endif %}
+            </tr>
+       </table>
+    </div>
+{% endmacro %}
+
+{% macro tab_script(id) %}
+    <script type="text/javascript">
+        jQuery(document).ready(function ($) {
+            $('#{{id}}').tab();
+            if(window.location.hash != "") {
+                  $('a[href="' + window.location.hash + '"]').click()
+            }
+          });
+    </script>
+{% endmacro %}
+
+{% block body %}
+    <div id="content">
+        <ul id="vehicle_tabs" class="nav nav-tabs" data-tabs="tabs">
+            {% for vehicle in data %}
+                {{ nav_tab(vehicle.id, vehicle.name, loop.first) }}
+            {% endfor %}
+        </ul>
+        <div id="vehicle_content" class="tab-content ">
+            {% for vehicle in data %}
+                <div class="tab-pane {% if loop.first %}active{% endif %}" id="ref_{{vehicle.id}}">
+                    {{ print_vehicle_table(vehicle) }}
+                    <ul id="vehicle_{{vehicle.id}}_tabs" class="nav nav-tabs" data-tabs="tabs">
+                        {{ nav_tab(vehicle.id|string + '_odometer', 'Odometer', true) }}
+                        {{ nav_tab(vehicle.id|string + '_costs', 'Costs', false) }}
+                        {% for consumable in vehicle.consumables %}
+                            {{ nav_tab(vehicle.id|string + '_' + consumable.id|string, consumable.name, false) }}
+                        {% endfor %}
+                    </ul>
+                    <div id="vehicle_{{vehicle.id}}_content" class="tab-content ">
+                        {{ tab_pane(
+                            vehicle.id|string + '_odometer',
+                            chart(
+                                vehicle.odometers,
+                                'ref_' + vehicle.id|string + '_odometer',
+                                'km',
+                                url_for('select_consumable_for_new_pitstop', vid=vehicle.id)
+                            ),
+                            true
+                            )
+                        }}
+                        {{ tab_pane(
+                            vehicle.id|string + '_costs',
+                            chart(
+                                vehicle.costs,
+                                'ref_' + vehicle.id|string + '_costs',
+                                '€',
+                                url_for('select_consumable_for_new_pitstop', vid=vehicle.id)
+                            ),
+                            false
+                            )
+                        }}
+                        {% for consumable in vehicle.consumables %}
+                            <div class="tab-pane" id="ref_{{vehicle.id}}_{{consumable.id}}">
+                                {{ print_consumable_table(consumable) }}
+                                <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 + '_amount', 'Amount', false) }}
+                                    {{ nav_tab(vehicle.id|string + '_' + consumable.id|string + '_price', 'Price', false) }}
+                                </ul>
+                                <div id="consumable_{{vehicle.id}}_{{consumable.id}}_content" class="tab-content ">
+                                    {{ tab_pane(
+                                        vehicle.id|string + '_' + consumable.id|string + '_consumption',
+                                        chart(
+                                            consumable.average_amount,
+                                            'ref_' + vehicle.id|string + '_' + consumable.id|string + '_consumption',
+                                            consumable.unit + '/100km',
+                                            url_for('create_pit_stop_form', vid=vehicle.id, cid=consumable.id)
+                                            ),
+                                        true
+                                        )
+                                    }}
+                                    {{ tab_pane(
+                                        vehicle.id|string + '_' + consumable.id|string + '_amount',
+                                        chart(
+                                            consumable.amounts,
+                                            'ref_' + vehicle.id|string + '_' + consumable.id|string + '_amount',
+                                            consumable.unit,
+                                            url_for('create_pit_stop_form', vid=vehicle.id, cid=consumable.id)
+                                            ),
+                                        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>
+                                {{ tab_script('vehicle_' + vehicle.id|string + '_' + consumable.id|string + '_tabs') }}
+                            </div>
+                        {% endfor %}
+                    </div>
+                    {{ tab_script('vehicle_' + vehicle.id|string + '_tabs') }}
+                </div>
+            {% endfor %}
+        </div>
+        {{ tab_script('vehicle_tabs') }}
+    </div>
+{% endblock %}

app/tools.py

@@ -0,0 +1,270 @@
+from sqlalchemy import or_
+import requests
+import logging
+from datetime import date, datetime, timedelta
+
+from .entities import Pitstop
+from . import db, app
+
+
+class RegularCostInstance:
+    def __init__(self, regular_id, date, odometer, costs, name):
+        self.id = regular_id
+        self.date = date
+        self.odometer = odometer
+        self.costs = costs
+        self.name = name
+
+
+class ConsumableStats:
+    def __init__(self, vehicle, consumable):
+        self.name = consumable.name
+        self.id = consumable.id
+        self.unit = consumable.unit
+        self.overall_amount = 0
+        self.average_distance = 0
+        self.average_amount_fuelled = 0
+        self.average_amount_used = 0
+        self.average_amount = []
+        self.amounts = []
+        self.price = []
+
+        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.overall_amount += pitstop.amount
+                self.amounts.append(StatsEvent(pitstop.date, pitstop.amount))
+                # some pitstops seem to have lost their costs...
+                if pitstop.costs:                
+                    self.price.append(StatsEvent(pitstop.date, pitstop.costs/pitstop.amount))
+            self.average_amount_fuelled = self.overall_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.overall_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.overall_distance = 0
+        self.overall_costs = 0
+        self.consumables = []
+        self.odometers = []
+        self.costs = []
+        self.costs_per_distance = "N/A"
+
+        for consumable in vehicle.consumables:
+            self.consumables.append(ConsumableStats(vehicle, consumable))
+
+        events = get_event_line_for_vehicle(vehicle)
+        pitstop_count = len(events)
+
+        if pitstop_count > 0:
+            for pitstop in events:
+                self.odometers.append(StatsEvent(pitstop.date, pitstop.odometer))
+                if pitstop.costs is not None:
+                    self.overall_costs += pitstop.costs
+                    self.costs.append(StatsEvent(pitstop.date, pitstop.costs))
+
+        # add the instances to the overall costs
+        for regular_cost_instance in calculate_regular_cost_instances(vehicle):
+            self.overall_costs += regular_cost_instance.costs
+            self.costs.append(
+                StatsEvent(regular_cost_instance.date, regular_cost_instance.costs)
+            )
+
+        if pitstop_count > 1:
+            self.overall_distance = events[-1].odometer - events[0].odometer
+
+        self.costs.sort(key=lambda x: x.date)
+        accumulated_costs = 0
+        for c in self.costs:
+            accumulated_costs += c.value
+            c.value = accumulated_costs
+
+        if self.overall_distance > 0:
+            self.costs_per_distance = float(self.overall_costs) / (
+                float(self.overall_distance) / 100
+            )
+
+
+class StatsEvent:
+    def __init__(self, date, value):
+        self.date = date
+        self.value = value
+
+    def __repr__(self):
+        return str(self.date)
+
+
+def db_log_add(entity):
+    logging.info("db_add: %s" % str(entity))
+
+
+def db_log_delete(entity):
+    logging.info("db_delete: %s" % str(entity))
+
+
+def db_log_update(entity):
+    logging.info("db_update: %s" % str(entity))
+
+
+def check_vehicle_name_is_unique(current_user, name_field):
+    """
+    Checks if the vehicle name given in the name_field is unique for the vehicles of the current user. An error is added
+    to the field it the name is not unique.
+
+    :param current_user: the user currently logged in
+    :param name_field: the form field to enter the name to
+    :return: True if the name is unique, False otherwise.
+    """
+    vehicle_name = name_field.data
+    for vehicle in current_user.vehicles:
+        if vehicle.name == vehicle_name:
+            name_field.default = vehicle_name
+            name_field.errors.append('Vehicle "%s" already exists.' % vehicle_name)
+            return False
+    return True
+
+
+def get_latest_pitstop_for_vehicle(vehicle_id):
+    """
+    return the latest pit stop for the vehicle with the given id.
+    :param vehicle_id: the id of the vehicle
+    :return: the latest pitstop or None if no pitstop exists
+    """
+    latest_pitstop = (
+        Pitstop.query.filter(Pitstop.vehicle_id == vehicle_id)
+        .order_by(Pitstop.id.desc())
+        .first()
+    )
+    return latest_pitstop
+
+
+def get_latest_pitstop_for_vehicle_and_consumable(vehicle_id, consumable_id):
+    """
+    return the latest pit stop for the vehicle and consumable with the given ids.
+    :param vehicle_id: the id of the vehicle
+    :param consumable_id: the id of the consumable
+    :return: the latest pitstop or None if no pitstop exists
+    """
+    latest_pitstop_consumable = (
+        Pitstop.query.filter(Pitstop.vehicle_id == vehicle_id)
+        .filter(Pitstop.consumable_id == consumable_id)
+        .order_by(Pitstop.id.desc())
+        .first()
+    )
+    return latest_pitstop_consumable
+
+
+def compute_lower_limits_for_new_pitstop(
+    latest_pitstop, last_pitstop_consumable, consumable_id
+):
+    """
+    This function figures out the lower limits for date and odometer of a new pitstop.
+    :param latest_pitstop:
+    :param last_pitstop_consumable:
+    :param consumable_id:
+    :return:
+    """
+    odometer = 0
+    date_of_pitstop = date(1970, 1, 1)
+    amount = 0
+    costs = 0
+
+    if latest_pitstop is not None:
+        odometer = latest_pitstop.odometer
+        date_of_pitstop = latest_pitstop.date
+
+    if last_pitstop_consumable is not None:
+        amount = last_pitstop_consumable.amount
+        costs = last_pitstop_consumable.costs
+
+    return Pitstop(odometer, amount, date_of_pitstop, costs, consumable_id)
+
+
+def pitstop_service_key(x):
+    # if the entry got no odometer (regular costs!) then we assume it's okay
+    # to have regular cost at a virtual odometer of 0 on that day.
+    return x.date, x.odometer or 0
+
+
+def get_event_line_for_vehicle(vehicle):
+    data = []
+    for pitstop in vehicle.pitstops:
+        data.append(pitstop)
+    for service in vehicle.services:
+        data.append(service)
+    data.sort(key=pitstop_service_key)
+    return data
+
+
+def chunks(l, n):
+    """Yield successive n-sized chunks from l."""
+    for i in range(0, len(l), n):
+        yield l[i : i + n]
+
+
+def calculate_regular_cost_instances(vehicle):
+    data = []
+    for regular in vehicle.regulars:
+        if date.today() < regular.start_at:
+            # skip regular costs that are not yet active
+            continue
+        if regular.ends_at:
+            end_date = regular.ends_at
+        else:
+            end_date = date.today()
+
+        start_year = regular.start_at.year
+        end_year = end_date.year
+
+        for year in range(start_year, end_year + 1):
+            for day in regular.days.split(","):
+                m, d = day.split("-")
+                d = date(year, int(m), int(d))
+                if regular.start_at <= d and d <= end_date:
+                    r = RegularCostInstance(
+                        regular.id,
+                        date=d,
+                        odometer=None,
+                        costs=regular.costs,
+                        name=regular.description,
+                    )
+                    data.append(r)
+    return data
+
+
+def get_users_active_vehicle(user):
+    def selector(vehicle):
+        if not vehicle.pitstops:
+            return date.today()
+        return vehicle.pitstops[-1].date
+
+    active_vehicles = [g for g in user.vehicles if g.is_active]
+    active_vehicles.sort(key=selector, reverse=True)
+    return active_vehicles

config.py

@@ -0,0 +1,53 @@
+import os
+
+basedir = os.path.abspath(os.path.dirname(__file__))
+
+
+class Config:
+    SECURITY_PASSWORD_HASH = 'pbkdf2_sha512'
+    SECURITY_REGISTERABLE = True
+    SECURITY_CHANGEABLE = True
+    SECURITY_RECOVERABLE = True
+    SECURITY_PASSWORD_SALT = os.environ.get('SECURITY_PASSWORD_SALT') or 'SOME SECRET STRING'
+    SECRET_KEY = os.environ.get('SECRET_KEY') or 'SOME SECRET STRING'
+    SECURITY_EMAIL_SENDER = 'no-reply@lusiardi.de'
+    SQLALCHEMY_TRACK_MODIFICATIONS = False
+    MAIL_SERVER = 'mail.nerd2nerd.org'
+    MAIL_PORT = 25
+    MAIL_USE_TLS = True
+    MAIL_USE_SSL = False
+    MAIL_USERNAME = os.environ.get('MAIL_USERNAME')
+    MAIL_PASSWORD = os.environ.get('MAIL_PASSWORD')
+    ADMIN_MAIL = 'joachim@lusiardi.de'
+    TANKERKOENIG_API_KEY = os.environ.get('TANKERKOENIG_API_KEY')
+    DEBUG = False
+
+    @staticmethod
+    def init_app(app):
+        pass
+
+
+class DevelopmentConfig(Config):
+    SECURITY_SEND_REGISTER_EMAIL = False
+    DEBUG = True
+    SQLALCHEMY_DATABASE_URI = 'sqlite:////data/data.sqlite'
+
+
+class TestingConfig(Config):
+    SECURITY_SEND_REGISTER_EMAIL = False
+    DEBUG = True
+    SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://root:{p}@{h}/pitstops'.format(p=os.environ.get('MYSQL_PASSWORD'),
+                                                                             h=os.environ.get('MYSQL_HOST'))
+
+
+class ProductionConfig(Config):
+    SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://pitstops:{h}@localhost/pitstops'.format(
+        h=os.environ.get('MYSQL_PASSWORD'))
+
+
+config = {
+    'development': DevelopmentConfig,
+    'testing': TestingConfig,
+    'production': ProductionConfig,
+    'default': DevelopmentConfig
+}

database_upgrades/upgrade_cathrine_to_danielle.sql

@@ -0,0 +1,28 @@
+CREATE TABLE IF NOT EXISTS `consumable` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `name` varchar(255) DEFAULT NULL,
+  `unit` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  UNIQUE KEY `name` (`name`)
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=latin1;
+
+INSERT INTO `consumable`(`id`, `name`, `unit`) VALUES (1, 'Super E5', 'l');
+
+CREATE TABLE IF NOT EXISTS `vehicles_consumables` (
+  `vehicle_id` int(11) DEFAULT NULL,
+  `consumable_id` int(11) DEFAULT NULL,
+  KEY `vehicle_id` (`vehicle_id`),
+  KEY `consumable_id` (`consumable_id`),
+  CONSTRAINT `vehicles_consumables_ibfk_1` FOREIGN KEY (`vehicle_id`) REFERENCES `vehicle` (`id`),
+  CONSTRAINT `vehicles_consumables_ibfk_2` FOREIGN KEY (`consumable_id`) REFERENCES `consumable` (`id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `pitstop` ADD COLUMN `costs` decimal(5,2) DEFAULT NULL;
+
+ALTER TABLE `pitstop` CHANGE `litres` `amount` decimal(5,2) DEFAULT NULL;
+
+ALTER TABLE `pitstop` ADD COLUMN `consumable_id` int(11);
+ALTER TABLE `pitstop` ADD FOREIGN KEY (`consumable_id`) REFERENCES `consumable` (`id`);
+UPDATE `pitstop` set `consumable_id`=1;
+
+INSERT INTO `vehicles_consumables`(`vehicle_id`, `consumable_id`) SELECT `id`, 1 FROM `vehicle`;

database_upgrades/upgrade_freckles_to_gillian.sql

@@ -0,0 +1,11 @@
+CREATE TABLE IF NOT EXISTS `service` (
+  `id` int(11) NOT NULL AUTO_INCREMENT,
+  `date` date DEFAULT NULL,
+  `odometer` int(11) DEFAULT NULL,
+  `vehicle_id` int(11) DEFAULT NULL,
+  `costs` decimal(10,2) DEFAULT NULL,
+  `description` varchar(4096) DEFAULT NULL,
+  PRIMARY KEY (`id`),
+  KEY `vehicle_id` (`vehicle_id`),
+  CONSTRAINT `service_ibfk_1` FOREIGN KEY (`vehicle_id`) REFERENCES `vehicle` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=16 DEFAULT CHARSET=latin1;

database_upgrades/upgrade_gillian_to_henni.sql

@@ -0,0 +1,39 @@
+CREATE TABLE `filling_station` (
+  `int_id` int(11) NOT NULL AUTO_INCREMENT,
+  `id` varchar(40) NOT NULL,
+  `name` text NOT NULL,
+  `street` text NOT NULL,
+  `place` text NOT NULL,
+  `houseNumber` text,
+  `postCode` int(11) NOT NULL,
+  `brand` text NOT NULL,
+  `lat` decimal(8,5) NOT NULL,
+  `lng` decimal(8,5) NOT NULL,
+  `last_update` datetime DEFAULT NULL,
+  `diesel` decimal(10,3) DEFAULT NULL,
+  `e5` decimal(10,3) DEFAULT NULL,
+  `e10` decimal(10,3) DEFAULT NULL,
+  `open` tinyint(1) DEFAULT NULL,
+  PRIMARY KEY (`int_id`),
+  UNIQUE KEY `id` (`id`)
+) ENGINE=InnoDB AUTO_INCREMENT=31 DEFAULT CHARSET=latin1;
+
+CREATE TABLE `users_fillingstations` (
+  `user_id` int(11) DEFAULT NULL,
+  `fillingstation_id` int(11) DEFAULT NULL,
+  KEY `user_id` (`user_id`),
+  KEY `fillingstation_id` (`fillingstation_id`),
+  CONSTRAINT `users_fillingstations_ibfk_1` FOREIGN KEY (`user_id`) REFERENCES `user` (`id`),
+  CONSTRAINT `users_fillingstations_ibfk_2` FOREIGN KEY (`fillingstation_id`) REFERENCES `filling_station` (`int_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+ALTER TABLE `consumable` ADD COLUMN `ext_id` varchar(255) DEFAULT NULL;
+update consumable set ext_id = 'e5' where id = 1;
+update consumable set ext_id = 'e10' where id = 34;
+update consumable set ext_id = 'diesel' where id = 32;
+
+
+ALTER TABLE `user` ADD COLUMN `home_lat` decimal(8,5) DEFAULT NULL;
+ALTER TABLE `user` ADD COLUMN `home_long` decimal(8,5) DEFAULT NULL;
+ALTER TABLE `user` ADD COLUMN `home_zoom` int(11) DEFAULT NULL;
+

database_upgrades/upgrade_jody_to_kilian.sql

@@ -0,0 +1,2 @@
+ALTER TABLE `vehicle` ADD COLUMN `is_active` tinyint(1);
+UPDATE `vehicle` SET `is_active` = 1;

docker-compose.yml

@@ -2,19 +2,9 @@ version: '2'
 services:
   rollerverbrauch:
     build: .
-    depends_on:
-      - database
-    volumes:
-      - ./compose_config/:/config
     environment:
       - config=/config/config.py
       - DATABASE_ENV_MYSQL_ROOT_PASSWORD=foobar123
+      - FLASK_CONFIG=testing
     ports:
-      - 5000
-  database:
-    image: mysql
-    environment:
-      - MYSQL_ROOT_PASSWORD=foobar123
-      - MYSQL_DATABASE=pitstops
-    ports:
-      - 3306
+      - 127.0.0.1:5000:5000

main.py

@@ -1,12 +1,17 @@
 import os
-from rollerverbrauch import app
+from app import app
 import logging
+from config import config
 
 
 def setup_logging():
     logging.basicConfig(format='%(asctime)s [%(levelname)s]: %(message)s', level=logging.INFO)
 
 if __name__ == '__main__':
-    DEBUG = 'DEBUG' in os.environ and os.environ['DEBUG'] != 'False'
+    c = config[os.getenv('FLASK_CONFIG') or 'default']
+
+    DEBUG = c.DEBUG
+    DEBUG = os.environ.get('DEBUG', DEBUG)
+
     setup_logging()
     app.run(debug=DEBUG, host='0.0.0.0')

requirements.txt

@@ -0,0 +1,13 @@
+Flask==2.1.2
+Flask-SQLAlchemy==2.5.1
+Flask-Security==3.0.0
+Flask-WTF==1.0.1
+PyMySQL==1.0.2
+markdown
+Flask-Limiter==2.4.5.1
+requests==2.27.1
+email-validator==1.2.1
+gunicorn==20.1.0
+pytz==2022.1
+SQLAlchemy==1.4.36
+Werkzeug==2.2.2

tests/Dockerfile

@@ -0,0 +1,12 @@
+FROM debian8_python3
+
+COPY app/requirements.txt /requirements.txt
+RUN pip3 install -r /requirements.txt; \
+    mkdir /data
+
+ADD app /app
+
+VOLUME ["/data"]
+VOLUME ["/app/config]
+EXPOSE 5000
+ENTRYPOINT python3 /app/main.py

tests/app/main.py

@@ -0,0 +1,137 @@
+import unittest
+import inspect
+from selenium import webdriver
+from selenium.webdriver.common.keys import Keys
+from selenium.webdriver.common.desired_capabilities import DesiredCapabilities
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import WebDriverWait
+from selenium.webdriver.support import expected_conditions
+
+
+def wait_net_service(server, port, timeout=None):
+    """ Wait for network service to appear
+        @param timeout: in seconds, if None or 0 wait forever
+        @return: True of False, if timeout is None may return only True or
+                 throw unhandled network exception
+    """
+    import socket
+    import errno
+
+    s = socket.socket()
+    if timeout:
+        from time import time as now
+        # time module is needed to calc timeout shared between two exceptions
+        end = now() + timeout
+
+    while True:
+        try:
+            if timeout:
+                next_timeout = end - now()
+                if next_timeout < 0:
+                    return False
+                else:
+                    s.settimeout(next_timeout)
+
+            s.connect((server, port))
+
+        except socket.timeout as err:
+            # this exception occurs only if timeout is set
+            if timeout:
+                return False
+
+        except socket.error as err:
+            # catch timeout exception from underlying network library
+            # this one is different from socket.timeout
+            if type(err.args) != tuple or err[0] != errno.ETIMEDOUT:
+                raise
+        else:
+            s.close()
+            return True
+
+
+class BaseTestCase(unittest.TestCase):
+    def setUp(self):
+        self.screen_shot_counter = 0
+        self.driver = webdriver.Remote(
+            command_executor='http://selenium:4444/wd/hub',
+            desired_capabilities=DesiredCapabilities.FIREFOX)
+        self.driver.get("http://rollerverbrauch:5000")
+        WebDriverWait(self.driver, 10).until(expected_conditions.presence_of_element_located((By.ID, "email")))
+
+    def create_screenshot(self):
+        self.driver.get_screenshot_as_file(
+            '/results/%s_%s_%s.png' % (self.__class__.__name__, inspect.stack()[1][3], str(self.screen_shot_counter)))
+        self.screen_shot_counter += 1
+
+    def tearDown(self):
+        self.driver.close()
+
+
+class RegisterCheck(BaseTestCase):
+    def setUp(self):
+        self.screen_shot_counter = 0
+        self.driver = webdriver.Remote(
+            command_executor='http://selenium:4444/wd/hub',
+            desired_capabilities=DesiredCapabilities.FIREFOX)
+        self.driver.get("http://rollerverbrauch:5000")
+        WebDriverWait(self.driver, 10).until(expected_conditions.presence_of_element_located((By.ID, "email")))
+
+    def test_page_loads(self):
+        self.driver.get("http://rollerverbrauch:5000")
+        self.create_screenshot()
+        self.assertIn("refuel", self.driver.title, "Title must contain reload")
+
+    def test_can_register(self):
+        self.driver.get("http://rollerverbrauch:5000")
+        self.driver.find_element_by_partial_link_text('Register').click()
+        self.create_screenshot()
+        WebDriverWait(self.driver, 10).until(expected_conditions.presence_of_element_located((By.ID, "submit")))
+        self.create_screenshot()
+        self.driver.find_element_by_id('email').send_keys('test@test.com')
+        self.driver.find_element_by_id('password').send_keys('test123')
+        self.driver.find_element_by_id('password_confirm').send_keys('test123')
+        self.create_screenshot()
+        self.driver.find_element_by_id('submit').click()
+        WebDriverWait(self.driver, 10).until(expected_conditions.presence_of_element_located((By.ID, "i1")))
+        self.create_screenshot()
+
+    def test_register_must_repeat_pwd(self):
+        self.driver.get("http://rollerverbrauch:5000")
+        self.driver.find_element_by_partial_link_text('Register').click()
+        self.create_screenshot()
+        WebDriverWait(self.driver, 10).until(expected_conditions.presence_of_element_located((By.ID, "submit")))
+        self.create_screenshot()
+        self.driver.find_element_by_id('email').send_keys('test1@test.com')
+        self.driver.find_element_by_id('password').send_keys('test123')
+        self.create_screenshot()
+        self.driver.find_element_by_id('submit').click()
+        self.create_screenshot()
+        error = self.driver.find_elements_by_class_name('error')
+        self.assertIsNotNone(error[0], 'we expect an error')
+        self.assertIn('Passwords do not match', error[0].text, 'wrong error message')
+
+    def test_register_must_be_equal_pwd(self):
+        self.driver.get("http://rollerverbrauch:5000")
+        self.driver.find_element_by_partial_link_text('Register').click()
+        self.create_screenshot()
+        WebDriverWait(self.driver, 10).until(expected_conditions.presence_of_element_located((By.ID, "submit")))
+        self.create_screenshot()
+        self.driver.find_element_by_id('email').send_keys('test1@test.com')
+        self.driver.find_element_by_id('password').send_keys('test123')
+        self.driver.find_element_by_id('password_confirm').send_keys('test1234')
+        self.create_screenshot()
+        self.driver.find_element_by_id('submit').click()
+        self.create_screenshot()
+        error = self.driver.find_elements_by_class_name('error')
+        self.assertIsNotNone(error[0], 'we expect an error')
+        self.assertIn('Passwords do not match', error[0].text, 'wrong error message')
+
+
+class LoginCheck(BaseTestCase):
+
+    def can_login(self):
+        pass
+
+if __name__ == "__main__":
+    wait_net_service('selenium', 4444)
+    unittest.main()

tests/app/requirements.txt

@@ -0,0 +1 @@
+selenium

tests/compose_config/config.py

@@ -0,0 +1,16 @@
+import os
+
+#SQLALCHEMY_DATABASE_URI = 'mysql+pymysql://root:%s@database/pitstops' % (os.environ['DATABASE_ENV_MYSQL_ROOT_PASSWORD'])
+SQLALCHEMY_DATABASE_URI = 'sqlite:////data/rollerverbrauch.db'
+
+MAIL_SERVER = ''
+MAIL_PORT= 25
+MAIL_USE_TLS = True
+MAIL_USE_SSL = False
+MAIL_USERNAME = ''
+MAIL_PASSWORD = ''
+SECURITY_EMAIL_SENDER = ''
+SECURITY_PASSWORD_SALT = 'SecretSalt'
+SECRET_KEY = 'SecretKey'
+
+SECURITY_SEND_REGISTER_EMAIL = False

tests/docker-compose.yml

@@ -0,0 +1,22 @@
+version: '2'
+services:
+  tests:
+    build: .
+    depends_on:
+      - selenium
+    volumes:
+     - ./results:/results
+  selenium:
+    image: selenium/standalone-firefox
+    depends_on:
+     - rollerverbrauch
+  rollerverbrauch:
+    build: ..
+    volumes:
+      - ./compose_config/:/config
+    environment:
+      - config=/config/config.py
+      - DATABASE_ENV_MYSQL_ROOT_PASSWORD=foobar123
+    ports:
+      - 5000
+

tests/run_test.sh

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+rm -f results/*
+docker-compose build
+docker-compose up --abort-on-container-exit
+docker-compose down
+docker-compose rm --all