From 3a3bcea588dc6008d8e4b7fcfc021acc0e211da1 Mon Sep 17 00:00:00 2001 From: gw3000 Date: Tue, 10 Oct 2023 08:12:40 +0200 Subject: [PATCH] Finder als eigene Abfrage entfernen Fixes #62 --- app/aviary/migrations/0001_initial.py | 53 +++---------- app/bird/forms.py | 2 + app/bird/migrations/0001_initial.py | 10 +-- .../0002_alter_birdstatus_description.py | 19 ----- app/bird/models.py | 9 +-- app/bird/templates/bird/bird_all.html | 38 +-------- app/bird/templates/bird/bird_create.html | 5 +- app/bird/templates/bird/bird_inactive.html | 4 - app/bird/templates/bird/bird_single.html | 1 - app/bird/views.py | 23 +----- app/core/jazzmin.py | 3 +- app/core/settings.py | 2 +- app/core/urls.py | 1 - app/costs/migrations/0001_initial.py | 2 +- app/export/views.py | 2 - app/rescuer/__init__.py | 0 app/rescuer/admin.py | 15 ---- app/rescuer/apps.py | 8 -- app/rescuer/forms.py | 31 -------- app/rescuer/migrations/0001_initial.py | 59 -------------- .../migrations/0002_alter_rescuer_options.py | 17 ---- app/rescuer/migrations/__init__.py | 0 app/rescuer/models.py | 26 ------ .../templates/rescuer/rescuer_all.html | 79 ------------------- .../templates/rescuer/rescuer_create.html | 40 ---------- .../templates/rescuer/rescuer_delete.html | 25 ------ .../templates/rescuer/rescuer_edit.html | 32 -------- .../templates/rescuer/rescuer_single.html | 51 ------------ app/rescuer/tests.py | 3 - app/rescuer/urls.py | 17 ---- app/rescuer/views.py | 64 --------------- app/templates/partials/_navbar.html | 6 +- 32 files changed, 32 insertions(+), 615 deletions(-) delete mode 100644 app/bird/migrations/0002_alter_birdstatus_description.py delete mode 100644 app/rescuer/__init__.py delete mode 100644 app/rescuer/admin.py delete mode 100644 app/rescuer/apps.py delete mode 100644 app/rescuer/forms.py delete mode 100644 app/rescuer/migrations/0001_initial.py delete mode 100644 app/rescuer/migrations/0002_alter_rescuer_options.py delete mode 100644 app/rescuer/migrations/__init__.py delete mode 100644 app/rescuer/models.py delete mode 100644 app/rescuer/templates/rescuer/rescuer_all.html delete mode 100644 app/rescuer/templates/rescuer/rescuer_create.html delete mode 100644 app/rescuer/templates/rescuer/rescuer_delete.html delete mode 100644 app/rescuer/templates/rescuer/rescuer_edit.html delete mode 100644 app/rescuer/templates/rescuer/rescuer_single.html delete mode 100644 app/rescuer/tests.py delete mode 100644 app/rescuer/urls.py delete mode 100644 app/rescuer/views.py diff --git a/app/aviary/migrations/0001_initial.py b/app/aviary/migrations/0001_initial.py index fab3309..e467c55 100644 --- a/app/aviary/migrations/0001_initial.py +++ b/app/aviary/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.3 on 2023-07-28 14:09 +# Generated by Django 4.2.6 on 2023-10-09 21:31 from django.db import migrations, models import uuid @@ -8,53 +8,22 @@ class Migration(migrations.Migration): initial = True - dependencies = [] + dependencies = [ + ] operations = [ migrations.CreateModel( - name="Aviary", + name='Aviary', fields=[ - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "description", - models.CharField( - max_length=256, unique=True, verbose_name="Beschreibung" - ), - ), - ( - "condition", - models.CharField( - choices=[ - ("Offen", "Offen"), - ("Geschlossen", "Geschlossen"), - ("Gesperrt", "Gesperrt"), - ], - max_length=256, - verbose_name="Zustand", - ), - ), - ("last_ward_round", models.DateField(verbose_name="letzte Visite")), - ( - "comment", - models.CharField( - blank=True, - max_length=512, - null=True, - verbose_name="Bemerkungen", - ), - ), + ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), + ('description', models.CharField(max_length=256, unique=True, verbose_name='Beschreibung')), + ('condition', models.CharField(choices=[('Offen', 'Offen'), ('Geschlossen', 'Geschlossen'), ('Gesperrt', 'Gesperrt')], max_length=256, verbose_name='Zustand')), + ('last_ward_round', models.DateField(verbose_name='letzte Visite')), + ('comment', models.CharField(blank=True, max_length=512, null=True, verbose_name='Bemerkungen')), ], options={ - "verbose_name": "Voliere", - "verbose_name_plural": "Volieren", + 'verbose_name': 'Voliere', + 'verbose_name_plural': 'Volieren', }, ), ] diff --git a/app/bird/forms.py b/app/bird/forms.py index b831a56..84fc109 100644 --- a/app/bird/forms.py +++ b/app/bird/forms.py @@ -26,6 +26,7 @@ class BirdAddForm(forms.ModelForm): "find_circumstances", "diagnostic_finding", "comment", + "finder", ] labels = { "bird_identifier": _("Kennung"), @@ -37,6 +38,7 @@ class BirdAddForm(forms.ModelForm): "find_circumstances": _("Fundumstände"), "diagnostic_finding": _("Diagnose bei Fund"), "comment": _("Bermerkung"), + "finder": _("Finder"), } diff --git a/app/bird/migrations/0001_initial.py b/app/bird/migrations/0001_initial.py index b4618a1..a019dbf 100644 --- a/app/bird/migrations/0001_initial.py +++ b/app/bird/migrations/0001_initial.py @@ -1,5 +1,6 @@ -# Generated by Django 4.2.5 on 2023-09-17 21:04 +# Generated by Django 4.2.6 on 2023-10-09 21:31 +import ckeditor.fields from django.conf import settings from django.db import migrations, models import django.db.models.deletion @@ -11,7 +12,6 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('rescuer', '0002_alter_rescuer_options'), ('aviary', '0001_initial'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), ] @@ -22,7 +22,7 @@ class Migration(migrations.Migration): fields=[ ('id', models.BigAutoField(primary_key=True, serialize=False)), ('name', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')), - ('description', models.CharField(blank=True, max_length=256, null=True, verbose_name='Beschreibung')), + ('description', ckeditor.fields.RichTextField(verbose_name='Erläuterungen')), ], options={ 'verbose_name': 'Vogel', @@ -65,11 +65,11 @@ class Migration(migrations.Migration): ('updated', models.DateTimeField(auto_now=True, verbose_name='geändert am')), ('diagnostic_finding', models.CharField(max_length=256, verbose_name='Diagnose bei Fund')), ('sent_to', models.CharField(blank=True, max_length=256, null=True, verbose_name='Übersandt nach')), - ('comment', models.TextField(blank=True, null=True, verbose_name='Bemerkung')), + ('comment', models.TextField(blank=True, null=True, verbose_name='Bemerkungen')), + ('finder', models.TextField(blank=True, null=True, verbose_name='Finder')), ('aviary', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='aviary.aviary', verbose_name='Voliere')), ('bird', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bird.bird', verbose_name='Vogel')), ('find_circumstances', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='bird.circumstance', verbose_name='Fundumstände')), - ('rescuer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='rescuer.rescuer', verbose_name='Finder')), ('status', models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='bird.birdstatus')), ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Benutzer')), ], diff --git a/app/bird/migrations/0002_alter_birdstatus_description.py b/app/bird/migrations/0002_alter_birdstatus_description.py deleted file mode 100644 index 72a671d..0000000 --- a/app/bird/migrations/0002_alter_birdstatus_description.py +++ /dev/null @@ -1,19 +0,0 @@ -# Generated by Django 4.2.6 on 2023-10-08 09:07 - -import ckeditor.fields -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('bird', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='birdstatus', - name='description', - field=ckeditor.fields.RichTextField(verbose_name='Erläuterungen'), - ), - ] diff --git a/app/bird/models.py b/app/bird/models.py index e3c7622..aee5d54 100644 --- a/app/bird/models.py +++ b/app/bird/models.py @@ -8,7 +8,6 @@ from django.utils.translation import gettext_lazy as _ from ckeditor.fields import RichTextField from aviary.models import Aviary -from rescuer.models import Rescuer CHOICE_AGE = [ @@ -51,13 +50,6 @@ class FallenBird(models.Model): diagnostic_finding = models.CharField( max_length=256, verbose_name=_("Diagnose bei Fund") ) - 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") ) @@ -73,6 +65,7 @@ class FallenBird(models.Model): 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")) class Meta: verbose_name = _("Patient") diff --git a/app/bird/templates/bird/bird_all.html b/app/bird/templates/bird/bird_all.html index 55337e1..1d41b22 100644 --- a/app/bird/templates/bird/bird_all.html +++ b/app/bird/templates/bird/bird_all.html @@ -48,9 +48,7 @@ mehr in Behandlung befindlichen Patienten finden Sie hier.

