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 f558370..c2ecc63 100644 Binary files a/users/__pycache__/models.cpython-38.pyc and b/users/__pycache__/models.cpython-38.pyc differ diff --git a/users/__pycache__/urls.cpython-38.pyc b/users/__pycache__/urls.cpython-38.pyc index 89540a6..59c0474 100644 Binary files a/users/__pycache__/urls.cpython-38.pyc and b/users/__pycache__/urls.cpython-38.pyc differ diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index 9170e2a..d8071f8 100644 Binary files a/users/__pycache__/usersforms.cpython-38.pyc and b/users/__pycache__/usersforms.cpython-38.pyc differ diff --git a/users/models.py b/users/models.py index a269e17..f0385e6 100644 --- a/users/models.py +++ b/users/models.py @@ -30,7 +30,8 @@ class Agency(models.Model): street = models.CharField(default="", max_length=200, blank=True) city = models.CharField(default="", max_length=200, blank=True) email = models.EmailField(default="", blank=True) - phone = models.CharField(default="", max_length=20, blank=True) + phone = models.CharField(default="", max_length=50, blank=True) + persnumber = models.CharField(default="", max_length=50, blank=True) agencypic = models.ImageField(default='agencymain/default.jpg', upload_to='agencymain', blank=True) def __str__(self): diff --git a/users/templates/users/base.html b/users/templates/users/base.html index e1c12ed..e4bbdec 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -295,14 +295,10 @@
- + - 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"),