aviary worked on

README.md

@@ -18,5 +18,5 @@ python3 manage.py loaddata fixtures/data.json
 ## Test Account
 The test account you can use:
 
-- user: gw
+- user: admin
 - password: abcdef

aviary/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-28 20:12
+# Generated by Django 4.2.2 on 2023-06-28 20:31
 
 from django.db import migrations, models
 import uuid

bird/admin.py

@@ -1,6 +1,6 @@
 from django.contrib import admin
 
-from .models import Bird, FallenBird
+from .models import Bird, FallenBird, BirdStatus
 
 
 @admin.register(FallenBird)
@@ -18,3 +18,8 @@ class FallenBirdAdmin(admin.ModelAdmin):
 @admin.register(Bird)
 class BirdAdmin(admin.ModelAdmin):
     list_display = ["name"]
+
+
+@admin.register(BirdStatus)
+class BirdStatusAdmin(admin.ModelAdmin):
+    list_display = ["description"]

bird/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-28 20:12
+# Generated by Django 4.2.2 on 2023-06-28 20:57
 
 from django.conf import settings
 from django.db import migrations, models
@@ -12,9 +12,9 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ("rescuer", "0001_initial"),
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ("aviary", "0001_initial"),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ("rescuer", "0001_initial"),
     ]
 
     operations = [
@@ -33,6 +33,21 @@ class Migration(migrations.Migration):
                 ("name", models.CharField(max_length=256)),
             ],
         ),
+        migrations.CreateModel(
+            name="BirdStatus",
+            fields=[
+                (
+                    "id",
+                    models.UUIDField(
+                        default=uuid.uuid4,
+                        editable=False,
+                        primary_key=True,
+                        serialize=False,
+                    ),
+                ),
+                ("description", models.CharField(max_length=256)),
+            ],
+        ),
         migrations.CreateModel(
             name="FallenBird",
             fields=[
@@ -378,7 +393,10 @@ class Migration(migrations.Migration):
                 (
                     "aviary",
                     models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE, to="aviary.aviary"
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="aviary.aviary",
                     ),
                 ),
                 (
@@ -390,10 +408,21 @@ class Migration(migrations.Migration):
                 (
                     "rescuer",
                     models.ForeignKey(
-                        on_delete=django.db.models.deletion.CASCADE,
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
                         to="rescuer.rescuer",
                     ),
                 ),
+                (
+                    "status",
+                    models.ForeignKey(
+                        blank=True,
+                        null=True,
+                        on_delete=django.db.models.deletion.SET_NULL,
+                        to="bird.birdstatus",
+                    ),
+                ),
                 (
                     "user",
                     models.ForeignKey(

bird/models.py

@@ -2,11 +2,18 @@ from uuid import uuid4
 
 from django.conf import settings
 from django.db import models
-
 from djmoney.models.fields import MoneyField
 
-from rescuer.models import Rescuer
 from aviary.models import Aviary
+from rescuer.models import Rescuer
+
+
+#  STATUS = [
+#  ("In Behandlung", "In Behandlung"),
+#  ("In Auswilderung", "In Auswilderung"),
+#  ("Ausgewildert", "Ausgewildert"),
+#  ("Verstorben", "Verstorben"),
+#  ]
 
 
 class FallenBird(models.Model):
@@ -17,12 +24,16 @@ class FallenBird(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     updated = models.DateTimeField(auto_now=True)
     diagnostic_finding = models.CharField(max_length=256)
-    cost_sum = MoneyField( max_digits=4, decimal_places=2,
+    cost_sum = MoneyField(
-                          default_currency='EUR')
+        max_digits=4, decimal_places=2, default_currency='EUR')
-    rescuer = models.ForeignKey(Rescuer, on_delete=models.CASCADE)
+    rescuer = models.ForeignKey(
-    user = models.ForeignKey( settings.AUTH_USER_MODEL,
+        Rescuer, on_delete=models.SET_NULL, blank=True, null=True)
-                             on_delete=models.CASCADE)
+    user = models.ForeignKey(
-    aviary = models.ForeignKey(Aviary, on_delete=models.CASCADE)
+        settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
+    aviary = models.ForeignKey(
+        Aviary, on_delete=models.SET_NULL, blank=True, null=True)
+    status = models.ForeignKey(
+        "BirdStatus", on_delete=models.SET_NULL, blank=True, null=True)
 
     def __str__(self):
         return self.place
@@ -34,3 +45,11 @@ class Bird(models.Model):
 
     def __str__(self):
         return self.name
+
+
+class BirdStatus(models.Model):
+    id = models.UUIDField(primary_key=True, default=uuid4, editable=False)
+    description = models.CharField(max_length=256)
+
+    def __str__(self):
+        return self.description

rescuer/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.2 on 2023-06-28 20:12
+# Generated by Django 4.2.2 on 2023-06-28 20:31
 
 from django.conf import settings
 from django.db import migrations, models