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/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})