diff --git a/recoverdir/forms.py b/recoverdir/forms.py index f44387e..b41d5e4 100644 --- a/recoverdir/forms.py +++ b/recoverdir/forms.py @@ -42,6 +42,44 @@ class HLForm(forms.ModelForm): 'rv_tel_1' : "Telefon 1", 'rv_tel_2' : "Telefon 2" } +# Handlungsleitfaden Vorsorge und Finanzen +class HLFVForm(forms.ModelForm): + + class Meta: + model = HandlungsleitfadenVF + fields = ['vf_ver_company','vf_ver_name','vf_ver_street','vf_ver_plzcity','vf_ver_tel','vf_ver_mail','vf_fb_company','vf_fb_name','vf_fb_street','vf_fb_plzcity','vf_fb_tel','vf_fb_mail','vf_rv_name','vf_rv_number','vf_rv_tel_1','vf_rv_tel_2'] + + labels = { + 'vf_ver_company' : "Firma", + 'vf_ver_name' : 'Name', + 'vf_ver_street' : "Straße und Hausnummer", + 'vf_ver_plzcity' : "PLZ und Ort", + 'vf_ver_tel' : "Telefon", + 'vf_ver_mail' : "E-Mail", + 'vf_fb_company' : "Firma", + 'vf_fb_name' : "Name", + 'vf_fb_street' : "Straße und Hausnummer", + 'vf_fb_plzcity': "PLZ und Ort", + 'vf_fb_tel' : "Telefon", + 'vf_fb_mail' : "E-Mail", + 'vf_rv_name' : "Name", + 'vf_rv_number' : "Versicherungsnummer", + 'vf_rv_tel_1' : "Telefon 1", + 'vf_rv_tel_2' : "Telefon 2" + } + + + + + def __init__(self, *args, **kwargs): + super(HLFVForm, self).__init__(*args, **kwargs) + + + + + + + class RDContactF(forms.ModelForm): @@ -88,7 +126,7 @@ class DocumentForm(forms.ModelForm): 'document' : "Dokument" } widgets = { - 'document_date': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}) + 'document_date': DatePickerInput(options={"format":'DD.MM.YYYY', "locale":'de'}) } def __init__(self, *args, **kwargs): super(DocumentForm, self).__init__(*args, **kwargs) diff --git a/recoverdir/models.py b/recoverdir/models.py index 5a6be12..5246da4 100644 --- a/recoverdir/models.py +++ b/recoverdir/models.py @@ -27,6 +27,8 @@ class PersLetter(models.Model): history = HistoricalRecords() # Notfallhilfe Datenfelder + +# AREA 1 # Handlungsleitfaden class Handlungsleitfaden(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) @@ -55,6 +57,7 @@ class RDContact(models.Model): rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) history = HistoricalRecords() +# Vertrauensperson class RDTrustPerson(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) @@ -64,6 +67,7 @@ class RDTrustPerson(models.Model): rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) history = HistoricalRecords() +# DOKUMENTE ALLGEMEIN class Documents(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) area = models.IntegerField(default=0) @@ -71,7 +75,87 @@ class Documents(models.Model): document_name = encrypt(models.CharField(max_length=500, blank=False, default="", null=False)) document_date = encrypt(models.DateField(default=timezone.now, blank=True, null=True)) document = EncryptedFileField(upload_to=rd_path_agency, blank=True) + #history = HistoricalRecords() + + +# AREA 2 +# Handlungsleitfaden Vorsorge und Finanzen +class HandlungsleitfadenVF(models.Model): + agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) + vf_ver_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_ver_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_ver_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_ver_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_ver_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_ver_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True)) + + vf_fb_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_fb_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_fb_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_fb_plzcity = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_fb_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_fb_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True)) + + vf_rv_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_rv_number = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_rv_tel_1 = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vf_rv_tel_2 = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + history = HistoricalRecords() + +# Bankvollmacht +class DepositVollmacht(models.Model): + agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) + geber_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + geber_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + geber_bank = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + + nehmer_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + nehmer_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + nehmer_geb = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + nehmer_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + vollmacht_doc = EncryptedFileField(upload_to=rd_path_agency, blank=True) + +class ErgoVerDir(models.Model): + agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) + ergo_username = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + ergo_password = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + +class OnlineBank(models.Model): + agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) + web_address = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + web_username = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + web_password = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + accountactivity = encrypt(models.CharField(max_length=5000, blank=True, default="", null=True)) + vollmacht_doc = EncryptedFileField(upload_to=rd_path_agency, blank=True) + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html index 139186b..6f499c9 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html @@ -22,7 +22,7 @@ {% for familyc in area_1_fc %} - {{familyc.rd_prename}} {{familyc.rd_postname}} + {{familyc.rd_prename}} {{familyc.rd_postname}} {{familyc.rd_rel}} {{familyc.rd_adresse}} {{familyc.rd_tel}} @@ -53,7 +53,7 @@ {% for trust in area_1_trust %} - {{trust.rd_prename}} {{trust.rd_postname}} + {{trust.rd_prename}} {{trust.rd_postname}} {{trust.rd_company}} {{trust.rd_adresse}} {{trust.rd_tel}} @@ -69,7 +69,7 @@