- +

einen Patienten anlegen

@@ -58,7 +56,6 @@ - @@ -73,7 +70,6 @@ - @@ -84,37 +80,5 @@ {% endfor %}
Patienten Alias Vogel gefunden amFinder Fundort Status Voliere{{ bird.bird_identifier }} {{ bird.bird }} {{ bird.date_found }}{{ bird.rescuer|default_if_none:"" }} {{ bird.place }} {{ bird.status }} {{ bird.aviary|default_if_none:"" }}
- - {% endblock content %} diff --git a/app/bird/templates/bird/bird_create.html b/app/bird/templates/bird/bird_create.html index 8307464..bb0f73d 100644 --- a/app/bird/templates/bird/bird_create.html +++ b/app/bird/templates/bird/bird_create.html @@ -3,15 +3,14 @@ {% load crispy_forms_tags %} {% block content %} -

Patient anlegen

-

(Retter: {{rescuer.first_name}} {{rescuer.last_name}})

+

Einen Patienten anlegen

{% csrf_token %} {{ form|crispy }} Abbrechen - +
* Pflichtfeld
diff --git a/app/bird/templates/bird/bird_inactive.html b/app/bird/templates/bird/bird_inactive.html index 1a19fac..64e85a1 100644 --- a/app/bird/templates/bird/bird_inactive.html +++ b/app/bird/templates/bird/bird_inactive.html @@ -52,7 +52,6 @@ Patienten Alias Vogel gefunden am - Finder Fundort Status Kosten @@ -66,9 +65,6 @@ {{ bird.bird_identifier }} {{ bird.bird }} {{ bird.date_found }} - - {{ bird.rescuer|default_if_none:"" }} - {{ bird.place }} {{ bird.status }} {{ bird.total_costs|default_if_none:"0,00" }} € diff --git a/app/bird/templates/bird/bird_single.html b/app/bird/templates/bird/bird_single.html index 9b72d4c..2ef29f7 100644 --- a/app/bird/templates/bird/bird_single.html +++ b/app/bird/templates/bird/bird_single.html @@ -4,7 +4,6 @@ {% block content %}

