Bug Organigramm, Notfallhilfe intern fertig

orga/templates/orga/orga_single.html

@@ -10,7 +10,7 @@
     {% if user|usergperm:"usermanager" %} 
     <button type="button" id="activatechangingorder" style="float: right" class="btn btn-secondary btn-sm" onclick="javascript:activateChangeTaskOrder()" data-toggle="tooltip" data-placement="top" title="Reihenfolge der Tätigkeiten anpassen"><small><i class="fas fa-pen"></i></small></button>
     <button type="button" id="changingorder" style="float: right; display: none" class="btn  btn-primary btn-sm" onclick="javascript:activateChangeTaskOrder()" data-toggle="tooltip" data-placement="top" title="Reihenfolge der Tätigkeiten speichern."><small><i class="fas fa-check"></i></small></button>
-
+    {% endif %}
     <span style="float: right;">
       {% if request.user.profile.agency.dynamicprofile %}
         <div class="dropdown">
@@ -28,7 +28,7 @@
       {% endif %}
     </span>
 
-    {% endif %}
+    
   </span></h3>
   <hr>
   <div class="media">

recoverdir/models.py

@@ -152,6 +152,7 @@ class StreamingAbo(models.Model):
 class DigitalAccounts(models.Model):
 	agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True)
 	name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
+	area = models.IntegerField(default=2)
 	link = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	username = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))
 	password = encrypt(models.CharField(max_length=500, blank=True, default="", null=True))

recoverdir/templates/recoverdir/rd_areas/rd_area_3.html

@@ -12,7 +12,7 @@
     <tbody >
     	{% for ele in area_3_abos %}
     	<tr>
-    		<td>{{ele.name|default:""}}</td>
+    		<td><a href="{% url 'rd-a3-viewstreaming' ele.pk %}">{{ele.name|default:""}}</a></td>
     		<td>{{ele.username|default:""}}</td>
     		<td>
           <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a3-viewstreaming' ele.pk %}"><i class="far fa-eye"></i></a>&nbsp;

recoverdir/templates/recoverdir/rd_areas/rd_area_4.html

@@ -1,5 +1,5 @@
 <h4>Online-Accounts (Messenger, E-Mail-Accounts, Social-Media etc.)
-<a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a4-adddigitalaccount' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Online-Account</a>
+<a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a4-adddigitalaccount' 4 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Online-Account</a>
 </h4>
 <table class="table table-hover" id="a4_digitalaccount" >
       <thead>

recoverdir/templates/recoverdir/rd_areas/rd_area_8.html

@@ -1,3 +1,31 @@
+<h4>Digitale Accounts (Webseiten, E-Mail etc.)
+<a class="btn btn-primary btn btn-sm mb-3" href="{% url 'rd-a4-adddigitalaccount' 8 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Account</a>
+</h4>
+<table class="table table-hover" id="a8_digitalaccount" >
+      <thead>
+      <tr>
+        <th scope="col">Name</th>
+        <th scope="col">Link</th>
+        <th scope="col">Benutzername</th>
+        <th scope="col">&nbsp;</th>
+      </tr>
+    </thead>
+    <tbody >
+      {% for ele in area_8_digitalaccount %}
+      <tr>
+        <td><a href="{% url 'rd-a4-viewdigitalaccount' ele.pk %}">{{ele.name|default:""}}</a></td>
+        <td>{{ele.link|default:""}}</td>
+        <td>{{ele.username|default:""}}</td>
+        <td>
+          <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a4-viewdigitalaccount' ele.pk %}"><i class="far fa-eye"></i></a>&nbsp;
+          <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a4-updatedigitalaccount' ele.pk %}"><small><i class="fas fa-pen"></i></small></a>&nbsp;
+          <a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a4-deldigitalaccount' ele.pk %}"><small><i class="fas fa-trash"></i></small></a>  
+        </td>
+      </tr>
+      {% endfor %}
+    </tbody>
+  </table>
+<hr>
 <h4>Dokumente 
 <a class="btn btn-primary btn-sm btn mb-3" href="{% url 'rd-a1-adddoc' 8 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
 </h4>
