diff --git a/app/aviary/migrations/0001_initial.py b/app/aviary/migrations/0001_initial.py deleted file mode 100644 index e467c55..0000000 --- a/app/aviary/migrations/0001_initial.py +++ /dev/null @@ -1,29 +0,0 @@ -# Generated by Django 4.2.6 on 2023-10-09 21:31 - -from django.db import migrations, models -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - 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')), - ], - options={ - 'verbose_name': 'Voliere', - 'verbose_name_plural': 'Volieren', - }, - ), - ] diff --git a/app/bird/migrations/0001_initial.py b/app/bird/migrations/0001_initial.py deleted file mode 100644 index a019dbf..0000000 --- a/app/bird/migrations/0001_initial.py +++ /dev/null @@ -1,81 +0,0 @@ -# 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 -import uuid - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ('aviary', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Bird', - fields=[ - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('name', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')), - ('description', ckeditor.fields.RichTextField(verbose_name='Erläuterungen')), - ], - options={ - 'verbose_name': 'Vogel', - 'verbose_name_plural': 'Vögel', - 'ordering': ['name'], - }, - ), - migrations.CreateModel( - name='BirdStatus', - fields=[ - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('description', models.CharField(max_length=256, unique=True, verbose_name='Bezeichnung')), - ], - options={ - 'verbose_name': 'Patientenstatus', - 'verbose_name_plural': 'Patientenstatus', - }, - ), - migrations.CreateModel( - name='Circumstance', - fields=[ - ('id', models.BigAutoField(primary_key=True, serialize=False)), - ('description', models.CharField(max_length=256, verbose_name='Bezeichnung')), - ], - options={ - 'verbose_name': 'Fundumstand', - 'verbose_name_plural': 'Fundumstände', - }, - ), - migrations.CreateModel( - name='FallenBird', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), - ('bird_identifier', models.CharField(max_length=256, verbose_name='Patienten Alias')), - ('age', models.CharField(choices=[('unbekannt', 'unbekannt'), ('Ei', 'Ei'), ('Nestling', 'Nestling'), ('Ästling', 'Ästling'), ('Juvenil', 'Juvenil'), ('Adult', 'Adult')], max_length=15, verbose_name='Alter')), - ('sex', models.CharField(choices=[('Weiblich', 'Weiblich'), ('Männlich', 'Männlich'), ('Unbekannt', 'Unbekannt')], max_length=15, verbose_name='Geschlecht')), - ('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')), - ('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='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')), - ('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')), - ], - options={ - 'verbose_name': 'Patient', - 'verbose_name_plural': 'Patienten', - }, - ), - ] diff --git a/app/bird/migrations/0002_alter_fallenbird_comment.py b/app/bird/migrations/0002_alter_fallenbird_comment.py deleted file mode 100644 index ca64834..0000000 --- a/app/bird/migrations/0002_alter_fallenbird_comment.py +++ /dev/null @@ -1,18 +0,0 @@ -# Generated by Django 4.2.6 on 2023-10-10 06:34 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bird', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='fallenbird', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Bemerkung'), - ), - ] diff --git a/app/bird/migrations/0002_alter_fallenbird_comment_alter_fallenbird_finder.py b/app/bird/migrations/0002_alter_fallenbird_comment_alter_fallenbird_finder.py deleted file mode 100644 index 1aba545..0000000 --- a/app/bird/migrations/0002_alter_fallenbird_comment_alter_fallenbird_finder.py +++ /dev/null @@ -1,23 +0,0 @@ -# Generated by Django 4.2.6 on 2023-10-11 15:49 - -from django.db import migrations, models - - -class Migration(migrations.Migration): - - dependencies = [ - ('bird', '0001_initial'), - ] - - operations = [ - migrations.AlterField( - model_name='fallenbird', - name='comment', - field=models.TextField(blank=True, null=True, verbose_name='Bemerkung'), - ), - migrations.AlterField( - model_name='fallenbird', - name='finder', - field=models.TextField(blank=True, default='Vorname:\nName:\\Straße und Hausnummer:\\PLZ:\\Ort', null=True, verbose_name='Finder'), - ), - ] diff --git a/app/contact/__init__.py b/app/contact/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/contact/admin.py b/app/contact/admin.py new file mode 100644 index 0000000..a444f08 --- /dev/null +++ b/app/contact/admin.py @@ -0,0 +1,15 @@ +from django.contrib import admin + +from .models import Contact + + +@admin.register(Contact) +class FallenBirdAdmin(admin.ModelAdmin): + list_display = [ + "name", + "phone", + "email", + "address", + "comment", + ] + list_filter = ("name", "phone", "email", "address", "comment") diff --git a/app/contact/apps.py b/app/contact/apps.py new file mode 100644 index 0000000..594aa3a --- /dev/null +++ b/app/contact/apps.py @@ -0,0 +1,8 @@ +from django.apps import AppConfig +from django.utils.translation import gettext_lazy as _ + + +class ContactConfig(AppConfig): + default_auto_field = "django.db.models.BigAutoField" + name = "contact" + verbose_name = _("Kontakte") diff --git a/app/contact/migrations/__init__.py b/app/contact/migrations/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/app/contact/models.py b/app/contact/models.py new file mode 100644 index 0000000..9b566af --- /dev/null +++ b/app/contact/models.py @@ -0,0 +1,27 @@ +from django.db import models +from uuid import uuid4 + +from django.utils.translation import gettext_lazy as _ + + +class Contact(models.Model): + id = models.UUIDField(primary_key=True, default=uuid4, editable=False) + name = models.CharField( + max_length=50, null=True, blank=True, verbose_name=_("Kontakt Name") + ) + phone = models.CharField( + max_length=50, null=True, blank=True, verbose_name=_("Telefon") + ) + email = models.CharField( + max_length=50, null=True, blank=True, verbose_name=_("Email") + ) + address = models.CharField( + max_length=50, null=True, blank=True, verbose_name=_("Adresse") + ) + comment = models.CharField( + max_length=50, null=True, blank=True, verbose_name=_("Bemerkungen") + ) + + class Meta: + verbose_name = _("Kontakt") + verbose_name_plural = _("Kontakte") diff --git a/app/contact/templates/contact/contact_all.html b/app/contact/templates/contact/contact_all.html new file mode 100644 index 0000000..949c475 --- /dev/null +++ b/app/contact/templates/contact/contact_all.html @@ -0,0 +1,75 @@ +{% extends "base.html" %} +{% load static %} +{% block header %} + + + + + + + + + + + + + + + + + + +{% endblock header %} + +{% block content %} +