Patient {{ bird.bird_identifier }} bearbeiten

-

Finder des Patienten: {{ bird.rescuer|default_if_none:"" }}. Das Alter des Patienten bei Fund wurde mit {{ bird.age }} angegeben.

diff --git a/app/bird/views.py b/app/bird/views.py index 4b82ce8..19f3f0b 100644 --- a/app/bird/views.py +++ b/app/bird/views.py @@ -5,23 +5,17 @@ from django.shortcuts import HttpResponse, redirect, render from .forms import BirdAddForm, BirdEditForm from .models import Bird, FallenBird -from rescuer.models import Rescuer @login_required(login_url="account_login") def bird_create(request): form = BirdAddForm(initial={"bird_identifier": names.get_first_name()}) - # Rescuer for modal usage - rescuer_id = request.session.get("rescuer_id") - rescuer = Rescuer.objects.get(id=rescuer_id) + rescuer_id = None # 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) + rescuer_id = None if form.is_valid(): fs = form.save(commit=False) @@ -30,7 +24,7 @@ def bird_create(request): fs.save() request.session["rescuer_id"] = None return redirect("bird_all") - context = {"form": form, "rescuer": rescuer} + context = {"form": form} return render(request, "bird/bird_create.html", context) @@ -55,16 +49,7 @@ def bird_all(request): .annotate(total_costs=Sum("costs__costs")) .order_by("date_found") ) - rescuer_modal = Rescuer.objects.all() - context = {"birds": birds, "rescuer_modal": rescuer_modal} - # Post came from the modal form. - if request.method == "POST": - rescuer_id = request._post["rescuer_id"] - if rescuer_id != "new_rescuer": - request.session["rescuer_id"] = rescuer_id - return redirect("bird_create") - else: - return redirect("rescuer_create") + context = {"birds": birds} return render(request, "bird/bird_all.html", context) diff --git a/app/core/jazzmin.py b/app/core/jazzmin.py index 55a540b..3d2414c 100644 --- a/app/core/jazzmin.py +++ b/app/core/jazzmin.py @@ -26,7 +26,6 @@ JAZZMIN_SETTINGS = { "aviary.Aviary", "bird.FallenBird", "bird.User", - "rescuer.Rescuer", ], # Field name on user model that contains avatar ImageField/URLField/Charfield or a callable that receives the user # "user_avatar": None, @@ -87,7 +86,7 @@ JAZZMIN_SETTINGS = { "bird.Circumstance": "fas fa-solid fa-ring", "bird.FallenBird": "fas fa-solid fa-bed", "costs.Costs": "fas fa-solid fa-money-bill", - "rescuer.Rescuer": "fas fa-solid fa-user-shield", + # "rescuer.Rescuer": "fas fa-solid fa-user-shield", "socialaccount.socialaccount": "fas fa-solid fa-lock", "socialaccount.socialapp": "fas fa-solid fa-laptop", "socialaccount.socialtoken": "fas fa-solid fa-keyboard", diff --git a/app/core/settings.py b/app/core/settings.py index f0ae66f..689b83e 100644 --- a/app/core/settings.py +++ b/app/core/settings.py @@ -74,7 +74,7 @@ INSTALLED_APPS = [ "bird", "costs", "export", - "rescuer", + ] MIDDLEWARE = [ diff --git a/app/core/urls.py b/app/core/urls.py index a4ecb8c..a394fb2 100644 --- a/app/core/urls.py +++ b/app/core/urls.py @@ -9,7 +9,6 @@ urlpatterns = [ path("bird/", include("bird.urls")), path("costs/", include("costs.urls")), path("export/", include("export.urls")), - path("rescuer/", include("rescuer.urls")), # Admin path("admin/", admin.site.urls), # Allauth diff --git a/app/costs/migrations/0001_initial.py b/app/costs/migrations/0001_initial.py index f6298de..93c7688 100644 --- a/app/costs/migrations/0001_initial.py +++ b/app/costs/migrations/0001_initial.py @@ -1,4 +1,4 @@ -# Generated by Django 4.2.5 on 2023-09-17 21:04 +# Generated by Django 4.2.6 on 2023-10-09 21:31 from django.conf import settings from django.db import migrations, models diff --git a/app/export/views.py b/app/export/views.py index da1fb99..c0f8765 100644 --- a/app/export/views.py +++ b/app/export/views.py @@ -48,7 +48,6 @@ def export_birds(request): "updated", "find_circumstances__description", "diagnostic_finding", - "rescuer__last_name", "user__username", "status__description", "aviary__description", @@ -69,7 +68,6 @@ def export_birds(request): "Pateient aktualisiert am", "Fundumstände", "Diagnose bei Fund", - "Finder (Nachname)", "Benutzer", "Status", "Voliere", diff --git a/app/rescuer/__init__.py b/app/rescuer/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/rescuer/admin.py b/app/rescuer/admin.py deleted file mode 100644 index d87ce7c..0000000 --- a/app/rescuer/admin.py +++ /dev/null @@ -1,15 +0,0 @@ -from django.contrib import admin -from .models import Rescuer - - -@admin.register(Rescuer) -class CustomerAdmin(admin.ModelAdmin): - list_display = [ - "last_name", - "first_name", - "street", - "street_number", - "city", - "phone", - "user", - ] diff --git a/app/rescuer/apps.py b/app/rescuer/apps.py deleted file mode 100644 index ede70ce..0000000 --- a/app/rescuer/apps.py +++ /dev/null @@ -1,8 +0,0 @@ -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/forms.py b/app/rescuer/forms.py deleted file mode 100644 index cb9fef0..0000000 --- a/app/rescuer/forms.py +++ /dev/null @@ -1,31 +0,0 @@ -from django import forms -from django.utils.translation import gettext_lazy as _ - -from .models import Rescuer - - -class DateInput(forms.DateInput): - input_type = "date" - - -class RescuerForm(forms.ModelForm): - class Meta: - model = Rescuer - fields = [ - "first_name", - "last_name", - "street", - "street_number", - "zip_code", - "city", - "phone", - ] - labels = { - "first_name": _("Vorname"), - "last_name": _("Nachname"), - "street": _("Straße"), - "street_number": _("Hausnummer"), - "zip_code": _("Postleitzahl"), - "city": _("Stadt"), - "phone": _("Telefon"), - } diff --git a/app/rescuer/migrations/0001_initial.py b/app/rescuer/migrations/0001_initial.py deleted file mode 100644 index bf3fe0d..0000000 --- a/app/rescuer/migrations/0001_initial.py +++ /dev/null @@ -1,59 +0,0 @@ -# Generated by Django 4.2.3 on 2023-07-28 14:09 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name="Rescuer", - fields=[ - ( - "id", - models.UUIDField( - default=uuid.uuid4, - editable=False, - primary_key=True, - serialize=False, - ), - ), - ( - "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( - on_delete=django.db.models.deletion.CASCADE, - to=settings.AUTH_USER_MODEL, - ), - ), - ], - options={ - "verbose_name": "Finder", - "verbose_name_plural": "Finder", - }, - ), - ] diff --git a/app/rescuer/migrations/0002_alter_rescuer_options.py b/app/rescuer/migrations/0002_alter_rescuer_options.py deleted file mode 100644 index 4164a0c..0000000 --- a/app/rescuer/migrations/0002_alter_rescuer_options.py +++ /dev/null @@ -1,17 +0,0 @@ -# Generated by Django 4.2.4 on 2023-08-12 12:57 - -from django.db import migrations - - -class Migration(migrations.Migration): - - dependencies = [ - ('rescuer', '0001_initial'), - ] - - operations = [ - migrations.AlterModelOptions( - name='rescuer', - options={'ordering': ['last_name'], 'verbose_name': 'Finder', 'verbose_name_plural': 'Finder'}, - ), - ] diff --git a/app/rescuer/migrations/__init__.py b/app/rescuer/migrations/__init__.py deleted file mode 100644 index e69de29..0000000 diff --git a/app/rescuer/models.py b/app/rescuer/models.py deleted file mode 100644 index d890c1d..0000000 --- a/app/rescuer/models.py +++ /dev/null @@ -1,26 +0,0 @@ -from datetime import date -from uuid import uuid4 - -from django.conf import settings -from django.db import models -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")) - 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) - - class Meta: - verbose_name = _("Finder") - verbose_name_plural = _("Finder") - ordering = ["last_name"] - - def __str__(self) -> str: - return self.first_name + " " + self.last_name diff --git a/app/rescuer/templates/rescuer/rescuer_all.html b/app/rescuer/templates/rescuer/rescuer_all.html deleted file mode 100644 index f2aab21..0000000 --- a/app/rescuer/templates/rescuer/rescuer_all.html +++ /dev/null @@ -1,79 +0,0 @@ -{% extends "base.html" %} -{% load static %} -{% block header %} - - - - - - - - - - - - - - - -{% endblock header %} -{% block content %} -

