diff --git a/app/aviary/models.py b/app/aviary/models.py index 42cbb73..738d5f7 100644 --- a/app/aviary/models.py +++ b/app/aviary/models.py @@ -3,14 +3,22 @@ from uuid import uuid4 from django.db import models from django.utils.translation import gettext_lazy as _ -CHOICE_AVIARY = [("Offen","Offen"), ("Geschlossen", "Geschlossen"), ("Gesperrt", "Gesperrt")] + +CHOICE_AVIARY = [ + ("Offen", "Offen"), + ("Geschlossen", "Geschlossen"), + ("Gesperrt", "Gesperrt")] + class Aviary(models.Model): id = models.UUIDField(primary_key=True, default=uuid4, editable=False) description = models.CharField( max_length=256, verbose_name=_("Beschreibung"), unique=True ) - condition = models.CharField(max_length=256, choices=CHOICE_AVIARY, verbose_name=_("Zustand")) + condition = models.CharField( + max_length=256, + choices=CHOICE_AVIARY, + verbose_name=_("Zustand")) last_ward_round = models.DateField(verbose_name=_("letzte Visite")) class Meta: diff --git a/app/bird/admin.py b/app/bird/admin.py index 3c379f1..0603016 100644 --- a/app/bird/admin.py +++ b/app/bird/admin.py @@ -5,7 +5,13 @@ from .models import Bird, FallenBird, BirdStatus, Circumstance @admin.register(FallenBird) class FallenBirdAdmin(admin.ModelAdmin): - list_display = ["bird", "date_found", "place", "created", "updated", "user"] + list_display = [ + "bird", + "date_found", + "place", + "created", + "updated", + "user"] list_filter = ("bird", "created", "user") diff --git a/app/bird/forms.py b/app/bird/forms.py index 03a0b1f..5f43e0a 100644 --- a/app/bird/forms.py +++ b/app/bird/forms.py @@ -17,8 +17,10 @@ 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", @@ -26,6 +28,8 @@ class BirdAddForm(forms.ModelForm): "date_found", "place", "find_circumstances", + "diagnostic_finding", + "costs", # "find_circumstances_new", # "status", ] @@ -35,6 +39,8 @@ class BirdAddForm(forms.ModelForm): "date_found": _("Datum des Fundes"), "place": _("Fundort"), "find_circumstances": _("Fundumstände"), + "diagnostic_finding": _("Diagnose bei Fund"), + "costs": _("Kosten"), # "find_circumstances_new": _("neuer Fundumstand"), # "status": _("Status"), } @@ -52,6 +58,8 @@ class BirdEditForm(forms.ModelForm): "status", "aviary", "find_circumstances", + "diagnostic_finding", + "costs", ] labels = { "bird": _("Vogel"), @@ -60,4 +68,6 @@ class BirdEditForm(forms.ModelForm): "status": _("Status"), "aviary": _("Voliere"), "find_circumstances": _("Fundumstände"), + "diagnostic_finding": _("Diagnose bei Fund"), + "costs": _("Kosten"), } diff --git a/app/bird/migrations/0002_alter_bird_name_alter_birdstatus_description_and_more.py b/app/bird/migrations/0002_alter_bird_name_alter_birdstatus_description_and_more.py new file mode 100644 index 0000000..a63b2a3 --- /dev/null +++ b/app/bird/migrations/0002_alter_bird_name_alter_birdstatus_description_and_more.py @@ -0,0 +1,37 @@ +# Generated by Django 4.2.3 on 2023-07-12 06:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("bird", "0001_initial"), + ] + + operations = [ + migrations.AlterField( + model_name="bird", + name="name", + field=models.CharField( + max_length=256, unique=True, verbose_name="Bezeichnung" + ), + ), + migrations.AlterField( + model_name="birdstatus", + name="description", + field=models.CharField( + max_length=256, unique=True, verbose_name="Bezeichnung" + ), + ), + migrations.AlterField( + model_name="circumstance", + name="description", + field=models.CharField(max_length=256, verbose_name="Bezeichnung"), + ), + migrations.AlterField( + model_name="fallenbird", + name="costs", + field=models.DecimalField(decimal_places=2, max_digits=5), + ), + ] diff --git a/app/bird/models.py b/app/bird/models.py index c4a48a1..fd4894a 100644 --- a/app/bird/models.py +++ b/app/bird/models.py @@ -1,11 +1,10 @@ from datetime import date from uuid import uuid4 +from aviary.models import Aviary from django.conf import settings from django.db import models from django.utils.translation import gettext_lazy as _ - -from aviary.models import Aviary from rescuer.models import Rescuer @@ -21,13 +20,13 @@ class FallenBird(models.Model): 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) - diagnostic_finding = models.CharField(max_length=256) - costs = models.DecimalField(max_digits=5, decimal_places=2) - rescuer = models.ForeignKey( Rescuer, on_delete=models.SET_NULL, blank=True, null=True) - user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + 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")) + costs = models.DecimalField(max_digits=5, decimal_places=2, verbose_name=_("Kosten")) + rescuer = models.ForeignKey( Rescuer, on_delete=models.SET_NULL, blank=True, null=True, verbose_name=_("Finder")) + 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) + aviary = models.ForeignKey(Aviary, on_delete=models.SET_NULL, blank=True, null=True, verbose_name=_("Voliere")) class Meta: verbose_name = _("Patient") diff --git a/app/bird/views.py b/app/bird/views.py index 51669df..ecd758b 100644 --- a/app/bird/views.py +++ b/app/bird/views.py @@ -17,16 +17,12 @@ def bird_create(request): # Just show only related rescuers in select field of the form. if request.method == "POST": form = BirdAddForm(request.POST or None, request.FILES or None) + # circumstances = Circumstance.objects.all() rescuer_id = request.session.get("rescuer_id") rescuer = Rescuer.objects.get(id=rescuer_id, user=request.user) if form.is_valid(): - # if form.cleaned_data["find_circumstances_new"]: - # circumstance = form.cleaned_data["find_circumstances_new"] - # if Circumstance.objects.filter(description=circumstance).exists(): - # print("is in circumstances") - fs = form.save(commit=False) fs.user = request.user fs.rescuer_id = rescuer_id @@ -47,15 +43,6 @@ def bird_help(request): @login_required(login_url="account_login") def bird_all(request): birds = FallenBird.objects.all() - # Sum all costs per bird from json - for bird in birds: - costs_per_bird = float() - for item in bird.costs: - costs_per_bird += float(item["cost_entry"]) - if costs_per_bird == 0.0: - costs_per_bird = "" - bird.costs = costs_per_bird - rescuer_modal = Rescuer.objects.all() context = {"birds": birds, "rescuer_modal": rescuer_modal} # Post came from the modal form. @@ -77,7 +64,10 @@ def bird_recover_all(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/fixtures/data.json b/app/fixtures/data.json index 0d65df3..fc69425 100644 --- a/app/fixtures/data.json +++ b/app/fixtures/data.json @@ -1 +1 @@ -[{"model": "admin.logentry", "pk": 1, "fields": {"action_time": "2023-07-10T18:15:18.808Z", "user": 1, "content_type": 7, "object_id": "1", "object_repr": "admin@email.de", "action_flag": 2, "change_message": "[{\"changed\": {\"fields\": [\"Verified\", \"Primary\"]}}]"}}, {"model": "admin.logentry", "pk": 2, "fields": {"action_time": "2023-07-10T18:15:34.770Z", "user": 1, "content_type": 12, "object_id": "3fac01df-caf6-438e-a1f6-e7dc24637dd3", "object_repr": "Voliere 1", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 3, "fields": {"action_time": "2023-07-10T18:15:45.489Z", "user": 1, "content_type": 12, "object_id": "a0d34198-ef0f-464c-8b8c-06ede7ea25be", "object_repr": "Voliere 2", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 4, "fields": {"action_time": "2023-07-10T18:15:54.399Z", "user": 1, "content_type": 12, "object_id": "affd9d6a-1397-4170-b679-a37b8f104b2d", "object_repr": "Voliere 3", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 5, "fields": {"action_time": "2023-07-10T18:16:06.971Z", "user": 1, "content_type": 15, "object_id": "1", "object_repr": "Neu", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 6, "fields": {"action_time": "2023-07-10T18:16:13.935Z", "user": 1, "content_type": 15, "object_id": "2", "object_repr": "Scheibenschlag", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 7, "fields": {"action_time": "2023-07-10T18:16:22.765Z", "user": 1, "content_type": 15, "object_id": "3", "object_repr": "Angriff Hund/Katze", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 8, "fields": {"action_time": "2023-07-10T18:16:27.919Z", "user": 1, "content_type": 15, "object_id": "4", "object_repr": "Entkräftet", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 9, "fields": {"action_time": "2023-07-10T18:16:32.970Z", "user": 1, "content_type": 15, "object_id": "5", "object_repr": "Verkehrsunfall", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 10, "fields": {"action_time": "2023-07-10T18:16:38.188Z", "user": 1, "content_type": 15, "object_id": "6", "object_repr": "unbekannt", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 11, "fields": {"action_time": "2023-07-10T18:16:53.107Z", "user": 1, "content_type": 14, "object_id": "1", "object_repr": "In Behandlung", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 12, "fields": {"action_time": "2023-07-10T18:16:57.106Z", "user": 1, "content_type": 14, "object_id": "2", "object_repr": "In Auswilderung", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 13, "fields": {"action_time": "2023-07-10T18:17:01.566Z", "user": 1, "content_type": 14, "object_id": "3", "object_repr": "Ausgewildert", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 14, "fields": {"action_time": "2023-07-10T18:17:08.920Z", "user": 1, "content_type": 14, "object_id": "4", "object_repr": "Übermittelt", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 15, "fields": {"action_time": "2023-07-10T18:17:13.922Z", "user": 1, "content_type": 14, "object_id": "5", "object_repr": "Verstorben", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 16, "fields": {"action_time": "2023-07-10T18:17:25.521Z", "user": 1, "content_type": 13, "object_id": "7094551b-2947-4b2c-a859-407e1c3d7be0", "object_repr": "Amsel", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 17, "fields": {"action_time": "2023-07-10T18:17:33.091Z", "user": 1, "content_type": 13, "object_id": "644e7e4a-9c09-40ed-bc2f-b8470a18f305", "object_repr": "Spatz", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 18, "fields": {"action_time": "2023-07-10T19:18:29.157Z", "user": 1, "content_type": 15, "object_id": "1", "object_repr": "Neu", "action_flag": 3, "change_message": ""}}, {"model": "auth.permission", "pk": 1, "fields": {"name": "Can add log entry", "content_type": 1, "codename": "add_logentry"}}, {"model": "auth.permission", "pk": 2, "fields": {"name": "Can change log entry", "content_type": 1, "codename": "change_logentry"}}, {"model": "auth.permission", "pk": 3, "fields": {"name": "Can delete log entry", "content_type": 1, "codename": "delete_logentry"}}, {"model": "auth.permission", "pk": 4, "fields": {"name": "Can view log entry", "content_type": 1, "codename": "view_logentry"}}, {"model": "auth.permission", "pk": 5, "fields": {"name": "Can add permission", "content_type": 2, "codename": "add_permission"}}, {"model": "auth.permission", "pk": 6, "fields": {"name": "Can change permission", "content_type": 2, "codename": "change_permission"}}, {"model": "auth.permission", "pk": 7, "fields": {"name": "Can delete permission", "content_type": 2, "codename": "delete_permission"}}, {"model": "auth.permission", "pk": 8, "fields": {"name": "Can view permission", "content_type": 2, "codename": "view_permission"}}, {"model": "auth.permission", "pk": 9, "fields": {"name": "Can add group", "content_type": 3, "codename": "add_group"}}, {"model": "auth.permission", "pk": 10, "fields": {"name": "Can change group", "content_type": 3, "codename": "change_group"}}, {"model": "auth.permission", "pk": 11, "fields": {"name": "Can delete group", "content_type": 3, "codename": "delete_group"}}, {"model": "auth.permission", "pk": 12, "fields": {"name": "Can view group", "content_type": 3, "codename": "view_group"}}, {"model": "auth.permission", "pk": 13, "fields": {"name": "Can add user", "content_type": 4, "codename": "add_user"}}, {"model": "auth.permission", "pk": 14, "fields": {"name": "Can change user", "content_type": 4, "codename": "change_user"}}, {"model": "auth.permission", "pk": 15, "fields": {"name": "Can delete user", "content_type": 4, "codename": "delete_user"}}, {"model": "auth.permission", "pk": 16, "fields": {"name": "Can view user", "content_type": 4, "codename": "view_user"}}, {"model": "auth.permission", "pk": 17, "fields": {"name": "Can add content type", "content_type": 5, "codename": "add_contenttype"}}, {"model": "auth.permission", "pk": 18, "fields": {"name": "Can change content type", "content_type": 5, "codename": "change_contenttype"}}, {"model": "auth.permission", "pk": 19, "fields": {"name": "Can delete content type", "content_type": 5, "codename": "delete_contenttype"}}, {"model": "auth.permission", "pk": 20, "fields": {"name": "Can view content type", "content_type": 5, "codename": "view_contenttype"}}, {"model": "auth.permission", "pk": 21, "fields": {"name": "Can add session", "content_type": 6, "codename": "add_session"}}, {"model": "auth.permission", "pk": 22, "fields": {"name": "Can change session", "content_type": 6, "codename": "change_session"}}, {"model": "auth.permission", "pk": 23, "fields": {"name": "Can delete session", "content_type": 6, "codename": "delete_session"}}, {"model": "auth.permission", "pk": 24, "fields": {"name": "Can view session", "content_type": 6, "codename": "view_session"}}, {"model": "auth.permission", "pk": 25, "fields": {"name": "Can add email address", "content_type": 7, "codename": "add_emailaddress"}}, {"model": "auth.permission", "pk": 26, "fields": {"name": "Can change email address", "content_type": 7, "codename": "change_emailaddress"}}, {"model": "auth.permission", "pk": 27, "fields": {"name": "Can delete email address", "content_type": 7, "codename": "delete_emailaddress"}}, {"model": "auth.permission", "pk": 28, "fields": {"name": "Can view email address", "content_type": 7, "codename": "view_emailaddress"}}, {"model": "auth.permission", "pk": 29, "fields": {"name": "Can add email confirmation", "content_type": 8, "codename": "add_emailconfirmation"}}, {"model": "auth.permission", "pk": 30, "fields": {"name": "Can change email confirmation", "content_type": 8, "codename": "change_emailconfirmation"}}, {"model": "auth.permission", "pk": 31, "fields": {"name": "Can delete email confirmation", "content_type": 8, "codename": "delete_emailconfirmation"}}, {"model": "auth.permission", "pk": 32, "fields": {"name": "Can view email confirmation", "content_type": 8, "codename": "view_emailconfirmation"}}, {"model": "auth.permission", "pk": 33, "fields": {"name": "Can add social account", "content_type": 9, "codename": "add_socialaccount"}}, {"model": "auth.permission", "pk": 34, "fields": {"name": "Can change social account", "content_type": 9, "codename": "change_socialaccount"}}, {"model": "auth.permission", "pk": 35, "fields": {"name": "Can delete social account", "content_type": 9, "codename": "delete_socialaccount"}}, {"model": "auth.permission", "pk": 36, "fields": {"name": "Can view social account", "content_type": 9, "codename": "view_socialaccount"}}, {"model": "auth.permission", "pk": 37, "fields": {"name": "Can add social application", "content_type": 10, "codename": "add_socialapp"}}, {"model": "auth.permission", "pk": 38, "fields": {"name": "Can change social application", "content_type": 10, "codename": "change_socialapp"}}, {"model": "auth.permission", "pk": 39, "fields": {"name": "Can delete social application", "content_type": 10, "codename": "delete_socialapp"}}, {"model": "auth.permission", "pk": 40, "fields": {"name": "Can view social application", "content_type": 10, "codename": "view_socialapp"}}, {"model": "auth.permission", "pk": 41, "fields": {"name": "Can add social application token", "content_type": 11, "codename": "add_socialtoken"}}, {"model": "auth.permission", "pk": 42, "fields": {"name": "Can change social application token", "content_type": 11, "codename": "change_socialtoken"}}, {"model": "auth.permission", "pk": 43, "fields": {"name": "Can delete social application token", "content_type": 11, "codename": "delete_socialtoken"}}, {"model": "auth.permission", "pk": 44, "fields": {"name": "Can view social application token", "content_type": 11, "codename": "view_socialtoken"}}, {"model": "auth.permission", "pk": 45, "fields": {"name": "Can add Voliere", "content_type": 12, "codename": "add_aviary"}}, {"model": "auth.permission", "pk": 46, "fields": {"name": "Can change Voliere", "content_type": 12, "codename": "change_aviary"}}, {"model": "auth.permission", "pk": 47, "fields": {"name": "Can delete Voliere", "content_type": 12, "codename": "delete_aviary"}}, {"model": "auth.permission", "pk": 48, "fields": {"name": "Can view Voliere", "content_type": 12, "codename": "view_aviary"}}, {"model": "auth.permission", "pk": 49, "fields": {"name": "Can add Vogel", "content_type": 13, "codename": "add_bird"}}, {"model": "auth.permission", "pk": 50, "fields": {"name": "Can change Vogel", "content_type": 13, "codename": "change_bird"}}, {"model": "auth.permission", "pk": 51, "fields": {"name": "Can delete Vogel", "content_type": 13, "codename": "delete_bird"}}, {"model": "auth.permission", "pk": 52, "fields": {"name": "Can view Vogel", "content_type": 13, "codename": "view_bird"}}, {"model": "auth.permission", "pk": 53, "fields": {"name": "Can add Patientenstatus", "content_type": 14, "codename": "add_birdstatus"}}, {"model": "auth.permission", "pk": 54, "fields": {"name": "Can change Patientenstatus", "content_type": 14, "codename": "change_birdstatus"}}, {"model": "auth.permission", "pk": 55, "fields": {"name": "Can delete Patientenstatus", "content_type": 14, "codename": "delete_birdstatus"}}, {"model": "auth.permission", "pk": 56, "fields": {"name": "Can view Patientenstatus", "content_type": 14, "codename": "view_birdstatus"}}, {"model": "auth.permission", "pk": 57, "fields": {"name": "Can add Fundumstand", "content_type": 15, "codename": "add_circumstance"}}, {"model": "auth.permission", "pk": 58, "fields": {"name": "Can change Fundumstand", "content_type": 15, "codename": "change_circumstance"}}, {"model": "auth.permission", "pk": 59, "fields": {"name": "Can delete Fundumstand", "content_type": 15, "codename": "delete_circumstance"}}, {"model": "auth.permission", "pk": 60, "fields": {"name": "Can view Fundumstand", "content_type": 15, "codename": "view_circumstance"}}, {"model": "auth.permission", "pk": 61, "fields": {"name": "Can add Patient", "content_type": 16, "codename": "add_fallenbird"}}, {"model": "auth.permission", "pk": 62, "fields": {"name": "Can change Patient", "content_type": 16, "codename": "change_fallenbird"}}, {"model": "auth.permission", "pk": 63, "fields": {"name": "Can delete Patient", "content_type": 16, "codename": "delete_fallenbird"}}, {"model": "auth.permission", "pk": 64, "fields": {"name": "Can view Patient", "content_type": 16, "codename": "view_fallenbird"}}, {"model": "auth.permission", "pk": 65, "fields": {"name": "Can add rescuer", "content_type": 17, "codename": "add_rescuer"}}, {"model": "auth.permission", "pk": 66, "fields": {"name": "Can change rescuer", "content_type": 17, "codename": "change_rescuer"}}, {"model": "auth.permission", "pk": 67, "fields": {"name": "Can delete rescuer", "content_type": 17, "codename": "delete_rescuer"}}, {"model": "auth.permission", "pk": 68, "fields": {"name": "Can view rescuer", "content_type": 17, "codename": "view_rescuer"}}, {"model": "auth.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$600000$RhQEv3KNoa4H7OQHhVliAt$GsfQrEPxv96hUlcCvjsRWQDYkpZyoOJaR1QIQCWA1HY=", "last_login": "2023-07-10T18:15:11.279Z", "is_superuser": true, "username": "admin", "first_name": "", "last_name": "", "email": "admin@email.de", "is_staff": true, "is_active": true, "date_joined": "2023-07-10T18:14:46.130Z", "groups": [], "user_permissions": []}}, {"model": "contenttypes.contenttype", "pk": 1, "fields": {"app_label": "admin", "model": "logentry"}}, {"model": "contenttypes.contenttype", "pk": 2, "fields": {"app_label": "auth", "model": "permission"}}, {"model": "contenttypes.contenttype", "pk": 3, "fields": {"app_label": "auth", "model": "group"}}, {"model": "contenttypes.contenttype", "pk": 4, "fields": {"app_label": "auth", "model": "user"}}, {"model": "contenttypes.contenttype", "pk": 5, "fields": {"app_label": "contenttypes", "model": "contenttype"}}, {"model": "contenttypes.contenttype", "pk": 6, "fields": {"app_label": "sessions", "model": "session"}}, {"model": "contenttypes.contenttype", "pk": 7, "fields": {"app_label": "account", "model": "emailaddress"}}, {"model": "contenttypes.contenttype", "pk": 8, "fields": {"app_label": "account", "model": "emailconfirmation"}}, {"model": "contenttypes.contenttype", "pk": 9, "fields": {"app_label": "socialaccount", "model": "socialaccount"}}, {"model": "contenttypes.contenttype", "pk": 10, "fields": {"app_label": "socialaccount", "model": "socialapp"}}, {"model": "contenttypes.contenttype", "pk": 11, "fields": {"app_label": "socialaccount", "model": "socialtoken"}}, {"model": "contenttypes.contenttype", "pk": 12, "fields": {"app_label": "aviary", "model": "aviary"}}, {"model": "contenttypes.contenttype", "pk": 13, "fields": {"app_label": "bird", "model": "bird"}}, {"model": "contenttypes.contenttype", "pk": 14, "fields": {"app_label": "bird", "model": "birdstatus"}}, {"model": "contenttypes.contenttype", "pk": 15, "fields": {"app_label": "bird", "model": "circumstance"}}, {"model": "contenttypes.contenttype", "pk": 16, "fields": {"app_label": "bird", "model": "fallenbird"}}, {"model": "contenttypes.contenttype", "pk": 17, "fields": {"app_label": "rescuer", "model": "rescuer"}}, {"model": "sessions.session", "pk": "txi8ra9ljpyte5pobthrdudqybmoon6s", "fields": {"session_data": ".eJxVjEEOwiAQRe_C2hAGSmFcuvcMZGCoVA0kpV0Z765NutDtf-_9lwi0rSVsPS9hZnEWIE6_W6T0yHUHfKd6azK1ui5zlLsiD9rltXF-Xg7376BQL99aZRoUoHGoPRANMKnkgHNChYysCXzy1ljSo4nKTZAwg3Ujo45RGyfeH8qpNzk:1qIvPj:0ShBnGM6TVthvf1KQbxnXyLFkZaXN1PiADtUZ4y9xRQ", "expire_date": "2023-07-24T18:15:11.280Z"}}, {"model": "account.emailaddress", "pk": 1, "fields": {"user": 1, "email": "admin@email.de", "verified": true, "primary": true}}, {"model": "aviary.aviary", "pk": "3fac01df-caf6-438e-a1f6-e7dc24637dd3", "fields": {"description": "Voliere 1", "condition": "Offen", "last_ward_round": "2023-07-10"}}, {"model": "aviary.aviary", "pk": "a0d34198-ef0f-464c-8b8c-06ede7ea25be", "fields": {"description": "Voliere 2", "condition": "Geschlossen", "last_ward_round": "2023-07-10"}}, {"model": "aviary.aviary", "pk": "affd9d6a-1397-4170-b679-a37b8f104b2d", "fields": {"description": "Voliere 3", "condition": "Gesperrt", "last_ward_round": "2023-07-10"}}, {"model": "bird.bird", "pk": "644e7e4a-9c09-40ed-bc2f-b8470a18f305", "fields": {"name": "Spatz", "description": "Spatz Hilfetext"}}, {"model": "bird.bird", "pk": "7094551b-2947-4b2c-a859-407e1c3d7be0", "fields": {"name": "Amsel", "description": "Amsel Hilfetext"}}, {"model": "bird.birdstatus", "pk": 1, "fields": {"description": "In Behandlung"}}, {"model": "bird.birdstatus", "pk": 2, "fields": {"description": "In Auswilderung"}}, {"model": "bird.birdstatus", "pk": 3, "fields": {"description": "Ausgewildert"}}, {"model": "bird.birdstatus", "pk": 4, "fields": {"description": "Übermittelt"}}, {"model": "bird.birdstatus", "pk": 5, "fields": {"description": "Verstorben"}}, {"model": "bird.circumstance", "pk": 2, "fields": {"description": "Scheibenschlag"}}, {"model": "bird.circumstance", "pk": 3, "fields": {"description": "Angriff Hund/Katze"}}, {"model": "bird.circumstance", "pk": 4, "fields": {"description": "Entkräftet"}}, {"model": "bird.circumstance", "pk": 5, "fields": {"description": "Verkehrsunfall"}}, {"model": "bird.circumstance", "pk": 6, "fields": {"description": "unbekannt"}}] \ No newline at end of file +[{"model": "admin.logentry", "pk": 1, "fields": {"action_time": "2023-07-10T18:15:18.808Z", "user": 1, "content_type": 7, "object_id": "1", "object_repr": "admin@email.de", "action_flag": 2, "change_message": "[{\"changed\": {\"fields\": [\"Verified\", \"Primary\"]}}]"}}, {"model": "admin.logentry", "pk": 2, "fields": {"action_time": "2023-07-10T18:15:34.770Z", "user": 1, "content_type": 12, "object_id": "3fac01df-caf6-438e-a1f6-e7dc24637dd3", "object_repr": "Voliere 1", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 3, "fields": {"action_time": "2023-07-10T18:15:45.489Z", "user": 1, "content_type": 12, "object_id": "a0d34198-ef0f-464c-8b8c-06ede7ea25be", "object_repr": "Voliere 2", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 4, "fields": {"action_time": "2023-07-10T18:15:54.399Z", "user": 1, "content_type": 12, "object_id": "affd9d6a-1397-4170-b679-a37b8f104b2d", "object_repr": "Voliere 3", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 5, "fields": {"action_time": "2023-07-10T18:16:06.971Z", "user": 1, "content_type": 15, "object_id": "1", "object_repr": "Neu", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 6, "fields": {"action_time": "2023-07-10T18:16:13.935Z", "user": 1, "content_type": 15, "object_id": "2", "object_repr": "Scheibenschlag", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 7, "fields": {"action_time": "2023-07-10T18:16:22.765Z", "user": 1, "content_type": 15, "object_id": "3", "object_repr": "Angriff Hund/Katze", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 8, "fields": {"action_time": "2023-07-10T18:16:27.919Z", "user": 1, "content_type": 15, "object_id": "4", "object_repr": "Entkräftet", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 9, "fields": {"action_time": "2023-07-10T18:16:32.970Z", "user": 1, "content_type": 15, "object_id": "5", "object_repr": "Verkehrsunfall", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 10, "fields": {"action_time": "2023-07-10T18:16:38.188Z", "user": 1, "content_type": 15, "object_id": "6", "object_repr": "unbekannt", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 11, "fields": {"action_time": "2023-07-10T18:16:53.107Z", "user": 1, "content_type": 14, "object_id": "1", "object_repr": "In Behandlung", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 12, "fields": {"action_time": "2023-07-10T18:16:57.106Z", "user": 1, "content_type": 14, "object_id": "2", "object_repr": "In Auswilderung", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 13, "fields": {"action_time": "2023-07-10T18:17:01.566Z", "user": 1, "content_type": 14, "object_id": "3", "object_repr": "Ausgewildert", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 14, "fields": {"action_time": "2023-07-10T18:17:08.920Z", "user": 1, "content_type": 14, "object_id": "4", "object_repr": "Übermittelt", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 15, "fields": {"action_time": "2023-07-10T18:17:13.922Z", "user": 1, "content_type": 14, "object_id": "5", "object_repr": "Verstorben", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 16, "fields": {"action_time": "2023-07-10T18:17:25.521Z", "user": 1, "content_type": 13, "object_id": "7094551b-2947-4b2c-a859-407e1c3d7be0", "object_repr": "Amsel", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 17, "fields": {"action_time": "2023-07-10T18:17:33.091Z", "user": 1, "content_type": 13, "object_id": "644e7e4a-9c09-40ed-bc2f-b8470a18f305", "object_repr": "Spatz", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 18, "fields": {"action_time": "2023-07-10T19:18:29.157Z", "user": 1, "content_type": 15, "object_id": "1", "object_repr": "Neu", "action_flag": 3, "change_message": ""}}, {"model": "admin.logentry", "pk": 19, "fields": {"action_time": "2023-07-10T19:32:42.646Z", "user": 1, "content_type": 4, "object_id": "2", "object_repr": "gw", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 20, "fields": {"action_time": "2023-07-10T19:33:20.326Z", "user": 1, "content_type": 4, "object_id": "2", "object_repr": "gw", "action_flag": 2, "change_message": "[{\"changed\": {\"fields\": [\"First name\", \"Last name\", \"Email address\", \"Staff status\"]}}]"}}, {"model": "admin.logentry", "pk": 21, "fields": {"action_time": "2023-07-10T19:33:41.071Z", "user": 1, "content_type": 7, "object_id": "2", "object_repr": "weissenbaeck@posteo.de", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 22, "fields": {"action_time": "2023-07-10T20:06:52.414Z", "user": 1, "content_type": 7, "object_id": "2", "object_repr": "weissenbaeck@posteo.de", "action_flag": 2, "change_message": "[{\"changed\": {\"fields\": [\"Verified\"]}}]"}}, {"model": "admin.logentry", "pk": 23, "fields": {"action_time": "2023-07-11T17:14:36.190Z", "user": 1, "content_type": 4, "object_id": "2", "object_repr": "gw", "action_flag": 3, "change_message": ""}}, {"model": "admin.logentry", "pk": 24, "fields": {"action_time": "2023-07-12T07:35:21.582Z", "user": 1, "content_type": 16, "object_id": "22d6cbd8-7437-41f4-8ce1-d7d4bda20c0a", "object_repr": "Am Planetarium 2", "action_flag": 3, "change_message": ""}}, {"model": "admin.logentry", "pk": 25, "fields": {"action_time": "2023-07-12T07:36:05.193Z", "user": 1, "content_type": 16, "object_id": "8b6e9a65-46e0-4408-84b7-c9a254e2552d", "object_repr": "Am Planetarium 2, 07743 Jena", "action_flag": 1, "change_message": "[{\"added\": {}}]"}}, {"model": "admin.logentry", "pk": 26, "fields": {"action_time": "2023-07-12T08:02:29.870Z", "user": 1, "content_type": 16, "object_id": "8b6e9a65-46e0-4408-84b7-c9a254e2552d", "object_repr": "Am Planetarium 2, 07743 Jena", "action_flag": 3, "change_message": ""}}, {"model": "auth.permission", "pk": 1, "fields": {"name": "Can add log entry", "content_type": 1, "codename": "add_logentry"}}, {"model": "auth.permission", "pk": 2, "fields": {"name": "Can change log entry", "content_type": 1, "codename": "change_logentry"}}, {"model": "auth.permission", "pk": 3, "fields": {"name": "Can delete log entry", "content_type": 1, "codename": "delete_logentry"}}, {"model": "auth.permission", "pk": 4, "fields": {"name": "Can view log entry", "content_type": 1, "codename": "view_logentry"}}, {"model": "auth.permission", "pk": 5, "fields": {"name": "Can add permission", "content_type": 2, "codename": "add_permission"}}, {"model": "auth.permission", "pk": 6, "fields": {"name": "Can change permission", "content_type": 2, "codename": "change_permission"}}, {"model": "auth.permission", "pk": 7, "fields": {"name": "Can delete permission", "content_type": 2, "codename": "delete_permission"}}, {"model": "auth.permission", "pk": 8, "fields": {"name": "Can view permission", "content_type": 2, "codename": "view_permission"}}, {"model": "auth.permission", "pk": 9, "fields": {"name": "Can add group", "content_type": 3, "codename": "add_group"}}, {"model": "auth.permission", "pk": 10, "fields": {"name": "Can change group", "content_type": 3, "codename": "change_group"}}, {"model": "auth.permission", "pk": 11, "fields": {"name": "Can delete group", "content_type": 3, "codename": "delete_group"}}, {"model": "auth.permission", "pk": 12, "fields": {"name": "Can view group", "content_type": 3, "codename": "view_group"}}, {"model": "auth.permission", "pk": 13, "fields": {"name": "Can add user", "content_type": 4, "codename": "add_user"}}, {"model": "auth.permission", "pk": 14, "fields": {"name": "Can change user", "content_type": 4, "codename": "change_user"}}, {"model": "auth.permission", "pk": 15, "fields": {"name": "Can delete user", "content_type": 4, "codename": "delete_user"}}, {"model": "auth.permission", "pk": 16, "fields": {"name": "Can view user", "content_type": 4, "codename": "view_user"}}, {"model": "auth.permission", "pk": 17, "fields": {"name": "Can add content type", "content_type": 5, "codename": "add_contenttype"}}, {"model": "auth.permission", "pk": 18, "fields": {"name": "Can change content type", "content_type": 5, "codename": "change_contenttype"}}, {"model": "auth.permission", "pk": 19, "fields": {"name": "Can delete content type", "content_type": 5, "codename": "delete_contenttype"}}, {"model": "auth.permission", "pk": 20, "fields": {"name": "Can view content type", "content_type": 5, "codename": "view_contenttype"}}, {"model": "auth.permission", "pk": 21, "fields": {"name": "Can add session", "content_type": 6, "codename": "add_session"}}, {"model": "auth.permission", "pk": 22, "fields": {"name": "Can change session", "content_type": 6, "codename": "change_session"}}, {"model": "auth.permission", "pk": 23, "fields": {"name": "Can delete session", "content_type": 6, "codename": "delete_session"}}, {"model": "auth.permission", "pk": 24, "fields": {"name": "Can view session", "content_type": 6, "codename": "view_session"}}, {"model": "auth.permission", "pk": 25, "fields": {"name": "Can add email address", "content_type": 7, "codename": "add_emailaddress"}}, {"model": "auth.permission", "pk": 26, "fields": {"name": "Can change email address", "content_type": 7, "codename": "change_emailaddress"}}, {"model": "auth.permission", "pk": 27, "fields": {"name": "Can delete email address", "content_type": 7, "codename": "delete_emailaddress"}}, {"model": "auth.permission", "pk": 28, "fields": {"name": "Can view email address", "content_type": 7, "codename": "view_emailaddress"}}, {"model": "auth.permission", "pk": 29, "fields": {"name": "Can add email confirmation", "content_type": 8, "codename": "add_emailconfirmation"}}, {"model": "auth.permission", "pk": 30, "fields": {"name": "Can change email confirmation", "content_type": 8, "codename": "change_emailconfirmation"}}, {"model": "auth.permission", "pk": 31, "fields": {"name": "Can delete email confirmation", "content_type": 8, "codename": "delete_emailconfirmation"}}, {"model": "auth.permission", "pk": 32, "fields": {"name": "Can view email confirmation", "content_type": 8, "codename": "view_emailconfirmation"}}, {"model": "auth.permission", "pk": 33, "fields": {"name": "Can add social account", "content_type": 9, "codename": "add_socialaccount"}}, {"model": "auth.permission", "pk": 34, "fields": {"name": "Can change social account", "content_type": 9, "codename": "change_socialaccount"}}, {"model": "auth.permission", "pk": 35, "fields": {"name": "Can delete social account", "content_type": 9, "codename": "delete_socialaccount"}}, {"model": "auth.permission", "pk": 36, "fields": {"name": "Can view social account", "content_type": 9, "codename": "view_socialaccount"}}, {"model": "auth.permission", "pk": 37, "fields": {"name": "Can add social application", "content_type": 10, "codename": "add_socialapp"}}, {"model": "auth.permission", "pk": 38, "fields": {"name": "Can change social application", "content_type": 10, "codename": "change_socialapp"}}, {"model": "auth.permission", "pk": 39, "fields": {"name": "Can delete social application", "content_type": 10, "codename": "delete_socialapp"}}, {"model": "auth.permission", "pk": 40, "fields": {"name": "Can view social application", "content_type": 10, "codename": "view_socialapp"}}, {"model": "auth.permission", "pk": 41, "fields": {"name": "Can add social application token", "content_type": 11, "codename": "add_socialtoken"}}, {"model": "auth.permission", "pk": 42, "fields": {"name": "Can change social application token", "content_type": 11, "codename": "change_socialtoken"}}, {"model": "auth.permission", "pk": 43, "fields": {"name": "Can delete social application token", "content_type": 11, "codename": "delete_socialtoken"}}, {"model": "auth.permission", "pk": 44, "fields": {"name": "Can view social application token", "content_type": 11, "codename": "view_socialtoken"}}, {"model": "auth.permission", "pk": 45, "fields": {"name": "Can add Voliere", "content_type": 12, "codename": "add_aviary"}}, {"model": "auth.permission", "pk": 46, "fields": {"name": "Can change Voliere", "content_type": 12, "codename": "change_aviary"}}, {"model": "auth.permission", "pk": 47, "fields": {"name": "Can delete Voliere", "content_type": 12, "codename": "delete_aviary"}}, {"model": "auth.permission", "pk": 48, "fields": {"name": "Can view Voliere", "content_type": 12, "codename": "view_aviary"}}, {"model": "auth.permission", "pk": 49, "fields": {"name": "Can add Vogel", "content_type": 13, "codename": "add_bird"}}, {"model": "auth.permission", "pk": 50, "fields": {"name": "Can change Vogel", "content_type": 13, "codename": "change_bird"}}, {"model": "auth.permission", "pk": 51, "fields": {"name": "Can delete Vogel", "content_type": 13, "codename": "delete_bird"}}, {"model": "auth.permission", "pk": 52, "fields": {"name": "Can view Vogel", "content_type": 13, "codename": "view_bird"}}, {"model": "auth.permission", "pk": 53, "fields": {"name": "Can add Patientenstatus", "content_type": 14, "codename": "add_birdstatus"}}, {"model": "auth.permission", "pk": 54, "fields": {"name": "Can change Patientenstatus", "content_type": 14, "codename": "change_birdstatus"}}, {"model": "auth.permission", "pk": 55, "fields": {"name": "Can delete Patientenstatus", "content_type": 14, "codename": "delete_birdstatus"}}, {"model": "auth.permission", "pk": 56, "fields": {"name": "Can view Patientenstatus", "content_type": 14, "codename": "view_birdstatus"}}, {"model": "auth.permission", "pk": 57, "fields": {"name": "Can add Fundumstand", "content_type": 15, "codename": "add_circumstance"}}, {"model": "auth.permission", "pk": 58, "fields": {"name": "Can change Fundumstand", "content_type": 15, "codename": "change_circumstance"}}, {"model": "auth.permission", "pk": 59, "fields": {"name": "Can delete Fundumstand", "content_type": 15, "codename": "delete_circumstance"}}, {"model": "auth.permission", "pk": 60, "fields": {"name": "Can view Fundumstand", "content_type": 15, "codename": "view_circumstance"}}, {"model": "auth.permission", "pk": 61, "fields": {"name": "Can add Patient", "content_type": 16, "codename": "add_fallenbird"}}, {"model": "auth.permission", "pk": 62, "fields": {"name": "Can change Patient", "content_type": 16, "codename": "change_fallenbird"}}, {"model": "auth.permission", "pk": 63, "fields": {"name": "Can delete Patient", "content_type": 16, "codename": "delete_fallenbird"}}, {"model": "auth.permission", "pk": 64, "fields": {"name": "Can view Patient", "content_type": 16, "codename": "view_fallenbird"}}, {"model": "auth.permission", "pk": 65, "fields": {"name": "Can add rescuer", "content_type": 17, "codename": "add_rescuer"}}, {"model": "auth.permission", "pk": 66, "fields": {"name": "Can change rescuer", "content_type": 17, "codename": "change_rescuer"}}, {"model": "auth.permission", "pk": 67, "fields": {"name": "Can delete rescuer", "content_type": 17, "codename": "delete_rescuer"}}, {"model": "auth.permission", "pk": 68, "fields": {"name": "Can view rescuer", "content_type": 17, "codename": "view_rescuer"}}, {"model": "auth.user", "pk": 1, "fields": {"password": "pbkdf2_sha256$600000$RhQEv3KNoa4H7OQHhVliAt$GsfQrEPxv96hUlcCvjsRWQDYkpZyoOJaR1QIQCWA1HY=", "last_login": "2023-07-12T05:39:26.789Z", "is_superuser": true, "username": "admin", "first_name": "", "last_name": "", "email": "admin@email.de", "is_staff": true, "is_active": true, "date_joined": "2023-07-10T18:14:46.130Z", "groups": [], "user_permissions": []}}, {"model": "contenttypes.contenttype", "pk": 1, "fields": {"app_label": "admin", "model": "logentry"}}, {"model": "contenttypes.contenttype", "pk": 2, "fields": {"app_label": "auth", "model": "permission"}}, {"model": "contenttypes.contenttype", "pk": 3, "fields": {"app_label": "auth", "model": "group"}}, {"model": "contenttypes.contenttype", "pk": 4, "fields": {"app_label": "auth", "model": "user"}}, {"model": "contenttypes.contenttype", "pk": 5, "fields": {"app_label": "contenttypes", "model": "contenttype"}}, {"model": "contenttypes.contenttype", "pk": 6, "fields": {"app_label": "sessions", "model": "session"}}, {"model": "contenttypes.contenttype", "pk": 7, "fields": {"app_label": "account", "model": "emailaddress"}}, {"model": "contenttypes.contenttype", "pk": 8, "fields": {"app_label": "account", "model": "emailconfirmation"}}, {"model": "contenttypes.contenttype", "pk": 9, "fields": {"app_label": "socialaccount", "model": "socialaccount"}}, {"model": "contenttypes.contenttype", "pk": 10, "fields": {"app_label": "socialaccount", "model": "socialapp"}}, {"model": "contenttypes.contenttype", "pk": 11, "fields": {"app_label": "socialaccount", "model": "socialtoken"}}, {"model": "contenttypes.contenttype", "pk": 12, "fields": {"app_label": "aviary", "model": "aviary"}}, {"model": "contenttypes.contenttype", "pk": 13, "fields": {"app_label": "bird", "model": "bird"}}, {"model": "contenttypes.contenttype", "pk": 14, "fields": {"app_label": "bird", "model": "birdstatus"}}, {"model": "contenttypes.contenttype", "pk": 15, "fields": {"app_label": "bird", "model": "circumstance"}}, {"model": "contenttypes.contenttype", "pk": 16, "fields": {"app_label": "bird", "model": "fallenbird"}}, {"model": "contenttypes.contenttype", "pk": 17, "fields": {"app_label": "rescuer", "model": "rescuer"}}, {"model": "sessions.session", "pk": "1qr2tbdael0jms9ajxqvv1se87fi115x", "fields": {"session_data": ".eJxVjEEOwiAQRe_C2pAZaEvp0r1nIANMLWrAlDbRGO-uTbrQ7X_vv5dwtC6TWyvPLkUxCBSH381TuHLeQLxQPhcZSl7m5OWmyJ1WeSqRb8fd_QtMVKfvG5gaQKuNVT0SNThCMBg5WLDRRkXYh77VLalOezAjBsvYmi5a5b3SZotWrjWV7PhxT_NTDKjAdgDvD97DP6g:1qJHPZ:zJ963EiwcssvCZO8rhUx8-yP25K-Fv78TaZu7AZQzTo", "expire_date": "2023-07-25T17:44:29.094Z"}}, {"model": "sessions.session", "pk": "gqf28j65p1hlhu3uxy81c87uzj5w0q5h", "fields": {"session_data": ".eJxVj8sOwiAURP-FdUO49EHp0r3fQC5wa9EGDJREY_x3bdKFbufMnGRezGDdFlMLZRM8mxiw5jez6G4Ud-CvGC-JuxS3HCzfK_yghZ-Tp_V0dP8EC5bluxaEnQDdKi1HQOxgFk6BJ6eF9tpLhNGNfdujHFor1AxOE_Rq8FpaK1u1SwuVElI09LiH_GQTSKEHIRqWqbh6HIh1Xd8fkj9GMg:1qIxlY:hAgNe1GquWyll01fvgJDCPU6YFvkQpIw3rFs0P_XpcY", "expire_date": "2023-07-24T20:45:52.146Z"}}, {"model": "sessions.session", "pk": "mbbsaga589qigmpbw3s0e18mp2kxfwy2", "fields": {"session_data": ".eJxVjEEOwiAQRe_C2pAZaEvp0r1nIANMLWrAlDbRGO-uTbrQ7X_vv5dwtC6TWyvPLkUxCBSH381TuHLeQLxQPhcZSl7m5OWmyJ1WeSqRb8fd_QtMVKfvG5gaQKuNVT0SNThCMBg5WLDRRkXYh77VLalOezAjBsvYmi5a5b3SZotWrjWV7PhxT_NTDKjAdgDvD97DP6g:1qJ9ma:2-QeO7Mz8SJCLifIzmIHSStpJ5F_9jjv_FNubJgf1Fc", "expire_date": "2023-07-25T09:35:44.797Z"}}, {"model": "sessions.session", "pk": "zfjoyauy0cu1pbofih3onjeqp9rgu5mz", "fields": {"session_data": ".eJxVjEEOwiAQRe_C2pAZaEvp0r1nIANMLWrAlDbRGO-uTbrQ7X_vv5dwtC6TWyvPLkUxCBSH381TuHLeQLxQPhcZSl7m5OWmyJ1WeSqRb8fd_QtMVKfvG5gaQKuNVT0SNThCMBg5WLDRRkXYh77VLalOezAjBsvYmi5a5b3SZotWrjWV7PhxT_NTDKjAdgDvD97DP6g:1qJSZS:V5bTWlnu4zezq5viLHixHHitPrIRTHlrfMgSWeHza1Q", "expire_date": "2023-07-26T05:39:26.801Z"}}, {"model": "account.emailaddress", "pk": 1, "fields": {"user": 1, "email": "admin@email.de", "verified": true, "primary": true}}, {"model": "aviary.aviary", "pk": "3fac01df-caf6-438e-a1f6-e7dc24637dd3", "fields": {"description": "Voliere 1", "condition": "Offen", "last_ward_round": "2023-07-10"}}, {"model": "aviary.aviary", "pk": "a0d34198-ef0f-464c-8b8c-06ede7ea25be", "fields": {"description": "Voliere 2", "condition": "Geschlossen", "last_ward_round": "2023-07-10"}}, {"model": "aviary.aviary", "pk": "affd9d6a-1397-4170-b679-a37b8f104b2d", "fields": {"description": "Voliere 3", "condition": "Gesperrt", "last_ward_round": "2023-07-10"}}, {"model": "bird.bird", "pk": "644e7e4a-9c09-40ed-bc2f-b8470a18f305", "fields": {"name": "Spatz", "description": "Spatz Hilfetext"}}, {"model": "bird.bird", "pk": "7094551b-2947-4b2c-a859-407e1c3d7be0", "fields": {"name": "Amsel", "description": "Amsel Hilfetext"}}, {"model": "bird.birdstatus", "pk": 1, "fields": {"description": "In Behandlung"}}, {"model": "bird.birdstatus", "pk": 2, "fields": {"description": "In Auswilderung"}}, {"model": "bird.birdstatus", "pk": 3, "fields": {"description": "Ausgewildert"}}, {"model": "bird.birdstatus", "pk": 4, "fields": {"description": "Übermittelt"}}, {"model": "bird.birdstatus", "pk": 5, "fields": {"description": "Verstorben"}}, {"model": "bird.circumstance", "pk": 2, "fields": {"description": "Scheibenschlag"}}, {"model": "bird.circumstance", "pk": 3, "fields": {"description": "Angriff Hund/Katze"}}, {"model": "bird.circumstance", "pk": 4, "fields": {"description": "Entkräftet"}}, {"model": "bird.circumstance", "pk": 5, "fields": {"description": "Verkehrsunfall"}}, {"model": "bird.circumstance", "pk": 6, "fields": {"description": "unbekannt"}}, {"model": "rescuer.rescuer", "pk": "4c3e416d-1f9c-45e7-aafd-d237becf361c", "fields": {"first_name": "Elmo", "last_name": "Piggy", "street": "Sesamstraße", "street_number": "22", "city": "Dreamworld", "zip_code": "08873", "phone": "+49871623662", "user": 1}}] \ No newline at end of file diff --git a/app/requirements.txt b/app/requirements.txt index b5e8a68..2f63297 100644 --- a/app/requirements.txt +++ b/app/requirements.txt @@ -1,8 +1,8 @@ Django>=4.2 +crispy-bootstrap5>=0.6 django-allauth>=0.50 django-bootstrap-datepicker-plus>=4.0 django-bootstrap-modal-forms>=2 django-crispy-forms>=1 django-jazzmin>=2.6.0 -crispy-bootstrap5>=0.6 names>=0.3.0 diff --git a/app/rescuer/migrations/0002_alter_rescuer_options_alter_rescuer_city_and_more.py b/app/rescuer/migrations/0002_alter_rescuer_options_alter_rescuer_city_and_more.py new file mode 100644 index 0000000..7f4c35f --- /dev/null +++ b/app/rescuer/migrations/0002_alter_rescuer_options_alter_rescuer_city_and_more.py @@ -0,0 +1,52 @@ +# Generated by Django 4.2.3 on 2023-07-12 06:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("rescuer", "0001_initial"), + ] + + operations = [ + migrations.AlterModelOptions( + name="rescuer", + options={"verbose_name": "Finder", "verbose_name_plural": "Finder"}, + ), + migrations.AlterField( + model_name="rescuer", + name="city", + field=models.CharField(max_length=200, verbose_name="Stadt"), + ), + migrations.AlterField( + model_name="rescuer", + name="first_name", + field=models.CharField(max_length=200, verbose_name="Vorname"), + ), + migrations.AlterField( + model_name="rescuer", + name="last_name", + field=models.CharField(max_length=200, verbose_name="Nachname"), + ), + migrations.AlterField( + model_name="rescuer", + name="phone", + field=models.CharField(max_length=200, verbose_name="Telefon"), + ), + migrations.AlterField( + model_name="rescuer", + name="street", + field=models.CharField(max_length=200, verbose_name="Straße"), + ), + migrations.AlterField( + model_name="rescuer", + name="street_number", + field=models.CharField(max_length=20, verbose_name="Nummer"), + ), + migrations.AlterField( + model_name="rescuer", + name="zip_code", + field=models.CharField(max_length=200, verbose_name="PLZ"), + ), + ] diff --git a/app/rescuer/models.py b/app/rescuer/models.py index f5715d4..1d5d428 100644 --- a/app/rescuer/models.py +++ b/app/rescuer/models.py @@ -15,7 +15,9 @@ class Rescuer(models.Model): city = models.CharField(max_length=200, verbose_name=_("Stadt")) zip_code = models.CharField(max_length=200, verbose_name=_("PLZ")) phone = models.CharField(max_length=200, verbose_name=_("Telefon")) - user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + user = models.ForeignKey( + settings.AUTH_USER_MODEL, + on_delete=models.CASCADE) class Meta: verbose_name = _("Finder")