Merge branch 'guntherweissenbaeck/issue63'

app/bird/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.6 on 2023-10-09 21:31
+# Generated by Django 4.2.5 on 2023-10-16 18:35
 
 import ckeditor.fields
 from django.conf import settings

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")

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")

app/contact/migrations/0001_initial.py

@@ -0,0 +1,26 @@
+# Generated by Django 4.2.5 on 2023-10-16 18:42
+
+from django.db import migrations, models
+import uuid
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Contact',
+            fields=[
+                ('id', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),
+                ('name', models.CharField(blank=True, max_length=50, null=True, verbose_name='Kontakt Name')),
+                ('phone', models.CharField(blank=True, max_length=50, null=True, verbose_name='Telefon')),
+                ('email', models.CharField(blank=True, max_length=50, null=True, verbose_name='Email')),
+                ('address', models.CharField(blank=True, max_length=50, null=True, verbose_name='Adresse')),
+                ('comment', models.CharField(blank=True, max_length=50, null=True, verbose_name='Bemerkungen')),
+            ],
+        ),
+    ]

app/contact/migrations/0002_alter_contact_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 4.2.6 on 2023-10-16 19:34
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('contact', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='contact',
+            options={'verbose_name': 'Kontakt', 'verbose_name_plural': 'Kontakte'},
+        ),
+    ]

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")

app/contact/templates/contact/contact_all.html

@@ -0,0 +1,75 @@
+{% extends "base.html" %}
+{% load static %}
+{% block header %}
+<!-- Datatable CSS -->
+<link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/dataTables.bootstrap5.min.css" />
+<link rel="stylesheet" href="https://cdn.datatables.net/responsive/2.2.9/css/responsive.bootstrap5.min.css">
+
+<!-- Font Awesome -->
+<link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/font-awesome/6.4.0/css/all.min.css">
+
+<!-- jQuery -->
+<script src="https://code.jquery.com/jquery-3.5.1.js"></script>
+
+<!-- Datatable jQuery -->
+<script src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.11.3/js/dataTables.bootstrap5.min.js"></script>
+<script src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
+<script src="https://cdn.datatables.net/responsive/2.2.9/js/responsive.bootstrap5.min.js"></script>
+
+<!-- Configure the DataTable. -->
+<script nonce="{{ request.csp_nonce }}">
+    $(document).ready(function () {
+        let table = $('#t__contact_all').DataTable({
+            language: {
+                url: 'https://cdn.datatables.net/plug-ins/1.11.3/i18n/de_de.json',
+            },
+            paging: true,
+            info: true,
+            "pagingType": "first_last_numbers",
+            responsive: true,
+            scrollX: true,
+            order: [[2, 'desc']],
+            columnDefs: [
+                { responsivePriority: 1, targets: 0 },
+            ]
+        });
+        table.on( 'responsive-display', function ( e, datatable, row, showHide, update ) {
+            table.rows().every( function () {
+              if (showHide && row.index() !== this.index() && this.child.isShown()) {
+                $('td', this.node()).eq(0).click();
+              }
+            }); 
+        });
+    })
+</script>
+{% endblock header %}
+
+{% block content %}
+<h3>Übersicht aller Kontakte</h3>
+<p>Die Übersicht aller bisher hinterlegten Kontakte.</p>
+
+<table class="table table-striped table-hover display responsive nowrap" width="100%" id="t__contact_all">
+    <thead>
+        <tr>
+            <th>Name</th>
+            <th>Telefon</th>
+            <th>Email</th>
+            <th>Adresse</th>
+            <th>Bemerkung</th>
+        </tr>
+    </thead>
+    <tbody>
+        {% for item in contacts %}
+        <tr>
+            <td> {{ item.name }} </td>
+            <td> {{ item.phone|default_if_none:"" }}</td>
+            <td> {{ item.email|default_if_none:"" }} </td>
+            <td> {{ item.address|default_if_none:"" }} </td>
+            <td> {{ item.comment|default_if_none:"" }} </td>
+        </tr>
+        {% endfor %}
+    </tbody>
+</table>
+{% endblock content %}
+

app/contact/tests.py

@@ -0,0 +1,3 @@
+from django.test import TestCase
+
+# Create your tests here.

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"),
+]

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)

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,

app/core/settings.py

@@ -83,6 +83,7 @@ INSTALLED_APPS = [
     # -----------------------------------
     "aviary",
     "bird",
+    "contact",
     "costs",
     "export",
 ]

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

app/costs/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.2.6 on 2023-10-09 21:31
+# Generated by Django 4.2.5 on 2023-10-16 18:35
 
 from django.conf import settings
 from django.db import migrations, models
@@ -11,8 +11,8 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        ('bird', '0001_initial'),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('bird', '0001_initial'),
     ]
 
     operations = [

app/templates/partials/_navbar.html

@@ -32,6 +32,10 @@
                         <a class="nav-link {% if '/costs/all' in request.path %} active {% endif %}"
                             href="{% url 'costs_all' %}">alle Kosten</a>
                     </li>
+                    <li class="nav-item">
+                        <a class="nav-link {% if '/contacts' in request.path %} active {% endif %}"
+                            href="{% url 'contact_all' %}">Kontakte</a>
+                    </li>
 
                     {% if request.user|group_check:"data-export" %} 
                         <li class="nav-item">