From 1bede3828eadcc8456fc28d2c37e252e99909fde Mon Sep 17 00:00:00 2001 From: Aarav Kumar Date: Sun, 23 Jun 2024 14:38:14 +0530 Subject: [PATCH] On branch ratingFix/Darkice000 Your branch is up to date with 'origin/ratingFix/Darkice000'. Changes to be committed: modified: core/models.py modified: core/views.py modified: templates/components/news.html Fixes: 1. style attribute in news.html,type error. 2. Rating overflows after some long decimal places number encounters 3. Rating does not appearing from database for the user if he rated previously, but not showing when reloging. If he rate then shows but when relogin all disappears. Not Fixed: 1. Rating button still not showing in green after being rated. --- .../core/__pycache__/__init__.cpython-310.pyc | Bin 0 -> 176 bytes .../core/__pycache__/admin.cpython-310.pyc | Bin 0 -> 356 bytes .../core/__pycache__/apps.cpython-310.pyc | Bin 0 -> 451 bytes .../core/__pycache__/forms.cpython-310.pyc | Bin 0 -> 712 bytes .../core/__pycache__/models.cpython-310.pyc | Bin 0 -> 2992 bytes .../core/__pycache__/urls.cpython-310.pyc | Bin 0 -> 897 bytes .../core/__pycache__/views.cpython-310.pyc | Bin 0 -> 7076 bytes newsaggregator/core/admin.py | 2 +- .../migrations/0004_alter_rating_headline.py | 19 ++++++++++++++++++ .../__pycache__/0001_initial.cpython-310.pyc | Bin 0 -> 1104 bytes .../__pycache__/0002_contact.cpython-310.pyc | Bin 0 -> 921 bytes ...line_rating_count_and_more.cpython-310.pyc | Bin 0 -> 1345 bytes ...0004_alter_rating_headline.cpython-310.pyc | Bin 0 -> 788 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 187 bytes newsaggregator/core/models.py | 7 ++++--- newsaggregator/core/views.py | 3 +-- newsaggregator/db.sqlite3 | Bin 241664 -> 249856 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 186 bytes .../__pycache__/settings.cpython-310.pyc | Bin 0 -> 2899 bytes .../__pycache__/urls.cpython-310.pyc | Bin 0 -> 401 bytes .../__pycache__/wsgi.cpython-310.pyc | Bin 0 -> 603 bytes newsaggregator/templates/components/news.html | 14 ++++++------- .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 181 bytes .../__pycache__/admin.cpython-310.pyc | Bin 0 -> 519 bytes .../__pycache__/apps.cpython-310.pyc | Bin 0 -> 466 bytes .../__pycache__/forms.cpython-310.pyc | Bin 0 -> 1074 bytes .../__pycache__/models.cpython-310.pyc | Bin 0 -> 1143 bytes .../__pycache__/urls.cpython-310.pyc | Bin 0 -> 451 bytes .../__pycache__/views.cpython-310.pyc | Bin 0 -> 1827 bytes .../__pycache__/0001_initial.cpython-310.pyc | Bin 0 -> 2115 bytes .../__pycache__/__init__.cpython-310.pyc | Bin 0 -> 192 bytes 31 files changed, 32 insertions(+), 13 deletions(-) create mode 100644 newsaggregator/core/__pycache__/__init__.cpython-310.pyc create mode 100644 newsaggregator/core/__pycache__/admin.cpython-310.pyc create mode 100644 newsaggregator/core/__pycache__/apps.cpython-310.pyc create mode 100644 newsaggregator/core/__pycache__/forms.cpython-310.pyc create mode 100644 newsaggregator/core/__pycache__/models.cpython-310.pyc create mode 100644 newsaggregator/core/__pycache__/urls.cpython-310.pyc create mode 100644 newsaggregator/core/__pycache__/views.cpython-310.pyc create mode 100644 newsaggregator/core/migrations/0004_alter_rating_headline.py create mode 100644 newsaggregator/core/migrations/__pycache__/0001_initial.cpython-310.pyc create mode 100644 newsaggregator/core/migrations/__pycache__/0002_contact.cpython-310.pyc create mode 100644 newsaggregator/core/migrations/__pycache__/0003_headline_average_rating_headline_rating_count_and_more.cpython-310.pyc create mode 100644 newsaggregator/core/migrations/__pycache__/0004_alter_rating_headline.cpython-310.pyc create mode 100644 newsaggregator/core/migrations/__pycache__/__init__.cpython-310.pyc create mode 100644 newsaggregator/newsaggregator/__pycache__/__init__.cpython-310.pyc create mode 100644 newsaggregator/newsaggregator/__pycache__/settings.cpython-310.pyc create mode 100644 newsaggregator/newsaggregator/__pycache__/urls.cpython-310.pyc create mode 100644 newsaggregator/newsaggregator/__pycache__/wsgi.cpython-310.pyc create mode 100644 newsaggregator/userauths/__pycache__/__init__.cpython-310.pyc create mode 100644 newsaggregator/userauths/__pycache__/admin.cpython-310.pyc create mode 100644 newsaggregator/userauths/__pycache__/apps.cpython-310.pyc create mode 100644 newsaggregator/userauths/__pycache__/forms.cpython-310.pyc create mode 100644 newsaggregator/userauths/__pycache__/models.cpython-310.pyc create mode 100644 newsaggregator/userauths/__pycache__/urls.cpython-310.pyc create mode 100644 newsaggregator/userauths/__pycache__/views.cpython-310.pyc create mode 100644 newsaggregator/userauths/migrations/__pycache__/0001_initial.cpython-310.pyc create mode 100644 newsaggregator/userauths/migrations/__pycache__/__init__.cpython-310.pyc diff --git a/newsaggregator/core/__pycache__/__init__.cpython-310.pyc b/newsaggregator/core/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..70040fed3bd1b6c32c25a855deb04ea40d113ff4 GIT binary patch literal 176 zcmd1j<>g`kg2gw=(m?cM5P=LBfgA@QE@lA|DGb33nv8xc8Hzx{2;x_;enx(7s(xZ( zQDT{XX>pNTW=?9cep-G}c4~^gpKExquA{qqkgL06h<}i7K#;$et8<8cUTS%9VtRT} tYI_!r}>A^xmDV3_@QU1(ijg6hjY@pM|z)NDLt_YyAW|aPw&&=Qq-`sGS5j+HU@>a7Kilx Zmp2z*QHpH^*PKkOcj~Z9-l28D{{WqIToV8Q literal 0 HcmV?d00001 diff --git a/newsaggregator/core/__pycache__/apps.cpython-310.pyc b/newsaggregator/core/__pycache__/apps.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..98ca37525d7e1113f57a8fb0a7d39a8b9104c73f GIT binary patch literal 451 zcmYjNy-ve05Vq?Sh5jt4D-vsl#xH*i8|vF!B~myb;RE z#49jyZYt4}?(_Y8_vw79-|rx>kFRa~4)3>34$XmN1a8g%1QIwyIgT(!ArdV?-jE;? zzmljWoF($wKfppBu8)JV9IGNuleMiJ8ir&9ZUz7nMOYx1#t{*%$PolooVqhsS~l}9 zr{bO$iSos*pDQ6V<6ovpP;JySm6@oWHBe_>yLK5XcrF>MJB$Id%52DwmXV&9}5NdYWd^&{*jQDd=o+vm6FtxR`{&YQ7j= zFXmU1@roAm$?zo6GT|Ggsoje5vNV4AtO-clLz*K17dhC)yV}enb$9h&K-EYYN literal 0 HcmV?d00001 diff --git a/newsaggregator/core/__pycache__/forms.cpython-310.pyc b/newsaggregator/core/__pycache__/forms.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..b2204f1666851256408ac14e40300cd251ab1473 GIT binary patch literal 712 zcmYjP&2AGh5VrRx+1(@{E~P>oDsFoy`vM5Hiqfb^q){3Pv6q#Jr<;V`b+El{$+cYb z6r6Ym9t8Qysjt8V#=DV-tr>Z~8Grt4j~EOhg5&$I+nb-1kl!{q93BQ|XzCR@PB<+{ zNmEM6m~e-?-w1bsuAK)rb-8y9vV`>cQ}*Gtp6Tk#z9HfkzIC0i9S zl>stspEb~QDJnRb)a57S>o?GQP>SU+iJzJv%PM5gG81K4DR^DjbwA6#)U0ST(y_9_ z;gZRV6%^crbGX-+)uz_Qvn3{Kj%}0ey3P7v<(U3ur6Gs??p`ZpU$L?3Okf$A1ZKJm zd=IGf4rFy;jDqZBZjihX^1>^-i#`%&q_$2mBhp${g;IYo8ps{{UBE!r1@- literal 0 HcmV?d00001 diff --git a/newsaggregator/core/__pycache__/models.cpython-310.pyc b/newsaggregator/core/__pycache__/models.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..98d138615333e9f72b47925ca4333fd92b79b4c9 GIT binary patch literal 2992 zcma)8TW=dh6yDj3cWtko)ReYR5H9dg1F_3RAfXZ((louMkfa4!LaVK3;@Da5rnBo_ zELQ?0uYKUTAhnPEC;WyHZ#?BM@B-hNb*^nB)|%s)b7p7HobNklCaF|P2A<8o9cd1|AOwufXL1cnVQglS`fsp7|7Y1Q3x*JA4 z9%hN`&^ia7y%=1FRv2x@jkYPQzRejopR%@tenGffMwf95V-MpZx4DCU3H>s5Zgcmk z+4l1tw=28^kITxPPvR`>WIO+2<(EvA2H~S15^*1Ehj2_pTu#xrq+!ez1t=taN%_~}Omsy)Q8}CINi0-xRXob{ zOyv$l3a^EHlU||C9}pC4=|U9IQi`@`_-vZ_tjc^#TV7#{gISko`ZC0EY~dDuHW=Xw z>$&&BXcxhg5_hz|@D$mBv5&C}4pkB~6Q7Xe+p5NM7)6>Al4#Jd zl*`3hIE*rRj^>g34JO~m-z%K4pwyhHp+lT`2G$T~o*92wpek5n*JoylHfE12C+lUA zkS8$tXtXGd@1SXjYiu;V>+C+pQ}PtOc$&l+5(KAwi^PWz%Dc0CGY7}%4G5ZdNox&d zq)Jz!B%B~u4UxVu2Qs82muG2~pAUjgGK{n1F?|nn$%(WIL6}yVr*ZX}B-<;f?$v-V zVLgbdaFF{}-{lNwQs&!&u*}CLZgOkeXqUN-AUewXE=e{9q1-^e6_a>Uj*drz_;(PE zzM118$!!2^4^ttPw?5&64&Sk;P;50SCxObYBm1cMuR{d^M;71!s%L_MA!{%1z=PobECd@i`vPHdP^XX$)>u4#?8^pdwaW^GtUy1r&F8u`S z|B5=|jqJ&*E-LW0A$&S_w#>^oDUe4vabQRNrE{iTnMhQDkRm z>`M`anc%uC9m0xuOD^inAtrZ$*3aG(HfEVIW?O8{{LQ>?uH;FA5^kXaQVKOMDAqfY zIjVFq>ZMsH8Enpy9~!DN#^^-uTXWyKL+QOkC2p0HytAJ4IwIXq@>*q&aqmIxBULTnlIgNUl)*Fue0E_0}Yut4T z7xEY$%SCcTZ?MTm)yW3;&Vbj~hYR!>i^QiSJ|l62a=HRIGK^6(z9IXu9Q+*C23ktT zC~>gH>cm2=#}y(KF&DB!0Pj8oG=2UCTDl66p*;4@G3#5%efGqn-V=LlJ-1&NV>@uh zcHiOVhAq!!1*-Pj#@HejZZWc)HDcTzFwY&^bOO+ANrxLHTE~%qJA@=TLoKC7#p_pM zTY=ctH|}DA`=(xkEnx}TJ_!63{uGl(saCw$6|s18PF{jPA`h%|IFJ-?+%m8%Nb@ZX zyk4AUVcZd_u<CDA~g+FM47=Kd{BQcf!8 z7TrJf0npvyVO0{CCTxI_OptXRn literal 0 HcmV?d00001 diff --git a/newsaggregator/core/__pycache__/urls.cpython-310.pyc b/newsaggregator/core/__pycache__/urls.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..a6c2ff3361d53c8a3d0bbd7b4baddbcc4bf41041 GIT binary patch literal 897 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 literal 0 HcmV?d00001 diff --git a/newsaggregator/core/admin.py b/newsaggregator/core/admin.py index ebf32b9..2686b6f 100644 --- a/newsaggregator/core/admin.py +++ b/newsaggregator/core/admin.py @@ -1,5 +1,5 @@ from django.contrib import admin -from core.models import Headline,Bookmark,Contact +from core.models import Headline, Bookmark, Contact admin.site.register(Headline) admin.site.register(Bookmark) admin.site.register(Contact) diff --git a/newsaggregator/core/migrations/0004_alter_rating_headline.py b/newsaggregator/core/migrations/0004_alter_rating_headline.py new file mode 100644 index 0000000..aa2c853 --- /dev/null +++ b/newsaggregator/core/migrations/0004_alter_rating_headline.py @@ -0,0 +1,19 @@ +# Generated by Django 5.0.6 on 2024-06-23 05:24 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0003_headline_average_rating_headline_rating_count_and_more'), + ] + + operations = [ + migrations.AlterField( + model_name='rating', + name='headline', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='ratings', to='core.headline'), + ), + ] diff --git a/newsaggregator/core/migrations/__pycache__/0001_initial.cpython-310.pyc b/newsaggregator/core/migrations/__pycache__/0001_initial.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..17a65f64c927f5cc4b439731f1997bc8c48e7d9e GIT binary patch literal 1104 zcmZuw&2G~`5caO^#Bq}TgMcR>hsNcK5NevH<*zMDQz7|cZL$-`u7ASXX(?B@_8nSr zLgEp403HGDl~Z4U1A@Y=leQqS(QamD=jWSm$7#K8Yq&mqJsN&8H0_&G{$6O))^TSK z@!%RKk>(QorxA^HS0~D*M@DSAW?XVhMBCQ5!Oiy?H^B_c?{v4!$-dSoU0}Sn+aS`) zAkTxu&l*(Pao`J<2WgVYQk-&#vVrpZdntVDxUs0Z9YCCF#@6 zh9PTglBeE40Ly{P>R1FZ6DQswoXAQBB4APQ7G&)RL_f{IOIQrj%!53Fi!VqI(rd@; zjTb@U=Obxiv=7L$*^gLqD2-$iMN*%L2yI3YTp9)t@l0A9X?lpY&}o8&@V=5J9zF=< z2ry5jHJZVFTOXtXnpf&>w8r(DU7 z*?7$Q=*VFV35R5GBB;8WZyofWcnABPuD7$d*?A#r*B$|6vf3`l*-^tH)O5<)M&P%Q zwk_3(th7f=OhxOU`(kG7!JB+4+FOV|@RR3AX^Dp{@l#28Us^@4IEk{{Ztb^Qn;mJV zW0+0nM@_6^t>XC6cSdOp4r78HIg<>lMUXkeR2%|#b~~^3S6kcL-OhHax7S^L+1-2A zY4@B2jx*-_0(_RI!ciPLH`DK|t*t%qW)wBYC&I*P7VhkRAsE!wjo*ez$qJn#3&bY$ zr*UailzxxgA@rAVX?-uE8kW2}?W@WA&FM$gylPIUbh0|TAEe1}N_yowqIjQz*dp6a Z+f%8j;;l#1M}ABcLIu;JHAHn={{zwkK)L_` literal 0 HcmV?d00001 diff --git a/newsaggregator/core/migrations/__pycache__/0002_contact.cpython-310.pyc b/newsaggregator/core/migrations/__pycache__/0002_contact.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..fa3375aa97a560e2b81b8568a955187d0b87389a GIT binary patch literal 921 zcmYjPOK;Oa5VqIrJe)@Zt$L`qZ~!TX#(^_JEg_9SYKz(kq+F~`X5u*YBdnd!a^M2j z{09&x{t??2AH8S zFzL%e7Fh!;;sb6PJp(M@-wfbrP3^DNzy|Z&Xxb~{7$;4poG9?6$buwJRUt|M!*rx| z_g96$0iE;<3Cz6=7?{2}u#it}U|?ZkS_Dqph5{6qe9WLk|4L8>XK50u5Gq3zooQuS z{a*WF_$Jhrj5PK99fvJwT9kDSSRkB&uq=-G1f; zagYTfRK-pbXJV8o7C`?vc)@2fv_Lsb zQuJaGq2gMuZYb%dNre)ZUWl=uO_Yt12*TC1)-c(ik8&1d0YsL_RN1ph660zoS1WrM ziuhvvsu*FK3LlA8*Q~-gz!1`tW@!> zCDRrvojj#u-8o5PVyNn?z(1s9kF;r3?o5PSU!AUwdVMdzRK$KFZDPo6O{?eH_qSQ7 zavv|V4KbPFW=4J)@`k_cTPq*%D~l-z`vy5mG%Ah;*p59j-bz1~^3ci2BY z+kba<`nKEYyD@&E3iuLzT`X7k&%K*Lmpb{}8?77Inq5gf)L`w?hZVuYa6Re)JsYPqVo> z7;c{9EI+{o93Yu9B=}1+I&+6EF`S#RnK$%i{?I4Rz5@)r?;Y@@H*I|94jVv@o!Ebi z-#dpf(LpJzD$SEJraGLZi4s*>E1T2M#K-9`U1%)bOG|*37V^y{xnv^}qe6iTq4A zKu*LWt2E0OS%!RQ1?9PzN#xAxO;VYGj%o)OVv$!dQ7!bN8>@ic{Itj=(xx%AKd`|x zO<_;d7rQajkyum(A1f&;3A!~`=}f2#ekLz;vy>_oS^5TVfys`FQr7YPI%Mp{^sPx- zlMfM5iyk3zEqaW|G@K?MA;NY<^dxrcOd8|UA|1<8MaaKt8>zNd+MssLBInpYvXYus zg=Py(C8nxlocQ+MAUvTG_jVds!hWOX%oDUdcqNdKdPx zYK2=nR?h?T26Xg!n)FcQ%VT?Z)ilY!LV>Ib@A=!#!l~er?=bJVKK)R zvG3_OM?J&4+vV>cx~IiVc7;&lyt^ndekRNAq)=xPx`+K&#}9k^`-A>|@8oFk@SDNW zm;IfSZZ2P!B1x1?L{+G+5xjf-Uc1<(kNK(q{Qcg%=5Mwd7dfEjShx9wGSv-mmLFR{ z-H@<%%%_Bs4q^W?&miRfhc@UYxknxl`VV^-{AInwfxchMvIV29`d?&grHy)u?seXvsX^M0um~-HX#)&&Fs!MJNwPgmi>OfXnp>Eb^gF+?1wS#E{BXGl4?W>7+4vL zEZXhN&UwUhCvq${XTZVv%D_RMx?gzYg0*5p_b0`$#n9G4p2SMlNm*3d%S*tlS{vWp z<&$wlQavYy4NGK$6J^t5Tm)oKivH+2rV6TO>zl+zM7O6h<&FiBb zKIFPv7J`by8g)-$CTj#y$Q-p@m*ftb(p$u7aQ8gH3>L$__Cuqaqa1ex$VDf+k9vlX3sF& I_pJf{12sP6IsgCw literal 0 HcmV?d00001 diff --git a/newsaggregator/core/migrations/__pycache__/__init__.cpython-310.pyc b/newsaggregator/core/migrations/__pycache__/__init__.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..37d17444d34114416ef75a541687faa697c48765 GIT binary patch literal 187 zcmd1j<>g`kg2gw=(m?cM5P=LBfgA@QE@lA|DGb33nv8xc8Hzx{2;x_qenx(7s(xZ( zQDT{XX>pNTW=?9cep-G}c4~^gpKExquA{qqkgL06h<}i7K#;$et8<8cUTS%9VtRT} zYIVo7FxUa@|Bd}dx|NqoFsLFFwDo80`A(wtN~kiErBK!Sw< E0D5jOEC2ui literal 0 HcmV?d00001 diff --git a/newsaggregator/core/models.py b/newsaggregator/core/models.py index 64adb0d..2b00c6d 100644 --- a/newsaggregator/core/models.py +++ b/newsaggregator/core/models.py @@ -26,7 +26,8 @@ class Headline(models.Model): average_rating = models.FloatField(default=0, null=True, blank=True) rating_count = models.IntegerField(default=0) def __str__(self): - return self.title + return f'{self.id} -> {self.title}' + class Bookmark(models.Model): user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) @@ -39,11 +40,11 @@ def __str__(self): # stores all the rating given by all the users class Rating(models.Model): user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE) - headline = models.ForeignKey(Headline, on_delete=models.CASCADE) + headline = models.ForeignKey(Headline, on_delete=models.CASCADE, related_name="ratings") rating = models.IntegerField(choices=[(i, str(i)) for i in range(1, 6)], null=True, blank=True) def __str__(self): - return f"{self.user} rated {self.headline.title} as {self.rating}" + return f"{self.id} -> ({self.user}) rated {self.headline.id} ({self.headline.title}) as {self.rating}" diff --git a/newsaggregator/core/views.py b/newsaggregator/core/views.py index a3d5241..f2ffa28 100644 --- a/newsaggregator/core/views.py +++ b/newsaggregator/core/views.py @@ -234,8 +234,7 @@ def rate_headline(request, headline_id): headline.rating_count = ratings.count() headline.average_rating = sum(r.rating for r in ratings) / headline.rating_count if headline.rating_count > 0 else 0 headline.save() - - return JsonResponse({'status': 'success', 'average_rating': headline.average_rating, 'rating_count': headline.rating_count}) + return JsonResponse({'status': 'success', 'average_rating': round(headline.average_rating, 2), 'rating_count': headline.rating_count}) return JsonResponse({'status': 'fail'}, status=400) diff --git a/newsaggregator/db.sqlite3 b/newsaggregator/db.sqlite3 index 50fd8e308f27edfb71620f1a1add02b5c1be8d05..22cfd7b7c045cfc26ee6b5edf37a57572f45548c 100644 GIT binary patch delta 3671 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 RdGgJzNgH5kO;VN$^6$nj-i-hN literal 0 HcmV?d00001 diff --git a/newsaggregator/newsaggregator/__pycache__/urls.cpython-310.pyc b/newsaggregator/newsaggregator/__pycache__/urls.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..67c37aacb04c918175b2ccc7bfd935cdc0bec517 GIT binary patch literal 401 zcmZ8a(MrQG6iu46>s&YdjXrGo0TGAHi4U7>1F>&$$-2(A88_|3zV1_e@{c6olTZGF zAea;%#0xq1oWspIs^33Bc3$2Nn|HfEocKF|6&LpDYYPGioTCCK7(4FeUO^I4(1c2Sl)3wB}qqwOB8oMZ5oQP@wq6nGWHDJ^J;54S-H+@A)BD} zS>xAQ0&50t@w(dTQ4P5^sOhd1$X3ka&@Zy1BxneZ2$lO literal 0 HcmV?d00001 diff --git a/newsaggregator/newsaggregator/__pycache__/wsgi.cpython-310.pyc b/newsaggregator/newsaggregator/__pycache__/wsgi.cpython-310.pyc new file mode 100644 index 0000000000000000000000000000000000000000..13583d380d51fd30599a581651799a3fb0379e12 GIT binary patch literal 603 zcmZ8f!H&}~5Ovb-b_p!vfZ*zDB^vL66GDiJ%|=~8i<+Vpy`(0dr0zO)WV`9^UiU{p zhy#Cwa^S*=U*Lq(3aQIT9_x8DZ{EyU9UlkC+1DR+{>?+^R}1#7>%ePw%!zXh%@OmM zFTAt*y)pLYT@-$W~Mq>Yt`el>{Vt z9-fe;+E_&xR6<>sAT8OLf|KC4n+h8Dz2&Vg2{YG5*s^Qi)oXenYp#`S0++}jr)y!G z`+J4IBi*ib>;8On;!7ZuYFd-E(Pyr8L)=I%fst`^kqm}$JdNVvY%(3ZpH9xBH#2fq g;Qz3d5?0sE(aYURUb(M>Ok1*xj_y71ANqm+7Xc2wng9R* literal 0 HcmV?d00001 diff --git a/newsaggregator/templates/components/news.html b/newsaggregator/templates/components/news.html index b198099..56b6e8a 100644 --- a/newsaggregator/templates/components/news.html +++ b/newsaggregator/templates/components/news.html @@ -28,20 +28,20 @@
- + - + - + - + - +
{% if record.average_rating %} - ({{ record.average_rating }}) + ({{ record.average_rating | floatformat:2}}) {% endif %}