diff --git a/app/bird/admin.py b/app/bird/admin.py index 5b19e87..23c25d1 100644 --- a/app/bird/admin.py +++ b/app/bird/admin.py @@ -8,12 +8,14 @@ class FallenBirdAdmin(admin.ModelAdmin): list_display = [ "bird", "age", + "sex", "date_found", "place", "created", "updated", "user", - "status"] + "status", + ] list_filter = ("bird", "created", "user", "status") diff --git a/app/bird/forms.py b/app/bird/forms.py index c7b31b7..ba8aa32 100644 --- a/app/bird/forms.py +++ b/app/bird/forms.py @@ -11,18 +11,16 @@ class DateInput(forms.DateInput): class BirdAddForm(forms.ModelForm): - class Meta: widgets = { - "date_found": DateInput( - format="%Y-%m-%d", - attrs={ - "value": date.today})} + "date_found": DateInput(format="%Y-%m-%d", attrs={"value": date.today}) + } model = FallenBird fields = [ "bird_identifier", "bird", "age", + "sex", "date_found", "place", "find_circumstances", @@ -32,6 +30,7 @@ class BirdAddForm(forms.ModelForm): "bird_identifier": _("Kennung"), "bird": _("Vogel"), "age": _("Alter"), + "sex": _("Geschlecht"), "date_found": _("Datum des Fundes"), "place": _("Fundort"), "find_circumstances": _("Fundumstände"), @@ -46,6 +45,7 @@ class BirdEditForm(forms.ModelForm): fields = [ "bird_identifier", "bird", + "sex", "date_found", "place", "status", @@ -56,6 +56,7 @@ class BirdEditForm(forms.ModelForm): ] labels = { "bird": _("Vogel"), + "sex": _("Geschlecht"), "date_found": _("Datum des Fundes"), "place": _("Fundort"), "status": _("Status"), diff --git a/app/bird/models.py b/app/bird/models.py index 4761a8e..1aa9e5f 100644 --- a/app/bird/models.py +++ b/app/bird/models.py @@ -17,6 +17,12 @@ CHOICE_AGE = [ ("Adult", "Adult"), ] +CHOICE_SEX = [ + ("Weiblich", "Weiblich"), + ("Männlich", "Männlich"), + ("Unbekannt", "Unbekannt"), +] + def costs_default(): return [{"date": date.today().strftime("%Y-%m-%d"), "cost_entry": "0.00"}] @@ -28,10 +34,9 @@ class FallenBird(models.Model): bird = models.ForeignKey( "Bird", on_delete=models.CASCADE, verbose_name=_("Patient") ) - age = models.CharField( - max_length=15, - choices=CHOICE_AGE, - verbose_name=_("Alter") + age = models.CharField(max_length=15, choices=CHOICE_AGE, verbose_name=_("Alter")) + sex = models.CharField( + max_length=15, choices=CHOICE_SEX, verbose_name=_("Geschlecht") ) date_found = models.DateField(verbose_name=_("Datum des Fundes")) place = models.CharField(max_length=256, verbose_name=_("Ort des Fundes")) diff --git a/app/bird/templates/bird/bird_all.html b/app/bird/templates/bird/bird_all.html index 19e96fc..d88bd41 100644 --- a/app/bird/templates/bird/bird_all.html +++ b/app/bird/templates/bird/bird_all.html @@ -61,6 +61,7 @@