From b405019a35288b6ea0a392ff2cf95699499b2c1a Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Wed, 14 Apr 2021 15:47:42 +0200 Subject: [PATCH] Div. Bugs --- orga/__pycache__/views.cpython-38.pyc | Bin 3511 -> 3518 bytes orga/templates/orga/orga_single_aut.html | 4 +- orga/templates/orga/orga_single_ex.html | 4 +- orga/templates/orga/orga_single_rep.html | 4 +- .../templates/standards/standard_task.html | 4 +- .../standards/standard_task_user.html | 102 ++++++++ .../standards/standards_single_agn.html | 26 +- standards/urls.py | 1 + standards/views.py | 17 ++ .../templates/users/user_confirm_delete.html | 232 ++++++++++-------- users/views.py | 2 +- 11 files changed, 282 insertions(+), 114 deletions(-) create mode 100644 standards/templates/standards/standard_task_user.html diff --git a/orga/__pycache__/views.cpython-38.pyc b/orga/__pycache__/views.cpython-38.pyc index 83549c21a729024499731037292421bb190dce6e..5c3a69a70d62944d50535e438369571af69b440b 100644 GIT binary patch delta 59 zcmdlky-%7al$V!_0SFd6C`;JLqrnms(MhoReRgq90I{ NS(aF`IgmMx3jh_E6E*+< delta 52 zcmdldy -
{{task.name}}
 +
{{task.name}}
 {% endif %} @@ -32,7 +32,7 @@ {% for prio in prios %} {% if prio.task.area.pk == area.pk and prio.task.visible %}
