Try to fix player names in submissions

Author: jiisloth

marathon/cms_plugins.py

@@ -4,7 +4,7 @@
 from cms.plugin_pool import plugin_pool
 
 from .forms import SubmissionForm, PlayerForm
-from .models import Event, Submission, MarathonPlugin
+from .models import Event, Submission, MarathonPlugin, Player
 from .utils import get_player_info_for_user
 
 class SubmissionListSubmission:
@@ -13,8 +13,14 @@ def __init__(self, submission):
         self.category = submission.category
         self.players = []
         self.estimate = submission.estimate
+        self.ptest = ""
+        self.ntest = ""
         for player in submission.players.all():
-            self.players.append(SubmissionListPlayer(player))
+            self.ptest += str(player.user_id) + " "
+            self.ntest += player.nickname + " "
+            self.atest = player
+            p = Player.objects.filter(user_id=player.user_id).first()
+            self.players.append(SubmissionListPlayer(p))
 
     def update(self, submission):
         for player in submission.players.all():

marathon/urls.py

@@ -7,5 +7,6 @@
     path('<slug:event>/', views.event_detail),
     path('<slug:event>/submission/', views.new_submission, name='new-submission'),
     path('<slug:event>/edit/<slug:submission_id>', views.edit_submission, name='edit-submission'),
+    path('<slug:event>/datadump/', views.data_dump, name='data-dump'),
     path('thanks', views.thanks),
 ]

marathon/views.py

@@ -2,7 +2,8 @@
 from operator import truediv
 
 from django.contrib import messages
-from django.http import Http404, HttpResponseRedirect
+from django.contrib.auth.decorators import permission_required
+from django.http import Http404, HttpResponseRedirect, JsonResponse
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
@@ -113,5 +114,49 @@ def edit_submission(request, event, submission_id):
         return render(request, 'marathon/edit_submission.html', context)
     raise Http404('Tämmöstä ei oo')
 
+
+@permission_required('marathon.delete_submission')
+def data_dump(request, event):
+
+    if request.user.is_authenticated:
+        perms = request.user.get_user_permissions()
+        if 'marathon.delete_submission' in perms:
+            event = get_object_or_404(Event, slug=event)
+            submissions = Submission.objects.filter(event=event, hidden=False)
+            subs = []
+            players = {}
+            for s in submissions:
+                sub = {
+                    'id': s.id,
+                    'players': [],
+                    'game_title': s.game_title,
+                    'publish_year': s.publish_year,
+                    'console': s.console,
+                    'console_display': s.console_display,
+                    'category': s.category,
+                    'estimate': s.estimate,
+                    'personal_best': s.personal_best,
+                    'time_constraints': s.time_constraints,
+                    'description': s.description,
+                    'priority': s.priority,
+                }
+                for p in s.players.all():
+                    sub['players'].append(p.user_id)
+                    if p.user_id not in players:
+                        players[p.user_id] = {
+                            'id': p.user_id,
+                            'nickname': p.nickname,
+                            'discord': p.discord,
+                            'twitch': p.twitch,
+                            'gmail': p.gmail,
+                            'games': [s.id]
+                        }
+                    else:
+                        players[p.user_id]['games'].append(s.id)
+                subs.append(sub)
+
+            return JsonResponse({"submissions": subs, "players": players})
+    raise Http404('Tämmöstä ei oo')
+
 def thanks(request):
     return

templates/marathon/plugins/submission_list.html

@@ -15,10 +15,11 @@
             <div class="runner">
                 <div class="label">Juoksija:</div>
                 <div class="value">
-                    {% for player in submission.players.all %}
+                    <span style="display: none">{{ submission.ptest }} {{ submission.ntest}} {{submission.atest}}</span>
+                    {% for player in submission.players %}
                         {% if not forloop.first %}{% if forloop.last %} & {% else %}, {% endif %}{% endif %}
                         {% if player.twitch %}
-                            <a class="twitch-link" target="_blank" href="https://www.twitch.tv/{{ player.twitch }}">{% include 'macros/long_text.html' with text=player.nickname long=18 increment=3 %} <img class="twitch-icon" /></a>
+                            <a class="twitch-link" target="_blank" href="https://www.twitch.tv/{{ player.twitch }}">{% include 'macros/long_text.html' with text=player.nickname long=12 increment=4 %} <img class="twitch-icon" /></a>
                         {% else %}
                             {% include 'macros/long_text.html' with text=player.nickname long=15 increment=4 %}
                         {% endif %}