From 2c4d284708aa8285df27b9eb2c49cbfdc762a663 Mon Sep 17 00:00:00 2001
From: gw3000 <weissenbaeck@posteo.de>
Date: Tue, 18 Jul 2023 19:28:15 +0200
Subject: [PATCH] =?UTF-8?q?=20Patient=20schreibgesch=C3=BCtzt=20#29?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/bird/templates/bird/bird_all.html      |   7 +-
 app/bird/templates/bird/bird_inactive.html | 102 +++++++++++++++++++++
 app/bird/urls.py                           |   4 +-
 app/bird/views.py                          |   8 ++
 4 files changed, 117 insertions(+), 4 deletions(-)
 create mode 100644 app/bird/templates/bird/bird_inactive.html

diff --git a/app/bird/templates/bird/bird_all.html b/app/bird/templates/bird/bird_all.html
index eabcaea..06c9af4 100644
--- a/app/bird/templates/bird/bird_all.html
+++ b/app/bird/templates/bird/bird_all.html
@@ -16,7 +16,7 @@
 
 <script>
   $(document).ready(function () {
-    $('#t__bird_all').DataTable({
+    $('#t__bird_inactive').DataTable({
       language: {
         url: 'https://cdn.datatables.net/plug-ins/1.11.3/i18n/de_de.json',
       },
@@ -34,7 +34,8 @@
 {% block content %}
 <h3>Übersicht aller Patienten in Behandlung</h3>
 <p>
-  Übersicht aller in Behandlung befindlichen oder behandelten Vögel.
+  Übersicht aller in Behandlung befindlichen oder behandelten Vögel. Die nicht
+  mehr in Behandlung befindlichen Patienten finden Sie <a href="{% url 'bird_inactive' %}">hier</a>.
 </p>
 <p>
   <button type="button" class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#addPatientModal">einen Patienten
@@ -104,4 +105,4 @@
   </div>
 </div>
 </form>
-{% endblock content %}
\ No newline at end of file
+{% endblock content %}
diff --git a/app/bird/templates/bird/bird_inactive.html b/app/bird/templates/bird/bird_inactive.html
new file mode 100644
index 0000000..400da11
--- /dev/null
+++ b/app/bird/templates/bird/bird_inactive.html
@@ -0,0 +1,102 @@
+{% extends "base.html" %}
+{% load static %}
+{% block header %}
+<!-- Datatable CSS -->
+<link rel="stylesheet" href="https://cdn.datatables.net/1.13.4/css/dataTables.bootstrap5.min.css" />
+<link rel="stylesheet" href="https://cdn.datatables.net/responsive/2.2.9/css/responsive.bootstrap5.min.css">
+
+<!-- jQuery -->
+<script src="https://code.jquery.com/jquery-3.5.1.js"></script>
+
+<!-- Datatable jQuery -->
+<script src="https://cdn.datatables.net/1.11.3/js/jquery.dataTables.min.js"></script>
+<script src="https://cdn.datatables.net/1.11.3/js/dataTables.bootstrap5.min.js"></script>
+<script src="https://cdn.datatables.net/responsive/2.2.9/js/dataTables.responsive.min.js"></script>
+<script src="https://cdn.datatables.net/responsive/2.2.9/js/responsive.bootstrap5.min.js"></script>
+
+<script>
+  $(document).ready(function () {
+    $('#t__bird_all').DataTable({
+      language: {
+        url: 'https://cdn.datatables.net/plug-ins/1.11.3/i18n/de_de.json',
+      },
+      paging: false,
+      info: false,
+      responsive: true,
+      columnDefs: [
+        { responsivePriority: 1, targets: 0 },
+      ]
+    })
+  })
+</script>
+
+{% endblock header %}
+{% block content %}
+<h3>Übersicht aller inaktiven Patienten</h3>
+<p>
+  Übersicht aller nicht mehr in Behandlung befindlichen oder behandelten Vögel.
+</p>
+<table class="table table-striped table-hover display responsive nowrap" id="t__bird_all">
+  <thead>
+    <tr>
+      <th>Patienten Alias</th>
+      <th>Vogel</th>
+      <th>gefunden am</th>
+      <th>Finder</th>
+      <th>Fundort</th>
+      <th>Status</th>
+      <th>Voliere</th>
+      <th>Kosten</th>
+    </tr>
+  </thead>
+  <tbody>
+    {% for bird in birds %}
+    <tr>
+      <td><a href="{% url 'bird_single' bird.id %}">{{ bird.bird_identifier }}</a></td>
+      <td>{{ bird.bird }}</td>
+      <td>{{ bird.date_found }}</td>
+      <td>
+        <a href="{% url 'rescuer_single' bird.rescuer_id %}">{{ bird.rescuer }}</a>
+      </td>
+      <td>{{ bird.place }}</td>
+      <td>{{ bird.status }}</td>
+      <td>{{ bird.aviary|default_if_none:"" }}</td>
+      <td>{{ bird.total_costs|default_if_none:"0,00" }} &euro;</td>
+    </tr>
+    {% endfor %}
+  </tbody>
+</table>
+
+<div class="modal fade" id="addPatientModal" tabindex="-1" data-bs-backdrop="static"
+  aria-labelledby="addRescuerModalLabel" aria-hidden="true">
+  <div class="modal-dialog">
+    <div class="modal-content">
+      <div class="modal-header bg-primary">
+        <h5 class="modal-title text-white" id="addRescuerModalLabel">(neuen) Finder zuweisen</h5>
+      </div>
+      <form method="post">
+        {% csrf_token %}
+        <div class="modal-body">
+          <label for="rescuer" class="form-label mt-3">Wählen Sie einen <strong>bereits angelegten</strong>
+            Finder aus oder legen Sie einen <strong>neuen</strong> Finder an:</label>
+          <select id="rescuer" class="form-select" name="rescuer_id">
+            <option value="new_rescuer"><strong>neuen
+                Finder anlegen</strong></option>
+            {% for rescuer in rescuer_modal %}
+            <option value={{rescuer.id}}>
+              {{rescuer.first_name}} {{rescuer.last_name}},
+              {{rescuer.street}} {{rescuer.street_number}},
+              {{rescuer.city}}
+            </option>
+            {% endfor %}
+          </select>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-danger" data-bs-dismiss="modal">Abbruch</button>
+          <button class="btn btn-primary" type="submit">Übernehmen und weiter</button>
+        </div>
+    </div>
+  </div>
+</div>
+</form>
+{% endblock content %}
diff --git a/app/bird/urls.py b/app/bird/urls.py
index 926e47e..0385f7c 100644
--- a/app/bird/urls.py
+++ b/app/bird/urls.py
@@ -2,9 +2,10 @@ from django.urls import path
 
 from .views import (
     bird_all,
-    bird_help,
     bird_create,
     bird_delete,
+    bird_help,
+    bird_inactive,
     bird_recover,
     bird_recover_all,
     bird_single,
@@ -12,6 +13,7 @@ from .views import (
 
 urlpatterns = [
     path("all/", bird_all, name="bird_all"),
+    path("inactive/", bird_inactive, name="bird_inactive"),
     path("create/", bird_create, name="bird_create"),
     path("delete/<id>", bird_delete, name="bird_delete"),
     path("help/", bird_help, name="bird_help"),
diff --git a/app/bird/views.py b/app/bird/views.py
index f94eba3..6469475 100644
--- a/app/bird/views.py
+++ b/app/bird/views.py
@@ -59,6 +59,14 @@ def bird_all(request):
             return redirect("rescuer_create")
     return render(request, "bird/bird_all.html", context)
 
+@login_required(login_url="account_login")
+def bird_inactive(request):
+    birds = FallenBird.objects.filter(~Q(status="1") | ~Q(status="2")).annotate(
+        total_costs=Sum("costs__costs")
+    )
+    context = {"birds": birds}
+    return render(request, "bird/bird_inactive.html", context)
+
 
 @login_required(login_url="account_login")
 def bird_recover_all(request):