Vorsorgedokumente - Vorsorgedokument + Vorsorgedokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html index db79ceb..a15aa20 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html @@ -1 +1,61 @@ -ZWEITE \ No newline at end of file +{% if area_2_hlfv == None %} + Handlungsleitfaden Vorsorge & Finanzen +{% else %} +

Handlungsleitfaden für Vorsorge & Finanzen bearbeiten

+{% endif %} +
+
+

Wertpapiere, Versicherungsscheine & Altersvorsorge + Dokument +

+
+ + + + + + + + + + {% for doc in area_2_doc %} + + + + + + + {% endfor %} + +
NameDatumBeschreibung 
{{doc.document_name}}{{doc.document_date|date:"d.m.Y"}}{{doc.document_desc}} +   +   + +
+ \ No newline at end of file diff --git a/recoverdir/templates/recoverdir/rd_doc_single.html b/recoverdir/templates/recoverdir/rd_doc_single.html index b570e62..aa79eb0 100644 --- a/recoverdir/templates/recoverdir/rd_doc_single.html +++ b/recoverdir/templates/recoverdir/rd_doc_single.html @@ -2,13 +2,14 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Dokumentenansicht +

Dokumentenansicht {% if history == True %} - Version vom {{document.history_date|date:"d.m.Y"}}{% endif %}

Beschreibung

+

{{document.document_name}}

{{document.document_desc}}

Datum: {{document.document_date}}

diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html index 990d52c..faef1af 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html @@ -3,7 +3,7 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Vorsorgedokument hinzufügen

+

Dokument bearbeiten

{% csrf_token %} @@ -11,7 +11,7 @@ {{ form|crispy }}
Abbrechen -   +  
{% else %}

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html index 1ff6b79..3692386 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html @@ -2,7 +2,7 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Familien- und Freundekontakt +

