Dockerfile

@@ -1,12 +1,10 @@
-FROM python:3.11-slim
+FROM python:3-slim
-# Use 3.11 to avoid django.core.exceptions.ImproperlyConfigured: Error loading psycopg2 or psycopg module
 MAINTAINER Julian-Samuel Gebühr
 
 ENV DOCKER_BUILD=true
 
 RUN apt update
 RUN apt install gettext -y
-RUN apt install libpq-dev gcc -y
 COPY . /app
 WORKDIR /app
 RUN mkdir /app/data

README.md

@@ -45,14 +45,12 @@ There is a system for customizing texts in Notfellchen. Not every change of a te
 Therefore, a solution is used where a number of predefined texts per site are supported. These markdown texts will then be included in the site, if defined.
 
 | Textcode            | Location |
-|-------------------------|-----------------------|
+|---------------------|----------|
 | `how_to`            | Index    |
 | `introduction`      | Index    |
 | `privacy_statement` | About    |
 | `terms_of_service`  | About    |
 | `imprint`           | About    |
-| `about_us`              | About                 |
-| `external_site_warning` | External Site Warning |
 | Any rule            | About    |
 
 # Developer Notes
@@ -108,20 +106,3 @@ Use a program like `gtranslator` or `poedit` to start translations
 | Edit adoption notice                | User that created, Moderator, Admin |
 | Edit animal                         | User that created, Moderator, Admin |
 | Add animal/photo to adoption notice | User that created, Moderator, Admin |
-
-# Celery and KeyDB
-
-Start KeyDB docker container
-```zsh
-docker run -d --name keydb -p 6379:6379 eqalpha/keydb
-```
-
-Start worker
-```zsh
- celery -A notfellchen.celery worker
-```
-
-Start beat
-```zsh
- celery -A notfellchen.celery beat
-```

docs/admin/index.rst

@@ -4,5 +4,9 @@ Administration
    :maxdepth: 2
    :caption: Contents:
 
-   GDPR.rst
+   create_user.rst
+   lending.rst
+   returning.rst
+   opening_hours.rst
+   add_items.rst
    monitoring.rst

docs/admin/monitoring.rst

@@ -1,7 +1,7 @@
 Monitoring
 ==========
 
-Notfellchen should, like every other software, be easy to monitor. Therefore a basic metrics are exposed to `https://notfellchen.org/metrics`.
+ILMO should, like every other software, be easy to monitor. Therefore a basic metrics are exposed to `https://notfellchen.org/metrics`.
 The data is encoded in JSON format and is therefore suitable to bea read by humans and it is easy to use it as data source for further processing.
 
 
@@ -60,12 +60,3 @@ Now we can simply use the InfluxDB as data source in Grafana and configure until
 beautiful plots!
 
 .. image:: monitoring_grafana.png
-
-Healthchecks
-------------
-
-You can configure notfellchen to give a hourly ping to a healthchecks server. If this ping is not received, you will get notified and cna check why the celery jobs are no running.
-Add the following to your `notfellchen.cfg` and adjust the URL to match your check.
-.. code::
-  [monitoring]
-  healthchecks_url=https://health.example.org/ping/5fa7c9b2-753a-4cb3-bcc9-f982f5bc68e8

docs/admin/opening_hours.rst

@@ -0,0 +1,10 @@
+Opening hours
+=============
+
+The opening hours can be changed by selecting the page :guilabel:`Opening hours` in the navigation menu.
+You can not change an entry, simply delete it and create a new one.
+
+
+.. note::
+
+   It is advised to fill empty time cells with a "-".

docs/admin/returning.rst

@@ -0,0 +1,8 @@
+Returning
+=========
+
+To return an item either visit the page :guilabel:`All loans` and search
+for the loan there or you search for the item via :guilabel:`Search`.
+
+If you found the loan, you can simply click on the button :guilabel:`Return` and
+you are finished.

docs/conf.py

@@ -20,7 +20,7 @@
 # -- Project information -----------------------------------------------------
 
 project = 'Notfellchen'
-copyright = 'CC-BY-SA Julian-Samuel Gebühr'
+copyright = 'Julian-Samuel Gebühr'
 author = 'Julian-Samuel Gebühr'
 
 # The short X.Y version

docs/dev/deployment.rst

@@ -4,16 +4,16 @@
 Deployment
 **********
 
-There are different ways to deploy Notfellchen. We support an ansible+docker based deployment and manual installation.
+There are different ways to deploy ILMO. We support an ansible+docker based deployment and manual installation.
 
 Ansible deployment
 ==================
 
-Notfellchen can be deployed with the `notfellchen-ansible-role <https://github.com/moan0s/ansible-role-notfellchen>`_ that is based on the
+ILMO can be deployed with the `ilmo-ansible-role <https://github.com/moan0s/ansible-role-ilmo>`_ that is based on the
-official Notfellchen docker image. This role will only install notfellchen itself. If you want a complete setup that includes a
+official ILMO docker image. This role will only install ilmo itself. If you want a complete setup that includes a
 database and a webserver with minimal configuration you can use the
 `mash-playbook <https://github.com/mother-of-all-self-hosting/mash-playbook>`_ by following `it's documentation
-on Notfellchen <https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/notfellchen.md>`_.
+on ILMO <https://github.com/mother-of-all-self-hosting/mash-playbook/blob/main/docs/services/ilmo.md>`_.
 
 
 
@@ -21,10 +21,10 @@ Manual Deployment
 =================
 
 
-This guide describes the installation of a installation of Notfellchen from source. It is inspired by this great guide from
+This guide describes the installation of a installation of ILMO from source. It is inspired by this great guide from
 pretix_.
 
-.. warning:: Even though this guide tries to make it as straightforward to run Notfellchen, it still requires some Linux experience to
+.. warning:: Even though this guide tries to make it as straightforward to run ILMO, it still requires some Linux experience to
              get it right. If you're not feeling comfortable managing a Linux server, check out a managed service_.
 
 This guide is tested on **Ubuntu20.04** but it should work very similar on other modern systemd based distributions.
@@ -39,18 +39,18 @@ installation guides):
 * A HTTP reverse proxy, e.g. `nginx`_ or Traefik to allow HTTPS connections
 * A `PostgreSQL`_ database server
 
-Also recommended is, that you use a firewall, although this is not a Notfellchen-specific recommendation. If you're new to
+Also recommended is, that you use a firewall, although this is not a ILMO-specific recommendation. If you're new to
 Linux and firewalls, it is recommended that you start with `ufw`_.
 
-.. note:: Please, do not run Notfellchen without HTTPS encryption. You'll handle user data and thanks to `Let's Encrypt`_
+.. note:: Please, do not run ILMO without HTTPS encryption. You'll handle user data and thanks to `Let's Encrypt`_
           SSL certificates can be obtained for free these days.
 
 Unix user
 ---------
 
-As we do not want to run notfellchen as root, we first create a new unprivileged user::
+As we do not want to run ilmo as root, we first create a new unprivileged user::
 
-    # adduser notfellchen --disabled-password --home /var/notfellchen
+    # adduser ilmo --disabled-password --home /var/ilmo
 
 In this guide, all code lines prepended with a ``#`` symbol are commands that you need to execute on your server as
 ``root`` user (e.g. using ``sudo``); all lines prepended with a ``$`` symbol should be run by the unprivileged user.
@@ -66,16 +66,16 @@ best compatibility. You can check this with the following command::
 
 For PostgreSQL database creation, we would do::
 
-    # sudo -u postgres createuser notfellchen
+    # sudo -u postgres createuser ilmo
-    # sudo -u postgres createdb -O notfellchen notfellchen
+    # sudo -u postgres createdb -O ilmo ilmo
-    # su notfellchen
+    # su ilmo
     $ psql
-    > ALTER USER notfellchen PASSWORD 'strong_password';
+    > ALTER USER ilmo PASSWORD 'strong_password';
 
 Package dependencies
 --------------------
 
-To build and run notfellchen, you will need the following debian packages::
+To build and run ilmo, you will need the following debian packages::
 
     # apt-get install git build-essential python-dev python3-venv python3 python3-pip \
                       python3-dev
@@ -83,32 +83,32 @@ To build and run notfellchen, you will need the following debian packages::
 Config file
 -----------
 
-We now create a config directory and config file for notfellchen::
+We now create a config directory and config file for ilmo::
 
-    # mkdir /etc/notfellchen
+    # mkdir /etc/ilmo
-    # touch /etc/notfellchen/notfellchen.cfg
+    # touch /etc/ilmo/ilmo.cfg
-    # chown -R notfellchen:notfellchen /etc/notfellchen/
+    # chown -R ilmo:ilmo /etc/ilmo/
-    # chmod 0600 /etc/notfellchen/notfellchen.cfg
+    # chmod 0600 /etc/ilmo/ilmo.cfg
 
-Fill the configuration file ``/etc/notfellchen/notfellchen.cfg`` with the following content (adjusted to your environment)::
+Fill the configuration file ``/etc/ilmo/ilmo.cfg`` with the following content (adjusted to your environment)::
 
-    [notfellchen]
+    [ilmo]
     instance_name=My library
-    url=https://notfellchen.example.com
+    url=https://ilmo.example.com
 
     [database]
     backend=postgresql
-    name=notfellchen
+    name=ilmo
-    user=notfellchen
+    user=ilmo
 
     [locations]
-    static=/var/notfellchen/static
+    static=/var/ilmo/static
 
     [mail]
     ; See config file documentation for more options
-    ; from=notfellchen@example.com
+    ; from=ilmo@example.com
     ; host=127.0.0.1
-    ; user=notfellchen
+    ; user=ilmo
     ; password=foobar
     ; port=587
 
@@ -121,21 +121,21 @@ Fill the configuration file ``/etc/notfellchen/notfellchen.cfg`` with the follow
     ;Scope=
     ;Policy=
 
-Install notfellchen as package
+Install ilmo as package
 ------------------------
 
-Now we will install notfellchen itself. The following steps are to be executed as the ``notfellchen`` user. Before we
+Now we will install ilmo itself. The following steps are to be executed as the ``ilmo`` user. Before we
-actually install notfellchen, we will create a virtual environment to isolate the python packages from your global
+actually install ilmo, we will create a virtual environment to isolate the python packages from your global
 python installation::
 
-    $ python3 -m venv /var/notfellchen/venv
+    $ python3 -m venv /var/ilmo/venv
-    $ source /var/notfellchen/venv/bin/activate
+    $ source /var/ilmo/venv/bin/activate
     (venv)$ pip3 install -U pip setuptools wheel
 
-We now clone and install notfellchen, its direct dependencies and gunicorn::
+We now clone and install ilmo, its direct dependencies and gunicorn::
 
-    (venv)$ git clone https://github.com/moan0s/Notfellchen2
+    (venv)$ git clone https://github.com/moan0s/ILMO2
-    (venv)$ cd Notfellchen2/src/
+    (venv)$ cd ILMO2/src/
     (venv)$ pip3 install -r requirements.txt
     (venv)$ pip3 install -e .
 
@@ -148,26 +148,26 @@ Finally, we compile static files and create the database structure::
     (venv)$ django-admin compilemessages --ignore venv
 
 
-Start notfellchen as a service
+Start ilmo as a service
 -------------------------
 
-You should start notfellchen using systemd to automatically start it after a reboot. Create a file
+You should start ilmo using systemd to automatically start it after a reboot. Create a file
-named ``/etc/systemd/system/notfellchen-web.service`` with the following content::
+named ``/etc/systemd/system/ilmo-web.service`` with the following content::
 
     [Unit]
-    Description=notfellchen web service
+    Description=ilmo web service
     After=network.target
 
     [Service]
-    User=notfellchen
+    User=ilmo
-    Group=notfellchen
+    Group=ilmo
-    Environment="VIRTUAL_ENV=/var/notfellchen/venv"
+    Environment="VIRTUAL_ENV=/var/ilmo/venv"
-    Environment="PATH=/var/notfellchen/venv/bin:/usr/local/bin:/usr/bin:/bin"
+    Environment="PATH=/var/ilmo/venv/bin:/usr/local/bin:/usr/bin:/bin"
-    ExecStart=/var/notfellchen/venv/bin/gunicorn notfellchen.wsgi \
+    ExecStart=/var/ilmo/venv/bin/gunicorn ilmo.wsgi \
-                          --name notfellchen --workers 5 \
+                          --name ilmo --workers 5 \
                           --max-requests 1200  --max-requests-jitter 50 \
                           --log-level=info --bind=127.0.0.1:8345
-    WorkingDirectory=/var/notfellchen
+    WorkingDirectory=/var/ilmo
     Restart=on-failure
 
     [Install]
@@ -176,14 +176,14 @@ named ``/etc/systemd/system/notfellchen-web.service`` with the following content
 You can now run the following commands to enable and start the services::
 
     # systemctl daemon-reload
-    # systemctl enable notfellchen-web
+    # systemctl enable ilmo-web
-    # systemctl start notfellchen-web
+    # systemctl start ilmo-web
 
 
 SSL
 ---
 
