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

Merge branch 'issue_6_pitstop_is_not_editable' into 'development' 

Fixed the edit function



See merge request !20
This commit is contained in:
Joachim Lusiardi 2016-07-21 19:14:21 +02:00
parent fd685c316d 88f88591a9
commit 89ebab29c4
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/__init__.py
View File

@ -319,7 +319,7 @@ def delete_pit_stop_form(pid):
@app.route('/pitstops/edit/<int:pid>', methods=['GET', 'POST']) @app.route('/pitstops/edit/<int:pid>', methods=['GET', 'POST'])
@login_required @login_required
def edit_pit_stop_form(pid): def edit_pit_stop_form(pid):
edit_pitstop = Pitstop.query.get(pid).first() edit_pitstop = Pitstop.query.get(pid)
if edit_pitstop is None: if edit_pitstop is None:
return redirect(url_for('get_pit_stops')) return redirect(url_for('get_pit_stops'))
@ -339,14 +339,14 @@ def edit_pit_stop_form(pid):
if form.validate_on_submit(): if form.validate_on_submit():
edit_pitstop.costs = form.costs.data edit_pitstop.costs = form.costs.data
edit_pitstop.date = form.date.data edit_pitstop.date = form.date.data
edit_pitstop.litres = form.litres.data edit_pitstop.amount = form.litres.data
edit_pitstop.odometer = form.odometer.data edit_pitstop.odometer = form.odometer.data
db.session.commit() db.session.commit()
tools.db_log_update(edit_pitstop) tools.db_log_update(edit_pitstop)
return redirect(url_for('get_pit_stops', _anchor='v' + str(vehicle.id))) return redirect(url_for('get_pit_stops', _anchor='v' + str(vehicle.id)))
form.odometer.default = edit_pitstop.odometer form.odometer.default = edit_pitstop.odometer
form.litres.default = edit_pitstop.litres form.litres.default = edit_pitstop.amount
form.date.default = edit_pitstop.date form.date.default = edit_pitstop.date
form.costs.default = edit_pitstop.costs form.costs.default = edit_pitstop.costs
form.process() form.process()
@ -354,7 +354,7 @@ def edit_pit_stop_form(pid):
'date': 'Date must be between %s and %s (including).' % (str(last_pitstop.date), str(date.today())), '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)) 'odometer': 'Odometer must be greater than %s km.' % (str(last_pitstop.odometer))
} }
if edit_pitstop.costs > 0: if edit_pitstop.costs is not None and edit_pitstop.costs > 0:
messages['costs'] = 'Costs must be higher than 0.01 €.' messages['costs'] = 'Costs must be higher than 0.01 €.'
return render_template('editPitStopForm.html', form=form, vehicle=vehicle, messages=messages) return render_template('editPitStopForm.html', form=form, vehicle=vehicle, messages=messages)