From 5b6c8db5743b449e2550902cbdae700e9d3b2ff8 Mon Sep 17 00:00:00 2001 From: gnuter3000 Date: Mon, 3 Jul 2023 23:00:38 +0200 Subject: [PATCH] little modifications --- aviary/models.py | 3 ++- bird/models.py | 32 +++++++++++++++----------------- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/aviary/models.py b/aviary/models.py index 6329afe..76d59ef 100644 --- a/aviary/models.py +++ b/aviary/models.py @@ -7,7 +7,8 @@ from django.utils.translation import gettext_lazy as _ class Aviary(models.Model): id = models.UUIDField(primary_key=True, default=uuid4, editable=False) description = models.CharField( - max_length=256, verbose_name=_("Beschreibung")) + max_length=256, verbose_name=_("Beschreibung"), unique=True + ) condition = models.CharField(max_length=256, verbose_name=_("Zustand")) last_ward_round = models.DateField(verbose_name=_("letzte Visite")) diff --git a/bird/models.py b/bird/models.py index 59ea4e2..ab5fdf6 100644 --- a/bird/models.py +++ b/bird/models.py @@ -1,3 +1,4 @@ +import names from uuid import uuid4 from django.conf import settings @@ -10,27 +11,24 @@ from rescuer.models import Rescuer class FallenBird(models.Model): id = models.UUIDField(primary_key=True, default=uuid4, editable=False) + bird_identifier = models.CharField(max_length=256,default=names.get_full_name(), verbose_name=_("Kennung")) bird = models.ForeignKey( - "Bird", - on_delete=models.CASCADE, - verbose_name=_("Patient")) + "Bird", on_delete=models.CASCADE, verbose_name=_("Patient") + ) 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")) + created = models.DateTimeField(auto_now_add=True, verbose_name=_("angelegt am")) + updated = models.DateTimeField(auto_now=True, verbose_name=_("geändert am")) diagnostic_finding = models.CharField(max_length=256) - cost_sum = models.DecimalField(max_digits=4, decimal_places=2) + cost_sum = models.DecimalField(max_digits=5, decimal_places=2, default=0.00) rescuer = models.ForeignKey( - Rescuer, on_delete=models.SET_NULL, blank=True, null=True) - user = models.ForeignKey( - settings.AUTH_USER_MODEL, on_delete=models.CASCADE) + Rescuer, on_delete=models.SET_NULL, blank=True, null=True + ) + user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) status = models.ForeignKey( - "BirdStatus", on_delete=models.SET_NULL, blank=True, null=True) - aviary = models.ForeignKey( - Aviary, on_delete=models.SET_NULL, blank=True, null=True) + "BirdStatus", on_delete=models.SET_NULL, blank=True, null=True + ) + aviary = models.ForeignKey(Aviary, on_delete=models.SET_NULL, blank=True, null=True) class Meta: verbose_name = _("Patient") @@ -42,7 +40,7 @@ class FallenBird(models.Model): class Bird(models.Model): id = models.UUIDField(primary_key=True, default=uuid4, editable=False) - name = models.CharField(max_length=256) + name = models.CharField(max_length=256, unique=True) class Meta: verbose_name = _("Vogel") @@ -54,7 +52,7 @@ class Bird(models.Model): class BirdStatus(models.Model): id = models.UUIDField(primary_key=True, default=uuid4, editable=False) - description = models.CharField(max_length=256) + description = models.CharField(max_length=256, unique=True) class Meta: verbose_name = _("Patientenstatus")