diff --git a/app/bird/views.py b/app/bird/views.py index 8c002ee..ed5edb4 100644 --- a/app/bird/views.py +++ b/app/bird/views.py @@ -10,8 +10,8 @@ from smtplib import SMTPException from .forms import BirdAddForm, BirdEditForm from .models import Bird, FallenBird -from sendemail.models import BirdEmail from sendemail.message import messagebody +from sendemail.models import BirdEmail env = environ.Env() @@ -96,7 +96,10 @@ def bird_inactive(request): @login_required(login_url="account_login") def bird_single(request, id): bird = FallenBird.objects.get(id=id) - form = BirdEditForm(request.POST or None, request.FILES or None, instance=bird) + form = BirdEditForm( + request.POST or None, + request.FILES or None, + instance=bird) if request.method == "POST": if form.is_valid(): fs = form.save(commit=False) diff --git a/app/sendemail/message.py b/app/sendemail/message.py index 6b66c23..4488f15 100644 --- a/app/sendemail/message.py +++ b/app/sendemail/message.py @@ -1,18 +1,11 @@ -# the message body for the email should have placeholders for the bird name, the date found and the diagnosis - - -def messagebody( - date, - bird, - place, - diagnosis, -) -> str: - text = f""" - Guten Tag, +def messagebody(date, bird, place, diagnosis,) -> str: + """Returns the body of the message to be sent to UNB.""" + body = f""" + Sehr geehrte Damen und Herren, am {date} wurde in der NABU Wildvogelhilfe ein Vogel der Art {bird} aufgenomen. - Der Fundort laut Finder*in war: {place} - Die Diagnose bei Fund lautet: {diagnosis} + Der Fundort laut Finder*in war: {place}. + Die Diagnose bei Fund lautet: {diagnosis}. Mit freundlichen Grüßen @@ -22,4 +15,4 @@ def messagebody( Schillergässchen 5 07745 Jena """ - return text + return body