External Bereich bis 5 fertig

digitaleagentur/views.py

@@ -15,6 +15,9 @@ from cryptography.hazmat.primitives.kdf.pbkdf2 import PBKDF2HMAC
 import os, six
 from recoverdir.models import RecoverDirSetting
 from datetime import datetime
+from django.contrib import messages
+from django.shortcuts import render, redirect, reverse
+
 
 def _get_setting(name):
     setting_name = "DEFF_{}".format(name)
@@ -64,7 +67,6 @@ def registerdone(request):
 # TASK: Hier den Abruf von Dokumenten bei eingeloggtem Recover-Datum weniger als 10 Minuten implementieren
 class GetCryptFileRecover(TemplateView):
 	def get(self, request, *args, **kwargs):
-		print("HI!")
 		
 		try:
 			settings = RecoverDirSetting.objects.filter(agency_id=kwargs['agpk'])[0]

re.txt

@@ -1,25 +0,0 @@
-Django==3.0.2
-django-appconf==1.0.3
-django-bootstrap-datepicker-plus==3.0.5
-django-cleanup==4.0.0
-django-colorful==1.3
-django-crispy-forms==1.8.1
-django-image-cropping==1.3.0
-django-js-asset==1.2.2
-django-jsonfield==1.3.1
-django-mathfilters==0.4.0
-django-mptt==0.11.0
-django-polymorphic==2.0.3
-django-redis==4.11.0
-django-staticfiles==1.2.1
-django-summernote==0.8.11.6
-django-templatetags==1.1
-django-user-agents==0.4.0
-djangorestframework==3.11.0
-easy-thumbnails==2.7
-mysqlclient==1.4.6
-Pillow==6.2.1
-requests==2.22.0
-requests-oauthlib==1.3.0
-user-agents==2.1
-webcolors==1.10

recoverdir/templates/recoverdir/rd_areas/rd_area_2.html

@@ -20,7 +20,7 @@
     <tbody >
     	{% for ele in area_2_deposit %}
     	<tr>
-    		<td><a href="#">{{ele.geber_name|default:""}}</a></td>
+    		<td><a href="{% url 'rd-a2-viewdeposit' ele.pk %}">{{ele.geber_name|default:""}}</a></td>
     		<td>{{ele.geber_adresse|default:""}}</td>
     		<td>{{ele.geber_bank|default:""}}</td>
     		<td>

recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_deposit_single.html

@@ -8,7 +8,7 @@
       </span>
     </h3>
     <hr>
-    <h4>Kont-/Depot-/Schrankfachinhaber/Vollmachtgeber</h4>
+    <h4>Konto-/Depot-/Schrankfachinhaber/Vollmachtgeber</h4>
     <table>
       <tr>
         <td>Name</td>

recoverdir/templates/recoverdir/rd_elements_forms/rd_area_4_digitalaccount_single.html

@@ -12,11 +12,11 @@
     <table>
       <tr>
         <td>Name:</td>
-        <td>{{account.name}}</td>
+        <td>{{account.name|default:""}}</td>
       </tr>
       <tr>
         <td>Link:</td>
-        <td>{{account.link}}</td>
+        <td>{{account.link|default:""}}</td>
       </tr>
       <tr>
         <td>Benutzername:</td>

recoverdir/templates/recoverdir/rd_external.html

@@ -53,8 +53,8 @@
   <div class="card">
     <div class="card-header" id="headingOne">
       <h5 class="mb-0">
-        <button class="btn btn-link tabelement" onclick="javascript:newTabOpen(1)" data-toggle="collapse" data-target="#rd_1" aria-expanded="true" aria-controls="rd_1">
+        <button class="btn btn-link tabelement" data-toggle="collapse" data-target="#rd_1" aria-expanded="true" aria-controls="rd_1">
-          <h4 style="margin-top: 11px;">1. Notfallleitfaden & Vorsorgedokumente</h4>
+          <h4 style="margin-top: 11px;">1. Handlungsleitfaden & Vorsorgedokumente</h4>
         </button>
         <span style="float: right;">
           <span class="square_private_arrow"><h2 class="h2_in_arrow">#1</h2></span>
