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

finished handling of services

Browse Source
This commit is contained in:
Joachim Lusiardi
2016-11-06 13:22:54 +01:00
parent 60a1b307e4
commit 6e665b9f2f
8 changed files with 69 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
app/routes/pitstop.py
View File

@@ -7,7 +7,8 @@ from datetime import date
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, get_latest_pitstop_for_vehicle, \
get_latest_pitstop_for_vehicle_and_consumable, compute_lower_limits_for_new_pitstop, pitstop_service_key
get_latest_pitstop_for_vehicle_and_consumable, compute_lower_limits_for_new_pitstop, pitstop_service_key, \
get_event_line_for_vehicle
from .. import app, db
@@ -62,15 +63,14 @@ def create_pit_stop_form(vid, cid):
form = CreatePitstopForm()
# the last pitstop is required to be able to check the monotonicy of date and odometer
last_pitstop = get_latest_pitstop_for_vehicle(vid)
last_pitstop_consumable = get_latest_pitstop_for_vehicle_and_consumable(vid, cid)
# we can enter the same odometer if the pitstops are not equal
form.same_odometer_allowed = (last_pitstop != last_pitstop_consumable)
# set the lower limits for odometer andd date and the values for amount and costs of the last stop
form.set_pitstop(compute_lower_limits_for_new_pitstop(last_pitstop, last_pitstop_consumable, cid))
data = get_event_line_for_vehicle(vehicle)
if len(data) > 0:
form.set_pitstop(Pitstop(data[-1].odometer, 0, data[-1].date, 0, cid))
form.same_odometer_allowed = (type(data[-1]) != Pitstop) or (data[-1].consumable.id != cid)
else:
form.set_pitstop(Pitstop(date(1970, 1, 1), 0, vid, 0, ''))
form.set_pitstop(Pitstop(0, 0, date(1970, 1, 1), 0, cid))
form.same_odometer_allowed = True
# set the label of the litres field to make the user comfortable
form.set_consumable(consumable)

56
app/routes/service.py
View File

@@ -2,9 +2,9 @@ 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, Pitstop
from ..forms import CreateServiceForm, DeleteServiceForm, EditServiceForm
from ..tools import db_log_update, db_log_delete, db_log_add, get_latest_pitstop_for_vehicle
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
from .. import app, db
@@ -16,9 +16,14 @@ def create_service_for_vehicle(vid):
return redirect(url_for('get_account_page'))
form = CreateServiceForm()
last_pitstop = get_latest_pitstop_for_vehicle(vid)
form.set_pitstop(last_pitstop)
form.same_odometer_allowed = True
data = get_event_line_for_vehicle(vehicle)
if len(data) > 0:
form.set_pitstop(Service(data[-1].date, data[-1].odometer, vid, 0, ''))
form.same_odometer_allowed = type(data[-1]) != Service
else:
form.set_pitstop(Service(date(1970, 1, 1), 0, vid, 0, ''))
form.same_odometer_allowed = True
form.preinit_with_data()
@@ -27,8 +32,7 @@ def create_service_for_vehicle(vid):
db.session.add(new_service)
vehicle.services.append(new_service)
db.session.commit()
print(new_service)
return redirect(url_for('get_account_page'))
return redirect(url_for('get_pit_stops', _anchor='v' + str(vehicle.id)))
form.process()
return render_template('createServiceForm.html', form=form, vehicle=vehicle, messages=[])
@@ -40,6 +44,7 @@ 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'))
@@ -65,15 +70,15 @@ def edit_service_form(sid):
if vehicle not in current_user.vehicles:
return redirect(url_for('get_pit_stops'))
# last_pitstop_pos = vehicle.pitstops.index(edit_service) - 1
# if last_pitstop_pos > 0:
# last_pitstop = vehicle.pitstops[last_pitstop_pos]
# else:
# last_pitstop = Pitstop(0, 0, date(1970, 1, 1), 0, 0)
last_pitstop = Pitstop(0, 0, date(1970, 1, 1), 0, 0)
form = EditServiceForm()
data = get_event_line_for_vehicle(vehicle)
data.reverse()
if len(data) > 0:
last_pitstop = Service(data[-1].date, data[-1].odometer, vehicle.id, 0, '')
else:
last_pitstop = Service(date(1970, 1, 1), 0, vehicle.id, 0, '')
form.set_pitstop(last_pitstop)
form.same_odometer_allowed = True
if form.validate_on_submit():
edit_service.costs = form.costs.data
@@ -90,9 +95,26 @@ def edit_service_form(sid):
form.costs.default = edit_service.costs
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))
'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))
}
if edit_service.costs is not None and edit_service.costs > 0:
messages['costs'] = 'Costs must be higher than 0.01 €.'
return render_template('editServiceForm.html', form=form, vehicle=vehicle, messages=messages)
@app.route('/service/vehicle/select', methods=['GET', 'POST'])
@login_required
def select_vehicle_for_new_service():
if len(current_user.vehicles) == 1:
return redirect(url_for('create_service_for_vehicle', vid=current_user.vehicles[0].id))
form = SelectVehicleForm()
form.vehicle.choices = [(g.id, g.name) for g in current_user.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)