From 0ac35e4bd11434d7491bdde3771669f2960d850e Mon Sep 17 00:00:00 2001 From: Holger Trampe Date: Tue, 3 Dec 2019 21:48:33 +0100 Subject: [PATCH] Ver 0.0.2 - Bereiche DONE - Rechte DONE --- areas/__pycache__/forms.cpython-38.pyc | Bin 1259 -> 1297 bytes areas/__pycache__/models.cpython-38.pyc | Bin 1345 -> 1389 bytes areas/__pycache__/urls.cpython-38.pyc | Bin 926 -> 898 bytes areas/__pycache__/views.cpython-38.pyc | Bin 4083 -> 4198 bytes areas/forms.py | 4 +++- areas/models.py | 1 + areas/templates/areas/areas_management.html | 5 ----- areas/templates/areas/areas_update.html | 7 +++---- areas/urls.py | 8 ++++---- areas/views.py | 7 ++++++- .../__pycache__/urls.cpython-38.pyc | Bin 1516 -> 1471 bytes digitaleagentur/urls.py | 3 +-- users/templates/users/base.html | 4 ++-- users/templates/users/users_management.html | 8 ++++++-- 14 files changed, 26 insertions(+), 21 deletions(-) diff --git a/areas/__pycache__/forms.cpython-38.pyc b/areas/__pycache__/forms.cpython-38.pyc index c8884b9c52220115e701be27b5c92ba3d68ec8e2..498f1aeffde8c8b57e3cf1957245821f724aad45 100644 GIT binary patch delta 372 zcmaFOIgyJul$V!_0SJDad=}fYk=K)vixtRo0ODee$q9_&VkxY1SfW@{*izV2IMSJ; z*itxy88o>jcQaa=SBZP(D)<+rC+20Q7bWKADimiXXOtu*7HP8FV#!O)O})jMoS&0l zbc-b=wK(|}ds$|2W>QY-(QZEV;$8_dv7F9+;08g(j6951J diff --git a/areas/__pycache__/models.cpython-38.pyc b/areas/__pycache__/models.cpython-38.pyc index ee4e6b78fe988f27a07e2466e87ea179286d5b62..7f829de272ec1f25a9e34d3b2b2d9b10a47626d1 100644 GIT binary patch delta 145 zcmX@e^_Gh_l$V!_0SF$Scoy3_k@qU&yorw+l~S3r#8bFZ1bP{xBvJ%ZgjyJ)BvXV_ zM1ZtZifAx{rr6{v##Jnuj77YY6`8siM4JWl!fIjMiN3Ni9bZfDsA00U_zaR2}S delta 103 zcmaFMb&!iUl$V!_0SH#+K8p>X$a|G>(!|G&VkrVCf-MYD;weHY!a!OgMI@L(Q*?40 ztVpN(O#jL_8Ik}$s!Q?U)4PhamF&xYSjC_m|Kr8@+LX$VM>;eGo CNg5*n diff --git a/areas/__pycache__/urls.cpython-38.pyc b/areas/__pycache__/urls.cpython-38.pyc index 5822c7dfc50074d18cab83d2c45197416e5ee343..54005abc18e93228f198fb33f3329a83e3b1f23e 100644 GIT binary patch delta 104 zcmbQo-o(xu%FD~e00d`uJ&O&P$h*doy_qqUYXR>t<8 delta 132 zcmZo-pU2J{%FD~e00h}x&tfAc@~&|dXl6|1TEM%Ip_ws7FonC9Ih8R*D3v`0B+d;L z7lw+9q%vpmrHF!f>8w%wDPqA4n&K0G^|F*C7H3cHW}Gc8Ra%@{RICRk<3VI@VqRi; OYHn&?$!1liSVjOYA13So diff --git a/areas/__pycache__/views.cpython-38.pyc b/areas/__pycache__/views.cpython-38.pyc index 868d62f9f0c20c47ab39a32aa2d6296addd2602a..b8e14a5d006d3cdcf2bea2aaa97cd6659579b601 100644 GIT binary patch delta 293 zcmew?|4e}|l$V!_0SIR8d=~ppcq89ZZdq<1mmP?mfw(x1k%6IxA&Vh}F`H=uV^PrL z3*7(0G8t+)YS>*EVpVE6Yd98&)^Mh9OELgS9x%x($&kV~hj}3*Bf|v7LZK3|8rEjU zTCNiD8m1bS8ul8F6#h9Z&5XeeB@!tDAUcI1m_bu;@;4s)$>(^*g>Errrf4!3`2g)N z@&yrolZ|+j7$ql9<+bEO2v2^>YbaJE4^(iAIVUx*ND!n{07z(ZPgduXW%Qry%BLV3 zC6bnzmzWb@kY8M!nUs?nUs{}6RD6p$H7B(wU~)R2Hlxnu$$TojOe~BXj7m%#j6zIB Qk(2lFePWE9ypi7t03WMKkpKVy delta 198 zcmaE+@L8TOl$V!_0SLZteipk;Xd~ZJZdpzsmko%Wfw5}%itn|g~gClSh=Y{X|Mc#AnFHLpkzXl0QAkkI6uT*)WP=regb lp8`{n@8m0d+Kg(G_*K{$IT(eQioz!w@_%9spR6L_1OO|-G-3b% 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 b254a197228c2ba04f21c8e0fa18121c2d3688d4..62d9742d38aee251ca0e277f4a11d51e37ba203d 100644 GIT binary patch delta 114 zcmaFEy`P&ml$V!_0SKCRJ&Vnp$Scceu~A!`Q7xS-N+OjrOL78Zkx8mVDmRcV1;o-R zs=Z9+3{es(YQYSe>YGa#)0vnx8E;Mg%WMlItyyw_//', 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 %} -