diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 33991c0..1dbeb6c 100644 Binary files a/digitaleagentur/__pycache__/settings.cpython-38.pyc and b/digitaleagentur/__pycache__/settings.cpython-38.pyc differ diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index 791f3e0..328f000 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -207,6 +207,7 @@ STATICFILES_DIRS = (os.path.join(SITE_ROOT, 'users/static/'),) ############################# FÜR COMMIT SITE_ROOT = os.path.dirname(os.path.realpath(__file__)) + '/..' STATIC_ROOT = (os.path.join(SITE_ROOT, 'users/static/')) +#STATIC_ROOT = (os.path.join(BASE_DIR, 'users/static/')) #STATICFILES_DIRS = (os.path.join(SITE_ROOT, 'users/static/'),) diff --git a/recoverdir/forms.py b/recoverdir/forms.py index 7c5fc38..46799f2 100644 --- a/recoverdir/forms.py +++ b/recoverdir/forms.py @@ -51,15 +51,16 @@ class HLForm(forms.ModelForm): class Meta: model = Handlungsleitfaden - fields = ['rd_main','rd_prename','rd_postname','rd_street','rd_plz','rd_city','rd_tel','rd_mail','bvk_number','rv_name','rv_number','rv_tel_1','rv_tel_2'] + fields = ['rd_main','rd_name','rd_adresse','rd_tel','rd_mail','bvk_number','rv_name','rv_number','rv_tel_1','rv_tel_2'] labels = { 'rd_main' : "Zuständige RD", - 'rd_prename': "Vorname RD Leiter", - 'rd_postname' : "Nachname RD Leiter", - 'rd_street' : "RD Straße", - 'rd_plz' : "RD PLZ", - 'rd_city' : "RD Stadt", + 'rd_name': "Vor- und Nachname RD Leiter", + #'rd_prename': "Vorname RD Leiter", + #'rd_postname' : "Nachname RD Leiter", + 'rd_adresse' : "RD Adresse", + #'rd_plz' : "RD PLZ", + #'rd_city' : "RD Stadt", 'rd_tel' : "RD Telefon", 'rd_mail' : "RD E-Mail", 'bvk_number' : "BVK Nummer", @@ -73,19 +74,21 @@ 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'] + fields = ['vf_ver_company','vf_ver_name','vf_ver_adresse','vf_ver_tel','vf_ver_mail','vf_fb_company','vf_fb_name','vf_fb_adresse','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_adresse' : 'Adresse', + #'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_adresse' : "Adresse", + #'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", @@ -179,15 +182,17 @@ class RDContactF(forms.ModelForm): class Meta: model = RDContact - fields = ['rd_prename','rd_postname','rd_rel','rd_adresse','rd_tel'] - + fields = ['rd_name','rd_rel','rd_adresse','rd_tel', 'rd_mail'] + + labels = { - 'rd_prename' : "Vorname", - 'rd_postname' : "Nachname", + 'rd_name' : "Vor- und Nachname", 'rd_rel' : "Beziehung", 'rd_adresse' : "Adresse", + 'rd_mail' : "E-Mailadresse", 'rd_tel' : "Telefon" } + # ERgo Digitaler Versicherungsordern class ErgoVerDirF(forms.ModelForm): @@ -243,16 +248,16 @@ class RDTrustPersonF(forms.ModelForm): class Meta: model = RDTrustPerson - - fields = ['rd_prename','rd_postname','rd_company','rd_adresse','rd_tel'] - + + fields = ['rd_name','rd_company','rd_adresse','rd_tel', 'rd_mail'] labels = { - 'rd_prename' : "Vorname", - 'rd_postname' : "Nachname", + 'rd_name' : "Vor- und Nachname", 'rd_company' : "Firma", 'rd_adresse' : "Adresse", + 'rd_mail' : "E-Mailadresse", 'rd_tel' : "Telefon" } + # Banken usw. class DepositVollmachtF(forms.ModelForm): diff --git a/recoverdir/models.py b/recoverdir/models.py index e15c6dc..9de7752 100644 --- a/recoverdir/models.py +++ b/recoverdir/models.py @@ -39,11 +39,13 @@ class PersLetter(models.Model): class Handlungsleitfaden(models.Model): agency = models.ForeignKey(Agency, on_delete=models.CASCADE, null=True) rd_main = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) - rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) - rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) - rd_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) - rd_plz = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) - rd_city = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_street = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_plz = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_city = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_mail = encrypt(models.EmailField(max_length=500, blank=True, default="", null=True)) bvk_number = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) @@ -56,21 +58,24 @@ class Handlungsleitfaden(models.Model): # Contacts class RDContact(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)) - rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_prename = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_rel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + rd_mail = 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)) - rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + rd_name = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + #rd_postname = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_company = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_adresse = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) rd_tel = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) + rd_mail = encrypt(models.CharField(max_length=500, blank=True, default="", null=True)) history = HistoricalRecords() # DOKUMENTE ALLGEMEIN @@ -90,15 +95,17 @@ 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_adresse = 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_adresse = 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)) diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html index 9c04da6..30b4427 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html @@ -6,7 +6,7 @@ {% endif %}
-

