From 3783e5de4402e0b22106c40af4fb9e41bdeb3a02 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sat, 18 Apr 2020 12:41:31 +0200 Subject: [PATCH] =?UTF-8?q?Kategorien=20fertig=20Bug=20bei=20Upload=20f?= =?UTF-8?q?=C3=BCr=20QS=20Ersetzlogik=20fertig=20Kleinigkeiten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cloud/templates/cloud/cloud_main.html | 128 +++++++++++-- cloud/views.py | 56 ++++-- .../dasettings/agencynetwork_content.html | 2 +- dasettings/templates/dasettings/settings.html | 75 ++++---- .../dasettings/structure_content.html | 2 +- .../__pycache__/settings.cpython-38.pyc | Bin 3891 -> 3891 bytes digitaleagentur/settings.py | 49 +++-- message/views.py | 4 + organizer/forms.py | 32 +++- organizer/models.py | 9 +- .../organizer/cat_confirm_delete.html | 25 +++ organizer/templates/organizer/cat_update.html | 19 ++ .../templates/organizer/category_add.html | 19 ++ .../organizer/category_management.html | 82 ++++++++ .../templates/organizer/contacts_content.html | 135 +++++++------ .../organizer/contacts_content_OLD.html | 180 ++++++++++++++++++ .../organizer/organizer_management.html | 2 +- .../organizer/passwords_content.html | 6 +- .../organizer/quicklinks_content.html | 2 - organizer/urls.py | 8 +- organizer/views.py | 78 +++++++- .../standards/agencynetwork_content.html | 2 +- .../templates/standards/standards_add.html | 86 ++++++++- .../standards/standards_from_agn.html | 36 +++- .../standards/standards_management.html | 18 +- .../templates/standards/standards_update.html | 98 +++++++++- .../__pycache__/counter_tag.cpython-38.pyc | Bin 5450 -> 5494 bytes standards/templatetags/counter_tag.py | 4 +- standards/views.py | 5 +- 29 files changed, 966 insertions(+), 196 deletions(-) create mode 100644 organizer/templates/organizer/cat_confirm_delete.html create mode 100644 organizer/templates/organizer/cat_update.html create mode 100644 organizer/templates/organizer/category_add.html create mode 100644 organizer/templates/organizer/category_management.html create mode 100644 organizer/templates/organizer/contacts_content_OLD.html diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html index 2475b3f..7eeb711 100644 --- a/cloud/templates/cloud/cloud_main.html +++ b/cloud/templates/cloud/cloud_main.html @@ -159,6 +159,8 @@ a.disabled { gespeichert.

+
+Erlaubte Dateitypen: Office- und OpenOffice-Formate, PNG, JPG/JPEG, SVG, FLV, Videoformate, EPS. Maximale Uploadgröße: 2 GB {% endif %} @@ -198,7 +200,7 @@ a.disabled {
- Mit löschen fortfahren? Alle Dateien in diesem Verzeichnis werden ebenfalls gelöscht! + Mit dem Löschen fortfahren? Alle Dateien in diesem Verzeichnis werden ebenfalls gelöscht!
   @@ -213,13 +215,13 @@ a.disabled {
- +
-
- Diesen Dateitypen dürfen Sie nicht hochladen. +
+ Die Datei konnte nicht hochgeladen werden. Bitte prüfen Sie die erlaubten Dateitypen und den verfügbaren Speicherplatz. Andernfalls melden Sie sich bei unserem Support support@digitale-agentur.com!
@@ -433,11 +435,37 @@ a.disabled {
Datei wird hochgeladen... +
+
+
+ + + + + + +{% else %} +

Das Modul Organizer wurden in ihrer Agentur deaktiviert.

+{% endif %} +{% endblock content %} diff --git a/organizer/templates/organizer/contacts_content.html b/organizer/templates/organizer/contacts_content.html index cc8aadc..94cc04b 100644 --- a/organizer/templates/organizer/contacts_content.html +++ b/organizer/templates/organizer/contacts_content.html @@ -3,42 +3,63 @@
- {% if user|usergperm:"moduleorganizer" %} -  Kontakt + {% if user|usergperm:"moduleorganizer" %} +  Kontakt +  Kategorien {% endif %} -
- -
-
+
- - {% for agc in contacts %} - -
-
-
{{agc.company}} - -
-

- {% if agc.personname|length > 0 %} - Ansprechpartner: {{agc.personname}}
+

+ + + + + + + + {% if user|usergperm:"moduleorganizer" %} + {% endif %} - {% if agc.mail|length > 0 %} - E-Mailadresse: {{agc.mail}}
- {% endif %} - {% if agc.phone1|length > 0 %} - Telefon 1: {{agc.phone1}} - {% endif %} -

- - {% if user|usergperm:"moduleorganizer" %} - - - {% endif %} - - + + + + {% for agc in contacts %} + + + + + + + + {% endfor %} + +
FirmaE-MailTelefonKategorie 
+ {{agc.company}} + + {% if agc.mail|length > 0 %} + {{agc.mail}}
+ {% endif %} + 		+ {% if agc.phone1|length > 0 %} + {{agc.phone1}} + {% endif %} + + {% if agc.category != None%} {{agc.category}} {% endif%} + + {% if user|usergperm:"moduleorganizer" %} +
+ +
+ Bearbeiten +
+ Löschen +
+
+ {% endif %} +
- {% endfor %}
@@ -80,30 +101,36 @@
{% endfor %} + diff --git a/organizer/templates/organizer/contacts_content_OLD.html b/organizer/templates/organizer/contacts_content_OLD.html new file mode 100644 index 0000000..3b77e40 --- /dev/null +++ b/organizer/templates/organizer/contacts_content_OLD.html @@ -0,0 +1,180 @@ +{% load counter_tag %} + +
+
+
+ {% if user|usergperm:"moduleorganizer" %} +  Kontakt +  Kategorien + {% endif %} +
+
+ +
+ +
+
+ +
+ +
+ + + + + + + + {% if user|usergperm:"moduleorganizer" %} + + {% endif %} + + + + {% for agc in contacts %} + + + + + + + {% endfor %} + +
FirmaE-MailTelefon 
+ {{agc.company}} + + {% if agc.mail|length > 0 %} + {{agc.mail}}
+ {% endif %} + 		+ {% if agc.phone1|length > 0 %} + {{agc.phone1}} + {% endif %} + + {% if user|usergperm:"moduleorganizer" %} +
+ +
+ Bearbeiten +
+ Löschen +
+
+ {% endif %} +
+
+
+
+ +
+
+{% for agc in contacts %} + +{% endfor %} + + + + diff --git a/organizer/templates/organizer/organizer_management.html b/organizer/templates/organizer/organizer_management.html index b586b04..32ac8a1 100644 --- a/organizer/templates/organizer/organizer_management.html +++ b/organizer/templates/organizer/organizer_management.html @@ -71,7 +71,7 @@ $(document).ready(function(){ if($('#' + activeTab).find().prevObject.length != 0){ $('#' + activeTab).tab('show'); $(".nav-link").removeClass("active"); - $("#" + activeTab + "-tab").addClass("active"); + $("#" + activeTab + "-tab").addClass("active"); } else{ $("#quicklinks-tab").addClass("active"); diff --git a/organizer/templates/organizer/passwords_content.html b/organizer/templates/organizer/passwords_content.html index 1623ba1..4dc371d 100644 --- a/organizer/templates/organizer/passwords_content.html +++ b/organizer/templates/organizer/passwords_content.html @@ -49,14 +49,14 @@ {{ap.link}} {{ap.agpass_username }} - + ********* -     - +     + diff --git a/organizer/templates/organizer/quicklinks_content.html b/organizer/templates/organizer/quicklinks_content.html index 7c2bee6..f8d7331 100644 --- a/organizer/templates/organizer/quicklinks_content.html +++ b/organizer/templates/organizer/quicklinks_content.html @@ -3,8 +3,6 @@
 Quicklink - -
{% endif %} diff --git a/organizer/urls.py b/organizer/urls.py index 2fb2439..a0551b2 100644 --- a/organizer/urls.py +++ b/organizer/urls.py @@ -1,14 +1,18 @@ from django.urls import path from django.contrib.auth import views as auth_views from django.contrib.auth.decorators import login_required, permission_required -from .views import OrganizerManagement, OrganizerAdd, OrganizerDeleteView, OrganizerUpdateView, OrganizerAddContact, OrganizerDelContact, OrganizerUpdateContact, OrganizerAddPassword, OrganizerDelPassword, OrganizerUpdatePassword +from .views import OrganizerManagement, OrganizerAdd, OrganizerDeleteView, OrganizerUpdateView, OrganizerAddContact, OrganizerDelContact, OrganizerUpdateContact, OrganizerAddPassword, OrganizerDelPassword, OrganizerUpdatePassword, CategoryManagement, CategoryAdd, CategoryUpdateView, CategoryDeleteView from . import views ''' Permissions definiert in models.py bei USERS und dann hier vor die View geschrieben! ''' urlpatterns = [ path('', OrganizerManagement.as_view(template_name="organizer/organizer_management.html"), name='organizer-management'), - path('addql/', permission_required('users.moduleorganizer')(OrganizerAdd.as_view(template_name="organizer/ql_add.html")), name='ql-addql'), + path('category/', CategoryManagement.as_view(template_name="organizer/category_management.html"), name='category-management'), + path('addcat/', permission_required('users.moduleorganizer')(CategoryAdd.as_view(template_name="organizer/category_add.html")), name='ql-addcategory'), + path('addcat//delete', permission_required('users.moduleorganizer')(CategoryDeleteView.as_view()), name='ql-cat-delete'), + path('addcat//', permission_required('users.moduleorganizer')(CategoryUpdateView.as_view()), name='cat-update'), + path('addql/', permission_required('users.moduleorganizer')(OrganizerAdd.as_view(template_name="organizer/ql_add.html")), name='ql-addql'), path('addcontact/', permission_required('users.moduleorganizer')(OrganizerAddContact.as_view(template_name="organizer/contact_add.html")), name='addcontact'), path('addql//delete', permission_required('users.moduleorganizer')(OrganizerDeleteView.as_view()), name='ql-delete'), path('remco//delete', permission_required('users.moduleorganizer')(OrganizerDelContact.as_view()), name='cont-delete'), diff --git a/organizer/views.py b/organizer/views.py index 5c919ed..862fa77 100644 --- a/organizer/views.py +++ b/organizer/views.py @@ -1,8 +1,8 @@ from django.shortcuts import render from django.contrib.auth.mixins import LoginRequiredMixin from django.views.generic import CreateView, ListView, UpdateView, DetailView, DeleteView -from .models import QuickLinks, AGContacts, AGPassword -from .forms import OrganizerAddQlForm, OrganizerAddContact, OrganizerUpdateContact, AddAGPassword +from .models import QuickLinks, AGContacts, AGPassword, AGContactsCagetory +from .forms import OrganizerAddQlForm, OrganizerAddContact, OrganizerUpdateContact, AddAGPassword, OrganizerAddCategoryForm from django.contrib import messages from django.shortcuts import redirect from django.http import HttpResponse, HttpResponseRedirect, JsonResponse @@ -11,7 +11,63 @@ from django.urls import reverse_lazy from users.models import AgencyGroup -# Create your views here. + +class CategoryManagement(LoginRequiredMixin, ListView): + model = AGContactsCagetory + # Adding active_link + # Loading only user same agency + # Change context and return for template-data + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({'active_link' : 'organizer', 'categorys' : AGContactsCagetory.objects.filter(agency=self.request.user.profile.agency).order_by('name') }) + return context + +class CategoryAdd(LoginRequiredMixin, CreateView): + model = AGContactsCagetory + success_url = reverse_lazy('category-management') + form_class = OrganizerAddCategoryForm + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context.update({"active_link" : "organizer"}) + return context + + def form_valid(self, form): + messages.success(self.request, f'Kategorie angelegt!') + form.instance.agency = self.request.user.profile.agency + return super().form_valid(form) + +class CategoryUpdateView(LoginRequiredMixin, UpdateView): + model = AGContactsCagetory + template_name = 'organizer/cat_update.html' + success_url = reverse_lazy('category-management') + form_class = OrganizerAddCategoryForm + + def form_valid(self, form): + # Send message to the site + messages.success(self.request, f'Kategorie aktualisiert!') + return super().form_valid(form) + + def get_context_data(self, **kwargs): + context = super(CategoryUpdateView, self).get_context_data(**kwargs) + context['active_link'] = 'organizer' + return context + +class CategoryDeleteView(LoginRequiredMixin, DeleteView): + model = AGContactsCagetory + success_url = reverse_lazy('category-management') + template_name = 'organizer/cat_confirm_delete.html' + + def delete(self, request, *args, **kwargs): + response = super(CategoryDeleteView, self).delete(request, *args, **kwargs) + messages.success(request, f'Kategorie wurde gelöscht!') + return response + + def get_context_data(self, **kwargs): + context = super(CategoryDeleteView, self).get_context_data(**kwargs) + context['active_link'] = 'organizer' + return context + class OrganizerManagement(LoginRequiredMixin, ListView): model = QuickLinks # Adding active_link @@ -31,7 +87,7 @@ class OrganizerAdd(LoginRequiredMixin, CreateView): def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context.update({'active_link' : 'organizer'}) - return context + return get_context_data def form_valid(self, form): # Send message to the site @@ -84,7 +140,13 @@ class OrganizerAddContact(LoginRequiredMixin, CreateView): context = super().get_context_data(**kwargs) context.update({'active_link' : 'organizer'}) return context - + + # Pass User to Form to get only categorys from agency + def get_form_kwargs(self): + kwargs = super(OrganizerAddContact, self).get_form_kwargs() + kwargs.update({'user': self.request.user}) + return kwargs + def form_valid(self, form): # Send message to the site messages.success(self.request, f'Kontakt angelegt!') @@ -120,6 +182,12 @@ class OrganizerUpdateContact(LoginRequiredMixin, UpdateView): messages.success(self.request, f'Kontakt aktualisiert!') return super().form_valid(form) + # Pass User to Form to get only categorys from agency + def get_form_kwargs(self): + kwargs = super(OrganizerUpdateContact, self).get_form_kwargs() + kwargs.update({'user': self.request.user}) + return kwargs + def get_context_data(self, **kwargs): context = super(OrganizerUpdateContact, self).get_context_data(**kwargs) context['active_link'] = 'organizer' diff --git a/standards/templates/standards/agencynetwork_content.html b/standards/templates/standards/agencynetwork_content.html index 3d161ab..af4ebd8 100644 --- a/standards/templates/standards/agencynetwork_content.html +++ b/standards/templates/standards/agencynetwork_content.html @@ -24,7 +24,7 @@ {% ifaginadminagn agn.pk request.user.profile.agency.pk as is_adminag %} {{agn.name}} - {{agn.creator_agency.name }}  + {{agn.creator_agency.name }}  {{agn.lastactivity}} {{agsum}} {{agn.standards.all|length}} diff --git a/standards/templates/standards/standards_add.html b/standards/templates/standards/standards_add.html index 9d00160..d3e5d19 100644 --- a/standards/templates/standards/standards_add.html +++ b/standards/templates/standards/standards_add.html @@ -327,11 +327,35 @@
Datei wird hochgeladen... +
+
+
+ + +