|
{% getHistoryClassOfObject rdele as hisotryelementinfo %}
-
{% if hisotryelementinfo.1 == 1 %}
{{hisotryelementinfo.0}}
@@ -55,14 +54,14 @@
{% elif hisotryelementinfo.1 == 9 %}
{{hisotryelementinfo.0}}
+ {% elif hisotryelementinfo.1 == 10 %}
+ {{hisotryelementinfo.0}}
-
{% endif %}
|
{{rdele.history_date|date:"d.m.Y H:i"}} |
{% gethistoryuser rdele.history_user_id as history_user %}
-
{% if history_user != None %}
{{history_user.get_full_name}}
{% else %}
@@ -100,6 +99,5 @@
"order": [[ 1, "desc" ]]
});
-
});
\ No newline at end of file
diff --git a/recoverdir/urls.py b/recoverdir/urls.py
index 5b519e8..3317a06 100644
--- a/recoverdir/urls.py
+++ b/recoverdir/urls.py
@@ -69,6 +69,11 @@ urlpatterns = [
path('three/streaming/del/', permission_required('users.recoverdirmanager')(RDAthreeDelstreaming.as_view()), name='rd-a3-delstreaming'),
path('three/streaming/update/', permission_required('users.recoverdirmanager')(RDAthreeUpdatestreaming.as_view()), name='rd-a3-updatestreaming'),
+ path('four/digitalaccount/add', permission_required('users.recoverdirmanager')(RDAfourAdddigitalaccount.as_view()), name='rd-a4-adddigitalaccount'),
+ path('four/digitalaccount/', permission_required('users.recoverdirmanager')(RDAfourViewdigitalaccount.as_view()), name='rd-a4-viewdigitalaccount'),
+ path('four/digitalaccount/del/', permission_required('users.recoverdirmanager')(RDAfourDeldigitalaccount.as_view()), name='rd-a4-deldigitalaccount'),
+ path('four/digitalaccount/update/', permission_required('users.recoverdirmanager')(RDAfourUpdatedigitalaccount.as_view()), name='rd-a4-updatedigitalaccount'),
+
# HISTORY VIEWS
# Persönliches Schreiben
@@ -88,8 +93,11 @@ urlpatterns = [
# Ergo Digitale Versicherungen
path('ergo/ver//', permission_required('users.recoverdirmanager')(ErgoSingleHistory.as_view()), name='recoverdir-ergohistory-single'),
# Online Bank
- path('onlinebank/ver//', permission_required('users.recoverdirmanager')(OnlinebankSingleHistory.as_view()), name='recoverdir-onlinebankhistory-single'),
+ path('onlinebank/ver//', permission_required('users.recoverdirmanager')(OnlinebankSingleHistory.as_view()), name='recoverdir-onlinebankhistory-single'),
+ # STREAMINGABO
path('streaming/ver//', permission_required('users.recoverdirmanager')(StreamingSingleHistory.as_view()), name='recoverdir-streaminghistory-single'),
+
+ path('digitalaccount/ver//', permission_required('users.recoverdirmanager')(DigitalAccountSingleHistory.as_view()), name='recoverdir-digitalaccounthistory-single'),
diff --git a/recoverdir/views.py b/recoverdir/views.py
index 7489657..666c73f 100644
--- a/recoverdir/views.py
+++ b/recoverdir/views.py
@@ -34,20 +34,23 @@ class RecoverDirManagement(LoginRequiredMixin, ListView):
contactfc = RDContact.objects.filter(agency=self.request.user.profile.agency)
contactstrust = RDTrustPerson.objects.filter(agency=self.request.user.profile.agency)
depistvollmacht = DepositVollmacht.objects.filter(agency=self.request.user.profile.agency)
+
ergodigi = ErgoVerDir.objects.filter(agency=self.request.user.profile.agency)
context.update({"area_2_ergo" : ergodigi})
onlinebank = OnlineBank.objects.filter(agency=self.request.user.profile.agency)
context.update({"area_2_onlinebank" : onlinebank})
-
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)
+ context.update({"area_4_digitalaccount" : digitalaccount})
+
handlungsleitfadenvf = HandlungsleitfadenVF.objects.filter(agency=self.request.user.profile.agency)
- finalupdatelist = chain(persletters, handlungsleitfaden, contactfc, contactstrust, handlungsleitfadenvf, depistvollmacht, ergodigi, onlinebank, streamingabo)
+ finalupdatelist = chain(persletters, handlungsleitfaden, contactfc, contactstrust, handlungsleitfadenvf, depistvollmacht, ergodigi, onlinebank, streamingabo, digitalaccount)
context.update({"history" : finalupdatelist})
# DOCUMENTS NOT WORKING Weil das "alte" nicht gespeichert wird sondern lediglich der Datensatz
@@ -88,6 +91,9 @@ class RecoverDirManagement(LoginRequiredMixin, ListView):
# A3
context.update({'area_3_doc' : Documents.objects.filter(agency=self.request.user.profile.agency, area=3).order_by('-document_date')})
+ # A4
+ context.update({'area_4_doc' : Documents.objects.filter(agency=self.request.user.profile.agency, area=4).order_by('-document_date')})
+
return context
class RecoverDirAddPL(CreateView):
@@ -577,7 +583,70 @@ class RDAthreeUpdatestreaming(UpdateView):
context.update({'active_link' : 'recoverdir'})
return context
-#################################################################### HISTORY ELEMENT VIEW #######################################################
+# Digitaler Account
+class RDAfourViewdigitalaccount(DetailView):
+ model = DigitalAccounts
+ success_url = reverse_lazy('recoverdir')
+ template_name = 'recoverdir/rd_elements_forms/rd_area_4_digitalaccount_single.html'
+ context_object_name = 'account'
+
+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 get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context.update({'active_link' : 'recoverdir'})
+ return context
+
+class RDAfourAdddigitalaccount(CreateView):
+ model = DigitalAccounts
+ success_url = reverse_lazy('recoverdir')
+ form_class = DigitalAccountsF
+ template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html"
+
+ def form_valid(self, form):
+ form.instance.agency = self.request.user.profile.agency
+ if(self.request.FILES and self.request.FILES['vollmacht_doc']):
+ # Randomize File-Name keeping extension
+ file = self.request.FILES['vollmacht_doc']
+ file_ext_arr = file.name.split(".")
+ file_ext = file_ext_arr[len(file_ext_arr)-1]
+ file.name = randomString() + "." + file_ext
+ form.instance.vollmacht_doc = file
+ return super().form_valid(form)
+
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context.update({'active_link' : 'recoverdir'})
+ return context
+
+class RDAfourUpdatedigitalaccount(UpdateView):
+ model = DigitalAccounts
+ success_url = reverse_lazy('recoverdir')
+ form_class = DigitalAccountsF
+ template_name = "recoverdir/rd_elements_forms/rd_area_4_adddigitalaccount.html"
+
+ def form_valid(self, form):
+ form.instance.agency = self.request.user.profile.agency
+ if(self.request.FILES and self.request.FILES['vollmacht_doc']):
+ # Randomize File-Name keeping extension
+ file = self.request.FILES['vollmacht_doc']
+ file_ext_arr = file.name.split(".")
+ file_ext = file_ext_arr[len(file_ext_arr)-1]
+ file.name = randomString() + "." + file_ext
+ form.instance.vollmacht_doc = file
+ return super().form_valid(form)
+
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context.update({'active_link' : 'recoverdir'})
+ return context
+
+################################################## HISTORY ELEMENT VIEW ##########################################
# Persönliches Schreiben
@@ -812,10 +881,28 @@ class StreamingSingleHistory(DetailView):
})
return context
-
-
-
-
+# Digitaler Account
+class DigitalAccountSingleHistory(DetailView):
+ model = DigitalAccounts
+ template_name = 'recoverdir/rd_elements_forms/rd_area_4_digitalaccount_single.html'
+
+ # Gewünschte Revision aufrufen
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context.update({'active_link' : 'recoverdir'})
+
+ historyelements = DigitalAccounts.objects.get(pk=self.kwargs['pk']).history.all()
+
+ shown_element = None
+ for he in historyelements:
+ if he.pk == self.kwargs["rev"]:
+ shown_element = he
+
+ context.update({
+ 'account' : shown_element,
+ 'history' : True
+ })
+ return context
diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
index 0069dbf..b61647c 100644
Binary files a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc and b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc differ
diff --git a/standards/templatetags/counter_tag.py b/standards/templatetags/counter_tag.py
index 2dc8276..212dcd6 100644
--- a/standards/templatetags/counter_tag.py
+++ b/standards/templatetags/counter_tag.py
@@ -792,6 +792,9 @@ def getHistoryClassOfObject(value):
elif(objectClass == 'HistoricalStreamingAbo'):
finalclass[0] = "Streaming-Abo"
finalclass[1] = 9
+ elif(objectClass == 'HistoricalDigitalAccounts'):
+ finalclass[0] = "Onine-Account"
+ finalclass[1] = 10
return finalclass
|