-
{{prio.task.name}}
 +
{{prio.task.name}}
{% endif %} {% endfor %} diff --git a/orga/templates/orga/orga_single_ex.html b/orga/templates/orga/orga_single_ex.html index c0ce83b..e04afd9 100644 --- a/orga/templates/orga/orga_single_ex.html +++ b/orga/templates/orga/orga_single_ex.html @@ -23,7 +23,7 @@ {% isUserInEx task area user_id as checkIsUserEx %} {% if task.area.pk == area.pk and task.visible and checkIsUserEx %} {% endif %} {% endfor %} @@ -32,7 +32,7 @@ {% for prio in prios %} {% if prio.task.area.pk == area.pk and prio.task.visible %}
-
{{prio.task.name}}
 +
{{prio.task.name}}
{% endif %} {% endfor %} diff --git a/orga/templates/orga/orga_single_rep.html b/orga/templates/orga/orga_single_rep.html index 9dc41d2..38d16f2 100644 --- a/orga/templates/orga/orga_single_rep.html +++ b/orga/templates/orga/orga_single_rep.html @@ -22,7 +22,7 @@ {% isUserInRep task area user_id as checkIsUserRep %} {% if task.area.pk == area.pk and task.visible and checkIsUserRep %} {% endif %} @@ -32,7 +32,7 @@ {% for prio in prios %} {% if prio.task.area.pk == area.pk and prio.task.visible %}
-
{{prio.task.name}}
 +
{{prio.task.name}}
{% endif %} {% endfor %} diff --git a/standards/templates/standards/standard_task.html b/standards/templates/standards/standard_task.html index b2d2a9b..3fd82a2 100644 --- a/standards/templates/standards/standard_task.html +++ b/standards/templates/standards/standard_task.html @@ -8,7 +8,9 @@
  • {{taskname}}
    • -

    Standards aus dem Tätigkeitsbereich {{taskname}} des Bereichs {{areaname}}

    +

    Standards aus dem Tätigkeitsbereich {{taskname}} des Bereichs {{areaname}} +  Standard +

    diff --git a/standards/templates/standards/standard_task_user.html b/standards/templates/standards/standard_task_user.html new file mode 100644 index 0000000..79a08dd --- /dev/null +++ b/standards/templates/standards/standard_task_user.html @@ -0,0 +1,102 @@ +{% extends "users/base.html" %} +{% block content %} +
    + +

    Standards aus dem Tätigkeitsbereich {{taskname}} des Bereichs {{areaname}} von {{vieweduser.get_full_name}} +  Standard +

    +
    +
    +
    + + + + + + + + + + + + {% for item in standards_of_agency_task %} + {% if item.public or item.created_standard_by == user or perms.users.standardmanager %} + + + + + + + + + + {% endif %} + {% endfor %} +
    TitelErstellt vonErstellt amGeändert vonGeändert amÖffentlichkeitsstatus 
    {{item.name}}{{item.created_standard_by.first_name}} {{item.created_standard_by.last_name}}{{ item.created_standard_date|date:"d.m.Y, H:i"}}{{ item.last_modified_by.first_name }} {{ item.last_modified_by.last_name }}{{ item.last_modified_on|date:"d.m.Y, H:i"}}{{item.public|yesno:"Öffentlich,Nicht öffentlich"}} + {% if item.created_standard_by == user or perms.users.standardmanager %} + + + + + + + + + {% endif %} +
    +
    + + + +{% endblock content %} diff --git a/standards/templates/standards/standards_single_agn.html b/standards/templates/standards/standards_single_agn.html index c20d030..016cb57 100644 --- a/standards/templates/standards/standards_single_agn.html +++ b/standards/templates/standards/standards_single_agn.html @@ -25,11 +25,7 @@
    - {% if standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.addedfiles.all|length > 0 or standard.linked_standards.all|length > 0 or standard.freefield_title|length > 0 %}
    - {% else %} -
    - {% endif %}

    @@ -39,6 +35,26 @@

    +
    +
    +
    Struktur
    +

    +

    Dieser Standard könnte wie folgt eingeordnet werden:

    + + + + + + + + + +
    Bereich:{{standard.area.name}}
    Tätigkeit:  {{standard.task.name}}
    +

    +
    +
    + + {% if standard.freefield_title|length > 0 %}
    @@ -49,7 +65,7 @@
    {% endif %} - + diff --git a/standards/urls.py b/standards/urls.py index cff200a..041839c 100644 --- a/standards/urls.py +++ b/standards/urls.py @@ -22,6 +22,7 @@ urlpatterns = [ path('standard///singleagn', views.StandardSingleAgn, name="standard-single-agn"), path('standard//area', views.StandardArea, name="standard-area"), path('standard//task', views.StandardTask, name="standard-task"), + path('standard//task/', views.StandardTaskUser, name="standard-task-user"), path('standardsagn/', views.StandardFromAgn, name="standard-agn"), path('standardcopy/', views.CopyStandard, name="standard-copyagn"), path('loadaggroupm/', views.LoadAGGroupMembers, name="standard-loadaggroupmembers"), diff --git a/standards/views.py b/standards/views.py index 7086a24..17d900c 100644 --- a/standards/views.py +++ b/standards/views.py @@ -816,6 +816,23 @@ def StandardTask(request, pk): } return render(request, 'standards/standard_task.html', context) +@login_required +def StandardTaskUser(request, pk, userpk): + standards = Standards.objects.filter(agency__pk=request.user.profile.agency.pk, created_standard_by=User.objects.get(pk=userpk)).exclude(area=None).exclude(task=None).filter(task__pk=pk) or Standards.objects.filter(agency__pk=request.user.profile.agency.pk, last_modified_by=User.objects.get(pk=userpk)).exclude(area=None).exclude(task=None).filter(task__pk=pk) + task = Tasks.objects.get(pk=pk, agency=request.user.profile.agency) + area = Areas.objects.get(pk=task.area.pk, agency=request.user.profile.agency) + context = { + 'active_link':'standards', + 'standards_of_agency_task' : standards, + 'taskid' : pk, + 'taskname' : task.name, + 'areaid' : area.pk, + 'areaname' : area.name, + 'vieweduser' : User.objects.get(pk=userpk) + } + return render(request, 'standards/standard_task_user.html', context) + + # AJAX Standard @login_required def updatesbyajax(request, pk): diff --git a/users/templates/users/user_confirm_delete.html b/users/templates/users/user_confirm_delete.html index bd1ac22..b46c7c5 100644 --- a/users/templates/users/user_confirm_delete.html +++ b/users/templates/users/user_confirm_delete.html @@ -47,108 +47,138 @@
    - {% for s in standards_to_change %} -
    -
    -   - Standard: {{s.name}} - -
    - - {% if s.created_standard_by == user_to_del %} - - - - - {% endif %} - - {% if user_to_del in s.representative.all %} - - - - - {% endif %} + - {% if user_to_del in s.executor.all %} - - - - - {% endif %} +
    + {% for s in standards_to_change %} +
    +
    +
    + +
    +
    - {% if user_to_del in s.authority.all %} -
    - - - - {% endif %} -
    - Ersteller ändern auf:   -
    - -
    - -
    - - {% for us in usersofagency %} - - {% endfor %} - -
    - -
    -
    -
    - Vertretung übertragen auf:   -
    - -
    - -
    - - {% for us in usersofagency %} - - {% endfor %} - -
    - -
    -
    -
    - Ausführung übertragen auf:   -
    - -
    - -
    - - {% for us in usersofagency %} - - {% endfor %} - -
    - -
    -
    -
    - Verantwortung übertragen auf:   - -
    - -
    - -
    - - {% for us in usersofagency %} - - {% endfor %} - -
    - -
    -
    -
    - {% endfor %} +
    +
    + +
    +   + Standard betrachten +
    + + + {% if s.created_standard_by == user_to_del %} + + + + + {% endif %} + + {% if user_to_del in s.representative.all %} + + + + + {% endif %} + + {% if user_to_del in s.executor.all %} + + + + + {% endif %} + + {% if user_to_del in s.authority.all %} + + + + + {% endif %} +
    + Ersteller ändern auf:   +
    + +
    + +
    + + {% for us in usersofagency %} + + {% endfor %} + +
    + +
    +
    +
    + Vertretung übertragen auf:   +
    + +
    + +
    + + {% for us in usersofagency %} + + {% endfor %} + +
    + +
    +
    +
    + Ausführung übertragen auf:   +
    + +
    + +
    + + {% for us in usersofagency %} + + {% endfor %} + +
    + +
    +
    +
    + Verantwortung übertragen auf:   + +
    + +
    + +
    + + {% for us in usersofagency %} + + {% endfor %} + +
    + +
    +
    +
    + + + +
    +
    +
    + {% endfor %} + +
    + + + + + + + +

    Alle Chat-Nachrichten werden unwiederruflich gelöscht! Soeben wurden alle Vertragsdaten (Abwesenheit und Zeiterfassung), wenn vorhanden, als CSV heruntergeladen. Diese können Sie archivieren und entsprechend Ihrer agenturinternen Gegebenheiten bzgl. Datenspeicherung aufbewahren.

    Daten erneut herunterladen @@ -295,7 +325,7 @@ - {% for s in standards_to_change %} +{% for s in standards_to_change %}