-The following snippet is an example on how to configure a nginx proxy for notfellchen::
+The following snippet is an example on how to configure a nginx proxy for ilmo::
 
         server {
                 listen 80;
@@ -196,8 +196,8 @@ The following snippet is an example on how to configure a nginx proxy for notfel
                 #
                 listen 443 ssl;
                 listen [::]:443 ssl;
-                ssl_certificate     /etc/letsencrypt/live/notfellchen.example.com/cert.pem;
+                ssl_certificate     /etc/letsencrypt/live/ilmo.example.com/cert.pem;
-                ssl_certificate_key /etc/letsencrypt/live/notfellchen.example.com/privkey.pem;
+                ssl_certificate_key /etc/letsencrypt/live/ilmo.example.com/privkey.pem;
                 ssl_protocols       TLSv1.2 TLSv1.3;
                 ssl_ciphers         HIGH:!aNULL:!MD5;
 
@@ -208,7 +208,7 @@ The following snippet is an example on how to configure a nginx proxy for notfel
             add_header Referrer-Policy same-origin;
             add_header X-Content-Type-Options nosniff;
 
-                server_name notfellchen.example.com;
+                server_name ilmo.example.com;
             location / {
                 proxy_pass http://localhost:8345;
                 proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -217,7 +217,7 @@ The following snippet is an example on how to configure a nginx proxy for notfel
             }
 
             location /static/ {
-                alias /var/notfellchen/static/;
+                alias /var/ilmo/static/;
                 access_log off;
                 expires 365d;
                 add_header Cache-Control "public";
@@ -230,22 +230,22 @@ We recommend reading about setting `strong encryption settings`_ for your web se
 Next steps
 ----------
 
-Yay, you are done! You should now be able to reach notfellchen at https://notfellchen.example.com/
+Yay, you are done! You should now be able to reach ilmo at https://ilmo.example.com/
 
 Updates
 -------
 
 .. warning:: While we try hard not to break things, **please perform a backup before every upgrade**.
 
-To upgrade to a new notfellchen release, pull the latest code changes and run the following commands::
+To upgrade to a new ilmo release, pull the latest code changes and run the following commands::
 
-    $ source /var/notfellchen/venv/bin/activate
+    $ source /var/ilmo/venv/bin/activate
     (venv)$ git pull
-    (venv)$ pg_dump notfellchen > notfellchen.psql
+    (venv)$ pg_dump ilmo > ilmo.psql
     (venv)$ python manage.py migrate
     (venv)$ django-admin compilemessages --ignore venv
 
-    # systemctl restart notfellchen-web
+    # systemctl restart ilmo-web
 
 
 .. _Postfix: https://www.digitalocean.com/community/tutorials/how-to-install-and-configure-postfix-as-a-send-only-smtp-server-on-ubuntu-16-04

docs/dev/index.rst

@@ -8,6 +8,5 @@ Installation, customization and contributing
 
    deployment.rst
    contributing.rst
-   translation.rst
    release.rst
    backup.rst

docs/index.rst

@@ -12,7 +12,10 @@ Notfellchen Plattform Dokumentation
    API/index.rst
 
 .. image:: rtfm.png
-   :name: Ratte lesend
+   :name: RTFM by Elektroll
-   :alt: Zeichnung einer lesenden Ratte
+   :scale: 50 %
+   :alt: Soviet style image of workers holding a sign with a gear and a screwdriver. Below is says "Read the manual"
    :align: center 
 
+
+Read the manual, Image by `Mike Powell (CC-BY) <https://elektroll.art/>`_.

docs/user/benachrichtigungen.rst

@@ -1,19 +1,9 @@
 Benachrichtigungen
 ==================
 
-Ersteller*innen von Vermittlungen werden über neue Kommentare per Mail benachrichtigt, ebenso alle die die Vermittlung abonniert haben.
-Jede Vermittlung kann abonniert werden. Dafür klickst du auf die Glocke neben dem Titel der Vermittlung.
-
-.. image:: abonnieren.png
-
-Auf der Website
-+++++++++++++++
-
-
 
 E-Mail
 ++++++
 
 Mit während deiner :doc:`registrierung` gibst du eine E-Mail Addresse an.
-
+Wir senden dir Benachrichtigungen an diese E-Mail. Du kannst das in deinen Profileinstellungen anpassen.
-Benachrichtigungen senden wir per Mail - du kannst das jederzeit in den Einstellungen deaktivieren.

docs/user/index.rst

@@ -1,11 +1,11 @@
-******************
+***********
-User Dokumentation
+Users guide
-******************
+***********
 .. toctree::
    :maxdepth: 2
-   :caption: Inhalt:
+   :caption: Contents:
    
    registrierung.rst
-   vermittlungen.rst
-   moderationskonzept.rst
    benachrichtigungen.rst
+   login.rst
+   email.rst

docs/user/moderationskonzept.rst

@@ -1,29 +0,0 @@
-Moderationskonzept
-==================
-
-Vertrauen in notfellchen.org ist uns wichtig. Unser Kernziel ist es Tierschutz und Tierwohl zu fördern. Dafür sind drei
-Grundkonzepte wichtig
-
-* Aktualität: Informationen auf notfellchen.org müssen aktuell&richtig sein
-* Tierschutz: Ausschließlich Ratten aus dem Tierschutz werden vermittelt
-* Moderation: Vermittlungen und Kommentare können gemeldet werden und werden vom Team zügig moderiert.
-
-Vermittlungen
-+++++++++++++
-
-Vermittlungen können von allen Nutzer*innen mit Account erstellt werden. Vermittlungen normaler Nutzer*innen kommen dann in eine Warteschlange und werden vom Admin & Modertionsteam geprüft und sichtbar geschaltet.
-Tierheime und Pflegestellen können auf Anfrage einen Koordinations-Status bekommen, wodurch sie Vermittlungsanzeigen erstellen können die direkt öffentlich sichtbar sind.
-
-Jede Vermittlung hat ein "Zuletzt-geprüft" Datum, das anzeigt, wann ein Mensch zuletzt überprüft hat, ob die Anzeige noch aktuell ist.
-Nach 3 Wochen ohne Prüfung werden Anzeigen automatisch von der Seite entfernt und nur dann wieder freigeschaltet, wenn eine manuelle Prüfung erfolgt.
-
-Darüber hinaus werden einmal täglich die verlinkten Seiten automatisiert geprüft. Wenn eine Vermittlung auf der Website eines Tierheims oder einer Pflegestelle entfernt wird, wird die Anzeige sofort deaktiviert.
-
-Vermittlungen können von allen Menschen, auch ohne Account gemeldet werden. Grund für eine Meldung kann sein, dass Informationen veraltet sind oder ein Verdacht von Tierwohlgefärdung. Gemeldete Vermittlungen werden vom Moderationsteam geprüft und ggf. entfernt.
-
-Kommentare
-++++++++++
-
-Die Kommentarfunktion von Vermittlungen ermöglicht es angemeldeten Nutzer*innen zusätzliche Informationen hinzuzufügen oder Fragen zu stellen.
-
-Kommentare können, wie Vermittlungen, gemeldet werden wenn sie nicht den Regeln entsprechen.

docs/user/registrierung.rst

@@ -1,10 +1,5 @@
-Registrierung
+Registration
 ================================
 
-Du kannst dich jederzeit selbst registrieren. Das geht unter https://notfellchen.org/accounts/register/
+To register you have to visit the library. An librarian will then set up an account for you.
-
+You will need to provide an valid E-Mail Address and a password.
-Ein Account ermöglicht es dir
-
-* Kommentare zu hinterlassen
-* Vermittlungen hinzuzufügen
-* Vermittlungen zu abonnieren

docs/user/vermittlungen.rst

@@ -1,17 +1,3 @@
 Vermittlungen
 =============
 
-Vermittlungen können von allen Nutzer*innen mit Account erstellt werden. Vermittlungen normaler Nutzer*innen kommen dann in eine Warteschlange und werden vom Admin & Modertionsteam geprüft und sichtbar geschaltet.
-Tierheime und Pflegestellen können auf Anfrage einen Koordinations-Status bekommen, wodurch sie Vermittlungsanzeigen erstellen können die direkt öffentlich sichtbar sind.
-
-Jede Vermittlung hat ein "Zuletzt-geprüft" Datum, das anzeigt, wann ein Mensch zuletzt überprüft hat, ob die Anzeige noch aktuell ist.
-Nach 3 Wochen ohne Prüfung werden Anzeigen automatisch von der Seite entfernt und nur dann wieder freigeschaltet, wenn eine manuelle Prüfung erfolgt.
-
-Darüber hinaus werden einmal täglich die verlinkten Seiten automatisiert geprüft. Wenn eine Vermittlungs-Seite bei einem Tierheim oder einer Pflegestelle entfernt wurde, wird die Anzeige ebenfalls deaktiviert.
-
-Vermittlungen können von allen Menschen, auch ohne Account gemeldet werden. Grund dafür kann sein, dass Informationen veraltet sind oder ein Verdacht von Tierwohlgefärdung. Gemeldete Vermittlungen werden vom Moderationsteam geprüft und ggf. entfernt.
-
-Die Kommentarfunktion von Vermittlungen ermöglicht es angemeldeten Nutzer*innen zusätzliche Informationen hinzuzufügen oder Fragen zu stellen.
-Ersteller*innen von Vermittlungen werden über neue Kommentare per Mail benachrichtigt, ebenso alle die die Vermittlung abonniert haben.
-
-Kommentare können, wie Vermittlungen, gemeldet werden.

pyproject.toml

@@ -35,20 +35,13 @@ dependencies = [
     "markdown",
     "Pillow",
     "django-registration",
-    "psycopg2",
+    "psycopg2-binary",
     "django-crispy-forms",
     "crispy-bootstrap4",
-    "djangorestframework",
+    "djangorestframework"
-    "celery[redis]"
 ]
-
 dynamic = ["version", "readme"]
 
-[project.optional-dependencies]
-develop = [
-  "pytest",
-]
-
 [project.urls]
 homepage = "https://notfellchen.org"
 repository = "https://codeberg.org/moanos/notfellchen/"

src/fellchensammlung/admin.py

@@ -1,16 +1,11 @@
-import csv
+from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-
 from django.contrib import admin
-from django.http import HttpResponse
 from django.utils.html import format_html
-from django.urls import reverse
-from django.utils.http import urlencode
 
-from .models import User, Language, Text, ReportComment, ReportAdoptionNotice, Log, Timestamp
+from .models import User, Language, Text, ReportComment, ReportAdoptionNotice
 
 from .models import Animal, Species, RescueOrganization, AdoptionNotice, Location, Rule, Image, ModerationAction, \
     Comment, Report, Announcement, AdoptionNoticeStatus, User, Subscriptions
-from django.utils.translation import gettext_lazy as _
 
 
 class StatusInline(admin.StackedInline):
@@ -19,45 +14,14 @@ class StatusInline(admin.StackedInline):
 
 @admin.register(AdoptionNotice)
 class AdoptionNoticeAdmin(admin.ModelAdmin):
-    search_fields = ("name__icontains", "description__icontains")
-    list_filter = ("owner",)
     inlines = [
         StatusInline,
     ]
 
 
 # Re-register UserAdmin
-@admin.register(User)
+admin.site.register(User)
-class UserAdmin(admin.ModelAdmin):
-    search_fields = ("usernamname__icontains", "first_name__icontains", "last_name__icontains", "email__icontains")
-    list_display = ("username", "email", "trust_level", "is_active", "view_adoption_notices")
-    list_filter = ("is_active", "trust_level",)
-    actions = ("export_as_csv",)
 
-    def view_adoption_notices(self, obj):
-        count = obj.adoption_notices.count()
-        url = (
-                reverse("admin:fellchensammlung_adoptionnotice_changelist")
-                + "?"
-                + urlencode({"owner__id": f"{obj.id}"})
-        )
-        return format_html('<a href="{}">{} Adoption Notices</a>', url, count)
-
-    def export_as_csv(self, request, queryset):
-        meta = self.model._meta
-        field_names = [field.name for field in meta.fields]
-
-        response = HttpResponse(content_type='text/csv')
-        response['Content-Disposition'] = 'attachment; filename={}.csv'.format(meta)
-        writer = csv.writer(response)
-
-        writer.writerow(field_names)
-        for obj in queryset:
-            row = writer.writerow([getattr(obj, field) for field in field_names])
-
-        return response
-
-    export_as_csv.short_description = _("Ausgewählte User exportieren")
 
 def _reported_content_link(obj):
     reported_content = obj.reported_content
@@ -86,30 +50,15 @@ class ReportAdoptionNoticeAdmin(admin.ModelAdmin):
     reported_content_link.short_description = "Reported Content"
 
 
-@admin.register(RescueOrganization)
-class RescueOrganizationAdmin(admin.ModelAdmin):
-    search_fields = ("name__icontains",)
-    list_display = ("name", "trusted", "allows_using_materials", "website")
-    list_filter = ("allows_using_materials", "trusted",)
-
-
-@admin.register(Text)
-class TextAdmin(admin.ModelAdmin):
-    search_fields = ("title__icontains", "text_code__icontains",)
-
-@admin.register(Comment)
-class CommentAdmin(admin.ModelAdmin):
-    list_filter = ("user",)
-
 admin.site.register(Animal)
 admin.site.register(Species)
+admin.site.register(RescueOrganization)
 admin.site.register(Location)
 admin.site.register(Rule)
 admin.site.register(Image)
 admin.site.register(ModerationAction)
 admin.site.register(Language)
+admin.site.register(Text)
 admin.site.register(Announcement)
 admin.site.register(AdoptionNoticeStatus)
 admin.site.register(Subscriptions)
-admin.site.register(Log)
-admin.site.register(Timestamp)

src/fellchensammlung/forms.py

@@ -1,10 +1,12 @@
+import datetime
+
 from django import forms
 
 from .models import AdoptionNotice, Animal, Image, ReportAdoptionNotice, ReportComment, ModerationAction, User, Species, \
     Comment
 from django_registration.forms import RegistrationForm
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import Submit, Layout, Fieldset, HTML, Row, Column, Field, Hidden
+from crispy_forms.layout import Submit, Layout, Fieldset, HTML, Row, Column, Field
 from django.utils.translation import gettext_lazy as _
 from notfellchen.settings import MEDIA_URL
 
@@ -140,8 +142,8 @@ class CommentForm(forms.ModelForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         self.helper = FormHelper()
+        self.helper.form_action = "comment"
         self.helper.form_class = 'form-comments'
-        self.helper.add_input(Hidden('action', 'comment'))
         self.helper.add_input(Submit('submit', _('Kommentieren'), css_class="btn2"))
 
     class Meta:
@@ -173,5 +175,5 @@ def _get_distances():
 
 
 class AdoptionNoticeSearchForm(forms.Form):
-    location = forms.CharField(max_length=20, label=_("Stadt"))
+    postcode = forms.CharField(max_length=20, label=_("Postleitzahl"))
     max_distance = forms.ChoiceField(choices=_get_distances, label=_("Max. Distanz"))

src/fellchensammlung/mail.py

@@ -1,8 +1,4 @@
-from venv import create
-
 import django.conf.global_settings
-from django.db.models.signals import post_save
-from django.dispatch import receiver
 
 from django.utils.translation import gettext_lazy as _
 from django.utils.translation import gettext
@@ -14,7 +10,6 @@ from notfellchen.settings import host
 
 NEWLINE = "\r\n"
 
-
 def mail_admins_new_report(report):
     subject = _("Neue Meldung")
     for moderator in User.objects.filter(trust_level__gt=User.TRUST_LEVEL[User.MODERATOR]):
@@ -36,21 +31,3 @@ def mail_admins_new_report(report):
         message = mail.EmailMessage(subject, body_text, settings.DEFAULT_FROM_EMAIL, [moderator.email])
         print("Sending email to ", moderator.email)
         message.send()
-
-
-@receiver(post_save, sender=User)
-def mail_admins_new_member(sender, instance: User, created: bool, **kwargs):
-    if not created:
-        return
-    subject = _("Neuer User") + f": {instance.username}"
-    for moderator in User.objects.filter(trust_level__gt=User.TRUST_LEVEL[User.MODERATOR]):
-        greeting = _("Moin,") + "{NEWLINE}"
-        new_report_text = _("es hat sich eine neue Person registriert.") + "{NEWLINE}"
-        user_detail_text = _("Username") + f": {instance.username}{NEWLINE}" + _(
-            "E-Mail") + f": {instance.email}{NEWLINE}"
-        user_url = "https://" + host + instance.get_absolute_url()
-        link_text = f"Um alle Details zu sehen, geh bitte auf: {user_url}"
-        body_text = greeting + new_report_text + user_detail_text + link_text
-        message = mail.EmailMessage(subject, body_text, settings.DEFAULT_FROM_EMAIL, [moderator.email])
-        print("Sending email to ", moderator.email)
-        message.send()

src/fellchensammlung/management/commands/clean_locations.py

@@ -1,6 +1,6 @@
 from django.core.management import BaseCommand
 from fellchensammlung.models import AdoptionNotice, Location
-from fellchensammlung.tools.admin import clean_locations
+from fellchensammlung.tools.geo import clean_locations
 
 
 class Command(BaseCommand):

src/fellchensammlung/migrations/0008_alter_adoptionnoticestatus_minor_status_and_more.py

@@ -1,23 +0,0 @@
-# Generated by Django 5.1.1 on 2024-10-10 14:14
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0007_alter_adoptionnotice_last_checked'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adoptionnoticestatus',
-            name='minor_status',
-            field=models.CharField(choices=[('searching', 'searching'), ('interested', 'interested'), ('waiting_for_review', 'waiting_for_review'), ('needs_additional_info', 'needs_additional_info'), ('successful_with_notfellchen', 'successful_with_notfellchen'), ('successful_without_notfellchen', 'successful_without_notfellchen'), ('animal_died', 'animal_died'), ('closed_for_other_adoption_notice', 'closed_for_other_adoption_notice'), ('not_open_for_adoption_anymore', 'not_open_for_adoption_anymore'), ('other', 'other'), ('against_the_rules', 'against_the_rules'), ('missing_information', 'missing_information'), ('technical_error', 'technical_error'), ('unchecked', 'unchecked')], max_length=200),
-        ),
-        migrations.AlterField(
-            model_name='announcement',
-            name='publish_start_time',
-            field=models.DateTimeField(verbose_name='Veröffentlichungszeitpunkt'),
-        ),
-    ]

src/fellchensammlung/migrations/0009_log.py

@@ -1,25 +0,0 @@
-# Generated by Django 5.1.1 on 2024-10-10 21:00
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0008_alter_adoptionnoticestatus_minor_status_and_more'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Log',
-            fields=[
-                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('action', models.CharField(max_length=255, verbose_name='Aktion')),
-                ('text', models.CharField(max_length=1000, verbose_name='Log text')),
-                ('created_at', models.DateTimeField(auto_now_add=True)),
-                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Nutzer*in')),
-            ],
-        ),
-    ]

