From adefeb122435eb873297095057c918f2e486df71 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Mon, 3 Feb 2020 20:30:43 +0100 Subject: [PATCH] =?UTF-8?q?Settings=20Profil=20fertig,=20andere=20Seiten?= =?UTF-8?q?=20vorbereitet,=20ein=20wenig=20aufger=C3=A4umt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orga/templates/orga/orga_main_ALT.html | 153 -------------------- users/__pycache__/models.cpython-38.pyc | Bin 3401 -> 3431 bytes users/__pycache__/urls.cpython-38.pyc | Bin 1967 -> 1775 bytes users/__pycache__/usersforms.cpython-38.pyc | Bin 5525 -> 5525 bytes users/models.py | 3 +- users/templates/users/base.html | 13 +- users/templates/users/profile.html | 62 -------- users/templates/users/support.html | 8 +- users/templates/users/users_management.html | 2 - users/templates/users/users_prio.html | 51 ------- users/urls.py | 6 +- 11 files changed, 10 insertions(+), 288 deletions(-) delete mode 100644 orga/templates/orga/orga_main_ALT.html delete mode 100644 users/templates/users/profile.html delete mode 100644 users/templates/users/users_prio.html diff --git a/orga/templates/orga/orga_main_ALT.html b/orga/templates/orga/orga_main_ALT.html deleted file mode 100644 index 6120fc5..0000000 --- a/orga/templates/orga/orga_main_ALT.html +++ /dev/null @@ -1,153 +0,0 @@ -{% extends "users/base.html" %} -{% block content %} - - -
-

{{request.user.profile.agency.name}}

-
-

Organigramm

-
-
-
- -
- -{% endblock content %} \ No newline at end of file diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc index f5583704088b121dd9fa51f46420ebba0f39594b..c2ecc63cf3fd7abbce6a1e4314cbf12f3b19db30 100644 GIT binary patch delta 246 zcmX>p^<0WCl$V!_0SGoYSi~_2ZRE>kWLz@2hB3>MC517CJ%uHOwU;@HCzUyiH-#gG z6UgTR^7&G@Q+Qe!qWDvIQ}}?iK&oI0e~Lg0Lo;KP&}4olUq++Ju}sGpRVS-3FJRQ1 ze3bbFqt4_$7BxoU$y-@6c%rxpQj3c7N^_G^izdsmdI(AYUBJP}$0z`XKzeft>k&q# zBEiX4>`NKrCqH0sVN9N!%CU#BVzUyb7?X4(P(!f*NEb5`BNF^sWIj2V+m+E|@=We9 aM$^e3xGfpYCu{M@FnVlu=V4@I)CB-Vpg5BN delta 219 zcmaDZbyA8il$V!_0SI1hRf*dzxREcHk#Wl88pbS5o)nH0&J>muu3qLS-W2W>o)(5E zz7*aRJ|NAXDv-jTBGAIn%ors&S)R$4QDky1(=kSs$tKJT7&RteWj?{EJ$W9B8l%wU zqbwPdEm=MI#ekM@F!C`9fFa-JNvua0nO+)Aj$mKP7&rMJdkbUI=Hszsw3wX0Dls{MhlSC7b1DxbBcl!g DeLgd{ diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc index 89540a669942a64a92d8d458e1d96fe2e6e94313..59c047456b715721fecb7a524a229ebbe9a18dbe 100644 GIT binary patch delta 272 zcmZ3_|DIPnl$V!_0SImsS;Wl-vL1st$UqdxaRB1to{8E!()m*Oni*5M76>k6Xl6_i zP2uQePGw9HONEGYK*hzO;u5LMSwbn2P@WV}l{8Q{CsdUTR9qIQN;pLh%9983L?(MN zW^knoM#-e;2Qz3IY<|YLm~rx1=F^L}voJEsPTs+~Oo%NpJvA@6@)l=kacWUy+`BM0r8B@6y2rgu3W=xTUic3MoIiTXwP;nWcZjlsOC{GTkN*<`26QXLe z7h{GA&L7=A`OZ@q&ePq5LW#xC)!hyb`N|Y&-ob9*C0Cf|SIP)X8zoXXLmGiZb&d zeEli`mLB^Us)F%)b{*yOXU;sX4kAm;=C&4P$de$3j= jrUnetBDKi{Z2pW!lMk?oC^GUf@-ay;N&smP#(=K@ExdI| diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index 9170e2ab8c7e1415ad70b99e09e58d4d4e807015..d8071f8e4ad8d14a30832e10c9d1d250efa594f7 100644 GIT binary patch delta 20 acmbQLJyn}Kl$V!_0SNltEH-j?i2?vFa|CSw delta 20 acmbQLJyn}Kl$V!_0SG1>P}#`cB?
- + - Profil - - - - Priorisierung - + Orga-Profil +
@@ -356,12 +352,11 @@ - - + diff --git a/users/templates/users/profile.html b/users/templates/users/profile.html deleted file mode 100644 index 64a37a6..0000000 --- a/users/templates/users/profile.html +++ /dev/null @@ -1,62 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
-
- -
- -
-
-
-
Name
-