Familien- und Freundekontakt {% if history == True %} - Version vom {{contact.history_date|date:"d.m.Y"}}{% endif %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html new file mode 100644 index 0000000..6ae9603 --- /dev/null +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html @@ -0,0 +1,41 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +{% if request.user.profile.agency.module_recoverdir %} +
+

Handlungsleitfaden Vorsroge und Finanzen bearbeiten

+
+
+ {% csrf_token %} + {{form.media}} + +

1. Daten des zuständigen Versicherungsberaters

+ {{form.vf_ver_company|as_crispy_field}} + {{form.vf_ver_name|as_crispy_field}} + {{form.vf_ver_street|as_crispy_field}} + {{form.vf_ver_plzcity|as_crispy_field}} + {{form.vf_ver_tel|as_crispy_field}} + {{form.vf_ver_mail|as_crispy_field}} +
+

2. Daten des zuständigen Finanzberaters

+ {{form.vf_fb_company|as_crispy_field}} + {{form.vf_fb_name|as_crispy_field}} + {{form.vf_fb_street|as_crispy_field}} + {{form.vf_fb_plzcity|as_crispy_field}} + {{form.vf_fb_tel|as_crispy_field}} + {{form.vf_fb_mail|as_crispy_field}} +
+

3. Rechtsschutzversicherer

+ {{form.vf_rv_name|as_crispy_field}} + {{form.vf_rv_number|as_crispy_field}} + {{form.vf_rv_tel_1|as_crispy_field}} + {{form.vf_rv_tel_2|as_crispy_field}} +
+ Abbrechen +   +
+
+{% else %} +

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

+{% endif %} +{% endblock content %} diff --git a/recoverdir/templates/recoverdir/rd_updates.html b/recoverdir/templates/recoverdir/rd_updates.html index 7489dbc..7016e4f 100644 --- a/recoverdir/templates/recoverdir/rd_updates.html +++ b/recoverdir/templates/recoverdir/rd_updates.html @@ -8,16 +8,45 @@ Handlung + {% for ele in history %} - {% for plver in ele.history.all %} + {% for rdele in ele.history.all %} - {% getClassOfObject plver as plver_typ %} - {{plver}} {{plver_typ}} - {{plver.history_date|date:"d.m.Y H:i"}} + {% getHistoryClassOfObject rdele as hisotryelementinfo %} + + {% if hisotryelementinfo.1 == 1 %} + {{hisotryelementinfo.0}} + + {% elif hisotryelementinfo.1 == 2 %} + + {{hisotryelementinfo.0}} + + {% elif hisotryelementinfo.1 == 3 %} + + {{hisotryelementinfo.0}} + + {% elif hisotryelementinfo.1 == 4 %} + {{hisotryelementinfo.0}} + + + {% elif hisotryelementinfo.1 == 5 %} + {{hisotryelementinfo.0}} + + {% endif %} + + {{rdele.history_date|date:"d.m.Y H:i"}} - {% gethistoryuser plver.history_user_id as history_user %} + {% gethistoryuser rdele.history_user_id as history_user %} {% if history_user != None %} {{history_user.get_full_name}} @@ -25,7 +54,7 @@ Gelöschter Nutzer {% endif %} - {% if plver.history_type == "~" %} Geändert {% elif plver.history_type == "+" %} Erstellt {% elif plver.history_type == "-"%} Gelöscht {% endif %} + {% if rdele.history_type == "~" %} Geändert {% elif rdele.history_type == "+" %} Erstellt {% elif rdele.history_type == "-"%} Gelöscht {% endif %} {% endfor %} {% endfor %} diff --git a/recoverdir/urls.py b/recoverdir/urls.py index 0d73755..0eb1b24 100644 --- a/recoverdir/urls.py +++ b/recoverdir/urls.py @@ -11,28 +11,46 @@ 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'), + + # Persönliches Schreiben path('addpl/', permission_required('users.recoverdirmanager')(RecoverDirAddPL.as_view(template_name="recoverdir/rd_pers_add.html")), name='recoverdir-addpl'), path('updatepl/', permission_required('users.recoverdirmanager')(RecoverDirUpdatePL.as_view(template_name="recoverdir/rd_pers_update.html")), name='recoverdir-updatepl'), - path('pl/ver//', permission_required('users.recoverdirmanager')(PLSingle.as_view(template_name="recoverdir/rd_persletter_single.html")), name='recoverdir-plsingle'), + + # Handlungsleitfaden path('aone/hl/add', permission_required('users.recoverdirmanager')(RDAoneAddHL.as_view()), name='rd-a1-hl'), path('aone/hl/update/', permission_required('users.recoverdirmanager')(RDAoneUpdateHL.as_view()), name='rd-a1-hl-update'), - + # FAMILIEN/FREUNDEKONTAKT path('aone/fc/add', permission_required('users.recoverdirmanager')(RDAoneAddFC.as_view()), name='rd-a1-addfamily'), path('aone/fc/', permission_required('users.recoverdirmanager')(RDAoneViewContact.as_view()), name='rd-a1-viewcontact'), path('aone/fc/del/', permission_required('users.recoverdirmanager')(RDAoneDelContact.as_view()), name='rd-a1-delcontact'), path('aone/fc/update/', permission_required('users.recoverdirmanager')(RDAoneUpdateContact.as_view()), name='rd-a1-updatecontact'), - + # VERTRAUENSPERSON path('aone/trust/add', permission_required('users.recoverdirmanager')(RDAoneAddTrust.as_view()), name='rd-a1-addtrust'), path('aone/trust/', permission_required('users.recoverdirmanager')(RDAoneViewTrust.as_view()), name='rd-a1-viewtrust'), path('aone/trust/del/', permission_required('users.recoverdirmanager')(RDAoneDelTrust.as_view()), name='rd-a1-deltrust'), path('aone/trust/update/', permission_required('users.recoverdirmanager')(RDAoneUpdateTrust.as_view()), name='rd-a1-updatetrust'), - - path('aone/doc/add', permission_required('users.recoverdirmanager')(RDAoneAddDoc.as_view()), name='rd-a1-adddoc'), + #DOCUMENTS URLS + path('aone/doc/add/', permission_required('users.recoverdirmanager')(RDAoneAddDoc.as_view()), name='rd-a1-adddoc'), path('aone/doc/', permission_required('users.recoverdirmanager')(RDAoneViewDoc.as_view()), name='rd-a1-viewdoc'), path('aone/doc/del/', permission_required('users.recoverdirmanager')(RDAoneDelDoc.as_view()), name='rd-a1-deldoc'), path('aone/doc/update/', permission_required('users.recoverdirmanager')(RDAoneUpdateDoc.as_view()), name='rd-a1-updatedoc'), + # Handlungsleitfaden Vorsroge und Finanzen + path('atwo/hlfv/add', permission_required('users.recoverdirmanager')(RDAtwoAddHLFV.as_view()), name='rd-a2-hlfv'), + path('atwo/hlfv/update/', permission_required('users.recoverdirmanager')(RDAtwoUpdateFV.as_view()), name='rd-a2-hlfv-update'), + + + # HISTORY VIEWS + # Persönliches Schreiben + path('pl/ver//', permission_required('users.recoverdirmanager')(PLSingleHistory.as_view()), name='recoverdir-plsingle'), + # Familien Freundekontakt + path('contact/ver//', permission_required('users.recoverdirmanager')(ContactSingleHistory.as_view()), name='recoverdir-contact-historysingle'), + # Dokument + #path('doc/ver//', permission_required('users.recoverdirmanager')(DocumentSingleHistory.as_view()), name='recoverdir-document-historysingle'), + + + ] \ No newline at end of file diff --git a/recoverdir/views.py b/recoverdir/views.py index 11375b1..025fca0 100644 --- a/recoverdir/views.py +++ b/recoverdir/views.py @@ -28,17 +28,20 @@ class RecoverDirManagement(LoginRequiredMixin, ListView): context.update({'persletter' : persletter}) # Load Update-Historys + # AREA 1 persletters = PersLetter.objects.filter(agency=self.request.user.profile.agency) handlungsleitfaden = Handlungsleitfaden.objects.filter(agency=self.request.user.profile.agency) contactfc = RDContact.objects.filter(agency=self.request.user.profile.agency) contactstrust = RDTrustPerson.objects.filter(agency=self.request.user.profile.agency) - documents = Documents.objects.filter(agency=self.request.user.profile.agency, area=1) - finalupdatelist = chain(persletters, handlungsleitfaden, contactfc, contactstrust, documents) + # DOCUMENTS NOT WORKING Weil das "alte" nicht gespeichert wird sondern lediglich der Datensatz + #documents = Documents.objects.filter(agency=self.request.user.profile.agency, area=1) + + # AREA 2 + handlungsleitfadenvf = HandlungsleitfadenVF.objects.filter(agency=self.request.user.profile.agency) + + finalupdatelist = chain(persletters, handlungsleitfaden, contactfc, contactstrust, handlungsleitfadenvf) context.update({"history" : finalupdatelist}) - - print(finalupdatelist) - # Bereich 1 - Handlungsleitfaden ########## ########## ########## ########## ########## ########## # Handlungsleitfaden hl = Handlungsleitfaden.objects.filter(agency=self.request.user.profile.agency) @@ -54,34 +57,20 @@ class RecoverDirManagement(LoginRequiredMixin, ListView): # Vertrauensperson context.update({'area_1_trust' : RDTrustPerson.objects.filter(agency=self.request.user.profile.agency)}) + hlfv = HandlungsleitfadenVF.objects.filter(agency=self.request.user.profile.agency) + if(len(hlfv) == 1): + hlfv = HandlungsleitfadenVF.objects.filter(agency=self.request.user.profile.agency)[0] + else: + hlfv = None + context.update({'area_2_hlfv' : hlfv}) + # Dokumente + # A1 context.update({'area_1_doc' : Documents.objects.filter(agency=self.request.user.profile.agency, area=1).order_by('-document_date')}) + # A2 + context.update({'area_2_doc' : Documents.objects.filter(agency=self.request.user.profile.agency, area=2).order_by('-document_date')}) - - return context - - -class PLSingle(DetailView): - model = PersLetter - template_name = 'recoverdir/rd_persletter_single.html' - context_object_name = 'persletter' - - # Gewünschte Revision aufrufen - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context.update({'active_link' : 'recoverdir'}) - - historyelements = PersLetter.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({ - 'historyelement' : shown_element, - }) return context class RecoverDirAddPL(CreateView): @@ -136,7 +125,7 @@ class RDAoneAddDoc(CreateView): def form_valid(self, form): form.instance.agency = self.request.user.profile.agency - form.instance.area = 1 + form.instance.area = self.kwargs["area"] # Randomize File-Name keeping extension file = self.request.FILES['document'] @@ -152,6 +141,7 @@ class RDAoneAddDoc(CreateView): context.update({'active_link' : 'recoverdir'}) return context + # Einzeldokumentenanzeige class RDAoneViewDoc(DetailView): model = Documents @@ -177,8 +167,6 @@ class RDAoneUpdateDoc(UpdateView): template_name = "recoverdir/rd_elements_forms/rd_area_1_adddoc.html" def form_valid(self, form): - form.instance.agency = self.request.user.profile.agency - form.instance.area = 1 if(self.request.FILES and self.request.FILES['document']): # Randomize File-Name keeping extension @@ -313,6 +301,108 @@ class RDAoneUpdateTrust(UpdateView): context.update({'active_link' : 'recoverdir'}) return context +########################## ABSCHNITT 2 ################################## +# Handlungsleitfaden Finanzen und Vorsorge +class RDAtwoAddHLFV(CreateView): + model = HandlungsleitfadenVF + success_url = reverse_lazy('recoverdir') + form_class = HLFVForm + template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html" + + def form_valid(self, form): + form.instance.agency = self.request.user.profile.agency + 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 RDAtwoUpdateFV(UpdateView): + model = HandlungsleitfadenVF + success_url = reverse_lazy('recoverdir') + form_class = HLFVForm + template_name = "recoverdir/rd_elements_forms/rd_area_2_addhlvf.html" + + 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 +class PLSingleHistory(DetailView): + model = PersLetter + template_name = 'recoverdir/rd_persletter_single.html' + context_object_name = 'persletter' + + # Gewünschte Revision aufrufen + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + + historyelements = PersLetter.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({ + 'historyelement' : shown_element, + }) + return context + +# CONTACT +class ContactSingleHistory(DetailView): + model = RDContact + template_name = 'recoverdir/rd_elements_forms/rd_area_1_contact_single.html' + + # Gewünschte Revision aufrufen + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + + historyelements = RDContact.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({ + 'contact' : shown_element, + 'history' : True + }) + return context + +# DOCUMENT +class DocumentSingleHistory(DetailView): + model = Documents + template_name = 'recoverdir/rd_doc_single.html' + + # Gewünschte Revision aufrufen + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + + historyelements = Documents.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({ + 'document' : 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 ba12a7b..f48fdb7 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 566146e..5a1f533 100644 --- a/standards/templatetags/counter_tag.py +++ b/standards/templatetags/counter_tag.py @@ -742,9 +742,46 @@ def gethistoryuser(userid): last_user = None return last_user +''' + + Gibt den Klassentyp als String für den Bereich Notfallhilfe, Aktualisierung als Array zurück. Der zweite Parameter definiert, welche Historical-View aufgerufen wird + + 0 = Dokument + 1 = Familien/Freundekontakt + 2 = Vertrauensperson + 3 = Handlungsleitfaden + 4 = Persönliches Schreiben + +''' @register.simple_tag -def getClassOfObject(value): - return value.__class__.__name__ +def getHistoryClassOfObject(value): + finalclass = [0,1] + finalclass[0] = "" + finalclass[1] = "" + objectClass = value.__class__.__name__ + + print(objectClass) + + if(objectClass == 'HistoricalDocuments'): + finalclass[0] = "Dokument" + finalclass[1] = 0 + elif(objectClass == 'HistoricalRDContact'): + finalclass[0] = "Familien-/Freundekontakt" + finalclass[1] = 1 + elif(objectClass == 'HistoricalRDTrustPerson'): + finalclass[0] = "Vertrauensperson" + finalclass[1] = 2 + elif(objectClass == 'HistoricalHandlungsleitfaden'): + finalclass[0] = "Handlungsleitfaden" + finalclass[1] = 3 + elif(objectClass == 'HistoricalPersLetter'): + finalclass[0] = "Persönliches Schreiben" + finalclass[1] = 4 + elif(objectClass == 'HistoricalHandlungsleitfadenVF'): + finalclass[0] = "Handlungsleitfaden Vorsorge und Finanzen" + finalclass[1] = 5 + + return finalclass