src/fellchensammlung/migrations/0010_timestamp.py

@@ -1,21 +0,0 @@
-# Generated by Django 5.1.1 on 2024-10-19 18:36
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0009_log'),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Timestamp',
-            fields=[
-                ('key', models.CharField(max_length=255, primary_key=True, serialize=False, verbose_name='Schlüssel')),
-                ('timestamp', models.DateTimeField(auto_now_add=True, verbose_name='Zeitstempel')),
-                ('data', models.CharField(blank=True, max_length=2000, null=True)),
-            ],
-        ),
-    ]

src/fellchensammlung/migrations/0011_alter_adoptionnotice_created_at_and_more.py

@@ -1,24 +0,0 @@
-# Generated by Django 5.1.1 on 2024-10-29 10:44
-
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0010_timestamp'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='adoptionnotice',
-            name='created_at',
-            field=models.DateField(default=django.utils.timezone.now, verbose_name='Erstellt am'),
-        ),
-        migrations.AlterField(
-            model_name='adoptionnotice',
-            name='last_checked',
-            field=models.DateTimeField(default=django.utils.timezone.now, verbose_name='Zuletzt überprüft am'),
-        ),
-    ]

src/fellchensammlung/migrations/0012_adoptionnotice_updated_at_and_more.py

@@ -1,136 +0,0 @@
-# Generated by Django 5.1.1 on 2024-11-03 20:07
-
-import django.utils.timezone
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0011_alter_adoptionnotice_created_at_and_more'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='adoptionnotice',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='adoptionnoticestatus',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='adoptionnoticestatus',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='animal',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='animal',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='announcement',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='basenotification',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='comment',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='image',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='image',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='location',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='log',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='moderationaction',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='report',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='rescueorganization',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='rescueorganization',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='rule',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='rule',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='species',
-            name='created_at',
-            field=models.DateTimeField(auto_now_add=True, default=django.utils.timezone.now),
-            preserve_default=False,
-        ),
-        migrations.AddField(
-            model_name='species',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='subscriptions',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-        migrations.AddField(
-            model_name='user',
-            name='updated_at',
-            field=models.DateTimeField(auto_now=True),
-        ),
-    ]

src/fellchensammlung/migrations/0013_alter_log_user.py

@@ -1,20 +0,0 @@
-# Generated by Django 5.1.1 on 2024-11-06 07:02
-
-import django.db.models.deletion
-from django.conf import settings
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0012_adoptionnotice_updated_at_and_more'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='log',
-            name='user',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Nutzer*in'),
-        ),
-    ]

src/fellchensammlung/migrations/0014_rescueorganization_email.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.1 on 2024-11-07 20:41
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0013_alter_log_user'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='rescueorganization',
-            name='email',
-            field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='E-Mail'),
-        ),
-    ]

src/fellchensammlung/migrations/0015_rescueorganization_comment.py

@@ -1,18 +0,0 @@
-# Generated by Django 5.1.1 on 2024-11-09 09:09
-
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('fellchensammlung', '0014_rescueorganization_email'),
-    ]
-
-    operations = [
-        migrations.AddField(
-            model_name='rescueorganization',
-            name='comment',
-            field=models.TextField(blank=True, null=True, verbose_name='Kommentar'),
-        ),
-    ]

src/fellchensammlung/models.py

@@ -3,6 +3,7 @@ import uuid
 from django.db import models
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+from datetime import datetime
 from django.utils import timezone
 from django.dispatch import receiver
 from django.db.models.signals import post_save
@@ -59,7 +60,6 @@ class User(AbstractUser):
     preferred_language = models.ForeignKey(Language, on_delete=models.PROTECT, null=True, blank=True,
                                            verbose_name=_('Bevorzugte Sprache'))
     trust_level = models.IntegerField(choices=TRUST_LEVEL, default=TRUST_LEVEL[MEMBER])
-    updated_at = models.DateTimeField(auto_now=True)
 
     class Meta:
         verbose_name = _('Nutzer*in')
@@ -72,11 +72,7 @@ class User(AbstractUser):
         return self.get_absolute_url()
 
     def get_num_unread_notifications(self):
-        return BaseNotification.objects.filter(user=self, read=False).count()
+        return BaseNotification.objects.filter(user=self,read=False).count()
-
-    @property
-    def adoption_notices(self):
-        return AdoptionNotice.objects.filter(owner=self)
 
     @property
     def owner(self):
@@ -87,8 +83,6 @@ class Image(models.Model):
     image = models.ImageField(upload_to='images')
     alt_text = models.TextField(max_length=2000)
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
-    updated_at = models.DateTimeField(auto_now=True)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.alt_text
@@ -102,8 +96,6 @@ class Species(models.Model):
     """Model representing a species of animal."""
     name = models.CharField(max_length=200, help_text=_('Name der Tierart'),
                             verbose_name=_('Name'))
-    updated_at = models.DateTimeField(auto_now=True)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         """String for representing the Model object."""
@@ -119,16 +111,10 @@ class Location(models.Model):
     latitude = models.FloatField()
     longitude = models.FloatField()
     name = models.CharField(max_length=2000)
-    updated_at = models.DateTimeField(auto_now=True)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return f"{self.name} ({self.latitude:.5}, {self.longitude:.5})"
 
-    @property
-    def str_hr(self):
-        return f"{self.name.split(',')[0]}"
-
     @staticmethod
     def get_location_from_string(location_string):
         geo_api = geo.GeoAPI()
@@ -148,13 +134,6 @@ class Location(models.Model):
         )
         return location
 
-    @staticmethod
-    def add_location_to_object(instance):
-        """Search the location given in the location string and add it to the object"""
-        location = Location.get_location_from_string(instance.location_string)
-        instance.location = location
-        instance.save()
-
 
 class RescueOrganization(models.Model):
     def __str__(self):
@@ -176,20 +155,13 @@ class RescueOrganization(models.Model):
 
     name = models.CharField(max_length=200)
     trusted = models.BooleanField(default=False, verbose_name=_('Vertrauenswürdig'))
-    allows_using_materials = models.CharField(max_length=200,
+    allows_using_materials = models.CharField(max_length=200,default=ALLOW_USE_MATERIALS_CHOICE[USE_MATERIALS_NOT_ASKED], choices=ALLOW_USE_MATERIALS_CHOICE, verbose_name=_('Erlaubt Nutzung von Inhalten'))
-                                              default=ALLOW_USE_MATERIALS_CHOICE[USE_MATERIALS_NOT_ASKED],
-                                              choices=ALLOW_USE_MATERIALS_CHOICE,
-                                              verbose_name=_('Erlaubt Nutzung von Inhalten'))
     location_string = models.CharField(max_length=200, verbose_name=_("Ort der Organisation"))
     location = models.ForeignKey(Location, on_delete=models.PROTECT, blank=True, null=True)
     instagram = models.URLField(null=True, blank=True, verbose_name=_('Instagram Profil'))
     facebook = models.URLField(null=True, blank=True, verbose_name=_('Facebook Profil'))
     fediverse_profile = models.URLField(null=True, blank=True, verbose_name=_('Fediverse Profil'))
-    email = models.EmailField(null=True, blank=True, verbose_name=_('E-Mail'))
     website = models.URLField(null=True, blank=True, verbose_name=_('Website'))
-    updated_at = models.DateTimeField(auto_now=True)
-    created_at = models.DateTimeField(auto_now_add=True)
-    comment = models.TextField(verbose_name=_("Kommentar"), null=True, blank=True,)
 
 
 class AdoptionNotice(models.Model):
@@ -199,13 +171,10 @@ class AdoptionNotice(models.Model):
         ]
 
     def __str__(self):
-        if not hasattr(self, 'adoptionnoticestatus'):
+        return f"{self.name}"
-            return self.name
-        return f"[{self.adoptionnoticestatus.as_string()}] {self.name}"
 
-    created_at = models.DateField(verbose_name=_('Erstellt am'), default=timezone.now)
+    created_at = models.DateField(verbose_name=_('Erstellt am'), default=datetime.now)
-    updated_at = models.DateTimeField(auto_now=True)
+    last_checked = models.DateTimeField(verbose_name=_('Zuletzt überprüft am'), default=datetime.now)
-    last_checked = models.DateTimeField(verbose_name=_('Zuletzt überprüft am'), default=timezone.now)
     searching_since = models.DateField(verbose_name=_('Sucht nach einem Zuhause seit'))
     name = models.CharField(max_length=200)
     description = models.TextField(null=True, blank=True, verbose_name=_('Beschreibung'))
@@ -222,24 +191,6 @@ class AdoptionNotice(models.Model):
     def animals(self):
         return Animal.objects.filter(adoption_notice=self)
 
