DigitaleAgentur___ALT
/
digitaleagenturnc
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bereich 2 angefangen

This commit is contained in:
holger.trampe 2020-10-06 10:55:34 +02:00
parent 045ddffd39
commit 99f06a0ca5
13 changed files with 453 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
recoverdir/forms.py
View File

@ -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)

84
recoverdir/models.py
View File

@ -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)

6
recoverdir/templates/recoverdir/rd_areas/rd_area_1.html
View File

@ -22,7 +22,7 @@
<tbody >
{% for familyc in area_1_fc %}
<tr>
<td>{{familyc.rd_prename}} {{familyc.rd_postname}}</td>
<td><a href="{% url 'rd-a1-viewcontact' familyc.pk %}">{{familyc.rd_prename}} {{familyc.rd_postname}}</a></td>
<td>{{familyc.rd_rel}}</td>
<td>{{familyc.rd_adresse}}</td>
<td>{{familyc.rd_tel}}</td>
@ -53,7 +53,7 @@
<tbody >
{% for trust in area_1_trust %}
<tr>
<td>{{trust.rd_prename}} {{trust.rd_postname}}</td>
<td><a href="{% url 'rd-a1-viewtrust' trust.pk %}">{{trust.rd_prename}} {{trust.rd_postname}}</a></td>
<td>{{trust.rd_company}}</td>
<td>{{trust.rd_adresse}}</td>
<td>{{trust.rd_tel}}</td>
@ -69,7 +69,7 @@
<hr>
<h4>Vorsorgedokumente
<a class="btn btn-primary btn mb-3" href="{% url 'rd-a1-adddoc' %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Vorsorgedokument</a>
<a class="btn btn-primary btn mb-3" href="{% url 'rd-a1-adddoc' 1 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Vorsorgedokument</a>
</h4>
<table class="table table-hover" id="a1_docs" >
<thead>

62
recoverdir/templates/recoverdir/rd_areas/rd_area_2.html
View File

