From 04cc3802f55b615eb81e3f440c15c86feedce48e Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Thu, 6 Feb 2020 21:50:16 +0100 Subject: [PATCH] =?UTF-8?q?Settings=20Agenturfunktionen=20vollst=C3=A4ndig?= =?UTF-8?q?=20implementiert,=20Bugs=20gefixed?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../__pycache__/settings.cpython-38.pyc | Bin 4557 -> 4539 bytes digitaleagentur/settings.py | 12 ++++++- users/__pycache__/models.cpython-38.pyc | Bin 4074 -> 4131 bytes users/__pycache__/urls.cpython-38.pyc | Bin 1775 -> 1642 bytes users/__pycache__/usersforms.cpython-38.pyc | Bin 6268 -> 6268 bytes users/__pycache__/views.cpython-38.pyc | Bin 15624 -> 16142 bytes users/models.py | 31 ++++++++++-------- users/static/users/css/custom.css | 6 ++-- users/templates/users/agency.html | 31 ------------------ users/templates/users/base.html | 8 ++--- users/urls.py | 4 +-- users/usersforms.py | 2 +- users/views.py | 30 +++++++++++++++++ 13 files changed, 67 insertions(+), 57 deletions(-) delete mode 100644 users/templates/users/agency.html diff --git a/digitaleagentur/__pycache__/settings.cpython-38.pyc b/digitaleagentur/__pycache__/settings.cpython-38.pyc index 2d8dda0b8043a7ff23edf102ae0b38d370f7f187..c5b95d101d4747eaa19c6734b7edf56d4c8c8583 100644 GIT binary patch delta 256 zcmX@Byjz(sl$V!_0SLOHY~r}3H}Z8d)~Barq-3UK&0)=Cj1o`DPRYq+1d_R6G7n7V zXELUG&0b7moE*1Uit_VIZZS-*;?`jk1p2DVV{#y? b@aFy8^I6!ef&3!t%_#x`jEw4&O9dkUIBiKK delta 274 zcmdn3d{&t+l$V!_0SI(7%;PMjHu7~c)~BVUr(~pL&SA}Dj1o`DO3BV-1d=&mG8atd zWiqC-L`kINM@gm>L`kKvMo9y)Oo~C2Y)WC2TuM=td`fYYLMmex(*kBNshG;TkZ~bn zN{Ki_loD7(IaMj8bRkoeN=jLjDpZ6mrF_#x+%3$dO%t~r7i{JK!X&fU7fK6yDiC@7h`a#daLW#3Xi|E+Hwjf)v^!ei~3IG7*H!s={(IlRu2tjGeZj zhp0+=s;ml))I-G$36WbXZb+!tUV7=F5-U`}iH1Yf8{*dY##OUHs#p8%d*6HWcKq#o z^RjgBVEmfnL>2hG{_4Z)k)b>BBKhskTzfG0g z6|dCq##xFwG`_8D5id;>5KIQ+_;0>W9gW_(Y!|N5n0CQd}@@niE*4A|4rIWJWwSs$@`T z<}p$hC(J9gw=r17I#!$eZN|GB{19@f{g6gC3xK(u9DqgQB>C?pE!B#MXJ&pyhu~?< zdKZ8x9-)e-GHp$#gsN2Qsh$Cz$s&Lj)xo!^LCtN&i_!?lVFh+yj*I>R$2aZH0q{J) z4hd|(Ri~`Ux=fVx>Lwq<*f>H3VQ<@V$GF?`aCcMyh1^d4S9!W#?{s;+UUOr75@P%? z!W07L@@a%JKoC9ebGEwN`jl-*1%k-jmCN(9=jH>mF(bd56fpE^xe59H_n^QzxH~35 zUonoHNW==8$H{(unAC+5P(*4YeH%0b)j%i1i-KY?&`PByK$hLx)VwSZdj)gg4M8Z{BVJxcVsrp}r>A+tp;#egk4QT%*Azqi zfe=3$;!At{qIWP97^4ZAgdP~DDVm07nN{c@&B!r%3#KYdb1+r8E!C^iA?T7kd ztu`4y27=Cev37&AR=2+1VcgaEaUfwJ{;*1yafo;kz}4h~e}Dug+#bPfXnd^GUR~_G zL)lVez1f{!YcKN>E+PGa!#?Dr2qR+7o|?qAbJak{^&Ag^|82jo#RI!hbV*>|_@cp= zJFqIk+2@SIN=Ggff9VzSjhKqAkO}d9^k~^dx<9sPz0uP+oeW&FoE49qC$l(m{0sulfB!JS9fkhJ-h7;dz-MrGaNH~{ uNpf(i#MO*=5wAorSaY)?o%oUz#kYxqiCf_(#r;GTh+h*0Bbh#s9{vY#+cJXy delta 1334 zcmZuxOK%%h6rMXz&)DNvY{#!W?X(&Pw-hxMqM=H}OI4)+N!W}8VUm06xN&E!J09AY zM+D6ZDU0YXKw<$BY_jgI5~5N!`~f7G6)cNbvF!rRu~B3YzVhdDzVqGV>p9=`xAVWx zrQfk_OM=(U)z$ZgrPFksJU(6iL8pZ+$tgaRi7u1xgsa!Zk`lJ4P1DDcn`3#Jq1j{U z0dc2j4wU&=U+*w~?=Y60{s`S1@kpu8mLcL5fLPn@dH%su4NEc~@ipN-}!vRKedhMG`h!i(b6m^oS_lEfsJ zP|1}kp)ysdO0|yWDonkjF&)sL`ibl&ATmd}MGaU9YMy9r64(?)CJ7q*Us)P6rqC1) zYt%6Z(GkpuO~Ljo2nx92yjc;l5>#?0#GM{hu#rLYpe#?+Did*a6vMP( zPi=y)Pw+Dn{Or+0VQ!)@PYbjNCR(5+It`zTtU=4PGBQ*14T)B1?O39<2eP|F>tL;! z*m#Qvx4S(C&MDy#5F9yHd(5M58V5Ouc#m}lk>7Ffaoz_<`0snYC-vnj+WIis?K&hj1Am9I9viT2H`(_%e9KM*hH_N?BA%iq zGUi+h-90kx_-HeDG$l6n_Ji&o3&&1J&9El^uxe>Oivlv{tKws`y*!T${2J`d@hb8~ zgxopgF+z`hB7QQxCSSt*BEtU((V?G-d)7W_iC?WNjptA}b~i@j7uoj(>|C!q7I~ z+DkQvsa6>$^e<_~d zKfZz_o}912{VO-GLHIVj!J;m0OE@>c>n+a delta 359 zcmaFG^PX2bl$V!_0SImsS;Wl-vL1st$UqdxaRB1to{8Gu>iJTnn;BC%7YHt7Xl6{2 zN#W>aPGwAyO=Zp!PLYH1oACPhD(LDOLKG{*0Yf!vAdsd>qjnR#jX z`nR|coGK9nTi+%#uf(b#+fKhqxU@L6s8|mo7oVJwn3tYf#S7u;<|gJPrf=?MR%2w8 voxF)<89N(9Vsbd^BsOJWpcE-je$VR9s59A~O+uWJk5Ph=kBJXRBf-}IH{V?W diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index d4d0a11fe7ccf1a2de7373c36791ab04f0913d99..f0a65f41380b70d55dd6352fc2bed23ed5a93f70 100644 GIT binary patch delta 46 rcmexk@W+5Fl$V!_0SG2nZ{#xI7WD%%i~K=^H;C{75x$%KxpjE~_YVn$ delta 46 rcmexk@W+5Fl$V!_0SI*6HgXwoi+Tf@MLr;Fg+`7B~;{FKg diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index 5928cbca9ce34f7e46376e5c446b6ada9b49d42a..2855e95cd43a1d83f833e33c9b2a4956232f34b3 100644 GIT binary patch delta 5340 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// return 'agency_{0}/agencystats/profilepics/{1}'.format(instance.pk, filename) + + ''' Class Agency @@ -47,8 +49,8 @@ class Agency(models.Model): return f'{self.name}' # Hier wird definiert, welche Parameter in der URL übertragen werden inkl. Bezeichner - def get_absolute_url(self): - return reverse('agency-update', kwargs={'pk':self.pk}) + #def get_absolute_url(self): + # return reverse('agency-update', kwargs={'pk':self.pk}) @property def get_photo_url(self): @@ -57,6 +59,17 @@ class Agency(models.Model): else: return "/media/agencymain/default.jpg" +''' + +Class AgencyJob + +''' +class AgencyJob(models.Model): + name = models.CharField(default="", max_length=80) + agency = models.ForeignKey(Agency, on_delete=models.PROTECT) + def __str__(self): + return f'{self.name}' + ''' Class Profile @@ -76,25 +89,15 @@ Klasse für die Zusatzinfos eines Nutzers. - Aufgaben ''' - - class Profile(models.Model): - # AGENCY TASKS - agency_task = [ - ("", ""), - ("lead", "Agenturleitung"), - ("external", "Außendienst"), - ("indoor", "Innendienst"), - ("trainee", "Azubi"), - ] - # Wenn der User gelöscht wird, wird auch das Profil gelöscht user = models.OneToOneField(User, on_delete=models.CASCADE) parent = models.ForeignKey(User, on_delete=models.PROTECT, blank=True, null=True, related_name='parent_user') phoneland = models.CharField(max_length=60, blank=True) phonemobile = models.CharField(max_length=60, blank=True) - func = models.CharField(choices=agency_task, default="", max_length=50) + # Wenn die Funktion gelöscht wird, wird die FUNC auf NULL gesetzt + func = models.ForeignKey(AgencyJob, blank=True, null=True, on_delete=models.SET_NULL) # Wenn dieses Profil gelöscht wird, wird NICHT die Agency geslöscht agency = models.ForeignKey(Agency, on_delete=models.PROTECT) image = models.ImageField(default='userprofilepics/default.jpg', upload_to=picturepath_user, blank=True) diff --git a/users/static/users/css/custom.css b/users/static/users/css/custom.css index f9fe106..e3f5710 100644 --- a/users/static/users/css/custom.css +++ b/users/static/users/css/custom.css @@ -52,7 +52,9 @@ html h1 { } body{ background-color: #f8f9fc; + padding-top: 70px; } +.modal-open {overflow-y: auto} .preview { overflow: hidden; @@ -65,10 +67,6 @@ body{ margin-bottom: 20px; } - body { - padding-top: 70px; - } - .default_content_style { margin-left: 212px !important; } diff --git a/users/templates/users/agency.html b/users/templates/users/agency.html deleted file mode 100644 index d2fb0e6..0000000 --- a/users/templates/users/agency.html +++ /dev/null @@ -1,31 +0,0 @@ -{% extends "users/base.html" %} -{% block content %} -
-

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

-
-
-
Inhaber
-

- {{ request.user.profile.agency.inhaber }} -

-
Adresse
-

- {{ request.user.profile.agency.street }} -

-

- {{ request.user.profile.agency.plz }} {{ request.user.profile.agency.city }} -

-
Kontaktdaten
-

- {{ request.user.profile.agency.agency_email }} -

-

- {{ request.user.profile.agency.phone }} -

-
Agenturbild
-

- -

-
-
-{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/base.html b/users/templates/users/base.html index 41b683b..68906d7 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -56,7 +56,7 @@ -
Digitale Agentur
+
Digitale Agentur
 @@ -102,18 +102,18 @@ Organigramm - + {% if active_link == 'quicklinks' %}
  • {% else%} diff --git a/users/urls.py b/users/urls.py index 4375ecd..121f6ec 100644 --- a/users/urls.py +++ b/users/urls.py @@ -23,8 +23,8 @@ urlpatterns = [ #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('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('areataskupdate//', views.UsersAreaTaskUpdate, name="users-areataskupdate"), diff --git a/users/usersforms.py b/users/usersforms.py index 63687a4..b072bab 100644 --- a/users/usersforms.py +++ b/users/usersforms.py @@ -80,7 +80,7 @@ class AgencyUpdateForm(forms.ModelForm): "phone" : "Telefon", "agencypic" : "Agenturbild" } - fields = ['name','inhaber','street', 'plz', 'city', 'agency_email', 'phone', 'agencypic', 'x', 'y', 'width', 'height', 'rotation'] + fields = ['name','inhaber','agency_email', 'phone', 'street', 'plz', 'city', 'agencypic', 'x', 'y', 'width', 'height', 'rotation'] def save(self): photo = super(AgencyUpdateForm, self).save() diff --git a/users/views.py b/users/views.py index a9da97c..09afbe5 100644 --- a/users/views.py +++ b/users/views.py @@ -25,6 +25,28 @@ from django.template.loader import render_to_string from django.contrib.auth.forms import PasswordResetForm from django.template.loader import render_to_string from io import StringIO +from users.models import AgencyJob + +@login_required +def toUpdate(request): + # NO AGENVYJOBS + # CREATE DEFAULT + ''' + + Agenturleiter + Außendienst + Innendienst + Auszubildender + + ''' + agencyjobsobject = AgencyJob.objects.filter(agency__pk=request.user.profile.agency.pk) + if(len(agencyjobsobject) == 0): + defaultAgencyJobs = ['Agenturleiter', 'Außendienst', 'Innendienst', 'Auszubildender'] + for ele in defaultAgencyJobs: + tempAgencyJob = AgencyJob(name=ele, agency=request.user.profile.agency) + tempAgencyJob.save() + + ''' DASHBOARD-View @@ -61,8 +83,16 @@ class AgencyCreateView(CreateView): ) return super().form_valid(form) + + + + @login_required def dashboard(request): + + # UPDATE FUNCTIONS BY NEW MODEL-CHANGES FOR COPIEN SOME DATA + toUpdate(request) + context = { 'active_link' : 'dashboard'