From de959c5ec0137f18ea977f97c441fbee936c0ba0 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 5 Oct 2020 19:30:53 +0200 Subject: [PATCH] Erste Ansicht fertig --- recoverdir/forms.py | 2 +- recoverdir/templates/.DS_Store | Bin 0 -> 6148 bytes recoverdir/templates/recoverdir/.DS_Store | Bin 0 -> 6148 bytes .../recoverdir/rd_areas/rd_area_1.html | 28 ++++-- .../templates/recoverdir/rd_doc_del.html | 20 ++++ .../rd_area_1_contact_del.html | 20 ++++ .../rd_area_1_contact_single.html | 36 +++++++ .../rd_area_1_trust_del.html | 20 ++++ .../rd_area_1_trust_single.html | 36 +++++++ recoverdir/templates/recoverdir/rd_rd.html | 36 ++++--- recoverdir/urls.py | 19 +++- recoverdir/views.py | 93 +++++++++++++++++- 12 files changed, 283 insertions(+), 27 deletions(-) create mode 100644 recoverdir/templates/.DS_Store create mode 100644 recoverdir/templates/recoverdir/.DS_Store create mode 100644 recoverdir/templates/recoverdir/rd_doc_del.html create mode 100644 recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html create mode 100644 recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html create mode 100644 recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html create mode 100644 recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html diff --git a/recoverdir/forms.py b/recoverdir/forms.py index 025ee80..50ceca6 100644 --- a/recoverdir/forms.py +++ b/recoverdir/forms.py @@ -80,7 +80,7 @@ class DocumentForm(forms.ModelForm): class Meta: model = Documents - fields = ['document_desc', 'document_date', 'document_name','document', 'area'] + fields = ['document_desc', 'document_date', 'document', 'document_name','area'] labels = { 'document_desc' : "Dokumentbeschreibung", 'document_date' : "Datum", diff --git a/recoverdir/templates/.DS_Store b/recoverdir/templates/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..90c316d25d64b9edc97b6b9f4511d637cf5e1466 GIT binary patch literal 6148 zcmeHKOKL(v5UfsINZh#0a<1SF2GJ9E0U=5Vh=LH;Z zJYFqczXo8-_uT@R1DMhs@!?@?e(pZ9hsqd{&O0vHoU0CB=} z7}qgN5Su56y>LimhGt16Ce>=hu%t8Js;(CfiAjgm@L~02s|m&8>Ab&1IjkotN&zWw ztH5J!=idL<^dIK`TatECKnnaT1#Gg~td@MG>aC-f^IqHNTe{bL(%rZY3PZGGVzgs! gyd6JBQPwqI^Sl=hi9u&R=tTVtxGpj&@Yf1_0qsc@vj6}9 literal 0 HcmV?d00001 diff --git a/recoverdir/templates/recoverdir/.DS_Store b/recoverdir/templates/recoverdir/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..75078b09a96bfed07f8c2daaa79be81e0c6fc544 GIT binary patch literal 6148 zcmeHKyH3ME5S)V)mS{ppdB4CPoTBgrd;l+pD#215dUyObvk#<12Bo8bS!r*4yE}LB z6y7X=vU=}tfhB;BZio+C=4N^GnO$VWu=p8!Z19A!A78e!>hA-_?XX9W2QrWN&%@wn zTxW8FEf3$(-*CXl@>dMZ?czEs=Wmcn0VyB_q<|EV0%sJ+e%W1}sZ&}CNP+*SfPEh- z-LNH2f&S^>;v)cY!LS>jeU>0r3lLl46vzmz1eF-nk|Rb5I^#9#TH+KKbQHgt=j6>L zCzRs1GhV$Mr3Gr00#e{qfy>w~t^eQAf0+MIN!m#PDe$KhD2w&|dc{}D-a30Z>$R2s sNdGd{dN~(w#YAt#+*m8VIjXDn%zR6n0-esd(~0^cV7kbpz;7t<2}BPcIRF3v literal 0 HcmV?d00001 diff --git a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html index aee45f5..139186b 100644 --- a/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html +++ b/recoverdir/templates/recoverdir/rd_areas/rd_area_1.html @@ -26,7 +26,11 @@ {{familyc.rd_rel}} {{familyc.rd_adresse}} {{familyc.rd_tel}} -   + +   +   + + {% endfor %} @@ -47,13 +51,17 @@ - {% for familyc in area_1_trust %} + {% for trust in area_1_trust %} - {{familyc.rd_prename}} {{familyc.rd_postname}} - {{familyc.rd_company}} - {{familyc.rd_adresse}} - {{familyc.rd_tel}} -   + {{trust.rd_prename}} {{trust.rd_postname}} + {{trust.rd_company}} + {{trust.rd_adresse}} + {{trust.rd_tel}} + +   +   + + {% endfor %} @@ -79,9 +87,9 @@ {{doc.document_date|date:"d.m.Y"}} {{doc.document_desc}} -   -   - +   +   + {% endfor %} diff --git a/recoverdir/templates/recoverdir/rd_doc_del.html b/recoverdir/templates/recoverdir/rd_doc_del.html new file mode 100644 index 0000000..9f079af --- /dev/null +++ b/recoverdir/templates/recoverdir/rd_doc_del.html @@ -0,0 +1,20 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +{% if request.user.profile.agency.module_recoverdir %} +
+

Dokument löschen

+
+
+ {% csrf_token %} + {{ form|crispy }} + Möchten Sie {{document.document_name}} wirklich endgültig löschen? +
+ Abbrechen +   +
+
+{% else %} +

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+{% endif %} +{% endblock content %} 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 new file mode 100644 index 0000000..9081d62 --- /dev/null +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_del.html @@ -0,0 +1,20 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +{% if request.user.profile.agency.module_recoverdir %} +
+

Familien- und Freundekontakt löschen

+
+
+ {% csrf_token %} + {{ form|crispy }} + Möchten Sie den Kontakt {{contact.rd_prename}} {{contact.rd_postname}} wirklich endgültig löschen? +
+ Abbrechen +   +
+
+{% else %} +

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+{% endif %} +{% endblock content %} 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 new file mode 100644 index 0000000..1ff6b79 --- /dev/null +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_contact_single.html @@ -0,0 +1,36 @@ +{% extends "users/base.html" %} +{% block content %} +{% if request.user.profile.agency.module_recoverdir %} +
+

Familien- und Freundekontakt + + + +

+
+

Kontaktdaten

+ + + + + + + + + + + + + + + + + + +
Name:{{contact.rd_prename}} {{contact.rd_postname}}
Beziehung:{{contact.rd_rel}}
Adresse:{{contact.rd_adresse}}
Telefonnummer:{{contact.rd_tel}}
+
+
+{% else %} +

Auf dieses Modul haben Sie keinen Zugriff!

+{% endif %} +{% endblock content %} \ No newline at end of file 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 new file mode 100644 index 0000000..bef759f --- /dev/null +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_del.html @@ -0,0 +1,20 @@ +{% extends "users/base.html" %} +{% load crispy_forms_tags %} +{% block content %} +{% if request.user.profile.agency.module_recoverdir %} +
+

Vertrauensperson löschen

+
+
+ {% csrf_token %} + {{ form|crispy }} + Möchten Sie die Vertrauensperson {{contact.rd_prename}} {{contact.rd_postname}} wirklich endgültig löschen? +
+ Abbrechen +   +
+
+{% else %} +

Das Modul Notfallordner wurden in ihrer Agentur deaktiviert.

+{% endif %} +{% endblock content %} 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 new file mode 100644 index 0000000..f18c2ca --- /dev/null +++ b/recoverdir/templates/recoverdir/rd_elements_forms/rd_area_1_trust_single.html @@ -0,0 +1,36 @@ +{% extends "users/base.html" %} +{% block content %} +{% if request.user.profile.agency.module_recoverdir %} +
+

Vertrauensperson + + + +

+
+

Kontaktdaten

+ + + + + + + + + + + + + + + + + + +
Name:{{contact.rd_prename}} {{contact.rd_postname}}
Firma:{{contact.rd_company}}
Adresse:{{contact.rd_adresse}}
Telefonnummer:{{contact.rd_tel}}
+
+
+{% else %} +

Auf dieses Modul haben Sie keinen Zugriff!

+{% endif %} +{% endblock content %} \ No newline at end of file diff --git a/recoverdir/templates/recoverdir/rd_rd.html b/recoverdir/templates/recoverdir/rd_rd.html index 76bc076..c4259a4 100644 --- a/recoverdir/templates/recoverdir/rd_rd.html +++ b/recoverdir/templates/recoverdir/rd_rd.html @@ -24,14 +24,16 @@ margin-top: 13px; } +.tabelement { +}
- @@ -54,7 +56,7 @@
- @@ -76,7 +78,7 @@
- @@ -98,7 +100,7 @@
- @@ -122,7 +124,7 @@
- @@ -144,7 +146,7 @@
- @@ -166,7 +168,7 @@
- @@ -188,7 +190,7 @@
- @@ -210,7 +212,7 @@
- @@ -227,11 +229,19 @@
- -
- - + diff --git a/recoverdir/urls.py b/recoverdir/urls.py index 27d296f..0d73755 100644 --- a/recoverdir/urls.py +++ b/recoverdir/urls.py @@ -14,10 +14,25 @@ urlpatterns = [ 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'), - 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/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'), + + 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'), + + 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'), + 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'), + ] \ No newline at end of file diff --git a/recoverdir/views.py b/recoverdir/views.py index ae6c77b..46edc5b 100644 --- a/recoverdir/views.py +++ b/recoverdir/views.py @@ -159,6 +159,42 @@ class RDAoneViewDoc(DetailView): template_name = 'recoverdir/rd_doc_single.html' context_object_name = 'document' +class RDAoneDelDoc(DeleteView): + model = Documents + success_url = reverse_lazy('recoverdir') + template_name = 'recoverdir/rd_doc_del.html' + context_object_name = 'document' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + return context + +class RDAoneUpdateDoc(UpdateView): + model = Documents + success_url = reverse_lazy('recoverdir') + form_class = DocumentForm + 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 + file = self.request.FILES['document'] + file_ext_arr = file.name.split(".") + file_ext = file_ext_arr[len(file_ext_arr)-1] + file.name = randomString() + "." + file_ext + form.instance.document = 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 + # Handlungsleitfaden # ABNSCHNITT 1 class RDAoneAddHL(CreateView): @@ -187,7 +223,7 @@ class RDAoneUpdateHL(UpdateView): context.update({'active_link' : 'recoverdir'}) return context - +# FAMILIEN class RDAoneAddFC(CreateView): model = RDContact success_url = reverse_lazy('recoverdir') @@ -203,8 +239,53 @@ class RDAoneAddFC(CreateView): context.update({'active_link' : 'recoverdir'}) return context +class RDAoneUpdateContact(UpdateView): + model = RDContact + success_url = reverse_lazy('recoverdir') + form_class = RDContactF + template_name = "recoverdir/rd_elements_forms/rd_area_1_addfc.html" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + return context +class RDAoneViewContact(DetailView): + model = RDContact + success_url = reverse_lazy('recoverdir') + template_name = 'recoverdir/rd_elements_forms/rd_area_1_contact_single.html' + context_object_name = 'contact' + +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 get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + return context + + +# VERTRAUENSPERSON +class RDAoneViewTrust(DetailView): + model = RDTrustPerson + success_url = reverse_lazy('recoverdir') + template_name = 'recoverdir/rd_elements_forms/rd_area_1_trust_single.html' + context_object_name = 'contact' + +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 get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + return context class RDAoneAddTrust(CreateView): model = RDTrustPerson @@ -221,6 +302,16 @@ class RDAoneAddTrust(CreateView): context.update({'active_link' : 'recoverdir'}) return context +class RDAoneUpdateTrust(UpdateView): + model = RDTrustPerson + success_url = reverse_lazy('recoverdir') + form_class = RDTrustPersonF + template_name = "recoverdir/rd_elements_forms/rd_area_1_addtrust.html" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'recoverdir'}) + return context