blacked files
This commit is contained in:
parent
efa29fec5c
commit
dc4836579d
7 changed files with 86 additions and 31 deletions
|
@ -12,7 +12,9 @@ class DateInput(forms.DateInput):
|
||||||
class AviaryEditForm(forms.ModelForm):
|
class AviaryEditForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
widgets = {
|
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
|
model = Aviary
|
||||||
fields = [
|
fields = [
|
||||||
|
|
|
@ -13,7 +13,9 @@ class DateInput(forms.DateInput):
|
||||||
class BirdAddForm(forms.ModelForm):
|
class BirdAddForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
widgets = {
|
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
|
model = FallenBird
|
||||||
fields = [
|
fields = [
|
||||||
|
|
|
@ -32,22 +32,61 @@ def costs_default():
|
||||||
|
|
||||||
class FallenBird(models.Model):
|
class FallenBird(models.Model):
|
||||||
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
|
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
|
||||||
bird_identifier = models.CharField( max_length=256, verbose_name=_("Patienten Alias"))
|
bird_identifier = models.CharField(
|
||||||
bird = models.ForeignKey("Bird", on_delete=models.CASCADE, verbose_name=_("Vogel"))
|
max_length=256, verbose_name=_("Patienten Alias")
|
||||||
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 = 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"))
|
date_found = models.DateField(verbose_name=_("Datum des Fundes"))
|
||||||
place = models.CharField(max_length=256, verbose_name=_("Ort des Fundes"))
|
place = models.CharField(max_length=256, verbose_name=_("Ort des Fundes"))
|
||||||
created = models.DateTimeField(auto_now_add=True, verbose_name=_("angelegt am"))
|
created = models.DateTimeField(
|
||||||
updated = models.DateTimeField(auto_now=True, verbose_name=_("geändert am"))
|
auto_now_add=True, verbose_name=_("angelegt 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"))
|
updated = models.DateTimeField(
|
||||||
user = models.ForeignKey( settings.AUTH_USER_MODEL, on_delete=models.CASCADE, verbose_name=_("Benutzer"))
|
auto_now=True, verbose_name=_("geändert am")
|
||||||
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"),)
|
find_circumstances = models.ForeignKey(
|
||||||
sent_to = models.CharField( max_length=256, null=True, blank=True, verbose_name=_("Übersandt nach"))
|
"Circumstance",
|
||||||
comment = models.TextField(blank=True, null=True, verbose_name=_("Bemerkung"))
|
on_delete=models.CASCADE,
|
||||||
finder = models.TextField( blank=True, null=True, verbose_name=_("Finder"), default="Vorname: \nNachname: \nStraße: \nHausnummer: \nStadt: \nPLZ: \nTelefonnummer: ",)
|
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:
|
class Meta:
|
||||||
verbose_name = _("Patient")
|
verbose_name = _("Patient")
|
||||||
|
@ -59,7 +98,9 @@ class FallenBird(models.Model):
|
||||||
|
|
||||||
class Bird(models.Model):
|
class Bird(models.Model):
|
||||||
id = models.BigAutoField(primary_key=True)
|
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"))
|
description = RichTextField(verbose_name=_("Erläuterungen"))
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
|
@ -87,7 +128,9 @@ class BirdStatus(models.Model):
|
||||||
|
|
||||||
class Circumstance(models.Model):
|
class Circumstance(models.Model):
|
||||||
id = models.BigAutoField(primary_key=True)
|
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:
|
class Meta:
|
||||||
verbose_name = _("Fundumstand")
|
verbose_name = _("Fundumstand")
|
||||||
|
|
|
@ -36,7 +36,9 @@ class Contact(models.Model):
|
||||||
|
|
||||||
class ContactTag(models.Model):
|
class ContactTag(models.Model):
|
||||||
id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
|
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:
|
class Meta:
|
||||||
verbose_name = _("Kontakt Tag")
|
verbose_name = _("Kontakt Tag")
|
||||||
|
|
|
@ -12,15 +12,12 @@ class DateInput(forms.DateInput):
|
||||||
class CostsForm(forms.ModelForm):
|
class CostsForm(forms.ModelForm):
|
||||||
class Meta:
|
class Meta:
|
||||||
widgets = {
|
widgets = {
|
||||||
"created": DateInput(format="%Y-%m-%d", attrs={"value": date.today})
|
"created": DateInput(
|
||||||
|
format="%Y-%m-%d", attrs={"value": date.today}
|
||||||
|
)
|
||||||
}
|
}
|
||||||
model = Costs
|
model = Costs
|
||||||
fields = [
|
fields = ["id_bird", "costs", "comment", "created"]
|
||||||
"id_bird",
|
|
||||||
"costs",
|
|
||||||
"comment",
|
|
||||||
"created"
|
|
||||||
]
|
|
||||||
labels = {
|
labels = {
|
||||||
"id_bird": _("Patient"),
|
"id_bird": _("Patient"),
|
||||||
"costs": _("Betrag [€]"),
|
"costs": _("Betrag [€]"),
|
||||||
|
|
|
@ -23,9 +23,12 @@ def export_costs(request):
|
||||||
"costs",
|
"costs",
|
||||||
"created",
|
"created",
|
||||||
"comment",
|
"comment",
|
||||||
"user__username")
|
"user__username",
|
||||||
|
)
|
||||||
response = HttpResponse(content_type="text/csv")
|
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 = csv.writer(response)
|
||||||
writer.writerow(
|
writer.writerow(
|
||||||
["Vogel", "Betrag in Euro", "Gebucht am", "Kommentar", "Gebucht von"]
|
["Vogel", "Betrag in Euro", "Gebucht am", "Kommentar", "Gebucht von"]
|
||||||
|
@ -54,7 +57,9 @@ def export_birds(request):
|
||||||
"sent_to",
|
"sent_to",
|
||||||
)
|
)
|
||||||
response = HttpResponse(content_type="text/csv")
|
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 = csv.writer(response)
|
||||||
writer.writerow(
|
writer.writerow(
|
||||||
[
|
[
|
||||||
|
|
|
@ -10,7 +10,9 @@ class Emailadress(models.Model):
|
||||||
created_at = models.DateTimeField(auto_now_add=True)
|
created_at = models.DateTimeField(auto_now_add=True)
|
||||||
updated_at = models.DateTimeField(auto_now=True)
|
updated_at = models.DateTimeField(auto_now=True)
|
||||||
user = models.ForeignKey(
|
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):
|
def __str__(self):
|
||||||
|
@ -22,7 +24,9 @@ class Emailadress(models.Model):
|
||||||
|
|
||||||
|
|
||||||
class BirdEmail(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(
|
email = models.ForeignKey(
|
||||||
Emailadress, on_delete=models.CASCADE, verbose_name=_("Emailadresse")
|
Emailadress, on_delete=models.CASCADE, verbose_name=_("Emailadresse")
|
||||||
)
|
)
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue