almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-05-06 13:01:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

enable currency rendering for bill form

Browse source
This commit is contained in:
Adrien CLERC 2020-05-02 12:40:30 +02:00
parent 934cc83e09
commit 2e3c70edcd
2 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ihatemoney/forms.py
View file

@ -45,19 +45,8 @@ def get_billform_for(project, set_default=True, **kwargs):
form.original_currency.data = project.default_currency form.original_currency.data = project.default_currency
if form.original_currency.data != CurrencyConverter.default: if form.original_currency.data != CurrencyConverter.default:
choices = copy.copy(form.original_currency.choices) form.original_currency.choices.remove((CurrencyConverter.default, render_localized_currency(CurrencyConverter.default, detailed=False)))
choices.remove((CurrencyConverter.default, CurrencyConverter.default))
choices.sort(
key=lambda rates: "" if rates[0] == project.default_currency else rates[0]
)
form.original_currency.choices = choices
else:
form.original_currency.render_kw = {"default": True}
form.original_currency.data = CurrencyConverter.default
form.original_currency.label = Label(
"original_currency", "Currency (Default: %s)" % (project.default_currency)
)
active_members = [(m.id, m.name) for m in project.active_members] active_members = [(m.id, m.name) for m in project.active_members]
form.payed_for.choices = form.payer.choices = active_members form.payed_for.choices = form.payer.choices = active_members
@ -233,7 +222,7 @@ class BillForm(FlaskForm):
original_currency = SelectField( original_currency = SelectField(
_("Currency"), _("Currency"),
choices=[ choices=[
(currency_name, currency_name) (currency_name, render_localized_currency(currency_name, detailed=False))
for currency_name in currency_helper.get_currencies() for currency_name in currency_helper.get_currencies()
], ],
validators=[DataRequired()], validators=[DataRequired()],
@ -276,7 +265,7 @@ class BillForm(FlaskForm):
return bill return bill
def fill(self, bill): def fill(self, bill, project):
self.payer.data = bill.payer_id self.payer.data = bill.payer_id
self.amount.data = bill.amount self.amount.data = bill.amount
self.what.data = bill.what self.what.data = bill.what
@ -285,6 +274,12 @@ class BillForm(FlaskForm):
self.date.data = bill.date self.date.data = bill.date
self.payed_for.data = [int(ower.id) for ower in bill.owers] self.payed_for.data = [int(ower.id) for ower in bill.owers]
if bill.original_currency != project.default_currency:
label = _("Currency (Default: %(currency)s)", currency=project.default_currency)
else:
label = _("Currency")
self.original_currency.label = Label("original_currency", label)
def set_default(self): def set_default(self):
self.payed_for.data = self.payed_for.default self.payed_for.data = self.payed_for.default

2
ihatemoney/web.py
View file

@ -733,7 +733,7 @@ def edit_bill(bill_id):
return redirect(url_for(".list_bills")) return redirect(url_for(".list_bills"))
if not form.errors: if not form.errors:
form.fill(bill) form.fill(bill, g.project)
return render_template("add_bill.html", form=form, edit=True) return render_template("add_bill.html", form=form, edit=True)