diff --git a/areas/__pycache__/forms.cpython-38.pyc b/areas/__pycache__/forms.cpython-38.pyc index c8884b9..498f1ae 100644 Binary files a/areas/__pycache__/forms.cpython-38.pyc and b/areas/__pycache__/forms.cpython-38.pyc differ diff --git a/areas/__pycache__/models.cpython-38.pyc b/areas/__pycache__/models.cpython-38.pyc index ee4e6b7..7f829de 100644 Binary files a/areas/__pycache__/models.cpython-38.pyc and b/areas/__pycache__/models.cpython-38.pyc differ diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc index 5822c7d..54005ab 100644 Binary files a/areas/__pycache__/urls.cpython-38.pyc and b/areas/__pycache__/urls.cpython-38.pyc differ diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index 868d62f..b8e14a5 100644 Binary files a/areas/__pycache__/views.cpython-38.pyc and b/areas/__pycache__/views.cpython-38.pyc differ diff --git a/areas/forms.py b/areas/forms.py index 0220c46..fc6eca7 100644 --- a/areas/forms.py +++ b/areas/forms.py @@ -13,7 +13,9 @@ class AreaAddAreaForm(forms.ModelForm): labels = { "name" : "Bereichsname", "color" : "Farbe", - "desc" : "Beschreibung" + "desc" : "Beschreibung", + "visible": "Im Organigramm sichtbar" + } fields = ['name', 'color', 'desc'] diff --git a/areas/models.py b/areas/models.py index 7a52b58..cc21492 100644 --- a/areas/models.py +++ b/areas/models.py @@ -26,6 +26,7 @@ class Areas(models.Model): usersfield = models.ManyToManyField(User, blank=True, related_name='users_in_area') created_area_by = models.ForeignKey(User, on_delete=models.PROTECT) created_area_date = models.DateField(default=datetime.date.today, blank=True) + visible = models.BooleanField(default=True) def __str__(self): return f'{self.name}' diff --git a/areas/templates/areas/areas_management.html b/areas/templates/areas/areas_management.html index da9ffa9..18eab57 100644 --- a/areas/templates/areas/areas_management.html +++ b/areas/templates/areas/areas_management.html @@ -45,11 +45,6 @@

{{ item.created_area_by.first_name }} {{ item.created_area_by.last_name }}

-
-

- -

-
Farbe
diff --git a/areas/templates/areas/areas_update.html b/areas/templates/areas/areas_update.html index 8165229..cb2e1ba 100644 --- a/areas/templates/areas/areas_update.html +++ b/areas/templates/areas/areas_update.html @@ -31,7 +31,7 @@ {% if added_users|length > 0 %} {% for us in added_users %} - {{ us.first_name }} {{ us.last_name }}   + {{ us.first_name }} {{ us.last_name }}   {% endfor %} {% else %} @@ -61,14 +61,13 @@ { clearSearchfield(); //Add User-Button - $("#added_users_button").append(''+data['username_clean']+'  '); + $("#added_users_button").append(''+data['username_clean']+'  '); $("#usersfree").empty(); for (var i in data['remaining_users']) { id = data['remaining_users'][i]['id']; name = data['remaining_users'][i]['first_name'] + " " + data['remaining_users'][i]['last_name']; - console.log(data['remaining_users'][i]); - $("#usersfree").append(''); + $("#usersfree").append(''); } if(data['remaining_users_counter'] == 0){ $("#no_user_in_area").show(); diff --git a/areas/urls.py b/areas/urls.py index f6069f0..c6c0640 100644 --- a/areas/urls.py +++ b/areas/urls.py @@ -12,10 +12,10 @@ Permissions definiert in models.py bei USERS und dann hier vor die View geschrie ''' urlpatterns = [ - path('', permission_required('users.tasks_management')(AreasManagement.as_view(template_name="areas/areas_management.html")), name='areas-management'), - path('addarea/', permission_required('users.tasks_management')(AreasAddArea.as_view(template_name="areas/areas_add.html")), name='areas-addarea'), - path('areas//delete', permission_required('users.users_usermanagement')(AreaDeleteView.as_view()), name='areas-delete'), - path('area//', permission_required('users.users_usermanagement')(AreaUpdateView.as_view()), name='areas-manage'), + path('', permission_required('users.areas_management')(AreasManagement.as_view(template_name="areas/areas_management.html")), name='areas-management'), + path('addarea/', permission_required('users.areas_management')(AreasAddArea.as_view(template_name="areas/areas_add.html")), name='areas-addarea'), + path('areas//delete', permission_required('users.areas_management')(AreaDeleteView.as_view()), name='areas-delete'), + path('area//', permission_required('users.areas_management')(AreaUpdateView.as_view()), name='areas-manage'), path('areaajax/', views.area_addareas_ajax, name="area-ajaxview") ] diff --git a/areas/views.py b/areas/views.py index 9918168..a7aa98f 100644 --- a/areas/views.py +++ b/areas/views.py @@ -115,8 +115,13 @@ def area_addareas_ajax(request): added_users = area.usersfield.all() possible_users = User.objects.filter(profile__agency__pk=request.user.profile.agency.pk).exclude(pk__in=added_users) possible_users_js = list(possible_users.values()) + # Cleaned out, that only data is neede will send to the side (first/last-name and id) + final_possible_users = {} + for ele in possible_users_js: + final_possible_users.update({'first_name':ele['first_name'],'last_name':ele['last_name'],'id':ele['id']}) + # Counter for remaining users to show/hide "Keine Mitarbeiter"-Div remaining_users_counter = len(added_users) - return JsonResponse({'userid' : userid, 'username_clean' : username_clean, 'remaining_users':possible_users_js, 'remaining_users_counter' : remaining_users_counter}) + return JsonResponse({'userid' : userid, 'username_clean' : username_clean, 'remaining_users':possible_users_js, 'remaining_users_counter' : final_possible_users}) else: return HttpResponse("Request method is not a GET") diff --git a/digitaleagentur/__pycache__/urls.cpython-38.pyc b/digitaleagentur/__pycache__/urls.cpython-38.pyc index b254a19..62d9742 100644 Binary files a/digitaleagentur/__pycache__/urls.cpython-38.pyc and b/digitaleagentur/__pycache__/urls.cpython-38.pyc differ diff --git a/digitaleagentur/urls.py b/digitaleagentur/urls.py index 5877f62..6f86747 100644 --- a/digitaleagentur/urls.py +++ b/digitaleagentur/urls.py @@ -22,8 +22,7 @@ urlpatterns = [ path('password-reset-confirm///', auth_views.PasswordResetConfirmView.as_view(template_name='users/password_reset_confirm.html'), name='password_reset_confirm'), path('password-reset-complete/', auth_views.PasswordResetCompleteView.as_view(template_name='users/password_reset_complete.html'), name='password_reset_complete'), path('register/', AgencyCreateView.as_view(template_name='users/register.html'), name='register'), - path('register/done', views.registerdone, name='register-done'), - path('select2/', include('django_select2.urls')), + path('register/done', views.registerdone, name='register-done') ] if settings.DEBUG: urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) \ No newline at end of file diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 67361b4..710a1cf 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -91,7 +91,7 @@
- Verwaltung + Agenturverwaltung
{%endif%} @@ -209,7 +209,7 @@ {% if messages %} {% for message in messages %} -