Übersicht aller Finder

-

- Die Übersicht aller aktiven Finder. -

-

- Einen neuen Finder anlegen -

- - - - - - - - - - - - - - {% for rescuer in rescuers %} - - - - - - - - - {% endfor %} - -
NachnameVornameStraßePLZOrtPhone
- {{ rescuer.last_name }} - {{ rescuer.first_name }}{{ rescuer.street }} {{ rescuer.street_number }}{{ rescuer.zip_code }}{{ rescuer.city }}{{ rescuer.phone }}
- -{% endblock content %} diff --git a/app/rescuer/templates/rescuer/rescuer_create.html b/app/rescuer/templates/rescuer/rescuer_create.html deleted file mode 100644 index 0b7b2d2..0000000 --- a/app/rescuer/templates/rescuer/rescuer_create.html +++ /dev/null @@ -1,40 +0,0 @@ -{% extends 'base.html' %} -{% load crispy_forms_tags %} -{% block content %} -

Einen neuen Finder anlegen

-
-
-
- {% csrf_token %} -
-
{{ form.first_name|as_crispy_field }}
-
{{ form.last_name|as_crispy_field }}
-
{{ form.street|as_crispy_field }}
-
{{ form.street_number|as_crispy_field }}
-
{{ form.city|as_crispy_field }}
-
{{ form.zip_code|as_crispy_field }}
-
{{ form.phone|as_crispy_field }}
-
- Abbrechen - -
-
* Pflichtfeld
-
- -
-
-