Familie und Freunde +

Familie & Freunde {% if request.user.profile.showtooltips %} {% endif %}  Kontakt

@@ -16,16 +16,18 @@ + {% for familyc in area_1_fc %} - + +
Beziehung Adresse TelefonE-Mail  
{{familyc.rd_prename|default:""}} {{familyc.rd_postname|default:""}}{{familyc.rd_name|default:""}} {{familyc.rd_rel|default:""}} {{familyc.rd_adresse|default:""}} {{familyc.rd_tel|default:""}}{{familyc.rd_mail|default:""}}     @@ -37,7 +39,7 @@
-

Vertrauensperson +

Vertrauensperson {% if request.user.profile.showtooltips %} {% endif %}  Vertrauensperson

@@ -68,7 +70,7 @@
-

Vorsorgedokumente +

Vorsorgedokumente {% if request.user.profile.showtooltips %} {% endif %}  Vorsorgedokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html index 1a0a14f..3c340c4 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_2.html @@ -5,7 +5,7 @@ {% endif %}
-

Bank-, Konto- & Depot-Vollmachten +

Bank-, Konto- & Depot-Vollmachten{% if request.user.profile.showtooltips %} {% endif %}  Vollmacht

@@ -34,7 +34,7 @@
-

Digitaler Versicherungsordner +

Digitaler Versicherungsordner{% if request.user.profile.showtooltips %} {% endif %}  Zugangsdaten

@@ -60,7 +60,7 @@
-

Online-Banking +

Online-Banking{% if request.user.profile.showtooltips %} {% endif %}  Online-Banking

@@ -86,7 +86,7 @@
-

Wertpapiere, Versicherungsscheine & Altersvorsorge +