- {{ user.first_name }} {{ user.last_name }} -

-
E-Mail
-

- {{ user.email }} -

-
Agenturfunktion
-

- {{ user.profile.get_func_display }} -

-
-
-
Tätigkeit
-

- {{ user.profile.compfunc }} -

-
Festnetz
-

- {{ user.profile.phoneland }} -

-
Mobil
-

- {{ user.profile.phonemobile }} -

-
-
-
-
- -
-
- {% csrf_token %} -
- - Profil bearbeiten - - - {{ u_form|crispy }} -
- - Agenturrelevante Daten werden in der Benutzerverwaltung verändert. -
-   - Abbrechen -
-
-
-
-{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/support.html b/users/templates/users/support.html index 133c625..609f926 100644 --- a/users/templates/users/support.html +++ b/users/templates/users/support.html @@ -1,7 +1,7 @@ {% extends "users/base.html" %} {% load crispy_forms_tags %} {% block content %} -
+

Supportanfrage stellen

@@ -15,12 +15,6 @@
{% endblock content %} diff --git a/users/templates/users/users_management.html b/users/templates/users/users_management.html index 320c9cf..61af915 100644 --- a/users/templates/users/users_management.html +++ b/users/templates/users/users_management.html @@ -50,8 +50,6 @@
Benutzerdaten
- Bearbeiten - Priorisierung
Rechte diff --git a/users/templates/users/users_prio.html b/users/templates/users/users_prio.html deleted file mode 100644 index eb7bf2e..0000000 --- a/users/templates/users/users_prio.html +++ /dev/null @@ -1,51 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
-

Reihenfolge im Organigramm von {{ user_first_name }} {{ user_last_name }}

- Elemente mit einer größeren Zahl werden im Organigramm weiter oben angezeigt. Die Änderungen werden sofort gespeichert. -
-
- {% for area in areas %} -

Bereich {{ area.name }}

- {% for prio in prios %} - {% if prio.task.area == area %} -
- -
-
-
- {% endif %} - {% endfor%} -
- {% endfor %} -
- Zum Dashboard -
- - -{% endblock content %} - diff --git a/users/urls.py b/users/urls.py index d317164..4375ecd 100644 --- a/users/urls.py +++ b/users/urls.py @@ -18,15 +18,15 @@ urlpatterns = [ path('logout/', auth_views.LogoutView.as_view(template_name='users/logout.html'), name='users-logout'), path('usersman/', permission_required('users.users_usermanagement')(UsersManagement.as_view(template_name="users/users_management.html")), name='users-management'), path('usersman/adduser/', permission_required('users.users_usermanagement')(UsersCreateUser.as_view(template_name="users/users_adduser.html")), name='users-adduser'), - path('usersman/profile/', views.profile, name='users-profile'), - path('usersman//', views.ProfileUpdateView, name='users-update'), + #path('usersman/profile/', views.profile, name='users-profile'), + #path('usersman//', views.ProfileUpdateView, name='users-update'), #path('usersman//', permission_required('users.users_usermanagement')(ProfileUpdateView.as_view()), name='users-update'), path('usersman//perms', permission_required('users.users_usermanagement')(UsersPermUpdateView.as_view()), name='users-perm-update'), path('usersman//delete', permission_required('users.users_usermanagement')(ProfileDeleteView.as_view()), name='users-delete'), path('agencyinfo/', views.agency, name='agencyinfo'), path('agencyinfo//', permission_required('users.agency_change')(AgencyUpdateView.as_view()), name='agency-manage'), path('usersman//prio', views.UsersPrio, name='users-prio'), - path('prioupdate/', views.UsersPrioUpdate, name="users-prioupdate"), + #path('prioupdate/', views.UsersPrioUpdate, name="users-prioupdate"), path('areataskupdate//', views.UsersAreaTaskUpdate, name="users-areataskupdate"), path('globalsearch/', views.GlobalSearch, name="globalsearch"), path('standardrout/', views.searchStandardRouter, name="standardrouter"),