diff --git a/app/main.py b/app/main.py index da1ebd4..88a435f 100644 --- a/app/main.py +++ b/app/main.py @@ -7,8 +7,10 @@ from flask import url_for from flask_sqlalchemy import SQLAlchemy import uuid import hashlib -import time from functools import wraps +from flask_wtf import Form +from wtforms import DateField, IntegerField, DecimalField +from wtforms.validators import DataRequired, ValidationError import os app = Flask(__name__) @@ -107,70 +109,53 @@ def index(): return redirect(url_for('get_pit_stops')) -@app.route('/pitstops', methods=['POST']) -@requires_auth -def create_pit_stop(): - last_pitstop = Pitstop.query.order_by(Pitstop.date.desc()).first() - if last_pitstop is None: - last_pitstop = Pitstop(0, 0, None) - error_msg = {} - - date_of_pitstop = request.form['date'] - try: - date_of_pitstop = datetime.strptime(date_of_pitstop, '%Y-%m-%d').strftime('%Y-%m-%d') - except ValueError: - error_msg['date'] = 'invalid date, only YYYY-MM-DD is allowed' - date_of_pitstop = request.form['date'] - - odometer = request.form['odometer'] - try: - odometer = int(odometer) - except ValueError: - error_msg['odometer'] = 'Illegal Value, only Integers allowed' - odometer = None - if odometer is not None and odometer <= last_pitstop.odometer: - error_msg['odometer'] = 'Illegal Value, new Value must be bigger as given value' - odometer = request.form['odometer'] - if odometer is None: - odometer = request.form['odometer'] - - litres = request.form['litres'] - try: - litres = float(litres) - except ValueError: - error_msg['litres'] = 'Illegal Value, only floating point allowed' - litres = None - if litres is not None and litres <= 0: - error_msg['litres'] = 'Litres must not be 0' - litres = request.form['litres'] - if litres is None: - litres = request.form['litres'] - - # error checking here - if len(error_msg) > 0: - data = {'last': {'date': date_of_pitstop, 'odometer': odometer, 'litres': litres}, 'error': error_msg} - return render_template('newPitStopForm.html', data=data) - - new_stop = Pitstop(odometer, litres, datetime.strptime(date_of_pitstop, '%Y-%m-%d')) - sqldb.session.add(new_stop) - sqldb.session.commit() - - return redirect(url_for('get_pit_stops')) +def date_check(form, field): + if field.data < form.pitstop.date: + raise ValidationError('The new date must after %s' % form.pitstop.date) -@app.route('/pitstops/createForm', methods=['GET']) +def odometer_check(form, field): + if field.data <= form.pitstop.odometer: + raise ValidationError('The new odometer value must be higher than %i km' % form.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 CreatePitstopForm(Form): + date = DateField('Date of Pitstop', validators=[date_check]) + odometer = IntegerField('Odometer (km)', validators=[odometer_check]) + litres = DecimalField('Litres (l)', places=1, validators=[litres_check]) + pitstop = None + + def set_pitstop(self, pitstop): + self.pitstop = pitstop + + +@app.route('/pitstops/createForm', methods=['GET', 'POST']) @requires_auth def create_pit_stop_form(): - last_stop = Pitstop.query.order_by(Pitstop.date.desc()).first() - if last_stop is None: - last_stop = Pitstop(0, 0, date(1970, 1, 1)) - values = dict() - values['odometer'] = last_stop.odometer - values['litres'] = last_stop.litres - values['date'] = time.strftime("%Y-%m-%d") - g.data['last'] = values - g.data['error'] = None - return render_template('newPitStopForm.html', data=g.data) + last_pitstop = Pitstop.query.order_by(Pitstop.id.desc()).first() + if last_pitstop is None: + last_pitstop = Pitstop(0, 0, datetime.now()) + + form = CreatePitstopForm() + form.set_pitstop(last_pitstop) + if form.validate_on_submit(): + + new_stop = Pitstop(form.odometer.data, form.litres.data, form.date.data) + sqldb.session.add(new_stop) + sqldb.session.commit() + return redirect(url_for('get_pit_stops')) + + # dynamically set values + form.odometer.default = last_pitstop.odometer + form.litres.default = last_pitstop.litres + form.date.default = datetime.now() + form.process() + return render_template('newPitStopForm.html', form=form) @app.route('/pitstops', methods=['GET']) @@ -197,7 +182,7 @@ def get_statistics(): average_distance = 0 average_litres_fuelled = 0 average_litres_used = 0 - + if count > 0: sum_litres = 0 for pitstop in pitstops: diff --git a/app/requirements.txt b/app/requirements.txt index fb675a9..ce9fbfc 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,2 +1,3 @@ Flask Flask-SQLAlchemy +Flask-WTF diff --git a/app/templates/layout.html b/app/templates/layout.html index 2688f76..a71985e 100644 --- a/app/templates/layout.html +++ b/app/templates/layout.html @@ -4,6 +4,25 @@
  • Manual
    • {%- endmacro %} +{% macro render_field(field) %} +
    + +
    + {{ field(**kwargs)|safe }} + {% if field.errors %} +

    + {% for error in field.errors %} + {{ error }} + {% endfor %} +

    + {% endif %} +
    +
    +{% endmacro %} + + @@ -69,4 +88,3 @@ - diff --git a/app/templates/newPitStopForm.html b/app/templates/newPitStopForm.html index 190e0eb..7cb043b 100644 --- a/app/templates/newPitStopForm.html +++ b/app/templates/newPitStopForm.html @@ -1,43 +1,13 @@ {% extends "layout.html" %} {% block body %} - -
    - - -
    - -
    - -

    {{ data.error['date'] }}

    -
    -
    - - -
    - -
    - -

    {{ data.error['odometer'] }}

    -
    -
    - - -
    - -
    - -

    {{ data.error['litres'] }}

    -
    -
    - - -
    -
    - - -
    -
    + + {{ form.hidden_tag() }} + {{ render_field(form.date) }} + {{ render_field(form.odometer) }} + {{ render_field(form.litres) }} +
    - -{% endblock %} \ No newline at end of file + + +{% endblock %}