Wertpapiere, Versicherungsscheine & Altersvorsorge{% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html index 3bff7c3..afddb05 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_3.html @@ -1,4 +1,4 @@ -

Streaming Abonnements +

Streaming Abonnements{% if request.user.profile.showtooltips %} {% endif %}  Streaming-Abo

@@ -24,7 +24,7 @@
-

Verträge +

Verträge{% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html index d7966e6..9807552 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_4.html @@ -1,4 +1,4 @@ -

Online-Accounts (Messenger, E-Mail-Accounts, Social-Media etc.) +

Online-Accounts{% if request.user.profile.showtooltips %} {% endif %}  Online-Account

@@ -26,7 +26,7 @@
-

Dokumente +

Dokumente {% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html index 3de1714..cbd72ee 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_5.html @@ -1,4 +1,4 @@ -

Personal, interne und externe Partner inkl. Funktionen usw. +

Personal, interne & externe Partner inkl. Funktionen usw.{% if request.user.profile.showtooltips %} {% endif %}  Personal

@@ -42,7 +42,7 @@
-

Dokumente, Vertretungsregeln & Zugriffsberechtigungen +

Dokumente, Vertretungsregeln & Zugriffsberechtigungen {% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html index f5c94ed..bbc0e2b 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_6.html @@ -1,4 +1,4 @@ -

Bankkonten und Online-Bankzugänge +

Bankkonten & Online-Bankzugänge{% if request.user.profile.showtooltips %} {% endif %}  Online-Banking

@@ -22,7 +22,7 @@
-

Dokumente +

Dokumente {% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html index e7aa046..38ce011 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_7.html @@ -1,4 +1,4 @@ -

Verträge +

Verträge {% if request.user.profile.showtooltips %} {% endif %}  Vertrag

@@ -23,7 +23,7 @@ {% endfor %}
-

Dokumente +

Dokumente {% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html index caad609..861b312 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_8.html @@ -1,4 +1,4 @@ -

Digitale Accounts (Webseiten, E-Mail etc.) +

Digitale Accounts{% if request.user.profile.showtooltips %} {% endif %}  Account

@@ -26,7 +26,7 @@
-

Dokumente +

Dokumente{% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html index d628930..faa5734 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_9.html @@ -1,4 +1,4 @@ -

Sonstige Datenelemente +

Sonstige Datenelemente{% if request.user.profile.showtooltips %} {% endif %}  Information

@@ -24,7 +24,7 @@
-

Dokumente +

Dokumente {% if request.user.profile.showtooltips %} {% endif %}  Dokument

diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html index 9e8f59b..31f8738 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addfc.html @@ -3,7 +3,7 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Familien/Freundekontakt bearbeiten

+

Familien & Freundekontakt bearbeiten

{% csrf_token %} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html index 408ea21..c288c52 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_addhl.html @@ -11,18 +11,15 @@

Daten der Regionaldirektion

{{form.rd_main|as_crispy_field}} - {{form.rd_prename|as_crispy_field}} - {{form.rd_postname|as_crispy_field}} - {{form.rd_street|as_crispy_field}} - {{form.rd_plz|as_crispy_field}} - {{form.rd_city|as_crispy_field}} + {{form.rd_name|as_crispy_field}} + {{form.rd_adresse|as_crispy_field}} {{form.rd_tel|as_crispy_field}} {{form.rd_mail|as_crispy_field}}

BVK Mitgliedsnummer

{{form.bvk_number|as_crispy_field}}
-

Rechtsschutzersicherungsdaten

+

Rechtsschutzversicherungsdaten

{{form.rv_name|as_crispy_field}} {{form.rv_number|as_crispy_field}} {{form.rv_tel_1|as_crispy_field}} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html index 255b43e..f926bbe 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html @@ -3,12 +3,12 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Familien- und Freundekontakt löschen

+

Familien- & Freundekontakt löschen

{% csrf_token %} {{ form|crispy }} - Möchten Sie den Kontakt {{contact.rd_prename}} {{contact.rd_postname}} wirklich endgültig löschen? + Möchten Sie den Kontakt {{contact.rd_name}} wirklich endgültig löschen?
Abbrechen   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 3692386..c5f6926 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 {% if history == True %} - Version vom {{contact.history_date|date:"d.m.Y"}}{% endif %} +

Familien- & Freundekontakt {% if history == True %} - Version vom {{contact.history_date|date:"d.m.Y"}}{% endif %} @@ -12,7 +12,7 @@

- + @@ -26,6 +26,10 @@ + + + +
Name:{{contact.rd_prename}} {{contact.rd_postname}}{{contact.rd_name}}
Beziehung:Telefonnummer: {{contact.rd_tel}}
E-Mail:{{contact.rd_mail}}
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html index c74bcc2..0492c96 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_hl_single.html @@ -16,15 +16,11 @@ Name des RD-Leiters - {{hl.rd_prename|default:""}} {{hl.rd_postname|default:""}} + {{hl.rd_name|default:""}} - Straße RD - {{hl.rd_street|default:""}} - - - PLZ Ort - {{hl.rd_plz|default:""}} {{hl.rd_city|default:""}} + Adresse RD + {{hl.rd_adresse|default:""}} Telefon diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html index 9a82e8f..a4aa0d5 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html @@ -8,7 +8,7 @@ {% csrf_token %} {{ form|crispy }} - Möchten Sie die Vertrauensperson {{contact.rd_prename}} {{contact.rd_postname}} wirklich endgültig löschen? + Möchten Sie die Vertrauensperson {{contact.rd_name}} wirklich endgültig löschen?
Abbrechen   diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html index f57857f..9f05a45 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html @@ -12,7 +12,7 @@ - + @@ -26,6 +26,10 @@ + + + +
Name:{{contact.rd_prename}} {{contact.rd_postname}}{{contact.rd_name}}
Firma:Telefonnummer: {{contact.rd_tel}}
Telefonnummer:{{contact.rd_mail}}
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 index 6ae9603..6ffa611 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html @@ -3,7 +3,7 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Handlungsleitfaden Vorsroge und Finanzen bearbeiten

+

Handlungsleitfaden Vorsorge & Finanzen bearbeiten

{% csrf_token %} @@ -12,16 +12,14 @@

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_adresse|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_adresse|as_crispy_field}} {{form.vf_fb_tel|as_crispy_field}} {{form.vf_fb_mail|as_crispy_field}}
diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html index 08a8332..20d7f94 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_hl_single.html @@ -19,12 +19,8 @@ {{hlvf.vf_ver_name|default:""}} - Straße Nr. - {{hlvf.vf_ver_street|default:""}} - - - PLZ Ort - {{hlvf.vf_ver_plzcity|default:""}} + Adresse + {{hlvf.vf_ver_adresse|default:""}} Telefon @@ -47,14 +43,10 @@ {{hlvf.vf_fb_name|default:""}} - Straße Nr. - {{hlvf.vf_fb_street|default:""}} + Adresse + {{hlvf.vf_fb_adresse|default:""}} - - PLZ Ort - {{hlvf.vf_fb_plzcity|default:""}} - - + Telefon {{hlvf.vf_fb_tel|default:""}} diff --git a/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html b/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html index d1bac55..6b14e59 100644 --- a/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_mainlogin.html @@ -4,7 +4,7 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Notfallhilfe{% if request.user.profile.showtooltips %} {% endif %} +

Notfallhilfe {% if request.user.profile.showtooltips %} {% endif %}

diff --git a/recoverdir/templates/recoverdir/rd_external.html b/recoverdir/templates/recoverdir/rd_external.html index e5d5368..f2e02a6 100644 --- a/recoverdir/templates/recoverdir/rd_external.html +++ b/recoverdir/templates/recoverdir/rd_external.html @@ -4,26 +4,31 @@ +

Private Unterlagen

@@ -37,7 +43,7 @@

1. Notfallleitfaden & Vorsorgedokumente

-

#1

 +

1
@@ -60,7 +66,7 @@

2. Absicherung, Vermögen & Immobilien

-

#2

 +

2
@@ -82,7 +88,7 @@

3. Verträge

-

#3

 +

3
@@ -104,7 +110,7 @@

4. Digitale Konten & Passwörter

-

#4

 +

4
@@ -117,8 +123,9 @@ - - +
+

Gewerbliche Unterlagen

+
@@ -128,7 +135,7 @@

5. Vorsorgedokumente

-

#5

 +

5
@@ -147,10 +154,10 @@
-

#6

 +

6
@@ -172,7 +179,7 @@

7. Immobilien

-

#7

 +

7

 @@ -194,7 +201,7 @@

8. Verträge

-

#8

 +

8

 @@ -216,7 +223,7 @@

9. Sonstiges

-

#9

 +

9

 diff --git a/recoverdir/templates/recoverdir/rd_settings.html b/recoverdir/templates/recoverdir/rd_settings.html index 6762b31..10ccac7 100644 --- a/recoverdir/templates/recoverdir/rd_settings.html +++ b/recoverdir/templates/recoverdir/rd_settings.html @@ -3,7 +3,7 @@ {% block content %} {% if request.user.profile.agency.module_recoverdir %}
-

Einstellungen verwalten

+

Sicherheit

Beachten Sie bitte, dass dieses Passwort allen Personen sicher zugänglich gemacht werden muss, die auf die Notfallhilfe zugreifen können! Zusätzlich benötigen diese Personen den Sicherheitssschlüssel. Dieser wird automatisch generiert und kann nicht geändert werden. Sie finden den Sicherheitsschlüssel unter Notfallhilfe, Einstellungen. @@ -19,3 +19,8 @@

Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.

{% endif %} {% endblock content %} + diff --git a/recoverdir/templates/recoverdir/rd_viewsettings.html b/recoverdir/templates/recoverdir/rd_viewsettings.html index 0edabcc..91ae452 100644 --- a/recoverdir/templates/recoverdir/rd_viewsettings.html +++ b/recoverdir/templates/recoverdir/rd_viewsettings.html @@ -2,21 +2,25 @@

- - - - - - - - - -
Sicherheitsschlüssel (nicht veränderbar):{{rd_settings.recoverkey}}
Passwort für die Notfallhilfe:*************** -   -   -
-

-
+

Zugangsdaten

+ + + + + + + + + +
Sicherheitsschlüssel (nicht veränderbar):{{rd_settings.recoverkey}}
Passwort für die Notfallhilfe:*************** +   +   +
+
+

Externer Zugang

+

Um die Notfallhilfe Außenstehenden zur Verfügung zu stellen, leiten Sie diesen Link weiter: https://digitale-agentur.com/rd/recover. Geben Sie dort den Sicherheitsschlüssel und das Passwort ein! Stellen Sie sicher, dass diese Daten an einem sicheren Ort in Kopie vorliegen!

+

+