bofh/fet2020
8
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update getting cleaned data

Browse Source
This commit is contained in:
Patrick Mayr
2024-02-17 10:24:58 +00:00
parent a4cba458ee
commit 18f73b5f21
3 changed files with 126 additions and 164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

181
fet2020/finance/forms.py
View File

@@ -21,15 +21,53 @@ class BankDataForm(forms.ModelForm):
labels = {"iban": "IBAN", "bic": "BIC", "name": "Kontoinhaber:in"} labels = {"iban": "IBAN", "bic": "BIC", "name": "Kontoinhaber:in"}
def get_cleaned_data(cleaned_data):
resolution = cleaned_data.get("resolution_text")
payer = cleaned_data.get("payer")
# Check if resolution exists.
if resolution != "":
try:
cleaned_data["resolution"] = Resolution.objects.get(
Q(id=resolution) | Q(name=resolution)
)
except Exception:
raise ValidationError({"resolution_text": "Es gibt keinen Beschluss mit dieser ID."})
# If payer is 'Me', you need name, iban and bic data.
if payer == Bill.Payer.ME:
if cleaned_data.get("name_text") == "":
raise ValidationError({"name_text": "Kontoinhaber:in fehlt bei privater Bezahlung."})
if cleaned_data.get("iban_text") == "":
raise ValidationError({"iban_text": "IBAN fehlt bei privater Bezahlung."})
if cleaned_data.get("bic_text") == "":
raise ValidationError({"bic_text": "BIC fehlt bei privater Bezahlung."})
# No saving if payer is 'Verein'.
if payer == Bill.Payer.VEREIN:
cleaned_data["name_text"] = ""
cleaned_data["iban_text"] = ""
cleaned_data["bic_text"] = ""
if cleaned_data.get("only_digital") and cleaned_data.get("file_field") is None:
raise ValidationError({"file_field": "Digitale Rechnung fehlt."})
return cleaned_data
class BillCreateForm(forms.ModelForm): class BillCreateForm(forms.ModelForm):
# Bank data # Bank data
name_text = forms.CharField(max_length=128) name_text = forms.CharField(required=False, label="Kontoinhaber:in", initial="", max_length=128)
iban_text = forms.CharField(max_length=34) iban_text = forms.CharField(required=False, label="IBAN", initial="", max_length=34)
bic_text = forms.CharField(max_length=11) bic_text = forms.CharField(required=False, label="BIC", initial="", max_length=11)
saving = forms.BooleanField() saving = forms.BooleanField(
required=False, label="Bankdaten für die nächsten Rechnungen speichern.", initial=False
)
# Resolution # Resolution
resolution_text = forms.CharField(max_length=128) resolution_text = forms.CharField(
required=False, label="Beschlussnummer", initial="", max_length=128
)
class Meta: class Meta:
model = Bill model = Bill
@@ -90,87 +128,28 @@ class BillCreateForm(forms.ModelForm):
self.fields["bic_text"].initial = bank_data.bic self.fields["bic_text"].initial = bank_data.bic
self.fields["saving"].initial = True self.fields["saving"].initial = True
self.fields["name_text"].label = "Kontoinhaber:in"
self.fields["name_text"].required = False
self.fields["iban_text"].label = "IBAN"
self.fields["iban_text"].required = False
self.fields["bic_text"].label = "BIC"
self.fields["bic_text"].required = False
self.fields["saving"].label = "Bankdaten speichern."
self.fields["saving"].required = False
# Resolution fields
self.fields["resolution_text"].label = "Beschlussnummer"
self.fields["resolution_text"].required = False
def clean(self): def clean(self):
cleaned_data = super().clean() return get_cleaned_data(super().clean())
resolution = cleaned_data.get("resolution_text")
payer = cleaned_data.get("payer")
name = cleaned_data.get("name_text")
iban = cleaned_data.get("iban_text")
bic = cleaned_data.get("bic_text")
saving = cleaned_data.get("saving")
only_digital = cleaned_data.get("only_digital")
file_field = cleaned_data.get("file_field")
# Check if resolution exists.
if resolution != "":
try:
Resolution.objects.get(id=resolution)
except Exception:
raise ValidationError(
f"Es gibt keinen Beschluss mit dieser ID. (Eingegebene ID: {resolution})"
)
# Check that amount is valid because invalid amount is a NoneType.
"""
if amount:
if amount > 30 and resolution == "":
raise ValidationError(
"Die Beschlussnummer fehlt, weil der Betrag über 30€ beträgt "
f"(Betrag: {amount}€)."
)
"""
# If payer is 'Me', you need name, iban and bic data.
if payer == Bill.Payer.ME:
if name == "" or iban == "" or bic == "":
raise ValidationError(
f"Bankdaten bei privater Bezahlung unvollständig. (Kontoinhaber:in: '{name}', "
f"IBAN: '{iban}', BIC: '{bic}')."
)
# No saving if payer is 'Verein' or you don't want to save bank data.
if payer == Bill.Payer.VEREIN or saving is not True:
cleaned_data["name_text"] = ""
cleaned_data["iban_text"] = ""
cleaned_data["bic_text"] = ""
if only_digital and file_field is None:
raise ValidationError("Digitale Rechnung fehlt.")
return cleaned_data
class BillUpdateForm(forms.ModelForm): class BillUpdateForm(forms.ModelForm):
# Bank data # Bank data
name_text = forms.CharField(max_length=128) name_text = forms.CharField(required=False, label="Kontoinhaber:in", initial="", max_length=128)
iban_text = forms.CharField(max_length=34) iban_text = forms.CharField(required=False, label="IBAN", initial="", max_length=34)
bic_text = forms.CharField(max_length=11) bic_text = forms.CharField(required=False, label="BIC", initial="", max_length=11)
saving = forms.BooleanField() saving = forms.BooleanField(
required=False, label="Bankdaten für die nächsten Rechnungen speichern.", initial=False
)
# only digital bill # only digital bill
only_digital_new = forms.BooleanField() only_digital_new = forms.BooleanField(
required=False, label="Ich habe eine neue digitale Rechnung.", initial=False
)
# Resolution # Resolution
resolution_text = forms.CharField(max_length=128) resolution_text = forms.CharField(
required=False, label="Beschlussnummer", initial="", max_length=128
)
class Meta: class Meta:
model = Bill model = Bill
@@ -232,41 +211,16 @@ class BillUpdateForm(forms.ModelForm):
self.fields["name_text"].initial = kwargs["instance"].bankdata.name self.fields["name_text"].initial = kwargs["instance"].bankdata.name
self.fields["iban_text"].initial = kwargs["instance"].bankdata.iban self.fields["iban_text"].initial = kwargs["instance"].bankdata.iban
self.fields["bic_text"].initial = kwargs["instance"].bankdata.bic self.fields["bic_text"].initial = kwargs["instance"].bankdata.bic
self.fields["saving"].initial = True self.fields["saving"].initial = not kwargs["instance"].bankdata.is_disabled
else:
self.fields["name_text"].initial = ""
self.fields["iban_text"].initial = ""
self.fields["bic_text"].initial = ""
self.fields["saving"].initial = False
self.fields["name_text"].label = "Kontoinhaber:in"
self.fields["name_text"].required = False
self.fields["iban_text"].label = "IBAN"
self.fields["iban_text"].required = False
self.fields["bic_text"].label = "BIC"
self.fields["bic_text"].required = False
self.fields["saving"].label = "Bankdaten speichern."
self.fields["saving"].required = False
# only digital bill field
self.fields["only_digital_new"].label = "Ich habe eine neue digitale Rechnung."
self.fields["only_digital_new"].required = False
# Resolution fields # Resolution fields
if kwargs["instance"].resolution: if kwargs["instance"].resolution:
_name = kwargs["instance"].resolution.name _name = kwargs["instance"].resolution.name
self.fields["resolution_text"].initial = _name self.fields["resolution_text"].initial = _name
self.fields["resolution_text"].label = "Beschlussnummer"
self.fields["resolution_text"].required = False
self.fields["payer"].autofocus = True self.fields["payer"].autofocus = True
else: else:
self.fields["bill_creator"].disabled = True
self.fields["date"].disabled = True self.fields["date"].disabled = True
self.fields["invoice"].disabled = True self.fields["invoice"].disabled = True
self.fields["amount"].disabled = True self.fields["amount"].disabled = True
@@ -280,35 +234,21 @@ class BillUpdateForm(forms.ModelForm):
# Bank data fields # Bank data fields
if kwargs["instance"].bankdata: if kwargs["instance"].bankdata:
self.fields["name_text"].initial = kwargs["instance"].bankdata.name self.fields["name_text"].initial = kwargs["instance"].bankdata.name
self.fields["name_text"].label = "Kontoinhaber:in"
self.fields["name_text"].required = True self.fields["name_text"].required = True
self.fields["iban_text"].initial = kwargs["instance"].bankdata.iban self.fields["iban_text"].initial = kwargs["instance"].bankdata.iban
self.fields["iban_text"].label = "IBAN"
self.fields["iban_text"].required = True self.fields["iban_text"].required = True
self.fields["bic_text"].initial = kwargs["instance"].bankdata.bic self.fields["bic_text"].initial = kwargs["instance"].bankdata.bic
self.fields["bic_text"].label = "BIC"
self.fields["bic_text"].required = True self.fields["bic_text"].required = True
self.fields["saving"].initial = True self.fields["saving"].initial = not kwargs["instance"].bankdata.is_disabled
self.fields["saving"].required = True
else:
self.fields["name_text"].required = False
self.fields["iban_text"].required = False
self.fields["bic_text"].required = False
self.fields["saving"].required = False
self.fields["saving"].initial = False
self.fields["name_text"].disabled = True self.fields["name_text"].disabled = True
self.fields["iban_text"].disabled = True self.fields["iban_text"].disabled = True
self.fields["bic_text"].disabled = True self.fields["bic_text"].disabled = True
self.fields["saving"].disabled = True self.fields["saving"].disabled = True
self.fields["saving"].label = "Bankdaten sind gespeichert."
# Resolution fields # Resolution fields
if kwargs["instance"].resolution: if kwargs["instance"].resolution:
@@ -316,8 +256,6 @@ class BillUpdateForm(forms.ModelForm):
self.fields["resolution_text"].initial = _name self.fields["resolution_text"].initial = _name
self.fields["resolution_text"].disabled = True self.fields["resolution_text"].disabled = True
self.fields["resolution_text"].label = "Beschlussnummer"
self.fields["resolution_text"].required = False
# Comment disabled when bill is cleared or finished # Comment disabled when bill is cleared or finished
if kwargs["instance"].status != Bill.Status.SUBMITTED: if kwargs["instance"].status != Bill.Status.SUBMITTED:
@@ -325,6 +263,9 @@ class BillUpdateForm(forms.ModelForm):
self.fields["comment"].autofocus = True self.fields["comment"].autofocus = True
def clean(self):
return get_cleaned_data(super().clean())
class ResolutionCreateForm(forms.ModelForm): class ResolutionCreateForm(forms.ModelForm):
class Meta: class Meta:

73
fet2020/finance/views.py
View File

@@ -18,39 +18,44 @@ from .forms import (
from .models import BankData, Bill, Resolution from .models import BankData, Bill, Resolution
def set_bankdata(creator, name, iban, bic, saving):
if name != "" and iban != "" and bic != "":
# Replace whitespaces in iban and bic text.
iban = iban.replace(" ", "")
bic = bic.replace(" ", "")
obj, created = BankData.objects.get_or_create(
name=name,
iban=iban,
bic=bic,
defaults={"bankdata_creator": creator, "is_disabled": not saving},
)
if saving is True:
# Disable old bank data.
qs = BankData.objects.filter(
~Q(id=obj.id) & Q(bankdata_creator=obj.bankdata_creator) & Q(is_disabled=False)
)
qs.update(is_disabled=True)
return obj
return None
class BillCreateView(LoginRequiredMixin, CreateView): class BillCreateView(LoginRequiredMixin, CreateView):
form_class = BillCreateForm form_class = BillCreateForm
model = Bill model = Bill
template_name = "finance/bill_create.html" template_name = "finance/bill_create.html"
def form_valid(self, form): def form_valid(self, form):
# Get or create resolution object # Get or create bankdata object.
resolution = form.cleaned_data["resolution_text"] creator = form.cleaned_data["bill_creator"]
if resolution != "":
obj, created = Resolution.objects.get_or_create(
id=resolution,
defaults={"name": resolution},
)
form.instance.resolution = obj
# Get or create bankdata object. Replace whitespaces in iban and bic text.
name = form.cleaned_data["name_text"] name = form.cleaned_data["name_text"]
iban = form.cleaned_data["iban_text"].replace(" ", "") iban = form.cleaned_data["iban_text"]
bic = form.cleaned_data["bic_text"].replace(" ", "") bic = form.cleaned_data["bic_text"]
if name != "" and iban != "" and bic != "": saving = form.cleaned_data["saving"]
obj, created = BankData.objects.get_or_create( form.instance.bankdata = set_bankdata(creator, name, iban, bic, saving)
name=name,
iban=iban,
bic=bic,
defaults={"bankdata_creator": form.cleaned_data["bill_creator"]},
)
form.instance.bankdata = obj
# Disable old bank data.
qs = BankData.objects.filter(
~Q(id=obj.id) & Q(bankdata_creator=obj.bankdata_creator) & Q(is_disabled=False)
)
qs.update(is_disabled=True)
add_log_action(self.request, form, "finance", "bill", True) add_log_action(self.request, form, "finance", "bill", True)
return super().form_valid(form) return super().form_valid(form)
@@ -88,13 +93,21 @@ class BillUpdateView(LoginRequiredMixin, UserPassesTestMixin, UpdateView):
template_name = "finance/bill_update.html" template_name = "finance/bill_update.html"
def form_valid(self, form): def form_valid(self, form):
# Set status to submitted if changes are valid and bill is incompleted.
if self.object.status == Bill.Status.INCOMPLETE: if self.object.status == Bill.Status.INCOMPLETE:
# Set status to submitted if changes are valid and bill is incompleted.
self.object.status = Bill.Status.SUBMITTED self.object.status = Bill.Status.SUBMITTED
# Override only_digital db value by value of new only_digital. # Override only_digital db value by value of new only_digital.
if "file_field" in form.changed_data: if "file_field" in form.changed_data:
self.object.only_digital = form.cleaned_data["only_digital_new"] self.object.only_digital = form.cleaned_data["only_digital_new"]
# Get or create bankdata object.
creator = form.cleaned_data["bill_creator"]
name = form.cleaned_data["name_text"]
iban = form.cleaned_data["iban_text"]
bic = form.cleaned_data["bic_text"]
saving = form.cleaned_data["saving"]
form.instance.bankdata = set_bankdata(creator, name, iban, bic, saving)
add_log_action(self.request, form, "finance", "bill", False) add_log_action(self.request, form, "finance", "bill", False)
return super().form_valid(form) return super().form_valid(form)

36
fet2020/templates/finance/bill_update.html
View File

@@ -27,17 +27,7 @@
{% include "baseform/select.html" with field=form.payer %} {% include "baseform/select.html" with field=form.payer %}
</div> </div>
{% if form.payer.value == object.Payer.ME %} {% if form.status.value == object.Status.INCOMPLETE %}
<div class="sm:col-span-4">
{% include "baseform/text.html" with field=form.name_text %}
</div>
<div class="sm:col-span-3">
{% include "baseform/text.html" with field=form.iban_text %}
</div>
<div class="sm:col-span-3">
{% include "baseform/text.html" with field=form.bic_text %}
</div>
{% elif form.status.value == object.Status.INCOMPLETE %}
<div class="sm:col-span-4"> <div class="sm:col-span-4">
{% include "baseform/text.html" with field=form.name_text %} {% include "baseform/text.html" with field=form.name_text %}
</div> </div>
@@ -50,6 +40,18 @@
<div class="col-span-full"> <div class="col-span-full">
{% include "baseform/checkbox.html" with field=form.saving %} {% include "baseform/checkbox.html" with field=form.saving %}
</div> </div>
{% else %}
{% if form.payer.value == object.Payer.ME %}
<div class="sm:col-span-4">
{% include "baseform/text.html" with field=form.name_text %}
</div>
<div class="sm:col-span-3">
{% include "baseform/text.html" with field=form.iban_text %}
</div>
<div class="sm:col-span-3">
{% include "baseform/text.html" with field=form.bic_text %}
</div>
{% endif %}
{% endif %} {% endif %}
</div> </div>
</section> </section>
@@ -165,9 +167,15 @@
</div> </div>
</div> </div>
</section> </section>
<section class="flex justify-end"> {% if form.status.value == object.Status.SUBMITTED or form.status.value == object.Status.INCOMPLETE %}
<button type="submit" class="btn btn-primary w-full sm:w-auto" value="Speichern">Änderung speichern</button> <section class="flex justify-end">
</section> <button type="submit" class="btn btn-primary w-full sm:w-auto" value="Speichern">Änderung speichern</button>
</section>
{% else %}
<section class="flex justify-end">
<button type="button" class="btn btn-primary w-full sm:w-auto"><a href="{% url 'finance:bill_list' %}">Gehe zurück</a></button>
</section>
{% endif %}
</form> </form>
</main> </main>
{% endblock %} {% endblock %}