@@ -50,5 +78,25 @@ $(document).ready(function(){
       }
     });
 
+   $('#a8_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"
+      }
+    });
+
 });
 </script>

recoverdir/templates/recoverdir/rd_infos.html

@@ -1,3 +1,6 @@
+<div class="card">  
+      <div class="card-body">
+          <p class="card-text">
 <h3>Wichtige Informationen bei Betriebsaufgabe</h3>
 
 <p>
@@ -208,7 +211,9 @@ Dies ist ebenfalls in §89b HGB geregelt. Es besteht kein Anspruch, wenn
 
 
 
-
+</p>
+</div>
+</div>
 
 
 

recoverdir/templates/recoverdir/rd_management.html

@@ -71,7 +71,23 @@
       </div>
 
       <div class="tab-pane fade" id="t_help" role="tabpanel" aria-labelledby="help">
-        Hilfe & Kontakt
+        <h5 class="mt-3">Hilfe & Kontakt{% if request.user.profile.showtooltips %}&nbsp;<small><i data-toggle="tooltip" data-placement="top" title="Hier erhalten Sie weitere Hilfe." class="far fa-question-circle"></i></small>{% endif %}</h5>
+        <hr>
+        <div class="card">  
+        <div class="card-body">
+            <p class="card-text">
+            Melden Sie sich bei der VVE-Geschäftsstelle, um weitere Unterstützung und Hilfe zu erhalten.
+            <br />
+            <b>Geschäftstelle des VVE e.V.</b><br />
+            Verband der selbständigen Verischerungskaufleute er ERGO Gesellschaften e.V.<br />
+            Frankenthaler Str. 2<br />
+            68519 Viernheim<br /><br />
+            Telefon: 06204/964060<br />
+            E-Mail: geschaeftsstelle@myvve.de<br />
+            </p>
+          </div>
+        </div>
+        <hr>
       </div>
     </div>
   </div>

recoverdir/templates/recoverdir/rd_viewsettings.html

@@ -1,4 +1,7 @@
 <hr>
+<div class="card">  
+      <div class="card-body">
+          <p class="card-text">
 <table>
 	<tr>
 		<td>Sicherheitsschlüssel (nicht veränderbar):</td><td><b>{{rd_settings.recoverkey}}</b></td>
@@ -12,6 +15,9 @@
 	</tr>
 	</tr>
 </table>
