blacked files

This commit is contained in:
Gunther Weissenbaeck 2024-02-15 11:38:33 +01:00
parent efa29fec5c
commit dc4836579d
7 changed files with 86 additions and 31 deletions

View file

@ -12,7 +12,9 @@ class DateInput(forms.DateInput):
class AviaryEditForm(forms.ModelForm):
class Meta:
widgets = {
"last_ward_round": DateInput(format="%Y-%m-%d", attrs={"value": date.today})
"last_ward_round": DateInput(
format="%Y-%m-%d", attrs={"value": date.today}
)
}
model = Aviary
fields = [

View file

@ -13,7 +13,9 @@ 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 = [

View file

@ -32,22 +32,61 @@ def costs_default():
class FallenBird(models.Model):
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
bird_identifier = models.CharField( max_length=256, verbose_name=_("Patienten Alias"))
bird = models.ForeignKey("Bird", on_delete=models.CASCADE, verbose_name=_("Vogel"))
age = models.CharField(max_length=15, choices=CHOICE_AGE, verbose_name=_("Alter"))
sex = models.CharField( max_length=15, choices=CHOICE_SEX, verbose_name=_("Geschlecht"))
bird_identifier = models.CharField(
max_length=256, verbose_name=_("Patienten Alias")
)
bird = models.ForeignKey(
"Bird", on_delete=models.CASCADE, verbose_name=_("Vogel")
)
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"))
created = models.DateTimeField(auto_now_add=True, verbose_name=_("angelegt am"))
updated = models.DateTimeField(auto_now=True, verbose_name=_("geändert am"))
find_circumstances = models.ForeignKey( "Circumstance", on_delete=models.CASCADE, verbose_name=_("Fundumstände"))
diagnostic_finding = models.CharField( max_length=256, verbose_name=_("Diagnose bei Fund"))
user = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.CASCADE, verbose_name=_("Benutzer"))
status = models.ForeignKey("BirdStatus", on_delete=models.CASCADE, default=1)
aviary = models.ForeignKey( Aviary, on_delete=models.SET_NULL, blank=True, null=True, verbose_name=_("Voliere"),)
sent_to = models.CharField( max_length=256, null=True, blank=True, verbose_name=_("Übersandt nach"))
comment = models.TextField(blank=True, null=True, verbose_name=_("Bemerkung"))
finder = models.TextField( blank=True, null=True, verbose_name=_("Finder"), default="Vorname: \nNachname: \nStraße: \nHausnummer: \nStadt: \nPLZ: \nTelefonnummer: ",)
created = models.DateTimeField(
auto_now_add=True, verbose_name=_("angelegt am")
)
updated = models.DateTimeField(
auto_now=True, verbose_name=_("geändert am")
)
find_circumstances = models.ForeignKey(
"Circumstance",
on_delete=models.CASCADE,
verbose_name=_("Fundumstände"),
)
diagnostic_finding = models.CharField(
max_length=256, verbose_name=_("Diagnose bei Fund")
)
user = models.ForeignKey(
settings.AUTH_USER_MODEL,
on_delete=models.CASCADE,
verbose_name=_("Benutzer"),
)
status = models.ForeignKey(
"BirdStatus", on_delete=models.CASCADE, default=1
)
aviary = models.ForeignKey(
Aviary,
on_delete=models.SET_NULL,
blank=True,
null=True,
verbose_name=_("Voliere"),
)
sent_to = models.CharField(
max_length=256, null=True, blank=True, verbose_name=_("Übersandt nach")
)
comment = models.TextField(
blank=True, null=True, verbose_name=_("Bemerkung")
)
finder = models.TextField(
blank=True,
null=True,
verbose_name=_("Finder"),
default="Vorname: \nNachname: \nStraße: \nHausnummer: \nStadt: \nPLZ: \nTelefonnummer: ",
)
class Meta:
verbose_name = _("Patient")
@ -59,7 +98,9 @@ class FallenBird(models.Model):
class Bird(models.Model):
id = models.BigAutoField(primary_key=True)
name = models.CharField(max_length=256, unique=True, verbose_name=_("Bezeichnung"))
name = models.CharField(
max_length=256, unique=True, verbose_name=_("Bezeichnung")
)
description = RichTextField(verbose_name=_("Erläuterungen"))
class Meta:
@ -87,7 +128,9 @@ class BirdStatus(models.Model):
class Circumstance(models.Model):
id = models.BigAutoField(primary_key=True)
description = models.CharField(max_length=256, verbose_name=_("Bezeichnung"))
description = models.CharField(
max_length=256, verbose_name=_("Bezeichnung")
)
class Meta:
verbose_name = _("Fundumstand")

View file

@ -36,7 +36,9 @@ class Contact(models.Model):
class ContactTag(models.Model):
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
tag = models.CharField(max_length=50, null=True, blank=True, verbose_name=_("Tag"))
tag = models.CharField(
max_length=50, null=True, blank=True, verbose_name=_("Tag")
)
class Meta:
verbose_name = _("Kontakt Tag")

View file

@ -12,15 +12,12 @@ class DateInput(forms.DateInput):
class CostsForm(forms.ModelForm):
class Meta:
widgets = {
"created": DateInput(format="%Y-%m-%d", attrs={"value": date.today})
"created": DateInput(
format="%Y-%m-%d", attrs={"value": date.today}
)
}
model = Costs
fields = [
"id_bird",
"costs",
"comment",
"created"
]
fields = ["id_bird", "costs", "comment", "created"]
labels = {
"id_bird": _("Patient"),
"costs": _("Betrag [€]"),

View file

@ -23,9 +23,12 @@ def export_costs(request):
"costs",
"created",
"comment",
"user__username")
"user__username",
)
response = HttpResponse(content_type="text/csv")
response["Content-Disposition"] = f"attachment, filename=fbf_costs_{today}.csv"
response["Content-Disposition"] = (
f"attachment, filename=fbf_costs_{today}.csv"
)
writer = csv.writer(response)
writer.writerow(
["Vogel", "Betrag in Euro", "Gebucht am", "Kommentar", "Gebucht von"]
@ -54,7 +57,9 @@ def export_birds(request):
"sent_to",
)
response = HttpResponse(content_type="text/csv")
response["Content-Disposition"] = f"attachment, filename=fbf_birds_{today}.csv"
response["Content-Disposition"] = (
f"attachment, filename=fbf_birds_{today}.csv"
)
writer = csv.writer(response)
writer.writerow(
[

View file

@ -10,7 +10,9 @@ class Emailadress(models.Model):
created_at = models.DateTimeField(auto_now_add=True)
updated_at = models.DateTimeField(auto_now=True)
user = models.ForeignKey(
settings.AUTH_USER_MODEL, on_delete=models.CASCADE, verbose_name=_("Benutzer")
settings.AUTH_USER_MODEL,
on_delete=models.CASCADE,
verbose_name=_("Benutzer"),
)
def __str__(self):
@ -22,7 +24,9 @@ class Emailadress(models.Model):
class BirdEmail(models.Model):
bird = models.ForeignKey(Bird, on_delete=models.CASCADE, verbose_name=_("Vogel"))
bird = models.ForeignKey(
Bird, on_delete=models.CASCADE, verbose_name=_("Vogel")
)
email = models.ForeignKey(
Emailadress, on_delete=models.CASCADE, verbose_name=_("Emailadresse")
)