Finder

-

- Bitte alle Kontaktinformationen zum Finder notieren. Sollte es - Nachfragen für die Auswilderung oder Nachweispflichten gegenüber - der Naturschutzbehörde geben, werden diese Informationen benötigt. -

-

Speicherung

-

- Alle personenbezogenen Daten werden fünf Jahre gespeichert und - danach automatisch gelöscht. -

-
-
- -{% endblock content %} diff --git a/app/rescuer/templates/rescuer/rescuer_delete.html b/app/rescuer/templates/rescuer/rescuer_delete.html deleted file mode 100644 index be8892b..0000000 --- a/app/rescuer/templates/rescuer/rescuer_delete.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} -

Finder löschen

-
-
-
- {% csrf_token %} -
-

Warnung!

-

Wollen Sie den Finder {{rescuer.first_name}} {{rescuer.last_name}} löschen?

-
-

- Abbrechen - -
-
-
-
Finder löschen
-

- Finder dürfen nur in vorheriger Absprache mit dem Fachgruppenleiter und dem Admin gelöscht werden. -

-
-
-{% endblock content %} \ No newline at end of file diff --git a/app/rescuer/templates/rescuer/rescuer_edit.html b/app/rescuer/templates/rescuer/rescuer_edit.html deleted file mode 100644 index a68497b..0000000 --- a/app/rescuer/templates/rescuer/rescuer_edit.html +++ /dev/null @@ -1,32 +0,0 @@ -{% extends 'base.html' %} -{% load crispy_forms_tags %} -{% block content %} -
-
-