Übersicht aller Kontakte

+

Die Übersicht aller bisher hinterlegten Kontakte.

+ + + + + + + + + + + + + {% for item in contacts %} + + + + + + + + {% endfor %} + +
NameTelefonEmailAdresseBemerkung
{{ item.name }} {{ item.phone|default_if_none:"" }} {{ item.email|default_if_none:"" }} {{ item.address|default_if_none:"" }} {{ item.comment|default_if_none:"" }}
+{% endblock content %} + diff --git a/app/contact/tests.py b/app/contact/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/app/contact/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/app/contact/urls.py b/app/contact/urls.py new file mode 100644 index 0000000..aece6bf --- /dev/null +++ b/app/contact/urls.py @@ -0,0 +1,7 @@ +from django.urls import path + +from .views import contact_all + +urlpatterns = [ + path("", contact_all, name="contact_all"), +] diff --git a/app/contact/views.py b/app/contact/views.py new file mode 100644 index 0000000..6085b97 --- /dev/null +++ b/app/contact/views.py @@ -0,0 +1,11 @@ +from django.shortcuts import render +from django.contrib.auth.decorators import login_required + +from .models import Contact + + +@login_required(login_url="account_login") +def contact_all(request): + contacts = Contact.objects.all() + context = {"contacts": contacts} + return render(request, "contact/contact_all.html", context) diff --git a/app/core/jazzmin.py b/app/core/jazzmin.py index 3d2414c..a7d1904 100644 --- a/app/core/jazzmin.py +++ b/app/core/jazzmin.py @@ -25,7 +25,7 @@ JAZZMIN_SETTINGS = { "search_model": [ "aviary.Aviary", "bird.FallenBird", - "bird.User", + # "bird.User", ], # Field name on user model that contains avatar ImageField/URLField/Charfield or a callable that receives the user # "user_avatar": None, @@ -86,10 +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", - "socialaccount.socialaccount": "fas fa-solid fa-lock", - "socialaccount.socialapp": "fas fa-solid fa-laptop", - "socialaccount.socialtoken": "fas fa-solid fa-keyboard", + "contact.Contact": "fas fa-solid fa-address-card", }, # Icons that are used when one is not manually specified # "default_icon_parents": "fas fa-chevron-circle-right", diff --git a/app/core/settings.py b/app/core/settings.py index 941ae28..8e90e07 100644 --- a/app/core/settings.py +++ b/app/core/settings.py @@ -83,6 +83,7 @@ INSTALLED_APPS = [ # ----------------------------------- "aviary", "bird", + "contact", "costs", "export", ] diff --git a/app/core/urls.py b/app/core/urls.py index a394fb2..08dee03 100644 --- a/app/core/urls.py +++ b/app/core/urls.py @@ -7,6 +7,7 @@ urlpatterns = [ path("", views.bird_all, name="index"), path("aviary/", include("aviary.urls")), path("bird/", include("bird.urls")), + path("contacts/", include("contact.urls")), path("costs/", include("costs.urls")), path("export/", include("export.urls")), # Admin diff --git a/app/costs/migrations/0001_initial.py b/app/costs/migrations/0001_initial.py deleted file mode 100644 index 93c7688..0000000 --- a/app/costs/migrations/0001_initial.py +++ /dev/null @@ -1,34 +0,0 @@ -# Generated by Django 4.2.6 on 2023-10-09 21:31 - -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 = [ - ('bird', '0001_initial'), - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ] - - operations = [ - migrations.CreateModel( - name='Costs', - fields=[ - ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)), - ('costs', models.DecimalField(decimal_places=2, default='0.00', max_digits=5, verbose_name='Betrag')), - ('created', models.DateField(verbose_name='Gebucht am')), - ('comment', models.CharField(blank=True, max_length=512, null=True, verbose_name='Bemerkungen')), - ('id_bird', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='bird.fallenbird', verbose_name='Patient')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Benutzer')), - ], - options={ - 'verbose_name': 'Kosten', - 'verbose_name_plural': 'Kosten', - }, - ), - ] diff --git a/app/templates/partials/_navbar.html b/app/templates/partials/_navbar.html index 40767dc..385d0c6 100644 --- a/app/templates/partials/_navbar.html +++ b/app/templates/partials/_navbar.html @@ -32,6 +32,10 @@ alle Kosten +
  • + Kontakte +
    • {% if request.user|group_check:"data-export" %}