@ -1 +1,61 @@
ZWEITE
{% if area_2_hlfv == None %}
<a class="btn btn-primary btn" href="{% url 'rd-a2-hlfv' %}"><i class="fas fa-plus"></i>&nbsp;Handlungsleitfaden Vorsorge & Finanzen</a>
{% else %}
<h4><a href="{% url 'rd-a2-hlfv-update' area_2_hlfv.pk %}">Handlungsleitfaden für Vorsorge & Finanzen bearbeiten</a></h4>
{% endif %}
<hr>
<hr>
<h4>Wertpapiere, Versicherungsscheine & Altersvorsorge
<a class="btn btn-primary btn mb-3" href="{% url 'rd-a1-adddoc' 2 %}" style="float: right;"><i class="fas fa-plus"></i>&nbsp;Dokument</a>
</h4>
<table class="table table-hover" id="a2_docs" >
<thead>
<tr>
<th scope="col">Name</th>
<th scope="col">Datum</th>
<th scope="col">Beschreibung</th>
<th scope="col">&nbsp;</th>
</tr>
</thead>
<tbody >
{% for doc in area_2_doc %}
<tr>
<td><a href="{% url 'rd-a1-viewdoc' doc.pk %}" target="_blank">{{doc.document_name}}</a></td>
<td>{{doc.document_date|date:"d.m.Y"}}</td>
<td>{{doc.document_desc}}</td>
<td>
<a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a1-viewdoc' doc.pk %}"><i class="far fa-eye"></i></a>&nbsp;
<a style="float: right" class="btn btn-secondary btn-sm mr-2 " href="{% url 'rd-a1-updatedoc' doc.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-a1-deldoc' doc.pk %}"><small><i class="fas fa-trash"></i></small></a>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<script type="text/javascript">
$(document).ready(function(){
$('#a2_docs').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>

3
recoverdir/templates/recoverdir/rd_doc_single.html
View File

@ -2,13 +2,14 @@
{% block content %}
{% if request.user.profile.agency.module_recoverdir %}
<div class="content-section col-12">
<h3>Dokumentenansicht
<h3>Dokumentenansicht {% if history == True %} - Version vom {{document.history_date|date:"d.m.Y"}}{% endif %}
<span style="float: right">
<a href="{% url 'recoverdir'%}" style="float: right" class="btn btn-secondary btn-sm "><small><i class="fas fa-chevron-circle-left"></i></small></a>
</span>
</h3>
<hr>
<h4>Beschreibung</h4>
<p>{{document.document_name}}</p>
<p>{{document.document_desc}}</p>
<p>Datum: {{document.document_date}}</p>
<hr>

5
recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_adddoc.html
View File

@ -3,7 +3,7 @@
{% block content %}
{% if request.user.profile.agency.module_recoverdir %}
<div class="content-section col-9">
<h3>Vorsorgedokument hinzufügen</h3>
<h3>Dokument bearbeiten</h3>
<hr>
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
@ -11,7 +11,7 @@
{{ form|crispy }}
<hr>
<a class="btn" href="{% url 'recoverdir' %} ">Abbrechen</a>
<button type="submit" class="btn btn-primary" style="float: right;">Vorsorgedokument speichern</button>&nbsp;
<button type="submit" class="btn btn-primary" style="float: right;">Dokument speichern</button>&nbsp;
</form>
</div>
<script type="text/javascript">
@ -20,6 +20,7 @@ $("#id_document").on("change", function(){
filetype = $("#id_document")[0]['files'][0]['type'];
$("#id_document_name").val(filename.split(".")[0]);
})
</script>
{% else %}
<h3>Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.</h3>

2
recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html
View File

@ -2,7 +2,7 @@
{% block content %}
{% if request.user.profile.agency.module_recoverdir %}
<div class="content-section col-12">
<h3>Familien- und Freundekontakt
<h3>Familien- und Freundekontakt {% if history == True %} - Version vom {{contact.history_date|date:"d.m.Y"}}{% endif %}
<span style="float: right">
<a href="{% url 'recoverdir'%}" style="float: right" class="btn btn-secondary btn-sm "><small><i class="fas fa-chevron-circle-left"></i></small></a>
</span>

41
recoverdir/templates/recoverdir/rd_elements_forms/rd_area_2_addhlvf.html Normal file
View File

@ -0,0 +1,41 @@
{% extends "users/base.html" %}
{% load crispy_forms_tags %}
{% block content %}
{% if request.user.profile.agency.module_recoverdir %}
<div class="content-section col-9">
<h3>Handlungsleitfaden Vorsroge und Finanzen bearbeiten</h3>
<hr>
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
{{form.media}}
<h4>1. Daten des zuständigen Versicherungsberaters</h4>
{{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}}
<hr>
<h4>2. Daten des zuständigen Finanzberaters</h4>
{{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}}
<hr>
<h4>3. Rechtsschutzversicherer</h4>
{{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}}
<hr>
<a class="btn" href="{% url 'recoverdir' %} ">Abbrechen</a>
<button type="submit" class="btn btn-primary" style="float: right;">Handlungsleitfaden Vorsorge und Finanzen speichern</button>&nbsp;
</form>
</div>
{% else %}
<h3>Das Modul Notfallhilfe wurden in ihrer Agentur deaktiviert.</h3>
{% endif %}
{% endblock content %}

41
recoverdir/templates/recoverdir/rd_updates.html
View File

@ -8,16 +8,45 @@
<th scope="col">Handlung</th>
</tr>
</thead>
<!--
1 = Familien/Freundekontakt
2 = Vertrauensperson
3 = Handlungsleitfaden
4 = Persönliches Schreiben
5 = Handlungsleitfaden Vorsorge und Finanzen
-->
<tbody>
{% for ele in history %}
{% for plver in ele.history.all %}
{% for rdele in ele.history.all %}
<tr>
<td>
{% getClassOfObject plver as plver_typ %}
{{plver}} {{plver_typ}}</td>
<td>{{plver.history_date|date:"d.m.Y H:i"}}</td>
{% getHistoryClassOfObject rdele as hisotryelementinfo %}
{% if hisotryelementinfo.1 == 1 %}
<a href="{% url 'recoverdir-contact-historysingle' ele.pk rdele.pk %}">{{hisotryelementinfo.0}}</a>
{% elif hisotryelementinfo.1 == 2 %}
<!-- TASK: Hier Einzelansicht HL hinzufügen -->
<a href="#">{{hisotryelementinfo.0}}</a>
{% elif hisotryelementinfo.1 == 3 %}
<!-- TASK: Hier Einzelansicht persönliches Schreiben hinzufpgen -->
<a href="#">{{hisotryelementinfo.0}}</a>
{% elif hisotryelementinfo.1 == 4 %}
<a href="{% url 'recoverdir-plsingle' ele.pk rdele.pk %}">{{hisotryelementinfo.0}}</a>
<!-- TASK: Hier Einzelansicht HLVF hinzufügen -->
{% elif hisotryelementinfo.1 == 5 %}
<a href="#">{{hisotryelementinfo.0}}</a>
{% endif %}
</td>
<td>{{rdele.history_date|date:"d.m.Y H:i"}}</td>
<td>
{% 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 %}
</td>
<td>{% if plver.history_type == "~" %} Geändert {% elif plver.history_type == "+" %} Erstellt {% elif plver.history_type == "-"%} Gelöscht {% endif %}
<td>{% if rdele.history_type == "~" %} Geändert {% elif rdele.history_type == "+" %} Erstellt {% elif rdele.history_type == "-"%} Gelöscht {% endif %}
</tr>
{% endfor %}
{% endfor %}

28
recoverdir/urls.py
View File

@ -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/<int:pk>', permission_required('users.recoverdirmanager')(RecoverDirUpdatePL.as_view(template_name="recoverdir/rd_pers_update.html")), name='recoverdir-updatepl'),
path('pl/ver/<int:pk>/<int:rev>', 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/<int:pk>', 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/<int:pk>', permission_required('users.recoverdirmanager')(RDAoneViewContact.as_view()), name='rd-a1-viewcontact'),
path('aone/fc/del/<int:pk>', permission_required('users.recoverdirmanager')(RDAoneDelContact.as_view()), name='rd-a1-delcontact'),
path('aone/fc/update/<int:pk>', 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/<int:pk>', permission_required('users.recoverdirmanager')(RDAoneViewTrust.as_view()), name='rd-a1-viewtrust'),
path('aone/trust/del/<int:pk>', permission_required('users.recoverdirmanager')(RDAoneDelTrust.as_view()), name='rd-a1-deltrust'),
path('aone/trust/update/<int:pk>', 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/<int:area>', permission_required('users.recoverdirmanager')(RDAoneAddDoc.as_view()), name='rd-a1-adddoc'),
path('aone/doc/<int:pk>', permission_required('users.recoverdirmanager')(RDAoneViewDoc.as_view()), name='rd-a1-viewdoc'),
path('aone/doc/del/<int:pk>', permission_required('users.recoverdirmanager')(RDAoneDelDoc.as_view()), name='rd-a1-deldoc'),
path('aone/doc/update/<int:pk>', 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/<int:pk>', permission_required('users.recoverdirmanager')(RDAtwoUpdateFV.as_view()), name='rd-a2-hlfv-update'),
# HISTORY VIEWS
# Persönliches Schreiben
path('pl/ver/<int:pk>/<int:rev>', permission_required('users.recoverdirmanager')(PLSingleHistory.as_view()), name='recoverdir-plsingle'),
# Familien Freundekontakt
path('contact/ver/<int:pk>/<int:rev>', permission_required('users.recoverdirmanager')(ContactSingleHistory.as_view()), name='recoverdir-contact-historysingle'),
# Dokument
#path('doc/ver/<int:pk>/<int:rev>', permission_required('users.recoverdirmanager')(DocumentSingleHistory.as_view()), name='recoverdir-document-historysingle'),
]

154
recoverdir/views.py
View File

@ -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

BIN
standards/templatetags/__pycache__/counter_tag.cpython-38.pyc
View File

Binary file not shown.

41
standards/templatetags/counter_tag.py
View File

@ -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