-    @property
-    def sexes(self):
-        sexes = set()
-        for animal in self.animals:
-            sexes.update(animal.sex)
-        return sexes
-
-    def sex_code(self):
-        if len(self.sexes) > 1:
-            return "mixed"
-        elif self.sexes.pop() == Animal.MALE:
-            return "male"
-        elif self.sexes.pop() == Animal.FEMALE:
-            return "female"
-        else:
-            return "mixed"
-
-
     @property
     def comments(self):
         return Comment.objects.filter(adoption_notice=self)
@@ -326,28 +277,14 @@ class AdoptionNotice(models.Model):
             return False
         return self.adoptionnoticestatus.is_active
     
-    @property
+    def set_checked(self):
-    def is_disabled_unchecked(self):
+        self.last_checked = datetime.now()
-        if not hasattr(self, 'adoptionnoticestatus'):
+        self.save()
-            return False
-        return self.adoptionnoticestatus.is_disabled_unchecked
     
     def set_closed(self):
-        self.last_checked = timezone.now()
+        self.last_checked = datetime.now()
         self.adoptionnoticestatus.set_closed()
 
-    def set_active(self):
-        self.last_checked = timezone.now()
-        if not hasattr(self, 'adoptionnoticestatus'):
-            AdoptionNoticeStatus.create_other(self)
-        self.adoptionnoticestatus.set_active()
-
-    def set_unchecked(self):
-        self.last_checked = timezone.now()
-        if not hasattr(self, 'adoptionnoticestatus'):
-            AdoptionNoticeStatus.create_other(self)
-        self.adoptionnoticestatus.set_unchecked()
-
 
 class AdoptionNoticeStatus(models.Model):
     """
@@ -387,7 +324,6 @@ class AdoptionNoticeStatus(models.Model):
             "against_the_rules": "against_the_rules",
             "missing_information": "missing_information",
             "technical_error": "technical_error",
-            "unchecked": "unchecked",
             "other": "other"
         }
     }
@@ -398,51 +334,23 @@ class AdoptionNoticeStatus(models.Model):
         minor_choices.update(MINOR_STATUS_CHOICES[key])
     minor_status = models.CharField(choices=minor_choices, max_length=200)
     adoption_notice = models.OneToOneField(AdoptionNotice, on_delete=models.CASCADE)
-    updated_at = models.DateTimeField(auto_now=True)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return f"{self.adoption_notice}: {self.major_status}, {self.minor_status}"
 
-    def as_string(self):
-        return f"{self.major_status}, {self.minor_status}"
-
     @property
     def is_active(self):
         return self.major_status == self.ACTIVE
 
-    @property
-    def is_disabled_unchecked(self):
-        return self.major_status == self.DISABLED and self.minor_status == "unchecked"
-
     @staticmethod
     def get_minor_choices(major_status):
         return AdoptionNoticeStatus.MINOR_STATUS_CHOICES[major_status]
 
-    @staticmethod
-    def create_other(an_instance):
-        # Used as empty status to be changed immediately
-        major_status = AdoptionNoticeStatus.DISABLED
-        minor_status = AdoptionNoticeStatus.MINOR_STATUS_CHOICES[AdoptionNoticeStatus.DISABLED]["other"]
-        AdoptionNoticeStatus.objects.create(major_status=major_status,
-                                            minor_status=minor_status,
-                                            adoption_notice=an_instance)
-
     def set_closed(self):
         self.major_status = self.MAJOR_STATUS_CHOICES[self.CLOSED]
         self.minor_status = self.MINOR_STATUS_CHOICES[self.CLOSED]["other"]
         self.save()
 
-    def set_unchecked(self):
-        self.major_status = self.MAJOR_STATUS_CHOICES[self.DISABLED]
-        self.minor_status = self.MINOR_STATUS_CHOICES[self.DISABLED]["unchecked"]
-        self.save()
-
-    def set_active(self):
-        self.major_status = self.MAJOR_STATUS_CHOICES[self.ACTIVE]
-        self.minor_status = self.MINOR_STATUS_CHOICES[self.ACTIVE]["searching"]
-        self.save()
-
 
 class Animal(models.Model):
     MALE_NEUTERED = "M_N"
@@ -464,15 +372,13 @@ class Animal(models.Model):
     sex = models.CharField(max_length=20, choices=SEX_CHOICES, )
     adoption_notice = models.ForeignKey(AdoptionNotice, on_delete=models.CASCADE)
     owner = models.ForeignKey(User, on_delete=models.CASCADE)
-    updated_at = models.DateTimeField(auto_now=True)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return f"{self.name}"
 
     @property
     def age(self):
-        return timezone.now().today().date() - self.date_of_birth
+        return datetime.today().date() - self.date_of_birth
 
     @property
     def hr_age(self):
@@ -509,8 +415,6 @@ class Rule(models.Model):
     language = models.ForeignKey(Language, on_delete=models.PROTECT)
     # Rule identifier allows to translate rules with the same identifier
     rule_identifier = models.CharField(max_length=24)
-    updated_at = models.DateTimeField(auto_now=True)
-    created_at = models.DateTimeField(auto_now_add=True)
 
     def __str__(self):
         return self.title
@@ -534,7 +438,6 @@ class Report(models.Model):
     reported_broken_rules = models.ManyToManyField(Rule)
     user_comment = models.TextField(blank=True)
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
 
     def __str__(self):
         return f"[{self.status}]: {self.user_comment:.20}"
@@ -581,12 +484,13 @@ class ModerationAction(models.Model):
     }
     action = models.CharField(max_length=30, choices=ACTIONS.items())
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
     public_comment = models.TextField(blank=True)
     # Only visible to moderator
     private_comment = models.TextField(blank=True)
     report = models.ForeignKey(Report, on_delete=models.CASCADE)
 
+    # TODO: Needs field for moderator that performed the action
+
     def __str__(self):
         return f"[{self.action}]: {self.public_comment}"
 
@@ -612,17 +516,6 @@ class Text(models.Model):
     def __str__(self):
         return f"{self.title} ({self.language})"
 
-    @staticmethod
-    def get_texts(text_codes, language, expandable_dict=None):
-        if expandable_dict is None:
-            expandable_dict = {}
-        for text_code in text_codes:
-            try:
-                expandable_dict[text_code] = Text.objects.get(text_code=text_code, language=language, )
-            except Text.DoesNotExist:
-                expandable_dict[text_code] = None
-        return expandable_dict
-
 
 class Announcement(Text):
     """
@@ -630,8 +523,7 @@ class Announcement(Text):
     """
     logged_in_only = models.BooleanField(default=False)
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
+    publish_start_time = models.DateTimeField(verbose_name="Veröffentlichungszeitpunk")
-    publish_start_time = models.DateTimeField(verbose_name="Veröffentlichungszeitpunkt")
     publish_end_time = models.DateTimeField(verbose_name="Veröffentlichungsende")
     IMPORTANT = "important"
     WARNING = "warning"
@@ -679,7 +571,6 @@ class Comment(models.Model):
     """
     user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_('Nutzer*in'))
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
     adoption_notice = models.ForeignKey(AdoptionNotice, on_delete=models.CASCADE, verbose_name=_('AdoptionNotice'))
     text = models.TextField(verbose_name="Inhalt")
     reply_to = models.ForeignKey("self", verbose_name="Antwort auf", blank=True, null=True, on_delete=models.CASCADE)
@@ -697,7 +588,6 @@ class Comment(models.Model):
 
 class BaseNotification(models.Model):
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
     title = models.CharField(max_length=100)
     text = models.TextField(verbose_name="Inhalt")
     user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_('Nutzer*in'))
@@ -723,33 +613,6 @@ class Subscriptions(models.Model):
     owner = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_('Nutzer*in'))
     adoption_notice = models.ForeignKey(AdoptionNotice, on_delete=models.CASCADE, verbose_name=_('AdoptionNotice'))
     created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
 
     def __str__(self):
-        return f"{self.owner} - {self.adoption_notice}"
+        return f"{self.owner} - { self.adoption_notice }"
-
-
-class Log(models.Model):
-    """
-    Basic class that allows logging random entries for later inspection
-    """
-    user = models.ForeignKey(User, on_delete=models.CASCADE, verbose_name=_("Nutzer*in"), blank=True, null=True)
-    action = models.CharField(max_length=255, verbose_name=_("Aktion"))
-    text = models.CharField(max_length=1000, verbose_name=_("Log text"))
-    created_at = models.DateTimeField(auto_now_add=True)
-    updated_at = models.DateTimeField(auto_now=True)
-
-    def __str__(self):
-        return f"[{self.action}] - {self.user} - {self.created_at.strftime('%H:%M:%S %d-%m-%Y ')}"
-
-
-class Timestamp(models.Model):
-    """
-    Class to store timestamps based on keys
-    """
-    key = models.CharField(max_length=255, verbose_name=_("Schlüssel"), primary_key=True)
-    timestamp = models.DateTimeField(auto_now_add=True, verbose_name=_("Zeitstempel"))
-    data = models.CharField(max_length=2000, blank=True, null=True)
-
-    def ___str__(self):
-        return f"[{self.key}] - {self.timestamp.strftime('%H:%M:%S %d-%m-%Y ')} - {self.data}"

src/fellchensammlung/static/fellchensammlung/css/styles.css

@@ -1,7 +1,3 @@
-/***************/
-/* MAIN COLORS */
-/***************/
-
 :root {
     --primary-light-one: #5daa68;
     --primary-light-two: #4a9455;
@@ -22,9 +18,7 @@
     --text-three: var(--primary-light-one);
     --shadow-three: var(--primary-dark-one);
 }
