From 80f3ae6dff67023fbc0184a46f7d976270689997 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Fri, 4 Dec 2020 19:52:48 +0100 Subject: [PATCH] =?UTF-8?q?Agenturl=C3=B6schen=20Message=20hinzugef=C3=BCg?= =?UTF-8?q?t?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- adm/templates/adm/adm_admdelconfirm.html | 42 ++++++++++++++++++ adm/templates/adm/adm_agency_single.html | 8 +++- adm/templates/adm/adm_agencys.html | 8 ++++ adm/templates/adm/adm_base.html | 2 +- adm/templates/adm/adm_bills.html | 18 +------- adm/urls.py | 1 + adm/views.py | 15 +++++++ .../standards/agencynetwork_content.html | 6 ++- .../__pycache__/counter_tag.cpython-38.pyc | Bin 19372 -> 19509 bytes standards/templatetags/counter_tag.py | 16 ++++++- users/models.py | 4 +- users/signals.py | 6 +++ users/views.py | 29 ++++++------ 13 files changed, 119 insertions(+), 36 deletions(-) create mode 100644 adm/templates/adm/adm_admdelconfirm.html diff --git a/adm/templates/adm/adm_admdelconfirm.html b/adm/templates/adm/adm_admdelconfirm.html new file mode 100644 index 0000000..7b47108 --- /dev/null +++ b/adm/templates/adm/adm_admdelconfirm.html @@ -0,0 +1,42 @@ +{% extends "adm/adm_base.html" %} +{% block content %} +{% load adm_tags %} +{% load mathfilters %} +{% load humanize %} +{% load counter_tag %} +
+

Agentur löschen + + + +

+
+Sie sind im Begriff, die Agentur {{object.name}} zu löschen! Damit werden alle Daten der Agentur unwiderruflich entfernt. Möchten Sie fortfahren? +
+Bitte bestätigen! +
+ + +
+ +
+
+ {% csrf_token %} + Abbrechen + + + + +{% endblock content %} diff --git a/adm/templates/adm/adm_agency_single.html b/adm/templates/adm/adm_agency_single.html index 6624f16..e851a7f 100644 --- a/adm/templates/adm/adm_agency_single.html +++ b/adm/templates/adm/adm_agency_single.html @@ -3,7 +3,13 @@ {% load adm_tags %} {% getAgencyData agency as agdata %}
-

Agentur {{agency.name}}

+

Agentur {{agency.name}} + + + + + +

Daten der Agentur
diff --git a/adm/templates/adm/adm_agencys.html b/adm/templates/adm/adm_agencys.html index 909541d..d8772b3 100644 --- a/adm/templates/adm/adm_agencys.html +++ b/adm/templates/adm/adm_agencys.html @@ -11,6 +11,7 @@ + @@ -21,6 +22,13 @@ + {% endfor %} diff --git a/adm/templates/adm/adm_base.html b/adm/templates/adm/adm_base.html index b0de70f..6d03f8a 100644 --- a/adm/templates/adm/adm_base.html +++ b/adm/templates/adm/adm_base.html @@ -103,7 +103,7 @@
  • {%endif%} - + Rechnungen
    • diff --git a/adm/templates/adm/adm_bills.html b/adm/templates/adm/adm_bills.html index a2c196d..e748658 100644 --- a/adm/templates/adm/adm_bills.html +++ b/adm/templates/adm/adm_bills.html @@ -59,20 +59,4 @@ }); }) -{% endblock content %} - - \ No newline at end of file +{% endblock content %} \ No newline at end of file diff --git a/adm/urls.py b/adm/urls.py index c222535..d633db6 100644 --- a/adm/urls.py +++ b/adm/urls.py @@ -12,6 +12,7 @@ urlpatterns = [ path('ag/', AdmAgencys.as_view(), name="adm-agencys"), path('us/', AdmUsers.as_view(), name="adm-users"), path('agsingle/', AdmAgencySingle.as_view(), name="adm-agency-single"), + path('ad/del/', delAgency.as_view(), name='adm-agency-delete'), path('ag/bills/', AdmBills.as_view(), name="adm-bills"), path('usersingle/', AdmUserSingle.as_view(), name="adm-user-single"), path('cron/', statisticCronJob, name="adm-cron"), diff --git a/adm/views.py b/adm/views.py index 1c9d8ba..e298410 100644 --- a/adm/views.py +++ b/adm/views.py @@ -1,6 +1,7 @@ from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView, FormView, TemplateView from django.contrib import messages from django.shortcuts import render, redirect, reverse +from django.urls import reverse_lazy from django.conf import settings from django.http import HttpResponseRedirect,HttpResponse, JsonResponse from .models import MainStatistic @@ -49,7 +50,21 @@ def getCSVRDOrders(request): pass +class delAgency(DeleteView): + model = Agency + success_url = reverse_lazy("adm-agencys") + template_name = "adm/adm_admdelconfirm.html" + def delete(self, *args, **kwargs): + messages.success(self.request, f'Agentur erfolgreich gelöscht!') + return super(delAgency, self).delete(*args, **kwargs) + + def dispatch(self, *args, **kwargs): + if(checkForStuffUser(self.request)): + return super().dispatch(*args, **kwargs) + else: + messages.warning(self.request, f'Sie benötigen einen Mitarbeiter-Account, um diese Seiten aufzurufen!') + return redirect("login") ''' Hauptansicht Statisik diff --git a/standards/templates/standards/agencynetwork_content.html b/standards/templates/standards/agencynetwork_content.html index d17c233..244ed40 100644 --- a/standards/templates/standards/agencynetwork_content.html +++ b/standards/templates/standards/agencynetwork_content.html @@ -24,7 +24,11 @@ {% ifaginadminagn agn.pk request.user.profile.agency.pk as is_adminag %} - + diff --git a/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc b/standards/templatetags/__pycache__/counter_tag.cpython-38.pyc index 12080b964de1ed11bab35454861b4619a2361db4..41c5513f3dde2131fe7634274d77f653af88de12 100644 GIT binary patch delta 2848 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 eVnIj=-~>v6GN2ql;l_5>jl0ZL7SC8Yo&E
    Registriert am Mitarbeiter StandardsAbo
    {{ele.registerdate}} {{agdata.0}} {{agdata.1}} + {% if ele.paymentplan == 1 %} + Aktiv + {% else %} + - + {% endif %} +
    {{agn.name}}{{agn.creator_agency.name }}  + {% if agn.creator_agency == None %} + Agentur gelöscht + {% endif %} + {{agn.creator_agency.name }}  {{agn.lastactivity}} {{agsum}} {{agn.standards.all|length}}