Payments add modal form

* adds modal form for adding payments
* generalizes generic_table_form.html for table-form-like usage in modal_form.html
* adds css enhancements for focused input fields
* adds BaseModalForm as specification to BaseForm, which inherits the BSModalForm class as well
* adds translations
This commit is contained in:
mipel
2021-07-26 10:23:09 +02:00
parent 76c7cce9bc
commit 4fb2ef26d0
14 changed files with 194 additions and 75 deletions

View File

@@ -5,10 +5,60 @@ Contact: michel.peltriaux@sgdnord.rlp.de
Created on: 04.12.20
"""
from konova.forms import BaseForm
from django import forms
from django.db import transaction
from django.utils.translation import gettext_lazy as _
from compensation.models import Payment
from konova.forms import BaseForm, BaseModalForm
class NewCompensationForm(BaseForm):
def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
super().__init__(*args, **kwargs)
class NewPaymentForm(BaseModalForm):
amount = forms.FloatField(
min_value=0.01,
label=_("Amount"),
label_suffix=_(""),
)
due = forms.DateField(
required=False,
label=_("Due on"),
label_suffix=_(""),
widget=forms.DateInput(
attrs={
"type": "date",
"data-provide": "datepicker",
},
format="%d.%m.%Y"
)
)
transfer_note = forms.CharField(
max_length=1000,
required=False,
label_suffix=_(""),
label=_("Transfer note")
)
def __init__(self, *args, **kwargs):
self.user = kwargs.pop("request", None).user
self.intervention = kwargs.pop("intervention", None)
super().__init__(*args, **kwargs)
self.form_title = _("Payment")
self.form_caption = _("Add a payment for intervention '{}'").format(self.intervention.title)
def save(self):
with transaction.atomic():
pay = Payment.objects.create(
created_by=self.user,
amount=self.cleaned_data.get("amount", -1),
due_on=self.cleaned_data.get("due", None),
comment=self.cleaned_data.get("transfer_note", None),
intervention=self.intervention,
)
return pay

View File

@@ -19,7 +19,7 @@ urlpatterns = [
path('<id>/remove', remove_view, name='remove'),
# Payment
path('pay/new', new_view, name='pay-new'),
path('pay/<intervention_id>/new', new_payment_view, name='pay-new'),
path('pay/<id>', open_view, name='pay-open'),
path('pay/<id>/edit', edit_view, name='pay-edit'),
path('pay/<id>/remove', remove_view, name='pay-remove'),

View File

@@ -1,9 +1,12 @@
from django.contrib.auth.decorators import login_required
from django.http import HttpRequest
from django.shortcuts import render
from django.shortcuts import render, get_object_or_404
from django.utils.translation import gettext_lazy as _
from compensation.forms import NewPaymentForm
from compensation.models import Compensation, EcoAccount
from compensation.tables import CompensationTable, EcoAccountTable
from intervention.models import Intervention
from konova.contexts import BaseContext
from konova.decorators import *
@@ -108,3 +111,41 @@ def account_open_view(request: HttpRequest, id: str):
def account_remove_view(request: HttpRequest, id: str):
# ToDo
pass
@login_required
def new_payment_view(request: HttpRequest, intervention_id: str):
""" Renders a modal view for adding new payments
Args:
request (HttpRequest): The incoming request
intervention_id (str): The intervention's id for which a new payment shall be added
Returns:
"""
template = "modal/modal_form.html"
intervention = get_object_or_404(Intervention, id=intervention_id)
form = NewPaymentForm(request.POST or None, intervention=intervention, request=request)
if request.method == "POST":
if form.is_valid():
payment = form.save()
messages.success(
request,
_("Payment added")
)
return redirect(request.META.get("HTTP_REFERER", "home"))
else:
messages.info(
request,
_("There was an error on this form.")
)
return redirect(request.META.get("HTTP_REFERER", "home"))
elif request.method == "GET":
context = {
"form": form,
}
context = BaseContext(request, context).context
return render(request, template, context)
else:
raise NotImplementedError