Adressänderung des Finders

-
-
- {% csrf_token %} -
-
{{ form.first_name|as_crispy_field }}
-
{{ form.last_name|as_crispy_field }}
-
{{ form.street|as_crispy_field }}
-
{{ form.street_number|as_crispy_field }}
-
{{ form.city|as_crispy_field }}
-
{{ form.zip_code|as_crispy_field }}
-
{{ form.phone|as_crispy_field }}
-
- Abbrechen - -
-
-
-
-

Finder

-

- Bitte alle Kontaktinformationen zum Finder notieren. Sollte es Nachfragen für die Auswilderung oder Nachweispflichten gegenüber der Naturschutzbehörde geben, werden diese Informationen benötigt. -

-
-
- -{% endblock content %} \ No newline at end of file diff --git a/app/rescuer/templates/rescuer/rescuer_single.html b/app/rescuer/templates/rescuer/rescuer_single.html deleted file mode 100644 index eb4b202..0000000 --- a/app/rescuer/templates/rescuer/rescuer_single.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends 'base.html' %} -{% load static %} -{% load crispy_forms_tags %} -{% block content %} - -

Stammdaten des Finders

-
-
-
-
Adressdaten des Finders
-
-

{{rescuer.first_name}} {{rescuer.last_name}}

-

- Straße: {{rescuer.street}} {{rescuer.street_number}}
- Stadt: {{rescuer.city}}
- PLZ: {{rescuer.zip_code}}
- Phone: {{rescuer.phone}}
-