+</p>
+</div>
+</div>
 <script type="text/javascript">
 function showPW(){
 	$("#pw_hidden").toggle();

recoverdir/urls.py

@@ -11,7 +11,8 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie
 
 urlpatterns = [
 	path('', permission_required('users.recoverdirmanager')(RecoverDirManagement.as_view(template_name="recoverdir/rd_management.html")), name='recoverdir'),
-
+	# RECOVER LINK EXTERN
+	path('recover/login/', LoadExternalDataLogin.as_view(), name="load-rd-external-login"),
 
 	# SETTINGS
 	path('rdsettings/', permission_required('users.recoverdirmanager')(RecoverDirAddSettings.as_view()), name='recoverdir-addsettings'),
@@ -78,7 +79,7 @@ urlpatterns = [
 	
 	# Bereich 4
 	# Digitale Accounts
-	path('four/digitalaccount/add', permission_required('users.recoverdirmanager')(RDAfourAdddigitalaccount.as_view()), name='rd-a4-adddigitalaccount'),
+	path('four/digitalaccount/add/<int:area>', permission_required('users.recoverdirmanager')(RDAfourAdddigitalaccount.as_view()), name='rd-a4-adddigitalaccount'),
 	path('four/digitalaccount/<int:pk>', permission_required('users.recoverdirmanager')(RDAfourViewdigitalaccount.as_view()), name='rd-a4-viewdigitalaccount'),
 	path('four/digitalaccount/del/<int:pk>', permission_required('users.recoverdirmanager')(RDAfourDeldigitalaccount.as_view()), name='rd-a4-deldigitalaccount'),
 	path('four/digitalaccount/update/<int:pk>', permission_required('users.recoverdirmanager')(RDAfourUpdatedigitalaccount.as_view()), name='rd-a4-updatedigitalaccount'),

recoverdir/views.py

@@ -18,6 +18,62 @@ from django.contrib.auth.password_validation import *
 from datetime import datetime
 from django.contrib.auth.models import User
 
+
+######## HELPER FUNCTIONS
+
+def randomString(stringLength=40):
+    """Generate a random string of fixed length """
+    letters = string.ascii_lowercase
+    return ''.join(random.choice(letters) for i in range(stringLength))
+
+def randomStringRecoverKey():
+	letters = string.ascii_uppercase
+
+	key = ""
+
+	for run in range(10):
+		key += ''.join(random.choice(letters) for i in range(5))
+		if(run < 9):
+			key += "-"
+
+	return key
+
+'''
+
+	Prüft, ob der User länger als 30 Minuten ausgeloggt war oder generell ausgeloggt war bzw. kein rd_login hat.
+
+'''
+def checkForLogin(self):
+
+	# Acutal Timestamp
+	now = datetime.now()
+	userloginrdtime = self.request.user.profile.rd_login
+	time_delta = (now-userloginrdtime)
+	total_seconds = time_delta.total_seconds()
+	minutes = total_seconds/60
+
+
+	print(userloginrdtime)
+
+	if(self.request.user.profile.rd_login == None or minutes > 30):
+		self.request.user.profile.rd_login = None
+		self.request.user.profile.save()
+		messages.warning(self.request, f'Bitte login Sie erneut ein!')
+		return False
+	else:
+		self.request.user.profile.rd_login = now
+		self.request.user.profile.save()
+		return True
+
+############################################# EXTERNAL ACCESS ############################################
+
+class LoadExternalDataLogin(FormView):
+	pass
+
+
+
+############# VIEWS
+
 # Create your views here.
 class RecoverDirManagement(LoginRequiredMixin, ListView):
 	model = PersLetter
@@ -29,7 +85,7 @@ class RecoverDirManagement(LoginRequiredMixin, ListView):
 			# Settings not found
 			return redirect('recoverdir-addsettings')
 		# TASK: Hier noch einstellen, dass der Nutzer weniger als 30 Minuten nicht inaktiv war!
-		elif(self.request.user.profile.rd_login == None and self.request.user.has_perm('users.recoverdirmanager')):
+		elif(self.request.user.profile.rd_login == None and self.request.user.has_perm('users.recoverdirmanager') or (self.request.user.has_perm('users.recoverdirmanager') and checkForLogin(self) == False)):
 			return redirect('recoverdir-login')
 		else:
 		     return super(RecoverDirManagement, self).get(request)
@@ -65,9 +121,12 @@ class RecoverDirManagement(LoginRequiredMixin, ListView):
 		streamingabo = StreamingAbo.objects.filter(agency=self.request.user.profile.agency)
 		context.update({"area_3_abos" : streamingabo})
 
-		digitalaccount = DigitalAccounts.objects.filter(agency=self.request.user.profile.agency)
+		digitalaccount = DigitalAccounts.objects.filter(agency=self.request.user.profile.agency, area=4)
 		context.update({"area_4_digitalaccount" : digitalaccount})
 
+		digitalaccount8 = DigitalAccounts.objects.filter(agency=self.request.user.profile.agency, area=8)
+		context.update({"area_8_digitalaccount" : digitalaccount8})
+
 		personal = Personal.objects.filter(agency=self.request.user.profile.agency)
 		context.update({"area_5_personal" : personal})
 
@@ -210,6 +269,12 @@ class RecoverDirUpdateSettings(UpdateView):
 	form_class = RecoverDirSettingForm
 	template_name = "recoverdir/rd_settings.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({
@@ -233,6 +298,12 @@ class RecoverDirAddPL(CreateView):
 	form_class = PersLetterForm
 	template_name = "recoverdir/rd_pers_add.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({
@@ -253,6 +324,12 @@ class RecoverDirUpdatePL(UpdateView):
 	form_class = PersLetterForm
 	template_name = "recoverdir/rd_pers_update.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -263,23 +340,6 @@ class RecoverDirUpdatePL(UpdateView):
 		return super().form_valid(form)
 
 
-def randomString(stringLength=40):
-    """Generate a random string of fixed length """
-    letters = string.ascii_lowercase
-    return ''.join(random.choice(letters) for i in range(stringLength))
-
-def randomStringRecoverKey():
-	letters = string.ascii_uppercase
-
-	key = ""
-
-	for run in range(10):
-		key += ''.join(random.choice(letters) for i in range(5))
-		if(run < 9):
-			key += "-"
-
-	return key
-
 # Notfallhilfe ELEMENTE
 
 # ABNSCHNITT 1
@@ -289,6 +349,12 @@ class RDAoneAddDoc(CreateView):
 	form_class = DocumentForm
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_adddoc.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		form.instance.area = self.kwargs["area"]
@@ -315,12 +381,24 @@ class RDAoneViewDoc(DetailView):
 	template_name = 'recoverdir/rd_doc_single.html'
 	context_object_name = 'document'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAoneDelDoc(DeleteView):
 	model = Documents
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_doc_del.html'
 	context_object_name = 'document'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -332,6 +410,12 @@ class RDAoneUpdateDoc(UpdateView):
 	form_class = DocumentForm
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_adddoc.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		
 		if(self.request.FILES and self.request.FILES['document']):
@@ -357,6 +441,12 @@ class RDAoneAddHL(CreateView):
 	form_class = HLForm
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_addhl.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -372,6 +462,12 @@ class RDAoneUpdateHL(UpdateView):
 	form_class = HLForm
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_addhl.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -384,6 +480,12 @@ class RDAoneAddFC(CreateView):
 	form_class = RDContactF
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_addfc.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -399,6 +501,12 @@ class RDAoneUpdateContact(UpdateView):
 	form_class = RDContactF
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_addfc.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -411,12 +519,24 @@ class RDAoneViewContact(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_1_contact_single.html'
 	context_object_name = 'contact'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAoneDelContact(DeleteView):
 	model = RDContact
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_1_contact_del.html'
 	context_object_name = 'contact'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -430,12 +550,24 @@ class RDAoneViewTrust(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_1_trust_single.html'
 	context_object_name = 'contact'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAoneDelTrust(DeleteView):
 	model = RDTrustPerson
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_1_trust_del.html'
 	context_object_name = 'contact'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -447,6 +579,12 @@ class RDAoneAddTrust(CreateView):
 	form_class = RDTrustPersonF
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_addtrust.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -462,6 +600,12 @@ class RDAoneUpdateTrust(UpdateView):
 	form_class = RDTrustPersonF
 	template_name = "recoverdir/rd_elements_forms/rd_area_1_addtrust.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -475,6 +619,12 @@ class RDAtwoAddHLFV(CreateView):
 	form_class = HLFVForm
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -490,6 +640,12 @@ class RDAtwoUpdateFV(UpdateView):
 	form_class = HLFVForm
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -503,12 +659,24 @@ class RDAtwoViewdeposit(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_deposit_single.html'
 	context_object_name = 'deposit'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAtwoDeldeposit(DeleteView):
 	model = DepositVollmacht
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_deposit_del.html'
 	context_object_name = 'deposit'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -520,6 +688,12 @@ class RDAtwoAdddeposit(CreateView):
 	form_class = DepositVollmachtF
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_adddeposit.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		if(self.request.FILES and self.request.FILES['vollmacht_doc']):
@@ -543,6 +717,12 @@ class RDAtwoUpdatedeposit(UpdateView):
 	form_class = DepositVollmachtF
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_adddeposit.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -559,12 +739,24 @@ class RDAtwoViewergo(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_ergo_single.html'
 	context_object_name = 'ergo'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAtwoDelergo(DeleteView):
 	model = ErgoVerDir
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_ergo_del.html'
 	context_object_name = 'ergo'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -576,6 +768,12 @@ class RDAtwoAddergo(CreateView):
 	form_class = ErgoVerDirF
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_addergo.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -591,6 +789,12 @@ class RDAtwoUpdateergo(UpdateView):
 	form_class = ErgoVerDirF
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_addergo.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -607,12 +811,24 @@ class RDAtwoViewonlinebank(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_onlinebank_single.html'
 	context_object_name = 'onlinebank'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAtwoDelonlinebank(DeleteView):
 	model = OnlineBank
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_onlinebank_del.html'
 	context_object_name = 'onlinebank'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -624,6 +840,12 @@ class RDAtwoAddonlinebank(CreateView):
 	form_class = OnlineBankF
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_addonlinebank.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		form.instance.area = self.kwargs["area"]
@@ -648,6 +870,12 @@ class RDAtwoUpdateonlinebank(UpdateView):
 	form_class = OnlineBankF
 	template_name = "recoverdir/rd_elements_forms/rd_area_2_addonlinebank.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		if(self.request.FILES and self.request.FILES['vollmacht_doc']):
@@ -671,12 +899,24 @@ class RDAthreeViewstreaming(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_3_streamingabo_single.html'
 	context_object_name = 'streaming'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAthreeDelstreaming(DeleteView):
 	model = StreamingAbo
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_3_streamingabo_del.html'
 	context_object_name = 'streaming'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -688,6 +928,12 @@ class RDAthreeAddstreaming(CreateView):
 	form_class = StreamingAboF
 	template_name = "recoverdir/rd_elements_forms/rd_area_3_addstreamingabo.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		if(self.request.FILES and self.request.FILES['vollmacht_doc']):
@@ -711,6 +957,12 @@ class RDAthreeUpdatestreaming(UpdateView):
 	form_class = StreamingAboF
 	template_name = "recoverdir/rd_elements_forms/rd_area_3_addstreamingabo.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		if(self.request.FILES and self.request.FILES['vollmacht_doc']):
@@ -734,12 +986,25 @@ class RDAfourViewdigitalaccount(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_4_digitalaccount_single.html'
 	context_object_name = 'account'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAfourDeldigitalaccount(DeleteView):
 	model = DigitalAccounts
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_4_digitalaccount_del.html'
 	context_object_name = 'account'
 
+
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -751,8 +1016,15 @@ class RDAfourAdddigitalaccount(CreateView):
 	form_class = DigitalAccountsF
 	template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
+		form.instance.area = self.kwargs["area"]
 		if(self.request.FILES and self.request.FILES['vollmacht_doc']):
 			# Randomize File-Name keeping extension
 			file = self.request.FILES['vollmacht_doc'] 
@@ -774,6 +1046,12 @@ class RDAfourUpdatedigitalaccount(UpdateView):
 	form_class = DigitalAccountsF
 	template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		if(self.request.FILES and self.request.FILES['vollmacht_doc']):
@@ -797,12 +1075,24 @@ class RDAfiveViewpersonal(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_5_personal_single.html'
 	context_object_name = 'personal'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAfiveDelpersonal(DeleteView):
 	model = Personal
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_5_personal_del.html'
 	context_object_name = 'personal'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -814,6 +1104,12 @@ class RDAfiveAddpersonal(CreateView):
 	form_class = PersonalF
 	template_name = "recoverdir/rd_elements_forms/rd_area_5_addpersonal.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -830,6 +1126,12 @@ class RDAfiveUpdatepersonal(UpdateView):
 	form_class = PersonalF
 	template_name = "recoverdir/rd_elements_forms/rd_area_5_addpersonal.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -847,12 +1149,24 @@ class RDAnineViewelse(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_9_else_single.html'
 	context_object_name = 'else'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAnineDelelse(DeleteView):
 	model = RDElse
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_9_else_del.html'
 	context_object_name = 'ele'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -864,6 +1178,12 @@ class RDAnineAddelse(CreateView):
 	form_class = RDElseF
 	template_name = "recoverdir/rd_elements_forms/rd_area_9_addelse.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -880,6 +1200,12 @@ class RDAnineUpdateelse(UpdateView):
 	form_class = RDElseF
 	template_name = "recoverdir/rd_elements_forms/rd_area_9_addelse.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -896,12 +1222,24 @@ class RDAsevenViewcontract(DetailView):
 	template_name = 'recoverdir/rd_elements_forms/rd_area_7_contract_single.html'
 	context_object_name = 'contract'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 class RDAsevenDelcontract(DeleteView):
 	model = RDContract
 	success_url = reverse_lazy('recoverdir')
 	template_name = 'recoverdir/rd_elements_forms/rd_area_7_contract_del.html'
 	context_object_name = 'ele'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
 		context.update({'active_link' : 'recoverdir'})
@@ -913,6 +1251,12 @@ class RDAsevenAddcontract(CreateView):
 	form_class = RDContractF
 	template_name = "recoverdir/rd_elements_forms/rd_area_7_addcontract.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -928,6 +1272,12 @@ class RDAsevenUpdatecontract(UpdateView):
 	form_class = RDContractF
 	template_name = "recoverdir/rd_elements_forms/rd_area_7_addcontract.html"
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	def form_valid(self, form):
 		form.instance.agency = self.request.user.profile.agency
 		return super().form_valid(form)
@@ -946,6 +1296,12 @@ class PLSingleHistory(DetailView):
 	template_name = 'recoverdir/rd_persletter_single.html'
 	context_object_name = 'persletter'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -967,6 +1323,11 @@ class HLSingleHistory(DetailView):
 	model = Handlungsleitfaden
 	template_name = 'recoverdir/rd_elements_forms/rd_area_1_hl_single.html'
 	
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
 
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
@@ -991,6 +1352,11 @@ class HLVFSingleHistory(DetailView):
 	model = HandlungsleitfadenVF
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_hl_single.html'
 	
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
 
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
@@ -1016,6 +1382,12 @@ class ContactSingleHistory(DetailView):
 	model = RDContact
 	template_name = 'recoverdir/rd_elements_forms/rd_area_1_contact_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1039,6 +1411,12 @@ class TrustSingleHistory(DetailView):
 	model = RDTrustPerson
 	template_name = 'recoverdir/rd_elements_forms/rd_area_1_trust_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1062,6 +1440,12 @@ class DepositSingleHistory(DetailView):
 	model = DepositVollmacht
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_deposit_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1085,6 +1469,12 @@ class DocumentSingleHistory(DetailView):
 	model = Documents
 	template_name = 'recoverdir/rd_doc_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1108,6 +1498,12 @@ class ErgoSingleHistory(DetailView):
 	model = ErgoVerDir
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_ergo_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1131,6 +1527,12 @@ class OnlinebankSingleHistory(DetailView):
 	model = OnlineBank
 	template_name = 'recoverdir/rd_elements_forms/rd_area_2_onlinebank_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1154,6 +1556,12 @@ class StreamingSingleHistory(DetailView):
 	model = StreamingAbo
 	template_name = 'recoverdir/rd_elements_forms/rd_area_3_streamingabo_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1177,6 +1585,12 @@ class DigitalAccountSingleHistory(DetailView):
 	model = DigitalAccounts
 	template_name = 'recoverdir/rd_elements_forms/rd_area_4_digitalaccount_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1200,6 +1614,12 @@ class PersonalSingleHistory(DetailView):
 	model = Personal
 	template_name = 'recoverdir/rd_elements_forms/rd_area_5_personal_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1223,6 +1643,12 @@ class ContractSingleHistory(DetailView):
 	model = RDContract
 	template_name = 'recoverdir/rd_elements_forms/rd_area_7_contract_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)
@@ -1246,6 +1672,12 @@ class ElseSingleHistory(DetailView):
 	model = RDElse
 	template_name = 'recoverdir/rd_elements_forms/rd_area_9_else_single.html'
 
+	def dispatch(self, *args, **kwargs):
+		if(checkForLogin(self)):
+			return super().dispatch(*args, **kwargs)
+		else:
+			return redirect('recoverdir-login')
+
 	# Gewünschte Revision aufrufen
 	def get_context_data(self, **kwargs):
 		context = super().get_context_data(**kwargs)