@@ -317,11 +317,11 @@
 </div>
 {% endfor %}
 
-  <!-- 2. ABSICHERUNG VERMÖGEN IMMOBILIEN -->
+<!-- 2. ABSICHERUNG VERMÖGEN IMMOBILIEN -->
-  <div class="card">
+<div class="card">
   <div class="card-header" id="headingOne">
     <h5 class="mb-0">
-        <button class="btn btn-link tabelement" onclick="javascript:newTabOpen(2)" data-toggle="collapse" data-target="#rd_2" aria-expanded="true" aria-controls="rd_2">
+      <button class="btn btn-link tabelement"  data-toggle="collapse" data-target="#rd_2" aria-expanded="true" aria-controls="rd_2">
         <h4 style="margin-top: 11px;">2. Absicherung, Vermögen & Immobilien</h4>
       </button>
   <span style="float: right;">
@@ -332,13 +332,344 @@
 
   <div id="rd_2" class="collapse" aria-labelledby="headingOne" data-parent="#accordion">
     <div class="card-body">
-        AREA 2
-      </div>
-    </div>
-  </div>
       
-  <!-- 3. Verträge -->
+      <a href="/#" data-toggle="modal" data-target="#hlfv">
-  <div class="card">
+        <h4>Handlungsleitfaden für Vorsoroge & Finanzen betrachten</h4>
+      </a>
+      <hr>
+
+      <h4>Bank-, Konto- & Depot-Vollmachten
+      </h4>
+      <table class="table table-hover" id="a2_deposit" >
+            <thead>
+            <tr>
+              <th scope="col">Name</th>
+              <th scope="col">Anschrift</th>
+              <th scope="col">Bank</th>
+            </tr>
+          </thead>
+          <tbody >
+            {% for ele in area_2_deposit %}
+            <tr>
+              <td><a href="/#" data-toggle="modal" data-target="#deposit_{{ele.pk}}">{{ele.geber_name|default:""}}</a></td>
+              <td>{{ele.geber_adresse|default:""}}</td>
+              <td>{{ele.geber_bank|default:""}}</td>
+            </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      <hr>
+        <h4>Digitaler Versicherungsordner
+        <a class="btn btn-primary btn mb-3 btn-sm " href="{% url 'rd-a2-addergo' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Zugangsdaten</a>
+        </h4>
+        <table class="table table-hover" id="a2_ergo" >
+              <thead>
+              <tr>
+                <th scope="col">Benutzername</th>
+              </tr>
+            </thead>
+            <tbody >
+              {% for ele in area_2_ergo %}
+              <tr>
+                <td><a href="/#" data-toggle="modal" data-target="#ergo_{{ele.pk}}">{{ele.ergo_username}}</a></td>
+              </tr>
+              {% endfor %}
+            </tbody>
+          </table>
+      <hr>
+
+    <h4>Online-Banking
+   </h4>
+    <table class="table table-hover" id="area_2_onlinebank" >
+          <thead>
+          <tr>
+            <th scope="col">Internetadresse/Bankname</th>
+          </tr>
+        </thead>
+        <tbody >
+          {% for ele in area_2_onlinebank %}
+          <tr>
+            <td><a href="/#" data-toggle="modal" data-target="#onlinebank_{{ele.pk}}">{{ele.web_address}}</a></td>
+          </tr>
+          {% endfor %}
+        </tbody>
+      </table>
+
+      <hr>
+      <h4>Wertpapiere, Versicherungsscheine & Altersvorsorge
+      </h4>
+      <table class="table table-hover" id="a2_docs" >
+            <thead>
+            <tr>
+              <th scope="col">Name</th>
+              <th scope="col">Datum</th>
+              <th scope="col">Beschreibung</th>
+              <th scope="col">&nbsp;</th>
+            </tr>
+          </thead>
+          <tbody >
+           {% for doc in area_2_doc %}
+            <tr>
+               <td>{{doc.document_name|default:""}}</a></td>
+               <td>{{doc.document_date|date:"d.m.Y"|default:""}}</td>
+               <td>{{doc.document_desc|default:""}}</td>
+               <td><a href="{% url 'getdoc' doc.document agencydata.pk %}" target="_blank">Download</a></td>
+            </tr>
+          {% endfor %}
+          </tbody>
+        </table>
+
+        
+
+       <!-- HANDLUNGSLEITFADEN Vorsorge und Finanzen -->
+      <div class="modal fade" id="hlfv" tabindex="-1" role="dialog" aria-labelledby="hl_label" aria-hidden="true">
+        <div class="modal-dialog modal-lg" role="document">
+          <div class="modal-content">
+            <div class="modal-header">
+              <h5 class="modal-title" id="exampleModalLabel">Handlungsleitfen Vorsorge & Finanzen</h5>
+              <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                <span aria-hidden="true">&times;</span>
+              </button>
+            </div>
+            <div class="modal-body">
+              
+              <h4>1. Bitte meinen zuständigen Versicherungsberater kontaktieren.</h4>
+          <table>
+            <tr>
+              <td>Unternehmen</td>
+              <td>{{hlvf.vf_ver_company|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Name</td>
+              <td>{{hlvf.vf_ver_name|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Straße Nr.</td>
+              <td>{{hlvf.vf_ver_street|default:""}}</td>
+            </tr>
+            <tr>
+              <td>PLZ Ort</td>
+              <td>{{hlvf.vf_ver_plzcity|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Telefon</td>
+              <td>{{hlvf.vf_ver_tel|default:""}}</td>
+            </tr>
+            <tr>
+              <td>E-Mail</td>
+              <td>{{hlvf.vf_ver_mail|default:""}}</td>
+            </tr>
+          </table>
+          <hr>
+          <h4>2. Bitte meinen zuständigen Finanzberater kontaktieren.</h4>
+          <table>
+            <tr>
+              <td>Unternehmen</td>
+              <td>{{hlvf.vf_fb_company|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Name</td>
+              <td>{{hlvf.vf_fb_name|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Straße Nr.</td>
+              <td>{{hlvf.vf_fb_street|default:""}}</td>
+            </tr>
+            <tr>
+              <td>PLZ Ort</td>
+              <td>{{hlvf.vf_fb_plzcity|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Telefon</td>
+              <td>{{hlvf.vf_fb_tel|default:""}}</td>
+            </tr>
+            <tr>
+              <td>PE-Mail</td>
+              <td>{{hlvf.vf_fb_mail|default:""}}</td>
+            </tr>
+          </table>
+          <hr>
+          <h4>3. Eventuell ist es nötig, meinen Rechtsschutzversicherer zu kontaktieren.</h4>
+          <table>
+            <tr>
+              <td>Rechtsschutzversicherer</td>
+              <td>{{hlvf.vf_rv_name|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Versicherungsnummer</td>
+              <td>{{hlvf.vf_rv_number|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Telefon 1</td>
+              <td>{{hlvf.vf_rv_tel_1|default:""}}</td>
+            </tr>
+            <tr>
+              <td>Telefon 2</td>
+              <td>{{hlvf.vf_rv_tel_2|default:""}}</td>
+            </tr>
+          </table>
+
+            </div>
+            <div class="modal-footer">
+              <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+</div>
+
+{% for deposit in area_2_deposit %}
+<!-- MODAL Bankkonto -->
+<div class="modal fade" id="deposit_{{deposit.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Kont-/Depot-/Schrankfachinhaber/Vollmachtgeber</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        
+       <h4>Kont-/Depot-/Schrankfachinhaber/Vollmachtgeber</h4>
+    <table>
+      <tr>
+        <td>Name</td>
+        <td>{{deposit.geber_name|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Anschrift</td>
+        <td>{{deposit.geber_adresse|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Name, Anschrift Bank</td>
+        <td>{{deposit.geber_bank|default:""}}</td>
+      </tr>
+    </table>
+    <hr>
+    <h4>Bevollmächtigte Person</h4>
+    <table>
+      <tr>
+        <td>Name</td>
+        <td>{{deposit.nehmer_name|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Anschrift</td>
+        <td>{{deposit.nehmer_adresse|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Geburtsdatum</td>
+        <td>{{deposit.nehmer_geb|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Telefon-Nr.</td>
+        <td>{{deposit.nehmer_tel|default:""}}</td>
+      </tr>
+    </table>
+      {% if deposit.vollmacht_doc %}
+      <h4><a href="{% url 'getdoc' deposit.vollmacht_doc agencydata.pk %}" target="_blank">Vollmachtsdokument herunterladen</a></h4>
+      {% endif %}
+
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+{% for ergo in area_2_ergo %}
+<!-- MODAL Ergo Versicherungsordner -->
+<div class="modal fade" id="ergo_{{ergo.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Digitaler Versicherungsordner</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        
+       <p>Meine Versicherungen sind im ERGO-Kundenportal hinterlegt. Mit folgenden Zugangsdaten erhälst Du alle Informationen zu bestehenden Versicherungen, Versicherungsnummern und Kontaktmöglichkeiten.
+    <h4>Applikation: ERGO meine Versicherung</h4>
+    <table>
+      <tr>
+        <td>Benutzername:</td>
+        <td>{{ergo.ergo_username}}</td>
+      </tr>
+      <tr>
+        <td>Passwort:</td>
+        <td>{{ergo.ergo_password}}</td>
+      </tr>
+    </table>
+
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+{% for onlinebank in area_2_onlinebank %}
+<!-- MODAL Online Banking -->
+<div class="modal fade" id="onlinebank_{{onlinebank.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Online-Banking</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        
+     <h4>Bankdaten</h4>
+    <table>
+      <tr>
+        <td>Internetadresse:</td>
+        <td><a href="https://{{onlinebank.web_address}}" target="_blank">{{onlinebank.web_address}}</a></td>
+      </tr>
+      <tr>
+        <td>Benutzername:</td>
+        <td>{{onlinebank.web_username|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Passwort:</td>
+        <td>{{onlinebank.web_password|default:""}}</td>
+      </tr>
+       <tr>
+        <td>BIC:</td>
+        <td>{{onlinebank.bic|default:""}}</td>
+      </tr>
+       <tr>
+        <td>IBAN:</td>
+        <td>{{onlinebank.iban|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Mit meinem Account soll Folgendes passieren:</td>
+        <td>{{onlinebank.accountactivity|default:""}}</td>
+      </tr>
+    </table>
+    {% if onlinebank.vollmacht_doc %}
+    <h4><a href="{% url 'getdoc' onlinebank.document agencydata.pk %}" target="_blank">Vollmachtsdokument herunterladen</a></h4>
+    {% endif %}
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+<!-- 3. Verträge -->
+<div class="card">
   <div class="card-header" id="headingOne">
     <h5 class="mb-0">
       <button class="btn btn-link tabelement"  onclick="javascript:newTabOpen(3)" data-toggle="collapse" data-target="#rd_3" aria-expanded="true" aria-controls="rd_3">
@@ -352,10 +683,98 @@
 
   <div id="rd_3" class="collapse" aria-labelledby="headingOne" data-parent="#accordion">
     <div class="card-body">
-        AREA 3
+      
+      <h4>Streaming Abonnements
+      <a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a3-addstreaming' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Streaming-Abo</a>
+      </h4>
+      <table class="table table-hover" id="a3_abos" >
+            <thead>
+            <tr>
+              <th scope="col">Name</th>
+              <th scope="col">Benutzername</th>
+            </tr>
+          </thead>
+          <tbody >
+            {% for ele in area_3_abos %}
+            <tr>
+              <td><a href="/#" data-toggle="modal" data-target="#streaming_{{ele.pk}}">{{ele.name|default:""}}</a></td>
+              <td>{{ele.username|default:""}}</td>
+            </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+      <hr>
+      <h4>Verträge
+      </h4>
+      <table class="table table-hover" id="a3_docs" >
+            <thead>
+            <tr>
+              <th scope="col">Name</th>
+              <th scope="col">Datum</th>
+              <th scope="col">Beschreibung</th>
+              <th scope="col">&nbsp;</th>
+            </tr>
+          </thead>
+          <tbody >
+           {% for doc in area_3_doc %}
+            <tr>
+               <td>{{doc.document_name|default:""}}</a></td>
+               <td>{{doc.document_date|date:"d.m.Y"|default:""}}</td>
+               <td>{{doc.document_desc|default:""}}</td>
+               <td><a href="{% url 'getdoc' doc.document agencydata.pk %}" target="_blank">Download</a></td>
+            </tr>
+          {% endfor %}
+          </tbody>
+        </table>
+    </div>
+  </div>
+</div>
+
+{% for streaming in area_3_abos %}
+<!-- MODAL Streamingabos -->
+<div class="modal fade" id="streaming_{{streaming.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Streaming-Abo</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        
+      <h4>Streaming-Dienst</h4>
+        <table>
+          <tr>
+            <td>Name:</td>
+            <td>{{streaming.name}}</td>
+          </tr>
+          <tr>
+            <td>Benutzername:</td>
+            <td>{{streaming.username|default:""}}</td>
+          </tr>
+          <tr>
+            <td>Passwort:</td>
+            <td>{{streaming.password|default:""}}</td>
+          </tr>
+          <tr>
+            <td>Mit meinem Account soll Folgendes passieren:</td>
+            <td>{{streaming.accountactivity|default:""}}</td>
+          </tr>
+        </table>
+        <hr>
+        {% if streaming.vollmacht_doc %}
+        <h4><a href="{% url 'getdoc' streaming.vollmacht_doc agencydata.pk %}" target="_blank">Vollmachtsdokument anschauen</a></h4>
+        {% endif %}
+
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
       </div>
     </div>
   </div>
+</div>
+{% endfor %}
 
   <!-- 4. Digitale Konten -->
   <div class="card">
@@ -372,11 +791,110 @@
 
     <div id="rd_4" class="collapse" aria-labelledby="headingOne" data-parent="#accordion">
       <div class="card-body">
-        AREA 4
+        
+
+        <h4>Online-Accounts (Messenger, E-Mail-Accounts, Social-Media etc.)
+      </h4>
+      <table class="table table-hover" id="a4_digitalaccount" >
+            <thead>
+            <tr>
+              <th scope="col">Name</th>
+              <th scope="col">Link</th>
+              <th scope="col">Benutzername</th>
+            </tr>
+          </thead>
+          <tbody >
+            {% for ele in area_4_digitalaccount %}
+            <tr>
+              <td><a href="/#" data-toggle="modal" data-target="#account_{{ele.pk}}">{{ele.name|default:""}}</a></td>
+              <td>{{ele.link|default:""}}</td>
+              <td>{{ele.username|default:""}}</td>
+            </tr>
+            {% endfor %}
+          </tbody>
+        </table>
+
+      <hr>
+     <h4>Dokumente
+      </h4>
+      <table class="table table-hover" id="a4_docs" >
+            <thead>
+            <tr>
+              <th scope="col">Name</th>
+              <th scope="col">Datum</th>
+              <th scope="col">Beschreibung</th>
+              <th scope="col">&nbsp;</th>
+            </tr>
+        </thead>
+        <tbody >
+         {% for doc in area_4_doc %}
+          <tr>
+             <td>{{doc.document_name|default:""}}</a></td>
+             <td>{{doc.document_date|date:"d.m.Y"|default:""}}</td>
+             <td>{{doc.document_desc|default:""}}</td>
+             <td><a href="{% url 'getdoc' doc.document agencydata.pk %}" target="_blank">Download</a></td>
+          </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+
       </div>
     </div>
   </div>
 
+{% for account in area_4_digitalaccount %}
+<!-- MODAL Digitale Accounts -->
+<div class="modal fade" id="account_{{account.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Digitaler Account</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+        
+ 
+        <h4>Online-Account</h4>
+        <table>
+          <tr>
+            <td>Name:</td>
+            <td>{{account.name|default:""}}</td>
+          </tr>
+          <tr>
+            <td>Link:</td>
+            <td>{{account.link|default:""}}</td>
+          </tr>
+          <tr>
+            <td>Benutzername:</td>
+            <td>{{account.username|default:""}}</td>
+          </tr>
+          <tr>
+            <td>Passwort:</td>
+            <td>{{account.password|default:""}}</td>
+          </tr>
+          <tr>
+            <td>E-Mail:</td>
+            <td>{{account.mail|default:""}}</td>
+          </tr>
+          <tr>
+            <td>Mit meinem Account soll Folgendes passieren:</td>
+            <td>{{account.accountactivity|default:""}}</td>
+          </tr>
+        </table>
+
+
+
+
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
 
   <!-- GEWERBE -->
   <!-- 5. Vorsorgedokumente -->
@@ -394,11 +912,188 @@
 
     <div id="rd_5" class="collapse" aria-labelledby="headingOne" data-parent="#accordion">
       <div class="card-body">
-        AREA 5
+        
+
+        <h4>Personal, interne und externe Partner inkl. Funktionen usw.
+</h4>
+<hr>
+<table class="table table-hover" id="a5_personal" >
+      <thead>
+      <tr>
+        <th scope="col">Name</th>
+        <th scope="col">Funktion</th>
+        <th scope="col">Intern/Extern</th>
+      </tr>
+    </thead>
+    <tbody >
+      {% for ele in area_5_personal %}
+      <tr>
+        <td><a href="/#" data-toggle="modal" data-target="#personal_{{ele.pk}}">{{ele.name|default:""}}</a></td>
+        <td>{{ele.function|default:""}}</td>
+        <td>
+          {% if ele.inorex == "in" %} Intern 
+          {% elif ele.inorex == "ex" %} Extern
+          {% else %} {% endif %}
+        </td>
+      </tr>
+      {% endfor %}
+      {% for us in users_of_agency %}
+      <tr>
+        <td><a href="/#" data-toggle="modal" data-target="#personal_in_{{us.pk}}">{{us.get_full_name}}</a></td>
+        <td>{{us.profile.func|default:""}}</td>
+        <td>
+          Intern
+        </td>
+        <td>
+        </td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+      <hr>
+
+      <h4>Dokumente
+      </h4>
+      <table class="table table-hover" id="a5_docs" >
+            <thead>
+            <tr>
+              <th scope="col">Name</th>
+              <th scope="col">Datum</th>
+              <th scope="col">Beschreibung</th>
+              <th scope="col">&nbsp;</th>
+            </tr>
+        </thead>
+        <tbody >
+         {% for doc in area_5_doc %}
+          <tr>
+             <td>{{doc.document_name|default:""}}</a></td>
+             <td>{{doc.document_date|date:"d.m.Y"|default:""}}</td>
+             <td>{{doc.document_desc|default:""}}</td>
+             <td><a href="{% url 'getdoc' doc.document agencydata.pk %}" target="_blank">Download</a></td>
+          </tr>
+        {% endfor %}
+        </tbody>
+      </table>
+
+
+
       </div>
     </div>
   </div>
 
+
+  {% for personal in area_5_personal %}
+<!-- MODAL Personalaccounts EXTERN -->
+<div class="modal fade" id="personal_{{personal.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Personaldaten Extern</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+
+
+           <h4>Personal und Partner</h4>
+    <table>
+      <tr>
+        <td>Name:</td>
+        <td>{{personal.name}}</td>
+      </tr>
+      <tr>
+        <td>Function:</td>
+        <td>{{personal.function|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Intern/Extern:</td>
+        <td>
+          {% if personal.inorex == "in" %} Intern 
+          {% elif personal.inorex == "ex" %} Extern
+          {% else %} {% endif %}
+        </td>
+      </tr>
+      <tr>
+        <td>PNR:</td>
+        <td>{{personal.pnr|default:""}}</td>
+      </tr>
+      <tr>
+        <td>ONR:</td>
+        <td>{{personal.onr|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Email-Adresse:</td>
+        <td>{{personal.mail|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Telefon:</td>
+        <td>{{personal.tel|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Adresse:</td>
+        <td>{{personal.adresse|default:""}}</td>
+      </tr>
+    </table>
+
+
+
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+{% for personal in users_of_agency %}
+<!-- MODAL Personalaccounts INTERN -->
+<div class="modal fade" id="personal_in_{{personal.pk}}" tabindex="-1" role="dialog" aria-labelledby="" aria-hidden="true">
+  <div class="modal-dialog modal-lg" role="document">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h5 class="modal-title" id="exampleModalLabel">Personaldaten Intern</h5>
+        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+          <span aria-hidden="true">&times;</span>
+        </button>
+      </div>
+      <div class="modal-body">
+
+
+           <h4>Personal und Partner</h4>
+    <table>
+      <tr>
+        <td>Name:</td>
+        <td>{{personal.get_full_name}}</td>
+      </tr>
+      <tr>
+        <td>Function:</td>
+        <td>{{personal.profile.compfunc|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Intern/Extern:</td>
+        <td>Intern </td>
+      </tr>
+      <tr>
+        <td>Email-Adresse:</td>
+        <td>{{personal.email|default:""}}</td>
+      </tr>
+      <tr>
+        <td>Telefon:</td>
+        <td>{{personal.profile.phoneland|default:""}} / {{personal.profile.phonemobile|default:""}} / {{personal.profile.phone_public|default:""}}</td>
+      </tr>
+      </table>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-primary" data-dismiss="modal">Schließen</button>
+      </div>
+    </div>
+  </div>
+</div>
+{% endfor %}
+
+
   <!-- 6. Vorsroge und Finanzen -->
   <div class="card">
     <div class="card-header" id="headingOne">
@@ -547,6 +1242,213 @@
       }
     });
 
+     $('#a2_docs').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });
+
+        $('#a2_deposit').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });
+
+
+      $('#a2_ergo').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });
+
+
+      $('#area_2_onlinebank').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });        
+
+
+ $('#a3_abos').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });        
+
+
+ $('#a3_docs').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });        
+
+
+ $('#a4_docs').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });  
+
+
+ $('#a4_digitalaccount').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    });  
+
+
+ $('#a5_personal').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    }); 
+     
+
+ $('#a5_docs').DataTable({
+      "language": {
+        "search" : "Suche",
+        "info": "Zeige _START_ bis _END_ von _TOTAL_ Einträgen",
+        "lengthMenu":     "Zeige _MENU_ Einträge",
+        "zeroRecords": "Nichts gefunden",
+        "infoEmpty": "Keine Einträge",
+        "paginate": {
+            "first":      "Erste",
+            "last":       "Letzte",
+            "next":       "Nächste",
+            "previous":   "Zurück"
+        },
+      },
+      "pageLength": 50,
+      "buttons" : {
+        "className" : "btn-danger"
+      }
+    }); 
      
      
 

recoverdir/views.py

@@ -18,6 +18,7 @@ from django.contrib.auth.password_validation import *
 from datetime import datetime
 from django.contrib.auth.models import User
 from django.core.exceptions import ObjectDoesNotExist
+from django.contrib import messages
 
 
 ######## HELPER FUNCTIONS
@@ -29,11 +30,12 @@ def randomString(stringLength=40):
 
 def randomStringRecoverKey():
 	letters = string.ascii_uppercase
-
+	numbers = string.digits
+	letters_l = string.ascii_lowercase
 	key = ""
 
 	for run in range(10):
-		key += ''.join(random.choice(letters) for i in range(5))
+		key += ''.join(random.choice(letters + numbers + letters_l) for i in range(5))
 		if(run < 9):
 			key += "-"
 
@@ -184,7 +186,7 @@ class LoadExternalData(TemplateView):
 			hlfv = HandlungsleitfadenVF.objects.filter(agency=agency)[0]
 		else:
 			hlfv = None
-		context.update({'area_2_hlfv' : hlfv})
+		context.update({'hlvf' : hlfv})
 
 		#Bankenvollmachten usw.
 		context.update({'area_2_deposit' : depistvollmacht})