-
-
- Abbrechen - Löschen - Bearbeiten -
- -
-

- Patienten des Finders -

-

Hier finden Sie die Patienten, die der Finder zur Auffangstation gebracht hat.

-

- {% for bird in birds %} -

-
Patient: {{bird.bird_identifier}}
-
-

- Vogel: {{bird.bird}}
- gefunden am: {{bird.created}}
- Statusänderung am: {{bird.updated}}
- Fundumstände: {{bird.find_circumstances}}
- Diagnose: {{bird.diagnostic_finding}}
-

-
-
- {% endfor %} -

-
- -
- -{% endblock content %} \ No newline at end of file diff --git a/app/rescuer/tests.py b/app/rescuer/tests.py deleted file mode 100644 index 7ce503c..0000000 --- a/app/rescuer/tests.py +++ /dev/null @@ -1,3 +0,0 @@ -from django.test import TestCase - -# Create your tests here. diff --git a/app/rescuer/urls.py b/app/rescuer/urls.py deleted file mode 100644 index 6b3768e..0000000 --- a/app/rescuer/urls.py +++ /dev/null @@ -1,17 +0,0 @@ -from django.urls import path - -from .views import ( - rescuer_all, - rescuer_create, - rescuer_single, - rescuer_delete, - rescuer_edit, -) - -urlpatterns = [ - path("all", rescuer_all, name="rescuer_all"), - path("create", rescuer_create, name="rescuer_create"), - path("edit/", rescuer_edit, name="rescuer_edit"), - path("delete/", rescuer_delete, name="rescuer_delete"), - path("", rescuer_single, name="rescuer_single"), -] diff --git a/app/rescuer/views.py b/app/rescuer/views.py deleted file mode 100644 index 89d36ae..0000000 --- a/app/rescuer/views.py +++ /dev/null @@ -1,64 +0,0 @@ -from bird.models import FallenBird -from django.contrib.auth.decorators import login_required -from django.db.models import Q -from django.shortcuts import redirect, render - -from .forms import RescuerForm -from .models import Rescuer - - -@login_required(login_url="account_login") -def rescuer_all(request): - rescuers = Rescuer.objects.all() - context = {"rescuers": rescuers} - return render(request, "rescuer/rescuer_all.html", context) - - -@login_required(login_url="account_login") -def rescuer_single(request, id): - rescuer = Rescuer.objects.get(id=id) - birds = FallenBird.objects.filter(rescuer=id).filter(Q(status="1") | Q(status="2")) - context = {"rescuer": rescuer, "birds": birds} - return render(request, "rescuer/rescuer_single.html", context) - - -@login_required(login_url="account_login") -def rescuer_create(request): - form = RescuerForm() - if request.method == "POST": - form = RescuerForm(request.POST or None) - if form.is_valid(): - fs = form.save(commit=False) - fs.user = request.user - fs.save() - - # set customer id in session cookie - # (uuid has to be cast to a string) - rescuer_id = str(fs.pk) - request.session["rescuer_id"] = rescuer_id - - return redirect("bird_create") - context = {"form": form} - return render(request, "rescuer/rescuer_create.html", context) - - -@login_required(login_url="account_login") -def rescuer_delete(request, id): - rescuer = Rescuer.objects.get(id=id) - if request.method == "POST": - rescuer.delete() - return redirect("rescuer_all") - context = {"rescuer": rescuer} - return render(request, "rescuer/rescuer_delete.html", context) - - -@login_required(login_url="account_login") -def rescuer_edit(request, id): - rescuer = Rescuer.objects.get(id=id) - form = RescuerForm(request.POST or None, instance=rescuer) - if request.method == "POST": - if form.is_valid(): - form.save() - return redirect("rescuer_all") - context = {"form": form} - return render(request, "rescuer/rescuer_edit.html", context) diff --git a/app/templates/partials/_navbar.html b/app/templates/partials/_navbar.html index bef0e2c..40767dc 100644 --- a/app/templates/partials/_navbar.html +++ b/app/templates/partials/_navbar.html @@ -5,7 +5,7 @@