-/**************************/
+
-/* TAG SETTINGS (GENERAL) */
-/**************************/
 html, body {
     margin: 0;
     height: 100%;
@@ -36,6 +30,10 @@ body {
 }
 
 
+.content-box {
+    margin: 20px;
+}
+
 table {
     width: 100%;
 }
@@ -81,145 +79,6 @@ h1, h2 {
     box-sizing: border-box;
 }
 
-textarea {
-    border-radius: 10px;
-    width: 100%;
-    margin: 5px;
-}
-
-
-/**************/
-/* CONTAINERS */
-/**************/
-
-.container-cards {
-    display: flex;
-    flex-wrap: wrap;
-}
-
-.card {
-    flex: 1 25%;
-    margin: 10px;
-    border-radius: 8px;
-    padding: 5px;
-    background: var(--background-three);
-    color: var(--text-two);
-}
-
-.container-edit-buttons {
-    display: flex;
-    flex-wrap: wrap;
-
-    .btn {
-        margin: 5px;
-    }
-}
-
-.spaced {
-    margin-bottom: 30px;
-}
-
-/*******************************/
-/* PARTIAL SPECIFIC CONTAINERS */
-/*******************************/
-
-
-.detail-animal-header {
-    border-radius: 5px;
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-}
-
-@media screen and (max-width: 800px) {
-    .detail-animal-header {
-        display: block;
-    }
-}
-
-.profile-card {
-    display: flex;
-    border-radius: 0px 0px 8px 8px;
-    background-color: var(--highlight-two);
-    color: var(--highlight-one-text);
-
-    .btn2 {
-        height: 40px;
-    }
-
-    .button_darken:hover {
-        background-color: var(--highlight-one);
-        color: var(--highlight-one-text);
-    }
-
-    button {
-        background: inherit;
-        color: inherit;
-    }
-}
-
-.container-comment-form {
-    width: 80%;
-    color: var(--text-one);
-
-    b {
-        text-shadow: 2px 2px var(--shadow-one);
-    }
-}
-
-/*************/
-/* Modifiers */
-/*************/
-
-/* Used to enlargen cards */
-.full-width {
-    width: 100%;
-    flex: none;
-}
-
-/***********/
-/* BUTTONS */
-/***********/
-
-select, .button {
-    width: 100%;
-    border: none;
-    border-radius: 4px;
-    opacity: 1;
-    background-color: var(--secondary-light-one);
-
-}
-
-.btn {
-    background-color: var(--primary-light-one);
-    color: var(--secondary-light-one);
-    padding: 16px;
-    border-radius: 8px;
-    border: none;
-    font-weight: bold;
-    display: block;
-}
-
-.btn2 {
-    background-color: var(--secondary-light-one);
-    color: var(--primary-dark-one);
-    padding: 8px;
-    border-radius: 4px;
-    border: none;
-    margin: 5px;
-}
-
-
-
-
-/*********************/
-/* UNIQUE COMPONENTS */
-/*********************/
-
-.content-box {
-    margin: 20px;
-}
-
 .header {
     overflow: hidden;
     background-color: var(--background-two);
@@ -251,7 +110,14 @@ select, .button {
     color: white;
 }
 
+select, .button {
+    width: 100%;
+    border: none;
+    border-radius: 4px;
+    opacity: 1;
+    background-color: var(--secondary-light-one);
 
+}
 
 .header-right select.option {
     color: #000;
@@ -269,6 +135,26 @@ select, .button {
     height: 67px;
 }
 
+.profile-card {
+    display: flex;
+    border-radius: 0px 0px 8px 8px;
+    background-color: var(--highlight-two);
+    color: var(--highlight-one-text);
+
+    .btn2 {
+        height: 40px;
+    }
+
+    .button_darken:hover {
+        background-color: var(--highlight-one);
+        color: var(--highlight-one-text);
+    }
+
+    button {
+        background: inherit;
+        color: inherit;
+    }
+}
 
 @media screen and (max-width: 500px) {
     .header a {
@@ -286,6 +172,25 @@ select, .button {
     height: 40px;
 }
 
+
+.btn {
+    background-color: var(--primary-light-one);
+    color: var(--secondary-light-one);
+    padding: 16px;
+    border-radius: 8px;
+    border: none;
+    font-weight: bold;
+}
+
+.btn2 {
+    background-color: var(--secondary-light-one);
+    color: var(--primary-dark-one);
+    padding: 8px;
+    border-radius: 4px;
+    border: none;
+    margin: 5px;
+}
+
 .form-button, .link-button a:link, .link-button a:visited {
     background-color: #4ba3cd;
     color: white;
@@ -298,6 +203,14 @@ select, .button {
     border: none;
 }
 
+.container-edit-buttons {
+    display: flex;
+    flex-wrap: wrap;
+
+    .btn {
+        margin: 5px;
+    }
+}
 
 .form-button:hover, .link-button a:hover, .link-button a:active {
     background-color: #4090b6;
@@ -413,6 +326,18 @@ select, .button {
     }
 }
 
+.detail-animal-header {
+    border-radius: 5px;
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+}
+
+@media screen and (max-width: 800px) {
+    .detail-animal-header {
+        display: block;
+    }
+}
 
 .tag {
     border: black 1px solid;
@@ -430,7 +355,10 @@ select, .button {
 }
 
 
-
+.container-cards {
+    display: flex;
+    flex-wrap: wrap;
+}
 
 
 .photos {
@@ -448,17 +376,23 @@ select, .button {
     border-radius: 10%;
 }
 
+.card {
+    flex: 1 25%;
+    margin: 10px;
+    border-radius: 8px;
+    padding: 5px;
+    background: var(--background-three);
+    color: var(--text-two);
+}
 
 .card h1 {
     color: var(--text-three);
     text-shadow: 1px 1px var(--shadow-three);
-    width: 85%;
 }
 
 .card h2 {
     color: var(--text-three);
     text-shadow: 1px 1px var(--shadow-three);
-    width: 85%;
 }
 
 .card img {
@@ -580,7 +514,20 @@ select, .button {
     color: var(--text-two);
 }
 
+.container-comment-form {
+    width: 80%;
+    color: var(--text-one);
 
+    b {
+        text-shadow: 2px 2px var(--shadow-one);
+    }
+}
+
+textarea {
+    border-radius: 10px;
+    width: 100%;
+    margin: 5px;
+}
 
 .form-comments {
     .btn {
@@ -605,21 +552,6 @@ select, .button {
     }
 }
 
-
-.form-search {
-    select, input {
-        background-color: var(--primary-light-one);
-        color: var(--text-one);
-        border-radius: 3px;
-        border: none;
-    }
-
-}
-
-/************************/
-/* GENERAL HIGHLIGHTING */
-/************************/
-
 .important {
     border: #e01137 4px solid;
 }
@@ -632,10 +564,15 @@ select, .button {
     border: rgba(17, 58, 224, 0.51) 4px solid;
 }
 
+.form-search {
+    select, input {
+        background-color: var(--primary-light-one);
+        color: var(--text-one);
+        border-radius: 3px;
+        border: none;
+    }
 
-/*******/
+}
-/* MAP */
-/*******/
 
 .marker {
     background-image: url('../img/logo_transparent.png');

src/fellchensammlung/tasks.py

@@ -1,45 +0,0 @@
-from django.utils import timezone
-from notfellchen.celery import app as celery_app
-from .tools.admin import clean_locations, deactivate_unchecked_adoption_notices, deactivate_404_adoption_notices
-from .tools.misc import healthcheck_ok
-from .models import Location, AdoptionNotice, Timestamp
-
-
-def set_timestamp(key: str):
-    try:
-        ts = Timestamp.objects.get(key=key)
-        ts.timestamp = timezone.now()
-        ts.save()
-    except Timestamp.DoesNotExist:
-        Timestamp.objects.create(key=key, timestamp=timezone.now())
-
-
-@celery_app.task(name="admin.clean_locations")
-def task_clean_locations():
-    clean_locations()
-    set_timestamp("task_clean_locations")
-
-
-@celery_app.task(name="admin.daily_unchecked_deactivation")
-def task_deactivate_unchecked():
-    deactivate_unchecked_adoption_notices()
-    set_timestamp("task_daily_unchecked_deactivation")
-
-
-@celery_app.task(name="admin.deactivate_404_adoption_notices")
-def task_deactivate_unchecked():
-    deactivate_404_adoption_notices()
-    set_timestamp("task_deactivate_404_adoption_notices")
-
-
-@celery_app.task(name="commit.add_location")
-def add_adoption_notice_location(pk):
-    instance = AdoptionNotice.objects.get(pk=pk)
-    Location.add_location_to_object(instance)
-    set_timestamp("add_adoption_notice_location")
-
-
-@celery_app.task(name="tools.healthcheck")
-def task_healthcheck():
-    healthcheck_ok()
-    set_timestamp("task_healthcheck")

src/fellchensammlung/templates/fellchensammlung/about.html

@@ -2,14 +2,7 @@
 {% load i18n %}
 {% load custom_tags %}
 
-{% block title %}<title>{% translate "Über uns und Regeln" %}</title>{% endblock %}
-
 {% block content %}
-    {% if about_us %}
-        <h1>{{ about_us.title }}</h1>
-        {{ about_us.content | render_markdown }}
-    {% endif %}
-
     <h1>{% translate "Regeln" %}</h1>
     {% include "fellchensammlung/lists/list-rules.html" %}
 

src/fellchensammlung/templates/fellchensammlung/base_generic.html

@@ -1,12 +1,10 @@
 {% load custom_tags %}
-{% load i18n %}
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    {% block title %}{% endblock %}
+    {% block title %}<title>Notfellchen</title>{% endblock %}
     <meta charset="utf-8">
     <meta name="viewport" content="width=device-width, initial-scale=1">
-    <meta name="description" content="{% translate "Farbratten aus dem Tierschutz finden und adoptieren" %}">
     <!-- Add additional CSS in static file -->
     {% load static %}
     <link rel="stylesheet" href="{% static 'fellchensammlung/css/styles.css' %}">

src/fellchensammlung/templates/fellchensammlung/details/detail_adoption_notice.html

@@ -2,8 +2,6 @@
 {% load custom_tags %}
 {% load i18n %}
 
-{% block title %}<title>{{adoption_notice.name }}</title>{% endblock %}
-
 {% block content %}
     <div class="detail-adoption-notice-header">
         <h1 class="detail-adoption-notice-header">{{ adoption_notice.name }}
@@ -50,14 +48,7 @@
                 <td>{{ adoption_notice.searching_since }}</td>
                 <td>{{ adoption_notice.last_checked | date:'d. F Y' }}</td>
                 {% if adoption_notice.further_information %}
-                    <td>
+                    <td>{{ adoption_notice.link_to_more_information | safe }}</td>
-                        <form method="get" action="{% url 'external-site' %}">
-                            <input type="hidden" name="url" value="{{ adoption_notice.further_information }}">
-                            <button class="btn" type="submit" id="submit">
-                                 {{ adoption_notice.further_information | domain }} <i class="fa-solid fa-arrow-up-right-from-square"></i>
-                            </button>
-                        </form>
-                    </td>
                 {% else %}
                     <td>-</td>
                 {% endif %}

src/fellchensammlung/templates/fellchensammlung/details/detail_animal.html

@@ -2,8 +2,6 @@
 {% load custom_tags %}
 {% load i18n %}
 
-{% block title %}<title>{{ animal.name }}</title>{% endblock %}
-
 {% block content %}
     {% include "fellchensammlung/details/detail-animal-partial.html" %}
 {% endblock %}

src/fellchensammlung/templates/fellchensammlung/external_site_warning.html

@@ -1,15 +0,0 @@
-{% extends "fellchensammlung/base_generic.html" %}
-{% load i18n %}
-    {% load custom_tags %}
-{% block content %}
-    <div class="card">
-        {% if external_site_warning %}
-            {{ external_site_warning.content | render_markdown }}
-        {% else %}
-            {% blocktranslate %}
-                <p>Achtung du verlässt notfellchen.org</p>
-            {% endblocktranslate %}
-        {% endif %}
-        <a href="{{ url }}" class="btn button">{% translate "Weiter" %}</a>
-    </div>
-{% endblock content %}

src/fellchensammlung/templates/fellchensammlung/forms/form_add_adoption.html

@@ -2,8 +2,6 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block title %}<title>{% translate "Vermittlung hinzufügen" %}</title>{% endblock %}
-
 {% block content %}
     <h1>{% translate "Vermitteln" %}</h1>
     <p>

src/fellchensammlung/templates/fellchensammlung/index.html

@@ -2,8 +2,6 @@
 {% load i18n %}
 {% load custom_tags %}
 
-{% block title %}<title>{% translate "Notfellchen - Farbratten aus dem Tierschutz adoptieren" %}</title>{% endblock %}
-
 {% block content %}
     {% for announcement in announcements %}
         {% include "fellchensammlung/partials/partial-announcement.html" %}

src/fellchensammlung/templates/fellchensammlung/instance-health-check.html

@@ -1,6 +1,5 @@
 {% extends "fellchensammlung/base_generic.html" %}
 {% load i18n %}
-{% block title %}<title>{% translate "Instanz-Check" %}</title> {% endblock %}
 {% block content %}
     <div class="card">
         <h1>{% translate "Instanz-Check" %}</h1>
@@ -24,28 +23,6 @@
             <p>{% translate "Texte scheinen vollständig" %}</p>
         {% endif %}
 
-        <h2>{% trans "Zeitstempel" %}</h2>
-        {% if timestamps|length > 0 %}
-            <p>
-            <table>
-                <tr>
-                    <th>{% translate "Key" %}</th>
-                    <th>{% translate "Zeitstempel" %}</th>
-                    <th>{% translate "Daten" %}</th>
-                </tr>
-                {% for timestamp in timestamps %}
-                    <tr>
-                        <td>{{ timestamp.key }}</td>
-                        <td>{{ timestamp.timestamp }}</td>
-                        <td>{{ timestamp.data }}</td>
-                    </tr>
-                {% endfor %}
-            </table>
-            </p>
-        {% else %}
-            <p>{% translate "Keine Zeitstempel geloggt." %}</p>
-        {% endif %}
-
         <h2>{% translate "Nicht-lokalisierte Vermittlungen" %}</h2>
         {% if number_not_geocoded_adoption_notices > 0 %}
             <details>
@@ -78,22 +55,6 @@
             <p>{{ number_not_geocoded_rescue_orgs }}/{{ number_of_rescue_orgs }}</p>
         {% endif %}
 
-        <h2>{% translate "Nicht-geprüfte Vermittlungen" %}</h2>
-        {% if number_unchecked_ans > 0 %}
-            <details>
-                <summary>{{ number_unchecked_ans }}</summary>
-                <ul>
-                    {% for unchecked_an in unchecked_ans %}
-                        <li>
-                            <a href="{{ unchecked_an.get_absolute_url }}">{{ unchecked_an.name }}</a>
-                        </li>
-                    {% endfor %}
-                </ul>
-            </details>
-        {% else %}
-            <p>{{ number_unchecked_ans }}</p>
-        {% endif %}
-
         <form class="notification-card-mark-read" method="post">
             {% csrf_token %}
             <input type="hidden" name="action" value="clean_locations">
@@ -101,13 +62,5 @@
                 <i class="fa-solid fa-broom"></i> {% translate "Erneut lokalisieren" %}
             </button>
         </form>
-
-        <form class="notification-card-mark-read" method="post">
-            {% csrf_token %}
-            <input type="hidden" name="action" value="deactivate_unchecked_adoption_notices">
-            <button class="btn" type="submit" id="submit">
-                <i class="fa-solid fa-broom"></i> {% translate "Deaktivire ungeprüfte Vermittlungen" %}
-            </button>
-        </form>
     </div>
 {% endblock content %}

src/fellchensammlung/templates/fellchensammlung/lists/list-adoption-notices.html

@@ -2,7 +2,7 @@
 <div class="container-cards">
     {% if adoption_notices %}
         {% for adoption_notice in adoption_notices %}
-            {% include "fellchensammlung/partials/partial-adoption-notice-minimal.html" %}
+            {% include "fellchensammlung/partials/partial-adoption-notice.html" %}
         {% endfor %}
     {% else %}
         <p>{% translate "Keine Vermittlungen gefunden." %}</p>

src/fellchensammlung/templates/fellchensammlung/map.html

@@ -1,6 +1,5 @@
 {% extends "fellchensammlung/base_generic.html" %}
 {% load i18n %}
-{% block title %}<title>{% translate "Karte" %}</title> %}
 
 {% block content %}
     <div class="card">

src/fellchensammlung/templates/fellchensammlung/modqueue.html

@@ -1,6 +1,5 @@
 {% extends "fellchensammlung/base_generic.html" %}
 {% load i18n %}
-{% block title %}<title>{% translate "Modqueue" %}</title> %}{% endblock %}
 
 {% block content %}
     <h1>{% translate "Modqueue" %}</h1>

src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice-minimal.html

@@ -10,9 +10,9 @@
                     class="fa-solid fa-flag"></i></a>
         </div>
         <p>
-            <b><i class="fa-solid fa-location-dot"></i></b>
+            <b>Ort</b>
             {% if adoption_notice.location %}
-                {{ adoption_notice.location.str_hr }}
+                {{ adoption_notice.location }}
             {% else %}
                 {{ adoption_notice.location_string }}
             {% endif %}

src/fellchensammlung/templates/fellchensammlung/partials/partial-adoption-notice.html

@@ -14,7 +14,7 @@
         <p>
             <b>Ort</b>
             {% if adoption_notice.location %}
-                {{ adoption_notice.location.str_hr }}
+                {{ adoption_notice.location }}
             {% else %}
                 {{ adoption_notice.location_string }}
             {% endif %}

src/fellchensammlung/templates/fellchensammlung/partials/partial-check-adoption-notice.html

@@ -1,28 +0,0 @@
-{% load i18n %}
-{% load custom_tags %}
-<div class="card">
-    <h1>
-        <a href="{{ adoption_notice.get_absolute_url }}">{{ adoption_notice.name }}</a>
-    </h1>
-    {% if adoption_notice.further_information %}
-        <p>{% translate "Externe Quelle" %}: {{ adoption_notice.link_to_more_information | safe }}</p>
-    {% endif %}
-    <div>
-        <form method="post">
-            {% csrf_token %}
-            <input type="hidden"
-                   name="adoption_notice_id"
-                   value="{{ adoption_notice.pk }}">
-            <input type="hidden" name="action" value="checked_active">
-            <button class="btn" type="submit">{% translate "Vermittlung noch aktuell" %}</button>
-        </form>
-        <form method="post">
-            {% csrf_token %}
-            <input type="hidden"
-                   name="adoption_notice_id"
-                   value="{{ adoption_notice.pk }}">
-            <input type="hidden" name="action" value="checked_inactive">
-            <button class="btn" type="submit">{% translate "Vermittlung inaktiv" %}</button>
-        </form>
-    </div>
-</div>

src/fellchensammlung/templates/fellchensammlung/search.html

@@ -1,8 +1,5 @@
 {% extends "fellchensammlung/base_generic.html" %}
 {% load i18n %}
-
-{% block title %}<title>{% translate "Suche" %}</title>{% endblock %}
-
 {% block content %}
     <form class="form-search card" method="post">
         {% csrf_token %}

src/fellchensammlung/templates/fellchensammlung/updatequeue.html

@@ -3,16 +3,32 @@
 {% block content %}
     <h1>{% translate "Aktualitätscheck" %}</h1>
     <p>{% translate "Überprüfe ob Vermittlungen noch aktuell sind" %}</p>
-    <div class="container-cards spaced">
+    {% for adoption_notice in adoption_notices %}
-        <h1>{% translate 'Deaktivierte Vermittlungen zur Überprüfung' %}</h1>
+        <div class="card">
-        {% for adoption_notice in adoption_notices_disabled %}
+            <h1>
-            {% include "fellchensammlung/partials/partial-check-adoption-notice.html" %}
+                <a href="{{ adoption_notice.get_absolute_url }}">{{ adoption_notice.name }}</a>
-        {% endfor %}
+            </h1>
+            {% if adoption_notice.further_information %}
+                <p>{% translate "Externe Quelle" %}: {{ adoption_notice.link_to_more_information | safe }}</p>
+            {% endif %}
+            <div>
+                <form method="post">
+                    {% csrf_token %}
+                    <input type="hidden"
+                           name="adoption_notice_id"
+                           value="{{ adoption_notice.pk }}">
+                           <input type="hidden" name="action" value="checked_active">
+                    <button class="btn" type="submit">{% translate "Vermittlung noch aktuell" %}</button>
+                </form>
+                <form method="post">
+                    {% csrf_token %}
+                    <input type="hidden"
+                           name="adoption_notice_id"
+                           value="{{ adoption_notice.pk }}">
+                           <input type="hidden" name="action" value="checked_inactive">
+                    <button class="btn" type="submit">{% translate "Vermittlung inaktiv" %}</button>
+                </form>
             </div>
-    <div class="container-cards spaced">
-        <h1>{% translate 'Aktive Vermittlungen zur Überprüfung' %}</h1>
-        {% for adoption_notice in adoption_notices_active %}
-            {% include "fellchensammlung/partials/partial-check-adoption-notice.html" %}
-        {% endfor %}
         </div>
+    {% endfor %}
 {% endblock %}

src/fellchensammlung/templatetags/custom_tags.py

@@ -4,7 +4,6 @@ from django import template
 from django.template.defaultfilters import stringfilter
 from django.utils.safestring import mark_safe
 from notfellchen import settings
-from urllib.parse import urlparse
 
 register = template.Library()
 
@@ -57,17 +56,6 @@ def pointdecimal(value):
     except ValueError:
         return value
 
-@register.filter
-@stringfilter
-def domain(url):
-    try:
-        domain = urlparse(url).netloc
-        if domain.startswith("www."):
-            return domain[4:]
-        return domain
-    except ValueError:
-        return url
-
 @register.simple_tag
 def settings_value(name):
     return getattr(settings, name)

src/fellchensammlung/tests.py

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

src/fellchensammlung/tools/admin.py

@@ -1,11 +1,4 @@
-import logging
+from fellchensammlung.models import AdoptionNotice, Location, RescueOrganization
-
-from django.utils import timezone
-from datetime import timedelta
-
-from fellchensammlung.models import AdoptionNotice, Location, RescueOrganization, AdoptionNoticeStatus, Log
-from fellchensammlung.tools.misc import is_404
-
 
 def clean_locations(quiet=True):
     # ADOPTION NOTICES
@@ -14,7 +7,7 @@ def clean_locations(quiet=True):
     num_without_location = adoption_notices_without_location.count()
     if not quiet:
         print(f"From {num_of_all} there are {num_without_location} adoption notices without location "
-              f"({num_without_location / num_of_all * 100:.2f}%)")
+            f"({num_without_location/num_of_all*100:.2f}%)")
     for adoption_notice in adoption_notices_without_location:
         if not quiet:
             print(f"Searching {adoption_notice.location_string} in Nominatim")
@@ -35,7 +28,7 @@ def clean_locations(quiet=True):
     num_without_location = rescue_orgs_without_location.count()
     if not quiet:
         print(f"From {num_of_all} there are {num_without_location} adoption notices without location "
-              f"({num_without_location / num_of_all * 100:.2f}%)")
+            f"({num_without_location/num_of_all*100:.2f}%)")
     for rescue_org in rescue_orgs_without_location:
         if not quiet:
             print(f"Searching {rescue_org.location_string} in Nominatim")
@@ -49,36 +42,3 @@ def clean_locations(quiet=True):
     num_new = num_without_location - num_without_location_new
     if not quiet:
         print(f"Added {num_new} new locations")
-
-
-def get_unchecked_adoption_notices(weeks=3):
-    now = timezone.now()
-    three_weeks_ago = now - timedelta(weeks=weeks)
-
-    # Query for active adoption notices that were checked in the last three weeks
-    unchecked_adoptions = AdoptionNotice.objects.filter(
-        last_checked__lte=three_weeks_ago
-    )
-    active_unchecked_adoptions = [adoption for adoption in unchecked_adoptions if adoption.is_active]
-    return active_unchecked_adoptions
-
-
-def get_active_adoption_notices():
-    ans = AdoptionNotice.objects.all()
-    active_adoptions = [adoption for adoption in ans if adoption.is_active]
-    return active_adoptions
-
-
-def deactivate_unchecked_adoption_notices():
-    for adoption_notice in get_unchecked_adoption_notices(weeks=3):
-        AdoptionNoticeStatus.objects.get(adoption_notice=adoption_notice).set_unchecked()
-
-
-def deactivate_404_adoption_notices():
-    for adoption_notice in get_active_adoption_notices():
-        if adoption_notice.further_information and adoption_notice.further_information != "":
-            if is_404(adoption_notice.further_information):
-                adoption_notice.set_closed()
-                logging_msg = f"Automatically set Adoption Notice {adoption_notice.id} closed as link to more information returened 404"
-                logging.info(logging_msg)
-                Log.objects.create(action="automated", text=logging_msg)

src/fellchensammlung/tools/geo.py

@@ -7,6 +7,7 @@ from notfellchen import __version__ as nf_version
 from notfellchen import settings
 
 
+
 def calculate_distance_between_coordinates(position1, position2):
     """
     Calculate the distance between two points identified by coordinates
@@ -64,8 +65,7 @@ class GeoAPI:
 
     def get_coordinates_from_query(self, location_string):
         try:
-            result = \
+            result = self.requests.get(self.api_url, {"q": location_string, "format": "jsonv2"}, headers=self.headers).json()[0]
-            self.requests.get(self.api_url, {"q": location_string, "format": "jsonv2"}, headers=self.headers).json()[0]
         except IndexError:
             return None
         return result["lat"], result["lon"]

src/fellchensammlung/tools/misc.py

@@ -1,8 +1,4 @@
 import datetime as datetime
-import logging
-
-from notfellchen import settings
-import requests
 
 
 def pluralize(number, letter="e"):
@@ -15,11 +11,11 @@ def pluralize(number, letter="e"):
 
 def age_as_hr_string(age: datetime.timedelta) -> str:
     days = age.days
-    weeks = age.days / 7
+    weeks = age.days/7
-    months = age.days / 30
+    months = age.days/30
-    years = age.days / 365
+    years = age.days/365
     if years >= 1:
-        months = months - 12 * years
+        months = months - 12*years
         return f'{years:.0f} Jahr{pluralize(years)} und {months:.0f} Monat{pluralize(months)}'
     elif months >= 3:
         return f'{months:.0f} Monat{pluralize(months)}'
@@ -27,18 +23,3 @@ def age_as_hr_string(age: datetime.timedelta) -> str:
         return f'{weeks:.0f} Woche{pluralize(weeks, "n")}'
     else:
         return f'{days:.0f} Tag{pluralize(days)}'
-
-
-def healthcheck_ok():
-    try:
-        requests.get(settings.HEALTHCHECKS_URL, timeout=10)
-    except requests.RequestException as e:
-        logging.error("Ping to healthcheck-server failed: %s" % e)
-
-
-def is_404(url):
-    try:
-        result = requests.get(url, timeout=10)
-        return result.status_code == 404
-    except requests.RequestException as e:
-        logging.warning(f"Request to {url} failed: {e}")

src/fellchensammlung/urls.py

@@ -79,9 +79,5 @@ urlpatterns = [
     #########
     path('api/', include('fellchensammlung.api.urls')),
 
-    ###################
-    ## External Site ##
-    ###################
-    path('external-site/', views.external_site_warning, name="external-site"),
 
 ]

src/fellchensammlung/views.py

@@ -13,16 +13,14 @@ from notfellchen import settings
 
 from fellchensammlung import logger
 from .models import AdoptionNotice, Text, Animal, Rule, Image, Report, ModerationAction, \
-    User, Location, AdoptionNoticeStatus, Subscriptions, CommentNotification, BaseNotification, RescueOrganization, \
+    User, Location, AdoptionNoticeStatus, Subscriptions, CommentNotification, BaseNotification, RescueOrganization, Species
-    Species, Log, Timestamp
 from .forms import AdoptionNoticeForm, AdoptionNoticeFormWithDateWidget, ImageForm, ReportAdoptionNoticeForm, \
     CommentForm, ReportCommentForm, AnimalForm, \
     AdoptionNoticeSearchForm, AnimalFormWithDateWidget, AdoptionNoticeFormWithDateWidgetAutoAnimal
 from .models import Language, Announcement
 from .tools.geo import GeoAPI
 from .tools.metrics import gather_metrics_data
-from .tools.admin import clean_locations, get_unchecked_adoption_notices, deactivate_unchecked_adoption_notices
+from .tools.admin import clean_locations
-from .tasks import add_adoption_notice_location
 
 
 def user_is_trust_level_or_above(user, trust_level=User.MODERATOR):
@@ -48,9 +46,12 @@ def index(request):
     lang = Language.objects.get(languagecode=language_code)
     active_announcements = Announcement.get_active_announcements(lang)
 
-    context = {"adoption_notices": active_adoptions[:5], "adoption_notices_map": active_adoptions,
+    context = {"adoption_notices": active_adoptions[:5], "adoption_notices_map": active_adoptions, "announcements": active_announcements}
-               "announcements": active_announcements}
+    for text_code in ["how_to", "introduction"]:
-    Text.get_texts(["how_to", "introduction"], lang, context)
+        try:
+            context[text_code] = Text.objects.get(text_code=text_code, language=lang, )
+        except Text.DoesNotExist:
+            context[text_code] = None
 
     return render(request, 'fellchensammlung/index.html', context=context)
 
@@ -80,8 +81,6 @@ def adoption_notice_detail(request, adoption_notice_id):
             is_subscribed = True
         except Subscriptions.DoesNotExist:
             is_subscribed = False
-    else:
-        is_subscribed = False
     has_edit_permission = user_is_owner_or_trust_level(request.user, adoption_notice)
     if request.method == 'POST':
         action = request.POST.get("action")
@@ -95,10 +94,6 @@ def adoption_notice_detail(request, adoption_notice_id):
                     comment_instance.user = request.user
                     comment_instance.save()
 
-                    """Log"""
-                    Log.objects.create(user=request.user, action="comment",
-                                       text=f"{request.user} hat Kommentar {comment_instance.pk} zur Vermittlung {adoption_notice_id} hinzugefügt")
-
                     # Auto-subscribe user to adoption notice
                     subscription, created = Subscriptions.objects.get_or_create(adoption_notice=adoption_notice,
                                                                                 owner=request.user)
@@ -125,7 +120,7 @@ def adoption_notice_detail(request, adoption_notice_id):
             raise PermissionDenied
     else:
         comment_form = CommentForm(instance=adoption_notice)
-    context = {"adoption_notice": adoption_notice, "comment_form": comment_form, "user": request.user,
+    context = {"adoption_notice": adoption_notice,"comment_form": comment_form, "user": request.user,
                "has_edit_permission": has_edit_permission, "is_subscribed": is_subscribed}
     return render(request, 'fellchensammlung/details/detail_adoption_notice.html', context=context)
 
@@ -146,9 +141,6 @@ def adoption_notice_edit(request, adoption_notice_id):
             location = Location.get_location_from_string(adoption_notice_instance.location_string)
             adoption_notice_instance.location = location
             adoption_notice_instance.save()
-
-            """Log"""
-            Log.objects.create(user=request.user, action="adoption_notice_edit", text=f"{request.user} hat Vermittlung {adoption_notice.pk} geändert")
             return redirect(reverse("adoption-notice-detail", args=[adoption_notice_instance.pk], ))
     else:
         form = AdoptionNoticeForm(instance=adoption_notice)
@@ -172,15 +164,14 @@ def search(request):
         if max_distance == "":
             max_distance = None
         geo_api = GeoAPI()
-        search_position = geo_api.get_coordinates_from_query(request.POST['location'])
+        search_position = geo_api.get_coordinates_from_query(request.POST['postcode'])
         if search_position is None:
             place_not_found = True
             adoption_notices_in_distance = active_adoptions
         else:
             adoption_notices_in_distance = [a for a in active_adoptions if a.in_distance(search_position, max_distance)]
             
-        context = {"adoption_notices": adoption_notices_in_distance, "search_form": search_form,
+        context = {"adoption_notices": adoption_notices_in_distance, "search_form": search_form, "place_not_found": place_not_found}
-                   "place_not_found": place_not_found}
     else:
         latest_adoption_list = AdoptionNotice.objects.order_by("-created_at")
         active_adoptions = [adoption for adoption in latest_adoption_list if adoption.is_active]
@@ -192,22 +183,27 @@ def search(request):
 @login_required
 def add_adoption_notice(request):
     if request.method == 'POST':
-        form = AdoptionNoticeFormWithDateWidgetAutoAnimal(request.POST, request.FILES,
+        form = AdoptionNoticeFormWithDateWidgetAutoAnimal(request.POST, request.FILES, in_adoption_notice_creation_flow=True)
-                                                          in_adoption_notice_creation_flow=True)
 
         if form.is_valid():
             instance = form.save(commit=False)
             instance.owner = request.user
+            """Search the location given in the location string and add it to the adoption notice"""
+            location = Location.get_location_from_string(instance.location_string)
+            instance.location = location
             instance.save()
 
-            """Spin up a task that adds the location"""
-            add_adoption_notice_location.delay_on_commit(instance.pk)
-
             # Set correct status
             if request.user.trust_level >= User.TRUST_LEVEL[User.COORDINATOR]:
-                instance.set_active()
+                major_status = AdoptionNoticeStatus.ACTIVE
+                minor_status = AdoptionNoticeStatus.MINOR_STATUS_CHOICES[AdoptionNoticeStatus.ACTIVE]["searching"]
             else:
-                instance.set_unchecked()
+                major_status=AdoptionNoticeStatus.AWAITING_ACTION
+                minor_status=AdoptionNoticeStatus.MINOR_STATUS_CHOICES[AdoptionNoticeStatus.AWAITING_ACTION]["waiting_for_review"]
+            status = AdoptionNoticeStatus.objects.create(major_status=major_status,
+                                                             minor_status=minor_status,
+                                                             adoption_notice=instance)    
+            status.save()
 
                 # Get the species and number of animals from the form
             species = form.cleaned_data["species"]
@@ -216,12 +212,7 @@ def add_adoption_notice(request):
             date_of_birth = form.cleaned_data["date_of_birth"]
             for i in range(0, num_animals):
                 Animal.objects.create(owner=request.user,
-                                      name=f"{species} {i + 1}", adoption_notice=instance, species=species, sex=sex,
+                name=f"{species} {i+1}", adoption_notice=instance, species=species, sex=sex, date_of_birth=date_of_birth)
-                                      date_of_birth=date_of_birth)
-
-            """Log"""
-            Log.objects.create(user=request.user, action="add_adoption_notice",
-                               text=f"{request.user} hat Vermittlung {instance.pk} hinzugefügt")
             return redirect(reverse("adoption-notice-detail", args=[instance.pk]))
     else:
         form = AdoptionNoticeFormWithDateWidgetAutoAnimal(in_adoption_notice_creation_flow=True)
@@ -266,11 +257,6 @@ def add_photo_to_animal(request, animal_id):
             instance.save()
 
             animal.photos.add(instance)
-
-            """Log"""
-            Log.objects.create(user=request.user, action="add_photo_to_animal",
-                               text=f"{request.user} hat Foto {instance.pk} zum Tier {animal.pk} hinzugefügt")
-
             if "save-and-add-another" in request.POST:
                 form = ImageForm(in_flow=True)
                 return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
@@ -294,9 +280,6 @@ def add_photo_to_adoption_notice(request, adoption_notice_id):
             instance.owner = request.user
             instance.save()
             adoption_notice.photos.add(instance)
-            """Log"""
-            Log.objects.create(user=request.user, action="add_photo_to_animal",
-                               text=f"{request.user} hat Foto {instance.pk} zur Vermittlung {adoption_notice.pk} hinzugefügt")
             if "save-and-add-another" in request.POST:
                 form = ImageForm(in_flow=True)
                 return render(request, 'fellchensammlung/forms/form-image.html', {'form': form})
@@ -323,10 +306,6 @@ def animal_edit(request, animal_id):
 
         if form.is_valid():
             animal = form.save()
-
-            """Log"""
-            Log.objects.create(user=request.user, action="add_photo_to_animal",
-                               text=f"{request.user} hat Tier {animal.pk} zum Tier geändert")
             return redirect(reverse("animal-detail", args=[animal.pk], ))
     else:
         form = AnimalForm(instance=animal)
@@ -340,7 +319,7 @@ def about(request):
     lang = Language.objects.get(languagecode=language_code)
 
     legal = {}
-    for text_code in ["terms_of_service", "privacy_statement", "imprint", "about_us"]:
+    for text_code in ["terms_of_service", "privacy_statement", "imprint"]:
         try:
             legal[text_code] = Text.objects.get(text_code=text_code, language=lang, )
         except Text.DoesNotExist:
@@ -444,26 +423,26 @@ def modqueue(request):
     context = {"reports": open_reports}
     return render(request, 'fellchensammlung/modqueue.html', context=context)
 
-
 @login_required
 def updatequeue(request):
-    #TODO: Make sure update can only be done for instances with permission
     if request.method == "POST":
+        print(request.POST.get("adoption_notice_id"))
         adoption_notice = AdoptionNotice.objects.get(id=request.POST.get("adoption_notice_id"))
         action = request.POST.get("action")
+        print(f"Action: {action}")
         if action == "checked_inactive":
             adoption_notice.set_closed()
-        if action == "checked_active":
+        elif action == "checked_active":
-            adoption_notice.set_active()
+            print("set checked")
+            adoption_notice.set_checked()
 
     if user_is_trust_level_or_above(request.user, User.MODERATOR):
         last_checked_adoption_list = AdoptionNotice.objects.order_by("last_checked")
     else:
         last_checked_adoption_list = AdoptionNotice.objects.filter(owner=request.user).order_by("last_checked")
-    adoption_notices_active = [adoption for adoption in last_checked_adoption_list if adoption.is_active]
+    adoption_notices = [adoption for adoption in last_checked_adoption_list if adoption.is_active]
-    adoption_notices_disabled = [adoption for adoption in last_checked_adoption_list if adoption.is_disabled_unchecked]
+
-    context = {"adoption_notices_disabled": adoption_notices_disabled,
+    context = {"adoption_notices": adoption_notices}
-               "adoption_notices_active": adoption_notices_active}
     return render(request, 'fellchensammlung/updatequeue.html', context=context)
 
 
@@ -477,7 +456,6 @@ def metrics(request):
     data = gather_metrics_data()
     return JsonResponse(data)
 
-
 @login_required
 def instance_health_check(request):
     """
@@ -487,20 +465,16 @@ def instance_health_check(request):
         action = request.POST.get("action")
         if action == "clean_locations":
             clean_locations(quiet=False)
-        elif action == "deactivate_unchecked_adoption_notices":
-            deactivate_unchecked_adoption_notices()
 
     number_of_adoption_notices = AdoptionNotice.objects.all().count()
     none_geocoded_adoption_notices = AdoptionNotice.objects.filter(location__isnull=True)
     number_not_geocoded_adoption_notices = len(none_geocoded_adoption_notices)
 
+
     number_of_rescue_orgs = RescueOrganization.objects.all().count()
     none_geocoded_rescue_orgs = RescueOrganization.objects.filter(location__isnull=True)
     number_not_geocoded_rescue_orgs = len(none_geocoded_rescue_orgs)
 
-    unchecked_ans = get_unchecked_adoption_notices()
-    number_unchecked_ans = len(unchecked_ans)
-
     # CHECK FOR MISSING TEXTS
     languages = Language.objects.all()
     texts = Text.objects.all()
@@ -513,9 +487,6 @@ def instance_health_check(request):
             except Text.DoesNotExist:
                 missing_texts.append((text_code, language))
 
-    # Timestamps
-    timestamps = Timestamp.objects.all()
-
     context = {
         "number_of_adoption_notices": number_of_adoption_notices,
         "number_not_geocoded_adoption_notices": number_not_geocoded_adoption_notices,
@@ -523,21 +494,10 @@ def instance_health_check(request):
         "number_of_rescue_orgs": number_of_rescue_orgs,
         "number_not_geocoded_rescue_orgs": number_not_geocoded_rescue_orgs,
         "none_geocoded_rescue_orgs": none_geocoded_rescue_orgs,
-        "missing_texts": missing_texts,
+        "missing_texts": missing_texts
-        "number_unchecked_ans": number_unchecked_ans,
-        "unchecked_ans": unchecked_ans,
-        "timestamps": timestamps
     }
 
+
     return render(request, 'fellchensammlung/instance-health-check.html', context=context)
 
 
-def external_site_warning(request):
-    url = request.GET.get("url")
-    context = {"url": url}
-    language_code = translation.get_language()
-    lang = Language.objects.get(languagecode=language_code)
-    texts = Text.get_texts(["external_site_warning", "good_adoption_practices"], language=lang)
-    context.update(texts)
-
-    return render(request, 'fellchensammlung/external_site_warning.html', context=context)

src/notfellchen/__init__.py

@@ -1,8 +1 @@
-__version__ = "0.3.1"
+__version__ = "0.2.0"
-
-# This will make sure the app is always imported when
-# Django starts so that shared_task will use this app.
-from .celery import app as celery_app
-
-__all__ = ('celery_app',)
-

src/notfellchen/celery.py

@@ -1,33 +0,0 @@
-import os
-from celery import Celery
-from celery.schedules import crontab
-from notfellchen import settings
-
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'notfellchen.settings')
-
-app = Celery('notfellchen')
-
-# Load task modules from all registered Django app configs.
-app.config_from_object('django.conf:settings', namespace='CELERY')
-app.autodiscover_tasks()
-
-app.conf.beat_schedule = {
-    'daily-cleanup': {
-        'task': 'admin.clean_locations',
-        'schedule': crontab(hour=2),
-    },
-    'daily-unchecked-deactivation': {
-        'task': 'admin.daily_unchecked_deactivation',
-        'schedule': crontab(hour=1),
-    },
-    'daily-404-deactivation': {
-        'task': 'admin.deactivate_404_adoption_notices',
-        'schedule': crontab(hour=3),
-    },
-}
-
-if settings.HEALTHCHECKS_URL is not None and settings.HEALTHCHECKS_URL != "":
-    # If a healthcheck is configured, this will send an hourly ping to the healthchecks server
-    app.conf.beat_schedule['hourly-healthcheck'] = {'task': 'tools.healthcheck',
-                                                    'schedule': crontab(minute=43),
-                                                    }

src/notfellchen/settings.py

@@ -14,7 +14,6 @@ from pathlib import Path
 import os
 import configparser
 from django.utils.translation import gettext_lazy as _
-from celery import Celery
 
 """CONFIG PARSER """
 config = configparser.RawConfigParser()
@@ -76,23 +75,16 @@ DB_NAME = config.get("database", "name", fallback="notfellchen.sqlite3")
 DB_USER = config.get("database", "user", fallback='')
 DB_PASSWORD = config.get("database", "password", fallback='')
 DB_HOST = config.get("database", "host", fallback='')
-
 # Build paths inside the project like this: BASE_DIR / 'subdir'.
 BASE_DIR = Path(__file__).resolve().parent.parent
 LOCALE_PATHS = [os.path.join(BASE_DIR, 'locale')]
 
-""" CELERY + KEYDB """
-CELERY_BROKER_URL = config.get("celery", "broker", fallback="redis://localhost:6379/0")
-CELERY_RESULT_BACKEND = config.get("celery", "backend", fallback="redis://localhost:6379/0")
-
-""" MONITORING """
-HEALTHCHECKS_URL = config.get("monitoring", "healthchecks_url", fallback=None)
-
 """ GEOCODING """
 GEOCODING_API_URL = config.get("geocoding", "api_url", fallback="https://nominatim.hyteck.de/search")
 """ Tile Server """
 MAP_TILE_SERVER = config.get("map", "tile_server", fallback="https://tiles.hyteck.de")
 
+
 """ OxiTraffic"""
 OXITRAFFIC_ENABLED = config.get("tracking", "oxitraffic_enabled", fallback=False)
 OXITRAFFIC_BASE_URL = config.get("tracking", "oxitraffic_base_url", fallback="")
@@ -187,8 +179,6 @@ MIDDLEWARE = [
 
 ROOT_URLCONF = 'notfellchen.urls'
 
-SETTINGS_PATH = os.path.dirname(os.path.dirname(__file__))
-
 TEMPLATES = [
     {
         'BACKEND': 'django.template.backends.django.DjangoTemplates',

src/tests/test_admin_tasks.py

@@ -1,97 +0,0 @@
-from datetime import timedelta
-from django.utils import timezone
-
-from fellchensammlung.tools.admin import get_unchecked_adoption_notices, deactivate_unchecked_adoption_notices, \
-    deactivate_404_adoption_notices
-from fellchensammlung.tools.misc import is_404
-from django.test import TestCase
-
-from model_bakery import baker
-from fellchensammlung.models import AdoptionNotice
-
-
-class DeactiviationTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        now = timezone.now()
-        more_than_three_weeks_ago = now - timedelta(weeks=3, days=2)
-        less_than_three_weeks_ago = now - timedelta(weeks=1, days=2)
-
-        cls.adoption1 = baker.make(AdoptionNotice,
-                                   name="TestAdoption1",
-                                   created_at=more_than_three_weeks_ago,
-                                   last_checked=more_than_three_weeks_ago)
-        cls.adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
-        cls.adoption3 = baker.make(AdoptionNotice,
-                                   name="TestAdoption3",
-                                   created_at=less_than_three_weeks_ago,
-                                   last_checked=less_than_three_weeks_ago)
-
-        cls.adoption1.set_active()
-        cls.adoption3.set_active()
-
-    def test_get_unchecked_adoption_notices(self):
-        result = get_unchecked_adoption_notices()
-
-        self.assertIn(self.adoption1, result)
-        self.assertNotIn(self.adoption2, result)
-        self.assertNotIn(self.adoption3, result)
-
-    def test_deactivate_unchecked_adoption_notices(self):
-        self.assertTrue(self.adoption1.is_active)
-        self.assertFalse(self.adoption2.is_active)
-        self.assertTrue(self.adoption3.is_active)
-
-        deactivate_unchecked_adoption_notices()
-
-        self.adoption1.refresh_from_db()
-        self.adoption2.refresh_from_db()
-        self.adoption3.refresh_from_db()
-
-        self.assertFalse(self.adoption1.is_active)
-        self.assertFalse(self.adoption2.is_active)
-        self.assertTrue(self.adoption3.is_active)
-
-
-class PingTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        link_active = "https://hyteck.de/"
-        link_inactive = "https://hyteck.de/maxwell"
-        now = timezone.now()
-        less_than_three_weeks_ago = now - timedelta(weeks=1, days=2)
-
-        cls.adoption1 = baker.make(AdoptionNotice,
-                                   name="TestAdoption1",
-                                   created_at=less_than_three_weeks_ago,
-                                   last_checked=less_than_three_weeks_ago,
-                                   further_information=link_active)
-        cls.adoption2 = baker.make(AdoptionNotice,
-                                   name="TestAdoption2",
-                                   created_at=less_than_three_weeks_ago,
-                                   last_checked=less_than_three_weeks_ago,
-                                   further_information=link_inactive)
-        cls.adoption3 = baker.make(AdoptionNotice,
-                                   name="TestAdoption3",
-                                   created_at=less_than_three_weeks_ago,
-                                   last_checked=less_than_three_weeks_ago,
-                                   further_information=None)
-        cls.adoption1.set_active()
-        cls.adoption2.set_active()
-        cls.adoption3.set_active()
-
-    def test_is_404(self):
-        urls = [("https://hyteck.de/maxwell", True),
-                ("https://hyteck.de", False)]
-        for url, expected_result in urls:
-            self.assertEqual(is_404(url), expected_result)
-
-    def test_deactivate_404_adoption_notices(self):
-        self.assertTrue(self.adoption1.is_active)
-        self.assertTrue(self.adoption2.is_active)
-        deactivate_404_adoption_notices()
-        self.adoption1.refresh_from_db()
-        self.adoption2.refresh_from_db()
-        self.assertTrue(self.adoption1.is_active)
-        self.assertFalse(self.adoption2.is_active)
-

src/tests/test_forms.py

@@ -1,25 +0,0 @@
-from django.test import TestCase
-from fellchensammlung.forms import AdoptionNoticeFormWithDateWidgetAutoAnimal
-from fellchensammlung.models import Species
-from model_bakery import baker
-
-
-class TestAdoptionNoticeFormWithDateWidgetAutoAnimal(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        rat = baker.make(Species, name="Farbratte")
-
-    def test_forms(self):
-        form_data = {"name": "TestAdoption3",
-                     "species": Species.objects.first(),
-                     "num_animals": "2",
-                     "date_of_birth": "2024-11-04",
-                     "sex": "M",
-                     "group_only": "on",
-                     "searching_since": "2024-11-10",
-                     "location_string": "Mannheim",
-                     "description": "Blaaaa",
-                     "further_information": "https://notfellchen.org",
-                     "save-and-add-another-animal": "Speichern"}
-        form = AdoptionNoticeFormWithDateWidgetAutoAnimal(data=form_data)
-        self.assertTrue(form.is_valid())

src/tests/test_geo.py

@@ -1,24 +0,0 @@
-from fellchensammlung.tools.geo import calculate_distance_between_coordinates
-from django.test import TestCase
-
-
-class DistanceTest(TestCase):
-    accuracy = 1.05  # 5% off is ok
-
-    def test_calculate_distance_between_coordinates(self):
-        coordinates_berlin = (52.50327,13.41238)
-        coordinates_stuttgart = (48.77753579028781, 9.185250111016634)
-        coordinates_weil_im_dorf = (48.813691653929276, 9.112217733791029)
-        coordinates_with_distance = {"berlin_stuttgart": (coordinates_berlin, coordinates_stuttgart, 510),
-                                     "stuttgart_berlin": (coordinates_stuttgart, coordinates_berlin, 510),
-                                     "stuttgart_weil": (coordinates_stuttgart, coordinates_weil_im_dorf, 6.7),
-                                     }
-        for key in coordinates_with_distance:
-            (a, b, distance) = coordinates_with_distance[key]
-            result = calculate_distance_between_coordinates(a, b)
-            try:
-                self.assertLess(result, distance * self.accuracy)
-                self.assertGreater(result, distance / self.accuracy)
-            except AssertionError as e:
-                print(f"Distance calculation failed. Expected {distance}, got {result}")
-                raise e

src/tests/test_models.py

@@ -4,15 +4,7 @@ from django.utils import timezone
 from django.test import TestCase
 from model_bakery import baker
 
-from fellchensammlung.models import Announcement, Language, User
+from fellchensammlung.models import Announcement, Language
-
-
-class UserTest(TestCase):
-    def test_creating_user(self):
-        test_user_1 = User.objects.create(username="Testuser1", password="SUPERSECRET", email="test@example.org")
-
-        self.assertTrue(test_user_1.trust_level == 1)
-        self.assertTrue(test_user_1.trust_level == User.TRUST_LEVEL[User.MEMBER])
 
 
 class AnnouncementTest(TestCase):
@@ -77,3 +69,4 @@ class AnnouncementTest(TestCase):
         self.assertTrue(self.announcement2 not in active_announcements)
         self.assertTrue(self.announcement4 not in active_announcements)
         self.assertTrue(self.announcement5 in active_announcements)
+

src/tests/test_views.py

@@ -4,9 +4,7 @@ from django.urls import reverse
 
 from model_bakery import baker
 
-from fellchensammlung.models import Animal, Species, AdoptionNotice, User, Location, AdoptionNoticeStatus
+from fellchensammlung.models import Animal, Species, AdoptionNotice, User
-from fellchensammlung.views import add_adoption_notice
-
 
 class AnimalAndAdoptionTest(TestCase):
     @classmethod
@@ -20,8 +18,7 @@ class AnimalAndAdoptionTest(TestCase):
                                               first_name="Max",
                                               last_name="Müller",
                                               password='12345')
-        test_user0.trust_level = User.TRUST_LEVEL[User.ADMIN]
+        test_user1.save()
-        test_user0.save()
 
         adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
         rat = baker.make(Species, name="Farbratte")
@@ -50,146 +47,3 @@ class AnimalAndAdoptionTest(TestCase):
         self.assertEqual(str(response.context['user']), 'testuser0')
         self.assertContains(response, "TestAdoption1")
         self.assertContains(response, "Rat1")
-
-    def test_creating_AN_as_admin(self):
-        self.client.login(username='testuser0', password='12345')
-
-        form_data = {"name": "TestAdoption4",
-                     "species": Species.objects.first().pk,
-                     "num_animals": "2",
-                     "date_of_birth": "2024-11-04",
-                     "sex": "M",
-                     "group_only": "on",
-                     "searching_since": "2024-11-10",
-                     "location_string": "Mannheim",
-                     "description": "Blaaaa",
-                     "further_information": "https://notfellchen.org",
-                     "save-and-add-another-animal": "Speichern"}
-
-        response = self.client.post(reverse('add-adoption'), data=form_data)
-        print(response.content)
-
-        self.assertTrue(response.status_code < 400)
-        self.assertTrue(AdoptionNotice.objects.get(name="TestAdoption4").is_active)
-
-
-
-class SearchTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        test_user0 = User.objects.create_user(username='testuser0',
-                                              first_name="Admin",
-                                              last_name="BOFH",
-                                              password='12345')
-        test_user0.save()
-
-        # Location of Berlin: lat 52.5170365 lon 13.3888599 PLZ 10115 (Mitte)
-
-        adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
-        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
-        adoption3 = baker.make(AdoptionNotice, name="TestAdoption3")
-
-        berlin = Location.get_location_from_string("Berlin")
-        adoption1.location = berlin
-        adoption1.save()
-        stuttgart = Location.get_location_from_string("Tübingen")
-        adoption3.location = stuttgart
-        adoption3.save()
-
-        adoption1.set_active()
-        adoption3.set_active()
-        adoption2.set_unchecked()
-
-    def test_basic_view(self):
-        response = self.client.get(reverse('search'))
-        self.assertEqual(response.status_code, 200)
-
-        self.assertContains(response, "TestAdoption1")
-        self.assertNotContains(response, "TestAdoption2")
-        self.assertContains(response, "TestAdoption3")
-
-    def test_basic_view_logged_in(self):
-        self.client.login(username='testuser0', password='12345')
-        response = self.client.get(reverse('search'))
-        self.assertEqual(response.status_code, 200)
-        # Check our user is logged in
-        self.assertEqual(str(response.context['user']), 'testuser0')
-
-        self.assertContains(response, "TestAdoption1")
-        self.assertContains(response, "TestAdoption3")
-        self.assertNotContains(response, "TestAdoption2")
-
-    def test_plz_search(self):
-        response = self.client.post(reverse('search'), {"max_distance": 100, "location": "Berlin"})
-        self.assertEqual(response.status_code, 200)
-        self.assertContains(response, "TestAdoption1")
-        self.assertNotContains(response, "TestAdoption3")
-
-
-class UpdateQueueTest(TestCase):
-    @classmethod
-    def setUpTestData(cls):
-        test_user0 = User.objects.create_user(username='testuser0',
-                                              first_name="Admin",
-                                              last_name="BOFH",
-                                              password='12345',
-                                              trust_level=User.TRUST_LEVEL[User.MODERATOR])
-        test_user0.is_superuser = True
-        test_user0.save()
-
-        # Location of Berlin: lat 52.5170365 lon 13.3888599 PLZ 10115 (Mitte)
-
-        cls.adoption1 = baker.make(AdoptionNotice, name="TestAdoption1")
-        adoption2 = baker.make(AdoptionNotice, name="TestAdoption2")
-        cls.adoption3 = baker.make(AdoptionNotice, name="TestAdoption3")
-
-        cls.adoption1.set_unchecked()
-        cls.adoption3.set_unchecked()
-
-    def test_login_required(self):
-        response = self.client.get(reverse('updatequeue'))
-        self.assertEqual(response.status_code, 302)
-        self.assertEquals(response.url, "/accounts/login/?next=/updatequeue/")
-
-    def test_set_updated(self):
-        self.client.login(username='testuser0', password='12345')
-
-        # First get the list
-        response = self.client.get(reverse('updatequeue'))
-        self.assertEqual(response.status_code, 200)
-        # Make sure Adoption1 is in response
-        self.assertContains(response, "TestAdoption1")
-        self.assertNotContains(response, "TestAdoption2")
-
-        self.assertFalse(self.adoption1.is_active)
-
-        # Mark as checked
-        response = self.client.post(reverse('updatequeue'), {"adoption_notice_id": self.adoption1.pk,
-                                                             "action": "checked_active"})
-        self.assertEqual(response.status_code, 200)
-        self.adoption1.refresh_from_db()
-        self.assertTrue(self.adoption1.is_active)
-
-    def test_set_checked_inactive(self):
-        self.client.login(username='testuser0', password='12345')
-        # First get the list
-        response = self.client.get(reverse('updatequeue'))
-        self.assertEqual(response.status_code, 200)
-
-        # Make sure Adoption3 is in response
-        self.assertContains(response, "TestAdoption3")
-        self.assertNotContains(response, "TestAdoption2")
-
-        self.assertFalse(self.adoption3.is_active)
-
-        # Mark as checked
-        response = self.client.post(reverse('updatequeue'),
-                                    {"adoption_notice_id": self.adoption3.id, "action": "checked_inactive"})
-        self.assertEqual(response.status_code, 200)
-        self.adoption3.refresh_from_db()
-
-        # Make sure correct status is set and AN is not shown anymore
-        self.assertNotContains(response, "TestAdoption3")
-        self.assertFalse(self.adoption3.is_active)
-        self.assertEqual(self.adoption3.adoptionnoticestatus.major_status, AdoptionNoticeStatus.CLOSED)
-