From 06a1428ce904a91e1fdc0f3911e14ce00d911dc4 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Thu, 6 Feb 2020 18:09:38 +0100 Subject: [PATCH] Settings AGentur umgebaut, Cropper und drehen eingebaut --- cloud/__pycache__/models.cpython-38.pyc | Bin 1202 -> 1208 bytes cloud/models.py | 4 +- users/__pycache__/models.cpython-38.pyc | Bin 3431 -> 4074 bytes users/__pycache__/usersforms.cpython-38.pyc | Bin 5525 -> 6268 bytes users/models.py | 41 +++++++++++++++++--- users/templates/users/agency.html | 9 ++--- users/templates/users/agency_update.html | 23 ----------- users/templates/users/base.html | 9 +++-- users/usersforms.py | 29 ++++++++++++-- 9 files changed, 72 insertions(+), 43 deletions(-) delete mode 100644 users/templates/users/agency_update.html diff --git a/cloud/__pycache__/models.cpython-38.pyc b/cloud/__pycache__/models.cpython-38.pyc index e5dc4fdcd42c76b5745f98f1fe30f00776193911..8da83454931f0f06194a14021e49f9fd9fea9b89 100644 GIT binary patch delta 43 xcmdnQxr388l$V!_0SL^@ZQ_// - return 'agency_{0}/{1}/{2}'.format(instance.agency.pk, instance.subdir, filename) + # file will be uploaded to MEDIA_ROOT/agency_/files// + return 'agency_{0}/files/{1}/{2}'.format(instance.agency.pk, instance.subdir, filename) class Data(models.Model): diff --git a/users/__pycache__/models.cpython-38.pyc b/users/__pycache__/models.cpython-38.pyc index c2ecc63cf3fd7abbce6a1e4314cbf12f3b19db30..73738fe33ebc17bde7564fdfbf5032ad12cdf689 100644 GIT binary patch delta 1875 zcmb7F&2Jk;6yI5|?e%B;-Na6s?@+g-Nl+7^D6Jwz6!p*)RH{m=!fNB0#!l9|tJyWB zX^KUY8_FS?0|x}O5(lClIdFsv{{RvP_5>#c;>rOkA>LaXvP8)NujcLhp11RUZ~Sxh z*U{{qOeQJ8@5ai?J3E!b>@fM}@Y09NG)*)6k~ToIbO7GD*Cm>x`F)Az8QIG3MYIBF z3bY8CVqa6FrQ1@yeE8#&u8bM`KjalyYp~ob5K5j(yV4ffCC_9Ckk@yr#wN2G5A{d$ zkLP-<>lvOq_h{kqk?hCr+q`XfzU*v+q_!+DS`Fr__gf~jj5a%xcpmcpd3A01-W`{5 zSNtw7bqh|b;dMB346mv8vZ9w8)F$&H@Qwdj=gb*(I^4!uV8ftho`T#<9KSUvtVaqU z`nhmX9jLVe+J8za0WS=)c~_x?#;8K02N5m7B3nt26&gQ~wG>EbRr}U7$QhboS&)<9 zJwQ`5js2n-nuT|s73cuX?Mr(^D~eHhcKj&92eGgrEGN2Q8rJqNQQ+%xPhS&Fd92j; z@)I4$v<<3zHm`{<K85b{n&zdE!}SuLzN$eSd00|8*NYr4ngnvCERcdNgcOQp@|OT-a|f%y5k}P z4x7izKrq0?15`IHVs5>CXdyw?caXqani>EzvRn zWSmy$Ie1U7NjgY}0-#L6Xjf?sM!U8rYtwWXrgX%QztKZE00lwIE8_E5H})#BHBpa` zP9vgtEifS&0aB0n@kY~bHJIB+ooL6$3j93UNKaJ-{h142lM*8zk;2w?%1o87c-oj9x=pj>#g zH`GJ55(jSF=naW8KLLre1xQFpAWr-QX55M*)W*uJXXe|P9e>~c+W(_!-ZBg=1HX6Y zPT!Zx>t>C-Tc3V;_)>=I)L6|>gONpRMRsh6nAC!ZwG}B*`(~z5TL1k*e39C>3zSfW z=GG)fWAdT`ULO4Hn(P$+^L6kIs?q}FHOQN^NcGi>V^M>eu-dFdEo!f3R)|v;ujOW~ zA#)SX$Sp8Qb}sO`OATo=WQ(8j*qEbv^Q_xi?s$H8V-uVd`n@3Zs2hje7B%IJvXSA# z;yXEC$h&S7bJv{`50twX5~;VeL6Y3kBahEV8&Z>=Y39e&;s-nsg;YCOat5}sjWrUo6)}}UaTLR`POj*>a23`?( z9{_I<-pgym8KMCE7kAXBxmkR*#aDH|i{x`VO`$1)X~;>wwGjF(7HtdU$!H(AgW<7S&u>Mul(oHn z5Fc6W%{$hANnXY}gqt9dy`o#NrUx(}B?-^j@+1Rg|l2uxB0K0AIC`C&KOiO@v3%3|-iAjU}L z6l}QGsPTVFh^BFj92cH3PU>RCn5ZDJPHyw+@M&ywLVPeLPj9P;&tNna5Ek62DQ`mJ zGW?^u_-Ia)P&I=R(bP0?tx*+uaFF3DaEDGO3PrOBPjCF+?@Nc#ahORy$hKOID= P6I}+Ym>^Pk^m6kLMhXjU diff --git a/users/__pycache__/usersforms.cpython-38.pyc b/users/__pycache__/usersforms.cpython-38.pyc index d8071f8e4ad8d14a30832e10c9d1d250efa594f7..d4d0a11fe7ccf1a2de7373c36791ab04f0913d99 100644 GIT binary patch delta 1732 zcmaKsO;8*~6o9*DXJ%(-cPC3=LD3*dMa=LIQ4@7lNF|U2h*2Qol*u}553uY0RZpXV z8r%b^$|)Dy9IUc*x#`j3W|dyNYU$A$J$UsZS1aYg_ht)-6gpk~)$7-)Kq5%d*bZw4<{wIN%9sn!}Aw zSUE4a`~4SQ?|PN>UUk>~>UyQ(aVK_j)^W6X;WF_^zcMuE7R&q$m^(>yOsw1{^ z^6Q8h#4KVCaRc!N;wIvle1rzC30D+rRr#%XijK%%&C_p9gRzgH8B|pi`mgqvZbmsQ zP?+EUk|4yP$DsS)00a>m0qG>WiXr<(ivSkKlQ^6fdsU1p5K;I_w zghoxISz;S>?~tmpL>TC8^9CPifL}-6JAV^&3pNdP?{3|#GFvJBrVLN_LB=4^|P z<1)OF=+*M)QF;N9LcEB;%MJDDB0YWqH5U;tAzntj0Xh zwH(vUyATjN;g=Ct5Qm-~{3cqS9#k@)Lc7ST2$7SKe|T*Z(0vP#F_aA5Z+lj)b@bD}`j%wK0_b`=|w&EkgHI0K8k1FTnm2yFDj1sg8HV zZ^_Ry=kzF@OY(=z_1m{m8`aK}AcZlgyij$y=h{XqQ+LoHk9ZFaG@SE8O}PI1KChul zMfqq}(9wqU+vZ08-(?1NA3^u=#tq8Z?p|9D%|_0yfQsKjL=Ik+XWGxU!dQ{B?c@EC z(P^AV%P?N&wdJx`fpYd-R;!jb>{RRJF3B(3FHE8(_%8(aZSA<=oW#2C@jU*Ejtl3Z y?Cluo_wl^r@+@HD6X^Sq2)WVmT_I3mLkYy>6 zR5N3S(%fn|4LB`v*;AKoK??JXa0MF8rp3#(9kXf~0@Pua5%1LI)M@(J32=$d${^fu zxm>B6wq3F6^>P{dDBxj6%m%X?IrMGvEuX=-&yW^!!9_q=;m722;ag4e& zu3gIw;ykdqW~~Bua2XZ|dBP%rQsFLPNtm)0p-!QPFo6)C`~&4V6m|lkGFg(?AHN^| zpf}5PU4|spXoPNpH{!E#da9oSv|A3%mJq50bFI0^6N#n8$F35a7SZT%Vg@7aSMVy< z(cKg)(WMM2m_3cQABtQrZyD7Fnk^%+*AOg=<3z5d#15E$h0<2V>v+naCb=$J@#W0| zNpCE@sN4?Q0arG`GIbTEDRz%gB;2P2g<`g=IHvvB28)(t(r`}8Tf#`JP5!@S19zyR zwTHpLXdNd8Skh~@gzK// + return 'agency_{0}/agencystats/{1}'.format(instance.pk, filename) + + +def picturepath_user(instance, filename): + # file will be uploaded to MEDIA_ROOT/agency_// + return 'agency_{0}/agencystats/profilepics/{1}'.format(instance.pk, filename) + ''' Class Agency @@ -29,10 +38,10 @@ class Agency(models.Model): inhaber = models.CharField(default="", max_length=200, blank=True) 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=50, blank=True) - persnumber = models.CharField(default="", max_length=50, blank=True) - agencypic = models.ImageField(default='agencymain/default.jpg', upload_to='agencymain', blank=True) + plz = models.CharField(default="", max_length=5, blank=True) + agency_email = models.EmailField(default="", blank=True) + phone = models.CharField(default="", max_length=50, blank=True) + agencypic = models.ImageField(default='agencymain/default.jpg', upload_to=picturepath_agency, blank=True) def __str__(self): return f'{self.name}' @@ -88,9 +97,31 @@ class Profile(models.Model): func = models.CharField(choices=agency_task, default="", max_length=50) # 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='userprofilepics', blank=True) + image = models.ImageField(default='userprofilepics/default.jpg', upload_to=picturepath_user, blank=True) compfunc = models.CharField(max_length=60, blank=True) visible = models.BooleanField(default=True) + persnumber = models.CharField(default="", max_length=50, blank=True) + + # NOTIFICATIONS + #NEWS + # Mitteilung bei neuen News innerhalb der Agentur + news_mail = models.BooleanField(default=True) + news_push = models.BooleanField(default=True) + + #STANDARDS + # Benutzerstandard wurde veröffentlicht + user_standard_public_mail = models.BooleanField(default=False) + user_standard_public_push = models.BooleanField(default=True) + + #STANDARDS + # Neue Standards + agency_new_standard_mail = models.BooleanField(default=False) + agency_new_standard_push = models.BooleanField(default=True) + + # GROUPS + # Neuer Gruppe zugeordnet + add_new_group_mail = models.BooleanField(default=False) + add_new_group_push = models.BooleanField(default=True) def __str__(self): return f'{self.user.last_name}' diff --git a/users/templates/users/agency.html b/users/templates/users/agency.html index 4c5f5b8..d2fb0e6 100644 --- a/users/templates/users/agency.html +++ b/users/templates/users/agency.html @@ -13,11 +13,11 @@ {{ request.user.profile.agency.street }}

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

Kontaktdaten

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

{{ request.user.profile.agency.phone }} @@ -26,9 +26,6 @@

- - {% if perms.users.agency_change %} - Agenturinformationen anpassen - {% endif %} + {% endblock content %} \ No newline at end of file diff --git a/users/templates/users/agency_update.html b/users/templates/users/agency_update.html deleted file mode 100644 index 72c4ffc..0000000 --- a/users/templates/users/agency_update.html +++ /dev/null @@ -1,23 +0,0 @@ -{% extends "users/base.html" %} -{% load crispy_forms_tags %} -{% block content %} -
- -
-
- {% csrf_token %} -
- - Agenturinformationen bearbeiten - - - {{ form|crispy }} -
-
-   - Abbrechen -
-
-
-
-{% endblock content %} \ No newline at end of file diff --git a/users/templates/users/base.html b/users/templates/users/base.html index e4bbdec..41b683b 100644 --- a/users/templates/users/base.html +++ b/users/templates/users/base.html @@ -125,7 +125,7 @@ - + @@ -314,7 +314,7 @@ {% if messages %} {% for message in messages %} -