diff --git a/reValuate/db.sqlite3 b/reValuate/db.sqlite3 index 0f69d56a..26e2ada1 100644 Binary files a/reValuate/db.sqlite3 and b/reValuate/db.sqlite3 differ diff --git a/reValuate/home/__pycache__/views.cpython-39.pyc b/reValuate/home/__pycache__/views.cpython-39.pyc index 1fece7bb..a5f1e8d5 100644 Binary files a/reValuate/home/__pycache__/views.cpython-39.pyc and b/reValuate/home/__pycache__/views.cpython-39.pyc differ diff --git a/reValuate/home/views.py b/reValuate/home/views.py index e7d1c978..257a3190 100644 --- a/reValuate/home/views.py +++ b/reValuate/home/views.py @@ -4,6 +4,7 @@ from users.models import Balance from django.conf import settings from users.models import User import operator +from upload.models import Media def homePage(request): iter_var = 0 @@ -54,15 +55,48 @@ def leaderboard(request): username = i.username balance = i.balance.balanceValue # add media counter and other stuff - if f"{username}" in leaderboard.values(): - leaderboard[username] = balance + leaderboard[username].value + if f"{username}" in leaderboard.keys(): + leaderboard[username] = balance + leaderboard[username] else: leaderboard[username] = balance + + leaderboard = dict(sorted(leaderboard.items(), key=operator.itemgetter(0))) + leaderboard = dict(reversed(list(leaderboard.items()))) + + while len(leaderboard) > 5: + leaderboard.pop() - print() + + media = Media.objects.all() + user_media = {} + for i in media: + username = i.user.username + if f"{username}" in user_media.keys(): + user_media[username] = 1 + user_media[username] + else: + user_media[username] = 1 + + user_media = dict(sorted(user_media.items(), key=operator.itemgetter(0))) + user_media = dict(reversed(list(user_media.items()))) + + while len(user_media) > 5: + user_media.pop() + + # for i in media: + # username = i.user.username + # image = i.image + + # if f"{username}" in media_count.values(): + # media_count[username] = image + media_count[username].value + # else: + # media_count[username] = image + # print(media_count) + context = { - "leaderboard":dict(sorted(leaderboard.items(), key=operator.itemgetter(0))), + "leaderboard":leaderboard, + "user_media":user_media } + return render(request, 'leaderboard.html', context) diff --git a/reValuate/media/2/140215832_447943516342611_5859484094486812456_n.jpg b/reValuate/media/2/140215832_447943516342611_5859484094486812456_n.jpg new file mode 100644 index 00000000..50286092 Binary files /dev/null and b/reValuate/media/2/140215832_447943516342611_5859484094486812456_n.jpg differ diff --git a/reValuate/templates/leaderboard.html b/reValuate/templates/leaderboard.html index ce6f7408..caf8d045 100644 --- a/reValuate/templates/leaderboard.html +++ b/reValuate/templates/leaderboard.html @@ -1,13 +1,160 @@ {% extends 'base.html' %} {% block title %}Класация{% endblock %} +{% block optionalParams %} + +{% endblock %} {% block content %} -
-{% for i, z in leaderboard.items reversed %} +
+
+
+ +

Най-много reCoins

+
+
+
    + {% for i, z in leaderboard.items %} +
  1. + {{ i }} + {{z}} reCoins +
  2. + {% endfor %} +
+
+
+
+
+
+
+ +

Най-много качена медия

+
+
+
    + {% for i, z in user_media.items %} +
  1. + {{ i }} + {{z}} снимки и видеа +
  2. + {% endfor %} +
+
+
+
-

{{ forloop.counter }}. {{i}} has {{z}} reCoins


-{% endfor %}
{% endblock %} \ No newline at end of file