From 4f2e8277dfe6e309b2dbc97b6ae114e40ff6abb8 Mon Sep 17 00:00:00 2001 From: gw3000 Date: Wed, 12 Jul 2023 12:00:03 +0200 Subject: [PATCH] linting formating --- app/aviary/admin.py | 2 +- app/bird/models.py | 40 +++++++++++++++++----- app/core/settings.py | 77 +++++++++++++------------------------------ app/rescuer/admin.py | 2 -- app/rescuer/apps.py | 2 -- app/rescuer/models.py | 12 +++---- 6 files changed, 61 insertions(+), 74 deletions(-) diff --git a/app/aviary/admin.py b/app/aviary/admin.py index 8f75713..36cae87 100644 --- a/app/aviary/admin.py +++ b/app/aviary/admin.py @@ -9,5 +9,5 @@ class AviaryAdmin(admin.ModelAdmin): "description", "condition", "last_ward_round", - ] + ] list_filter = ("description", "condition", "last_ward_round") diff --git a/app/bird/models.py b/app/bird/models.py index fd4894a..460d05a 100644 --- a/app/bird/models.py +++ b/app/bird/models.py @@ -15,18 +15,40 @@ 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=_("Kennung")) - bird = models.ForeignKey( "Bird", on_delete=models.CASCADE, verbose_name=_("Patient")) + bird = models.ForeignKey( + "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")) - 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")) + 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, verbose_name=_("Voliere")) + aviary = models.ForeignKey( + Aviary, + on_delete=models.SET_NULL, + blank=True, + null=True, + verbose_name=_("Voliere"), + ) class Meta: verbose_name = _("Patient") @@ -51,7 +73,9 @@ class Bird(models.Model): class BirdStatus(models.Model): id = models.BigAutoField(primary_key=True) - description = models.CharField(max_length=256, unique=True, verbose_name=_("Bezeichnung")) + description = models.CharField( + max_length=256, unique=True, verbose_name=_("Bezeichnung") + ) class Meta: verbose_name = _("Patientenstatus") diff --git a/app/core/settings.py b/app/core/settings.py index 4976e15..3664e0d 100644 --- a/app/core/settings.py +++ b/app/core/settings.py @@ -29,11 +29,11 @@ SECRET_KEY = ")g-j2v+*dvjtnz)q-3+*y7*lq$el$im8p^wr@2v$g^u99quq50" # SECURITY WARNING: don't run with debug turned on in production! # DEBUG = True -DEBUG = env('DEBUG') +DEBUG = env("DEBUG") # ALLOWED_HOSTS = [] -ALLOWED_HOSTS = env('DJANGO_ALLOWED_HOSTS', default=[]) +ALLOWED_HOSTS = env("DJANGO_ALLOWED_HOSTS", default=[]) # Application definition @@ -121,7 +121,7 @@ DATABASES = { # "PASSWORD": "django_traefik", # "HOST": "db", # "PORT": "5432", - 'default': env.db(), + "default": env.db(), } } @@ -131,20 +131,16 @@ DATABASES = { AUTH_PASSWORD_VALIDATORS = [ { - "NAME": - "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", + "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator", }, { - "NAME": - "django.contrib.auth.password_validation.MinimumLengthValidator", + "NAME": "django.contrib.auth.password_validation.MinimumLengthValidator", }, { - "NAME": - "django.contrib.auth.password_validation.CommonPasswordValidator", + "NAME": "django.contrib.auth.password_validation.CommonPasswordValidator", }, { - "NAME": - "django.contrib.auth.password_validation.NumericPasswordValidator", + "NAME": "django.contrib.auth.password_validation.NumericPasswordValidator", }, ] @@ -166,7 +162,7 @@ USE_TZ = True STATIC_URL = "static/" STATICFILES_DIRS = [BASE_DIR / "static"] -STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage' +STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage" # Default primary key field type # https://docs.djangoproject.com/en/4.2/ref/settings/#default-auto-field @@ -199,117 +195,88 @@ EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend" JAZZMIN_SETTINGS = { # title of the window (Will default to current_admin_site.site_title if absent or None) "site_title": "FBF Admin", - # Title on the login screen (19 chars max) (defaults to current_admin_site.site_header if absent or None) "site_header": "Fallen Birdy App", - # Title on the brand (19 chars max) (defaults to current_admin_site.site_header if absent or None) "site_brand": "Fallen Birdy App", - # Logo to use for your site, must be present in static files, used for brand on top left # "site_logo": "img/wvhLogo.svg", - # Logo to use for your site, must be present in static files, used for login form logo (defaults to site_logo) "login_logo": None, - # Logo to use for login form in dark themes (defaults to login_logo) "login_logo_dark": None, - # CSS classes that are applied to the logo above "site_logo_classes": "img-circle", - # Relative path to a favicon for your site, will default to site_logo if absent (ideally 32x32 px) "site_icon": None, - # Welcome text on the login screen "welcome_sign": "Willkommen bei der FBF-App im Admin-Bereich", - # Copyright on the footer # "copyright": "Acme Library Ltd", - # List of model admins to search from the search bar, search bar omitted if excluded # If you want to use a single search field you dont need to use a list, you can use a simple string "search_model": ["auth.User", "auth.Group"], - # Field name on user model that contains avatar ImageField/URLField/Charfield or a callable that receives the user "user_avatar": None, - ############ # Top Menu # ############ - # Links to put along the top menu "topmenu_links": [ - # Url that gets reversed (Permissions can be added) # {"name": "Home", "url": "admin:index", "permissions": ["auth.view_user"]}, - # external url that opens in a new window (Permissions can be added) # {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True}, - # model admin to link to (Permissions checked against model) {"model": "auth.User"}, - # App with dropdown menu to all its models pages (Permissions checked against models) # {"app": "books"}, ], - ############# # User Menu # ############# - # Additional links to include in the user menu on the top right ("app" url type is not allowed) # "usermenu_links": [ - # {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True}, - # {"model": "auth.user"} + # {"name": "Support", "url": "https://github.com/farridav/django-jazzmin/issues", "new_window": True}, + # {"model": "auth.user"} # ], - ############# # Side Menu # ############# - # Whether to display the side menu "show_sidebar": True, - # Whether to aut expand the menu "navigation_expanded": True, - # Hide these apps when generating side menu e.g (auth) # "hide_apps": [], - # Hide these models when generating side menu (e.g auth.user) # "hide_models": [], - # List of apps (and/or models) to base side menu ordering off of (does not need to contain all apps/models) # "order_with_respect_to": ["auth", "books", "books.author", "books.book"], - # Custom links to append to app groups, keyed on app name # "custom_links": { - # "books": [{ - # "name": "Make Messages", - # "url": "make_messages", - # "icon": "fas fa-comments", - # "permissions": ["books.view_book"] - # }] + # "books": [{ + # "name": "Make Messages", + # "url": "make_messages", + # "icon": "fas fa-comments", + # "permissions": ["books.view_book"] + # }] # }, - # Custom icons for side menu apps/models See https://fontawesome.com/icons?d=gallery&m=free&v=5.0.0,5.0.1,5.0.10,5.0.11,5.0.12,5.0.13,5.0.2,5.0.3,5.0.4,5.0.5,5.0.6,5.0.7,5.0.8,5.0.9,5.1.0,5.1.1,5.2.0,5.3.0,5.3.1,5.4.0,5.4.1,5.4.2,5.13.0,5.12.0,5.11.2,5.11.1,5.10.0,5.9.0,5.8.2,5.8.1,5.7.2,5.7.1,5.7.0,5.6.3,5.5.0,5.4.2 # for the full list of 5.13.0 free icon classes # "icons": { - # "auth": "fas fa-users-cog", - # "auth.user": "fas fa-user", - # "auth.Group": "fas fa-users", + # "auth": "fas fa-users-cog", + # "auth.user": "fas fa-user", + # "auth.Group": "fas fa-users", # }, # Icons that are used when one is not manually specified # "default_icon_parents": "fas fa-chevron-circle-right", # "default_icon_children": "fas fa-circle", - ################# # Related Modal # ################# # Use modals instead of popups # "related_modal_active": False, - ############# # UI Tweaks # ############# @@ -320,7 +287,6 @@ JAZZMIN_SETTINGS = { "use_google_fonts_cdn": True, # Whether to show the UI customizer on the sidebar "show_ui_builder": True, - ############### # Change view # ############### @@ -332,7 +298,10 @@ JAZZMIN_SETTINGS = { # - carousel "changeform_format": "horizontal_tabs", # override change forms on a per modeladmin basis - "changeform_format_overrides": {"auth.user": "collapsible", "auth.group": "vertical_tabs"}, + "changeform_format_overrides": { + "auth.user": "collapsible", + "auth.group": "vertical_tabs", + }, # Add a language dropdown into the admin # "language_chooser": True, } diff --git a/app/rescuer/admin.py b/app/rescuer/admin.py index f02470f..d87ce7c 100644 --- a/app/rescuer/admin.py +++ b/app/rescuer/admin.py @@ -1,5 +1,3 @@ -from django.contrib import admin - from django.contrib import admin from .models import Rescuer diff --git a/app/rescuer/apps.py b/app/rescuer/apps.py index f2629af..ede70ce 100644 --- a/app/rescuer/apps.py +++ b/app/rescuer/apps.py @@ -2,9 +2,7 @@ from django.apps import AppConfig from django.utils.translation import gettext_lazy as _ - class RescuerConfig(AppConfig): default_auto_field = "django.db.models.BigAutoField" name = "rescuer" verbose_name = _("Finder") - diff --git a/app/rescuer/models.py b/app/rescuer/models.py index 1d5d428..041d6d7 100644 --- a/app/rescuer/models.py +++ b/app/rescuer/models.py @@ -8,16 +8,14 @@ from django.utils.translation import gettext_lazy as _ class Rescuer(models.Model): id = models.UUIDField(primary_key=True, default=uuid4, editable=False) - first_name = models.CharField(max_length=200, verbose_name=_("Vorname")) - last_name = models.CharField(max_length=200, verbose_name=_("Nachname")) + first_name = models.CharField(max_length=200, verbose_name=_("Vorname")) + last_name = models.CharField(max_length=200, verbose_name=_("Nachname")) street = models.CharField(max_length=200, verbose_name=_("Straße")) street_number = models.CharField(max_length=20, verbose_name=_("Nummer")) 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) + 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) class Meta: verbose_name = _("Finder")