nabujena/FallenBirdyForm
1
0
Fork 0
Code Issues 3 Pull requests Projects Releases Packages Wiki Activity Actions

beautified code

Browse source
This commit is contained in:
gw3000 2023-06-22 17:41:37 +02:00
parent 27802b317d
commit d8ba98366f
5 changed files with 30 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
bird/apps.py
View file

@ -2,5 +2,5 @@ from django.apps import AppConfig
class BirdConfig(AppConfig): class BirdConfig(AppConfig):
default_auto_field = 'django.db.models.BigAutoField' default_auto_field = "django.db.models.BigAutoField"
name = 'bird' name = "bird"

16
bird/forms.py
View file

@ -10,12 +10,18 @@ class DateInput(forms.DateInput):
class BirdAddForm(forms.ModelForm): class BirdAddForm(forms.ModelForm):
class Meta: class Meta:
widgets = { widgets = {"date_found": DateInput()}
"date_found": DateInput()}
model = FallenBird model = FallenBird
fields = ["bird", "date_found", "place", ] fields = [
labels = {"bird": _("Vogel"), "date_found": _( "bird",
"Datum des Fundes"), "place": _("Fundort")} "date_found",
"place",
]
labels = {
"bird": _("Vogel"),
"date_found": _("Datum des Fundes"),
"place": _("Fundort"),
}
class BirdEditForm(forms.ModelForm): class BirdEditForm(forms.ModelForm):

4
bird/models.py
View file

@ -14,9 +14,7 @@ class FallenBird(models.Model):
created = models.DateTimeField(auto_now_add=True) created = models.DateTimeField(auto_now_add=True)
updated = models.DateTimeField(auto_now=True) updated = models.DateTimeField(auto_now=True)
rescuer = models.ForeignKey(Rescuer, on_delete=models.CASCADE) rescuer = models.ForeignKey(Rescuer, on_delete=models.CASCADE)
user = models.ForeignKey( user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
settings.AUTH_USER_MODEL,
on_delete=models.CASCADE)
def __str__(self): def __str__(self):
return self.place return self.place

7
bird/views.py
View file

@ -16,7 +16,7 @@ def bird_create(request):
# just show only related rescuers in select field of the form # just show only related rescuers in select field of the form
if request.method == "POST": if request.method == "POST":
form = BirdAddForm(request.POST or None, request.FILES or None) form = BirdAddForm(request.POST or None, request.FILES or None)
rescuer_id = request.session.get('rescuer_id') rescuer_id = request.session.get("rescuer_id")
rescuer = Rescuer.objects.get(id=rescuer_id, user=request.user) rescuer = Rescuer.objects.get(id=rescuer_id, user=request.user)
if form.is_valid(): if form.is_valid():
@ -54,10 +54,7 @@ def bird_recover_all(request):
@login_required(login_url="account_login") @login_required(login_url="account_login")
def bird_single(request, id): def bird_single(request, id):
bird = FallenBird.objects.get(id=id) bird = FallenBird.objects.get(id=id)
form = BirdEditForm( form = BirdEditForm(request.POST or None, request.FILES or None, instance=bird)
request.POST or None,
request.FILES or None,
instance=bird)
if request.method == "POST": if request.method == "POST":
if form.is_valid(): if form.is_valid():
form.save() form.save()

27
rescuer/forms.py
View file

@ -5,12 +5,12 @@ from .models import Rescuer
class DateInput(forms.DateInput): class DateInput(forms.DateInput):
input_type = 'date' input_type = "date"
class RescuerForm(forms.ModelForm): class RescuerForm(forms.ModelForm):
class Meta: class Meta:
widgets = {'date_of_birth': DateInput()} widgets = {"date_of_birth": DateInput()}
model = Rescuer model = Rescuer
fields = [ fields = [
"gender", "gender",
@ -22,16 +22,17 @@ class RescuerForm(forms.ModelForm):
"city", "city",
"state", "state",
"date_of_birth", "date_of_birth",
"email"] "email",
]
labels = { labels = {
'gender': _('Geschlecht'), "gender": _("Geschlecht"),
'first_name': _('Vorname'), "first_name": _("Vorname"),
'last_name': _('Nachname'), "last_name": _("Nachname"),
'date_of_birth': _('Geburtstag'), "date_of_birth": _("Geburtstag"),
'street': _('Straße'), "street": _("Straße"),
'street_number': _('Hausnummer'), "street_number": _("Hausnummer"),
'zip_code': _('Postleitzahl'), "zip_code": _("Postleitzahl"),
'city': _('Stadt'), "city": _("Stadt"),
'state': _('Land'), "state": _("Land"),
'email': _('Email'), "email": _("Email"),
} }