From d422d4c5b992df48fcd5b7a9d40de9a614c29fc6 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Sun, 23 Feb 2020 11:23:58 +0100 Subject: [PATCH] =?UTF-8?q?Bugliste=20von=20Darius=20abgearbeitet,=20au?= =?UTF-8?q?=C3=9Fer=20Bug=20Profilbild=20(neu-Erstellung)=20und=20Agentur-?= =?UTF-8?q?Default-Bild?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 6 ++++++ cloud/templates/cloud/cloud_main.html | 7 ++----- dasettings/__pycache__/views.cpython-38.pyc | Bin 13020 -> 13040 bytes .../templates/dasettings/agency_content.html | 11 +---------- .../templates/dasettings/calc_content.html | 7 +++++++ .../templates/dasettings/groups_content.html | 11 +++++------ .../templates/dasettings/profil_content.html | 7 ++++--- dasettings/templates/dasettings/settings.html | 14 ++++++++++++++ dasettings/views.py | 6 +++--- media/userprofilepics/default.jpg | Bin 1871 -> 5787 bytes standards/__pycache__/views.cpython-38.pyc | Bin 9535 -> 9523 bytes standards/views.py | 2 +- users/models.py | 4 ++-- users/signals.py | 1 + users/templates/users/base.html | 4 +++- users/templates/users/searchres.html | 14 ++++++++++++-- users/usersforms.py | 2 +- users/views.py | 12 +++++++++--- 18 files changed, 71 insertions(+), 37 deletions(-) create mode 100644 dasettings/templates/dasettings/calc_content.html diff --git a/.gitignore b/.gitignore index 80ef707..86d22a8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,8 @@ media/agencymain/* !media/agencymain/default.jpg !media/agencymain/linkdefault.png +digitaleagentur/__pycache__/* + media/userprofilepics/* !media/userprofilepics/default.jpg media/uploadsCK/* @@ -40,5 +42,9 @@ notificsys/migrations/* !notificsys/migrations/__init__.py notificsys/__pycache__/* +dasettings/migrations/* +!dasettings/migrations/__init__.py +dasettings/__pycache__/* + orga/__pycache__/* diff --git a/cloud/templates/cloud/cloud_main.html b/cloud/templates/cloud/cloud_main.html index 7dd6315..0ee8057 100644 --- a/cloud/templates/cloud/cloud_main.html +++ b/cloud/templates/cloud/cloud_main.html @@ -3,9 +3,6 @@ {% load counter_tag %} {% load static %} {% block content %} - - - -
- +
+
{% endif %} -
-
Abrechnung
-

Kontostand: {{request.user.profile.agency.balance|floatformat:0}} €

-

Nächste Abbuchung am {{request.user.profile.agency.nextdebiting|date:"d.m.Y"}}

-

Max. Nutzungszeit:  {{request.user.profile.agency.balance|div:30|floatformat:0}} Monate

-

IBAN: DE4412345678912345

-

Laden Sie das Konto mit einem beliebigen Geldbetrag auf. Die Kosten belaufen sich auf 40 € pro Monat.

-
+
diff --git a/dasettings/templates/dasettings/calc_content.html b/dasettings/templates/dasettings/calc_content.html new file mode 100644 index 0000000..c251475 --- /dev/null +++ b/dasettings/templates/dasettings/calc_content.html @@ -0,0 +1,7 @@ +{% load mathfilters %} +{% load humanize %} +

Kontostand: {{request.user.profile.agency.balance|floatformat:0}} €

+

Nächste Abbuchung am {{request.user.profile.agency.nextdebiting|date:"d.m.Y"}}

+

Max. Nutzungszeit:  {{request.user.profile.agency.balance|div:30|floatformat:0}} Monate

+

IBAN: DE4412345678912345

+

Laden Sie das Konto mit einem beliebigen Geldbetrag auf. Die Kosten belaufen sich auf 30 € pro Monat zzgl. gebuchter Module.

diff --git a/dasettings/templates/dasettings/groups_content.html b/dasettings/templates/dasettings/groups_content.html index 432cbec..a9e3dc0 100644 --- a/dasettings/templates/dasettings/groups_content.html +++ b/dasettings/templates/dasettings/groups_content.html @@ -3,8 +3,6 @@ - -
@@ -24,14 +22,15 @@     + + {% if not aggroup.savefordel %} + {% endif %} + {% if not aggroup.savefordel %} {% endif %} - {% if aggroup.savefordel %} - - {% endif %} +
diff --git a/dasettings/templates/dasettings/profil_content.html b/dasettings/templates/dasettings/profil_content.html index 855b187..7a6e04d 100644 --- a/dasettings/templates/dasettings/profil_content.html +++ b/dasettings/templates/dasettings/profil_content.html @@ -87,7 +87,8 @@ type: "GET", url: "/dasettings/ajax", data:{ - action : "change_showtooltips" + action : "change_showtooltips", + newtoolvalue : $("#showtooltips").prop("checked") }, success: function( data ) { @@ -97,10 +98,10 @@ $("#toast_savecontent").html("Tooltipseinstellung erfolgreich gespeichert!"); if(data['data']['newttvalue']){ - $('*').tooltip("enable"); + $('*').tooltip("enable"); } else{ - $('*').tooltip("disable"); + $('*').tooltip("disable"); } } else{ diff --git a/dasettings/templates/dasettings/settings.html b/dasettings/templates/dasettings/settings.html index ecdd3dc..441ebdb 100644 --- a/dasettings/templates/dasettings/settings.html +++ b/dasettings/templates/dasettings/settings.html @@ -48,6 +48,11 @@ Agentur {% endif %} + {% if user|usergperm:"agencyinfo" %} +
  • + Abrechnung +
    • + {% endif %} {% if user|usergperm:"structuremanager" %}
  • Struktur @@ -92,6 +97,15 @@ {% include "dasettings/agency_content.html" %} {% endblock %}
    • + {% endif %} + {% if user|usergperm:"agencyinfo" %} +
    +
    Abrechnung 
    +
    + {% block calc_content %} + {% include "dasettings/calc_content.html" %} + {% endblock %} +
    {% endif %} {% if user|usergperm:"structuremanager" %}
    diff --git a/dasettings/views.py b/dasettings/views.py index ab270f9..02ffe3f 100644 --- a/dasettings/views.py +++ b/dasettings/views.py @@ -226,11 +226,11 @@ def SettingsAjaxRouter(request): elif request.method == 'GET' and request.GET['action'] == "change_showtooltips" : newtooltipvalue = False user = User.objects.get(pk=request.user.pk, profile__agency=request.user.profile.agency) - if user.profile.showtooltips: - user.profile.showtooltips = False - else: + if(request.GET['newtoolvalue'] == "true"): user.profile.showtooltips = True newtooltipvalue = True + else: + user.profile.showtooltips = False user.save() success = True data = {'newttvalue' : newtooltipvalue} diff --git a/media/userprofilepics/default.jpg b/media/userprofilepics/default.jpg index d47174033f6204d606cd8403cfcffac4d5a0e111..86489159e6f591b8af41b3fc11ecc9e7b2a08c6f 100644 GIT binary patch literal 5787 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 diff --git a/standards/__pycache__/views.cpython-38.pyc b/standards/__pycache__/views.cpython-38.pyc index dfc7d31fc19888a94fb3be7b3006465ddd928f13..6ba1f57153239f1bd86ad3e17e34e3100490b062 100644 GIT binary patch delta 46 ycmdn*wb_d|l$V!_0SIRL1jQL_$ delta 58 zcmdn&wcm?3l$V!_0SNAg`^0H& {% endif %} - + + + diff --git a/users/templates/users/searchres.html b/users/templates/users/searchres.html index 5b4479f..565655e 100644 --- a/users/templates/users/searchres.html +++ b/users/templates/users/searchres.html @@ -20,13 +20,23 @@ {% endif %}
    -

    Aufgaben

    +

    Tätigkeiten

    {% if res_tasks|length > 0 %} {% for s in res_tasks %}   {{s.name|striptags}}

    {% endfor %} {% else %} -

    Keine Ergebnisse in Aufgaben

    +

    Keine Ergebnisse in Tätigkeiten

    + {% endif %} + +
    +

    News

    + {% if res_news|length > 0 %} + {% for s in res_news %} +   {{s.name}}

    + {% endfor %} + {% else %} +

    Keine Ergebnisse in News

    {% endif %}
    diff --git a/users/usersforms.py b/users/usersforms.py index 485cd47..bccad41 100644 --- a/users/usersforms.py +++ b/users/usersforms.py @@ -149,7 +149,7 @@ class SupportForm(forms.Form): def __init__(self, user, *args, **kwargs): super().__init__(*args, **kwargs) user_name = user.first_name + " " + user.last_name - self.fields['name'] = forms.CharField(required=True, label="Ihr Name", initial=user_name) + self.fields['name'] = forms.CharField(required=True, label="Name", initial=user_name) self.fields['mail'] = forms.EmailField(required=True, label="E-Mail", initial=user.email) self.fields['problemconc'] = forms.CharField(required=True, label="Problemzusammenfassung") self.fields['problem'] = forms.CharField(required=True, widget=forms.Textarea, label="Ausführliche Beschreibung") diff --git a/users/views.py b/users/views.py index 252c44a..1912637 100644 --- a/users/views.py +++ b/users/views.py @@ -68,7 +68,7 @@ def toUpdate(request): # VERWALTUNG temgroup_verwaltung = Group(name=str(request.user.profile.agency.pk) + "_" + randomString(8)) temgroup_verwaltung.save() - temgroup_verwaltung_ag = AgencyGroup(savefordel=True, is_admin=True, group=temgroup_verwaltung, agency=request.user.profile.agency, agencygroupname="Verwaltung") + temgroup_verwaltung_ag = AgencyGroup(savefordel=True, is_admin=True, group=temgroup_verwaltung, agency=request.user.profile.agency, agencygroupname="Administratoren") temgroup_verwaltung_ag.save() print("default groups created...adding users...") users_of_agency = User.objects.filter(profile__agency__pk=request.user.profile.agency.pk) @@ -273,7 +273,7 @@ class UsersPermUpdateView(LoginRequiredMixin, View): user_tochange.user_permissions.add(tempperm) else: # Eingeloggter User darf sich nicht selbst die Userverwaltungsrechte entziehen - if user_tochange == request.user and ele[0]=='users_usermanagement': + if user_tochange == request.user and ele[0]=='usermanager': messages.warning(request, f'Benutzerverwaltungsrechte für {user_tochange.first_name} {user_tochange.last_name} kann nicht entfernt werden.') else: user_tochange.user_permissions.remove(tempperm) @@ -475,11 +475,17 @@ def GlobalSearch(request): searchfor = request.GET['searchstring'] ag = request.user.profile.agency.pk res_standard = Standards.objects.filter(agency__pk=ag, public=True).filter(name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(content__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(area__name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(task__name__icontains=searchfor) | Standards.objects.filter(agency__pk=ag, public=True).filter(created_standard_by__last_name__icontains=searchfor)|Standards.objects.filter(agency__pk=ag, public=True).filter(created_standard_by__first_name__icontains=searchfor) + + res_news = News.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) | News.objects.filter(agency__pk=ag).filter(content__icontains=searchfor) | News.objects.filter(agency__pk=ag).filter(created_by__last_name__icontains=searchfor)|News.objects.filter(agency__pk=ag).filter(created_by__first_name__icontains=searchfor) + + + res_areas = Areas.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) res_tasks = Tasks.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) |Tasks.objects.filter(agency__pk=ag).filter(area__name__icontains=searchfor) res_pers = User.objects.filter(profile__agency__pk=ag).filter(first_name__icontains=searchfor) | User.objects.filter(profile__agency__pk=ag).filter(last_name__icontains=searchfor) links = QuickLinks.objects.filter(agency__pk=ag).filter(name__icontains=searchfor) | QuickLinks.objects.filter(agency__pk=ag).filter(link__icontains=searchfor) - html = render_to_string('users/searchres.html', {'links': links, 'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers}) + + html = render_to_string('users/searchres.html', {'links': links, 'res_standard': res_standard, 'res_areas': res_areas, 'res_tasks': res_tasks, 'res_pers': res_pers, 'res_news' : res_news}) return HttpResponse(html) else: return HttpResponse("Request method is not a GET")