mirror of
https://github.com/spiral-project/ihatemoney.git
synced 2025-04-28 17:32:38 +02:00
Remember last owers for next new bill
This commit is contained in:
parent
b92a36c049
commit
f8a7a6aad3
1 changed files with 10 additions and 2 deletions
|
@ -645,7 +645,7 @@ def list_bills():
|
||||||
bill_form = get_billform_for(g.project)
|
bill_form = get_billform_for(g.project)
|
||||||
# Used for CSRF validation
|
# Used for CSRF validation
|
||||||
csrf_form = EmptyForm()
|
csrf_form = EmptyForm()
|
||||||
# set the last selected payer as default choice if exists
|
# set the last selected payer and last selected owers as default choice if they exist
|
||||||
if "last_selected_payer_per_project" in session:
|
if "last_selected_payer_per_project" in session:
|
||||||
if g.project.id in session["last_selected_payer_per_project"]:
|
if g.project.id in session["last_selected_payer_per_project"]:
|
||||||
bill_form.payer.data = session["last_selected_payer_per_project"][
|
bill_form.payer.data = session["last_selected_payer_per_project"][
|
||||||
|
@ -655,6 +655,11 @@ def list_bills():
|
||||||
else:
|
else:
|
||||||
if "last_selected_payer" in session:
|
if "last_selected_payer" in session:
|
||||||
bill_form.payer.data = session["last_selected_payer"]
|
bill_form.payer.data = session["last_selected_payer"]
|
||||||
|
if (
|
||||||
|
"last_selected_payed_for" in session
|
||||||
|
and g.project.id in session["last_selected_payed_for"]
|
||||||
|
):
|
||||||
|
bill_form.payed_for.data = session["last_selected_payed_for"][g.project.id]
|
||||||
|
|
||||||
# Each item will be a (weight_sum, Bill) tuple.
|
# Each item will be a (weight_sum, Bill) tuple.
|
||||||
# TODO: improve this awkward result using column_property:
|
# TODO: improve this awkward result using column_property:
|
||||||
|
@ -758,10 +763,13 @@ def add_bill():
|
||||||
form = get_billform_for(g.project)
|
form = get_billform_for(g.project)
|
||||||
if request.method == "POST":
|
if request.method == "POST":
|
||||||
if form.validate():
|
if form.validate():
|
||||||
# save last selected payer in session
|
# save last selected payer and last selected owers in session
|
||||||
if "last_selected_payer_per_project" not in session:
|
if "last_selected_payer_per_project" not in session:
|
||||||
session["last_selected_payer_per_project"] = {}
|
session["last_selected_payer_per_project"] = {}
|
||||||
session["last_selected_payer_per_project"][g.project.id] = form.payer.data
|
session["last_selected_payer_per_project"][g.project.id] = form.payer.data
|
||||||
|
if "last_selected_payed_for" not in session:
|
||||||
|
session["last_selected_payed_for"] = {}
|
||||||
|
session["last_selected_payed_for"][g.project.id] = form.payed_for.data
|
||||||
session.update()
|
session.update()
|
||||||
|
|
||||||
db.session.add(form.export(g.project))
|
db.session.add(form.export(g.project))
|
||||||
|
|
Loading…
Reference in a new issue