From e5c92127ea3c7a609f2e28c375ebc87f6e31cc34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C4=99drzej=20Klepacki?= <jedkle@st.amu.edu.pl>
Date: Sun, 3 Jan 2021 12:26:35 +0100
Subject: [PATCH] dodawanie komentarzy

---
 .../homepage/__pycache__/views.cpython-37.pyc | Bin 10467 -> 10850 bytes
 .../__pycache__/0001_initial.cpython-37.pyc   | Bin 1356 -> 1623 bytes
 .../templates/homepage/add_comment.html       |   2 +-
 .../homepage/templates/homepage/index.html    |   2 +-
 SocialHelper/homepage/views.py                |  55 ++++++++++++------
 5 files changed, 39 insertions(+), 20 deletions(-)

diff --git a/SocialHelper/homepage/__pycache__/views.cpython-37.pyc b/SocialHelper/homepage/__pycache__/views.cpython-37.pyc
index 078b274f2ccec1b4c7d8b35cf2add24443348281..d6c3c7504e3a6913dce74ff980b5cf8c2d614c3a 100644
GIT binary patch
delta 1654
zcmZvcU2IfE6oBuU`?L3NcW-yMp_EoCyDeRjVrWJ2CxKD~LEAuEstu&sbeh1n-7T|M
zAkADFQ<0!FHBKLS*nLwTOw96P(kEl$lSU0M_DxMlcrd96?|RN{11RohzBzNw{G6G4
z&iUia?_;UKWYX2}_x+cDO|2gNI#qL1NgR^y7`ED=T6OcrXCPd4&+T8*$`*HbYLP8<
z?#=2Vlu%|U`zsKEG<b5Bi8X0ruZuOFik#T)@bqK5F7Cy4ChqazKXxl#e_tlz_4l8(
zFU5vO@dPFwJ#&Cf8<4YfEC=2~$A*c>4eiJa9qBFuXcD9=J*i7Wn$nU9Y4gk-C-OsA
zvbraIsWsR#jB3T~@K_N<8$QEg_F{E@W}&2RTS@hk*Y8hySF3Z?N>~z?N{ab~ENu7_
zTbdA6VbKxo>blwEZ8$h_YOXq6no}eG5G2)_-^;|H`o<qP@(ymTu@t!AV|)BJZ17nC
z#{UxM>IT|u#-Q1q>|>@lio2*%x)n~StLbZSOl_toVOX6G4kW}N+Qdn9GdOOZLh-Kp
zIk*6))Pa^yyfHGR2;=IzmgDeS)6J|xahNo_2)hZd6OI#(5Z)r3Ae>a+W?#Uq{>;7!
zZ>xQ|nR6qgrl{Fk6mNZ&h6dpb;WUB#6{CbBgck|%mh>Lt4Z^#G*uio2AXhBJPVFUS
z2jLuHg76+;`;z^wz3{MkzV)=(8hb&3{In}-y}c_(n{N2EnQ&^MRI6RB3Xa#`Y@dV9
z=7n9?;a{)vpyMp?=HX7I<D>r2)z<#xHdWetfw1l6-(6EsYfe3X9&qmZp3Y#LjPcE1
zBk8PqxaT0$RY(3)7*}89UxKgHulXYUsPw|fQfQUqL@JxySb@6N(8OJCMGiLiT8}h`
zv<uH+1pCs7BiNB%Ik`i_^l^Ctd-rl>LX$Y!MLLJuIqbs}&5oRk!5!36v^!ESr@4E_
zz-SMoRd3mjc9X*0Q|pDp0g$r+;vv-lG5dLU9x|%X{pyYijfW5$ZgqO5Qkp8y@QN5!
zmF^pTO<Y#%Lz@N`WLO3Qa2bXv%VDS*7}|Cm<TmxpP@O$HmK>aHVvEa69R;bCwK9mc
zkS%KwldP<l4GA3ZJ<Ns{>1ek&!vZ5vN^l*^kP%A;N@j>9Nt&4B#xig-r*UgVk1V{S
z+t5G@y*lPKPc#_HNqiYtT4tjfw<TPHC=sUX0e2b@*<p*c>lrKx+eH8;XQ>!)4PVF|
z#(HoVU5%q^(z;Te`(S=%D<}4$x~PkT*lifo)%khx5sHh!P?eV|)vj5rA5<<D#SK#L
zyr^#Xv@I2L;$<9)Lxeb7_mGq)Tq8WmrdArpN%K_Rk}eLhn<V*!0>LKe1Pg)1sGDRu
zSzIQ3jF|MVbj1E|Ri~|VS|n?nXFY1OXZQYJ=)00n8h$zavfD+90sRApg$i8V)?Jjv
nt!82G0ANLUzjrU(QXlq?WDnV|*tR`jpRm*RemiBG_U?ZGoor-9

delta 1277
zcmZvc-EUMy6u|GfUpx16x9e_NU0Z?ew!IBvwVQzTBL!&-Vv8*cH3ZyjxHWdWc477!
zN;0>`G?+$1nt0xnm^KhC4?K`H{0sKY_-3jPMqX;-10nta%(=me4R<oXnK|d4GiPSb
z%%7D9)BZ8fvlaRMeeGfOz}xrymhHQ8XvzAHtgRkgvx_R<!Ta{`XIf}4X#8UVbyaAg
za|2=!dgv~wd{r2-)%a@Y#VpaY(BIW-d^6Fjd^1e%(VL0=mPjS`ThG*Me24Tia-yBR
z6GW-lidbw%matX;6am5#w$Oww3}H&M%uN<MkuB79M>s;+P*>oL5_C*e0^nWvx!HyP
zIKx<WiyGrE;Ih%D1}^?=K9Bd^09^dT9YD`}^~iC#8;a_K{dCb7xM~LUXHnCooT=?)
z?~v+myR*$kb1|w#e7+Xpy>uSN@Tc?=9L3Shd6>j+Gp~5t*41XC+Gt*?HTXFGk{L5j
z$T@Fgq2nT)z-t{}I%njV`-BSm*)jO7UCFLNFiDaE;U&Tw1UfxFN}$O37-1aU+@N%I
zIQJGz;HSB{b5kTfN=S?n*V8oA3GWk565b`u5Jm|H35m;7)O(Zg9w7;^f<yVBHwmhr
zgf9}#63!832_F!~G0qRbgZB6NQ${|C!Xxohp`cmVmm{a!Zfh>8UaqxTSDQSP%O5E;
zptJo$VHy6nD?{Bg@L_wU8@1v8mSvFFGGWgGn<TqTcoO)@{Z;s+eP{m#IJCz+O@EoY
zJ}T5pHfe-<(>Ppw4ZgvTieEtm9~FmS6N|k8{D_mir|Y2^TVX1;m->WpT)EgI^U-;d
zt(I`=Zl@B<oDEa5wXd9?RVafCB(p-6lWpYD-*QYjZ3(UJht^F!cB8Z~*E7Q1&1xI>
zm0ouiD58wSUpCH{iqL^KN=LHCq+r`_UYc91RqJ!%BA>zEOV<bQg1qH}Qm23kSv3n8
zuvJQ3DmE}#T}fGRt*_Ik9iZ(@9)}URy6*mUBUCpa)<aFeJj6z13Vl5#BmMWT=~MEm
zmGQg&o(X<k+6Ig#=X^l+d6BS0pm&G&5*R^~2uxn0K3VZAgf9qvxM6f*eZb9cQS`|J
qM$v<<G5H3yZw-_|runZyKdgQ|c>1{^c9=0%W)m#UUS>WsSm80yeG7m9

diff --git a/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-37.pyc b/SocialHelper/homepage/migrations/__pycache__/0001_initial.cpython-37.pyc
index f887f0fdb5dfe56d7f2710f1d55a8ee9c7cddf10..6af8b47f2054961745ad087140e726bfdbfe8b49 100644
GIT binary patch
delta 755
zcmZ`#zi-n(6wcX~A9fSh`PnutO$!ui34z4GR#7!lR0hCOgODnr$oO4cTaJyK3ltV4
zMx+dp#m>UO!pO?Rh7cRlO{`3a|A2Q%2vsF~^67ow``-87y)XLrqH$0v=^6Zfz5Cr8
zYZK$mQWeoY{=>Iq@?meM02=6HrLVve(}N-`u%|+CtS}mAP?~(Jzcesi0s_lpf?{)u
z=p2<18JHtbf$CVrd<~gpW(MV;0(EFi8>}E#g;iMd6l~L+a_duW11_B5Hjz6s2(%=&
zv1DsL>GnCn#X0_)zl6BP>OmvWgOy;F<$^q1mhHUa;!QjFrbk!K8C^xZ_HPC7e<Lc5
zJoUH<yGI$z653tgOC0XUQCH;b&~e!?{Y3U3Q`hIuMds%&ZroBt9$4QQg<R+Z=d>5H
z$m1uX@GK5`QilQ>IRhqgeV>Ie6nQ&|VdQd=b6oB}Wfn<HG!n&!aTrJ3;fe30rqU*6
z+Es3}Wdrvl_Oba)myP><mRL&C!m3douLr}=uSTAO)V4Iz?BoT5fgf{`<vtHt`a`+B
zA+q;f7CC~t@n9hISb|=_Ai8I*r#IEtS*^=XdHPYc(=xr*>V&bwJ91*wK4G&p4Buyx
zLu`>8rZzol-@>q<P}QK6C`yf(q@m6tgBYYjYSUvPFVEIIC*vfGrIwcLrC({Mc_1w%
NGdEvEchc+G%|GgC!|wn9

delta 508
zcmZ9Ize~eF6vvZG(ln_}t*N!GT7OJt5(Ebku_`!-il8onNa(x7gtn1OD&itK3LVPf
zAK_B)A8>PX7qd9KIyw4MtB7~p<9$Ex``#V*GW4t)>)EU>;4-h@PF|I+ahJ)Xs^JMg
zg>G-<N`!PrbO>lv_p>14)*;i8kPIO)XwDz@^N<CjLy+Z=jleMET>>Lu_F19NMxpqJ
zjUhA9QG#;cQyJ*-fu8uO9}d9eKSLFDfsXn`U-!rS5>5FkOeLe-3`}>3D;||$W?!&o
zV{ONCnH_mS>mXM5SOD#M#2r%0r|f#<ol{GURiKXDZt%3UAsT#Jnm>*Oi^OXEH1O&)
zWCngmtOSljnMGI;Ra?by7(U&!T^ms;F=%`2l0wr9qF9N%s6pT75M#C9t~c$AlLl?M
z(J6nFR!y8Qx9ld3Q;tU)5bjzPUY2ipPu^0r19}nh4|%~1&gl2s!+U|%a2%`g4P`%9
o#WYQ1$&h7{kOF^DOpPhYbsAgbugYd+IWZ?>(Ds|H@ugJt3#{CO$N&HU

diff --git a/SocialHelper/homepage/templates/homepage/add_comment.html b/SocialHelper/homepage/templates/homepage/add_comment.html
index 52b627d..925e1a8 100644
--- a/SocialHelper/homepage/templates/homepage/add_comment.html
+++ b/SocialHelper/homepage/templates/homepage/add_comment.html
@@ -17,7 +17,7 @@
         <!--================End Categories Banner Area =================-->
 
         <!--================Register Area =================-->
-        <form action="{% url 'login' %}" method="POST" enctype="multipart/form-data">
+        <form action="{% url 'add_comment' user_name %}" method="POST" enctype="multipart/form-data">
           {% csrf_token %}
           {{ form.media }}
           {{ form.as_p }}
diff --git a/SocialHelper/homepage/templates/homepage/index.html b/SocialHelper/homepage/templates/homepage/index.html
index 2e7a5e6..4349c0f 100644
--- a/SocialHelper/homepage/templates/homepage/index.html
+++ b/SocialHelper/homepage/templates/homepage/index.html
@@ -159,7 +159,7 @@
                                         <h3>Wolontariat</h3>
                                     </div>
                                     <ul>
-                                      {% if wol_local%}
+                                      {% if wol_local %}
                                         <input type="checkbox" id="wolontariat" name="wolontariat" Checked>
                                       {% else %}
                                         <input type="checkbox" id="wolontariat" name="wolontariat" >
diff --git a/SocialHelper/homepage/views.py b/SocialHelper/homepage/views.py
index fbb5d66..854a730 100644
--- a/SocialHelper/homepage/views.py
+++ b/SocialHelper/homepage/views.py
@@ -124,7 +124,7 @@ def filter(request):
         usluga_local = request.POST['usluga']
         przedmiot_local = request.POST['przedmiot']
         wol_local = request.POST['wolontariat']
-        
+
 
 
         if place_local != "":
@@ -145,7 +145,7 @@ def filter(request):
         if usluga_local != "on" and przedmiot_local == "on":
             zmienna = 2
             all_product = all_product.filter(type=zmienna)
-        
+
         if wol_local == "on":
             all_product = all_product.filter(Wolontatriat=True)
 
@@ -162,6 +162,7 @@ def filter(request):
         'potrzebuje_local': potrzebuje_local,
         'usluga_local': usluga_local,
         'przedmiot_local': przedmiot_local,
+        'wol_local': wol_local,
 
     }
     return HttpResponse(template.render(context, request))
@@ -441,15 +442,19 @@ def user_profile(request, user_name):
 
     types = TYPE_T
     types_o = TYPE_O
-    ocena = 5
-    suma = 1
-    for ocena_j in oceny:
-        print(ocena)
-        ocena = ocena + ocena_j.ocena_jedn
-        suma = suma + 1
-    ocena = ocena / suma
-    ocena = ocena * 10
-    ocena = int (ocena)
+
+    if Ocena.objects.filter(user_iden = user_prof.id).exists():
+        ocena = 0
+        suma = 0
+        for ocena_j in oceny:
+            print(ocena)
+            ocena = ocena + ocena_j.ocena_jedn
+            suma = suma + 1
+        ocena = ocena / suma
+        ocena = ocena * 10
+        ocena = int (ocena)
+    else:
+        ocena = 5
     context = {
         'all_product': all_product,
         'all_oceny': oceny,
@@ -459,12 +464,26 @@ def user_profile(request, user_name):
     return HttpResponse(template.render(context, request))
 
 def add_comment(request, user_name):
-    User = get_user_model()
-    user_prof = User.objects.filter(username=user_name).first()
-    template = loader.get_template('homepage/add_comment.html')
+    if request.user.is_authenticated:
+        User = get_user_model()
+        user_prof = User.objects.filter(email=user_name).first()
+        if request.method == 'POST':
+            volume_local = request.POST['volume']
+            script_local = request.POST['script']
+            instant = Ocena(
+                user_iden = user_prof,
+                comm = script_local,
+                ocena_jedn = int(volume_local)*2,
+            )
+            instant.save()
+            messages.success(request, 'Dodano komentarz')
+            return redirect(user_profile, user_name)
 
-    context = {
-        'user_name': user_name,
+        context = {
+            'user_name': user_name,
 
-    }
-    return HttpResponse(template.render(context, request))
+        }
+        template = loader.get_template('homepage/add_comment.html')
+        return HttpResponse(template.render(context, request))
+    else:
+        return redirect(login)