Fix sponsorlogos, fix submissionlist, add way to edit submissions

Author: jiisloth

marathon/cms_plugins.py

@@ -22,6 +22,65 @@ def render(self, context, instance, placeholder):
         else:
             submissions = Submission.objects.filter(hidden=False)
 
+        unique_players = []
+        run_times = {}
+        total_time = 0
+        for s in submissions:
+            for p in s.players.all():
+                if p not in unique_players:
+                    unique_players.append(p)
+            time = s.estimate.split(":")
+            if len(time) == 2:
+                run_id = s.game_title.lower() + s.category.lower()
+                run_time = int(time[0]) * 60 + int(time[1])
+                if run_id in run_times:
+                    if run_times[run_id] < run_time:
+                        total_time -= run_times[run_id]
+                        run_times[run_id] = run_time
+                        total_time += run_time
+                else:
+                    run_times[run_id] = run_time
+                    total_time += run_time
+        total_days = int(total_time / 60 / 24)
+        total_hours = int(total_time / 60) % 24
+        total_minutes = total_time % 60
+        time_string = str(total_hours) + " t " + str(total_minutes) + " m"
+        if total_days > 0:
+            time_string = str(total_days) + " p " + str(total_hours) + "." + str(int(total_minutes/6)) + " t"
+
+        context['submissions'] = submissions
+        context['game_count'] = str(len(run_times))
+        context['unique_players'] = str(len(unique_players))
+        context['total_run_time'] = time_string
+        return context
+
+
+@plugin_pool.register_plugin
+class MySubmissionsPlugin(CMSPluginBase):
+    name = 'My Submissions'
+    model = MarathonPlugin
+    render_template = 'marathon/plugins/my_submissions.html'
+    cache = False
+
+    def render(self, context, instance, placeholder):
+        context = super().render(context, instance, placeholder)
+        if context['request'].user.is_authenticated:
+            player = get_player_info_for_user(context['request'].user)
+        else:
+            player = {'id': -1}
+
+        if instance.event:
+            submissions = Submission.objects.filter(event=instance.event, hidden=False, players__in=[player['id']])
+        else:
+            submissions = Submission.objects.filter(hidden=False, players__in=[player['id']])
+
+        event_duration = (instance.event.end - instance.event.start).days
+        event_days = []
+        for d in range(event_duration + 1):
+            event_days.append(instance.event.start + datetime.timedelta(days=d))
+        context['require_authentication'] = True
+        context['event'] = instance.event
+        context['event_days'] = event_days
         context['submissions'] = submissions
         return context
 
@@ -37,18 +96,27 @@ def render(self, context, instance, placeholder):
         context = super().render(context, instance, placeholder)
 
         previous_data = context['request'].session.get('previous_form')
+        if context['request'].user.is_authenticated and not previous_data:
+            player_info = get_player_info_for_user(context['request'].user)
+            last_submit = Submission.objects.filter(event=instance.event, hidden=False, players__in=[player_info['id']]).last()
+            if last_submit:
+                form = SubmissionForm(initial={'time_constraints': last_submit.time_constraints})
+            else:
+                form = SubmissionForm()
+        else:
+            form = SubmissionForm(previous_data)
 
-        form = SubmissionForm(previous_data)
         if previous_data:
             player_form = PlayerForm(previous_data, prefix='player')
         elif context['request'].user.is_authenticated:
-            print('got user')
             player_info = get_player_info_for_user(context['request'].user)
             player_form = PlayerForm(initial=player_info, prefix='player')
             if player_info.get('discord'):
                 player_form.fields['discord'].widget.attrs['readonly'] = True
         else:
             player_form = PlayerForm(prefix='player')
+
+
         event_duration = (instance.event.end - instance.event.start).days
         event_days = []
         for d in range(event_duration + 1):

marathon/models.py

@@ -77,7 +77,7 @@ class Submission(models.Model):
     scoreboard_link = models.URLField(_('rankinglistalinkki'), blank=True)
 
     # Extras
-    time_constraints = models.TextField(_('aikataulurajoitteet'), blank=True, help_text=_('Mikäli sinulle kelpaavat ajat muuttuvat, voit korjata tiedot ilmoittautumisen päätyttyä.'))
+    time_constraints = models.TextField(_('aikataulurajoitteet'), blank=True, help_text=_('Mikäli sinulle kelpaavat ajat muuttuvat, voit korjata tiedot ilmoittautumisen päätyttyä.'), default='')
     for_children = models.BooleanField(_('sopiva lapsille'), default=False,
                                        help_text=_('Runin sisältö ja selostus ovat lapsiyleisölle sopivia'))
     flashing_lights = models.BooleanField(_('sisältää nopeasti vilkkuvia valoja'), default=False)

marathon/urls.py

@@ -6,5 +6,6 @@
     path('', views.active_event),
     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('thanks', views.thanks),
 ]

marathon/views.py

@@ -1,10 +1,13 @@
+import datetime
+
 from django.contrib import messages
 from django.http import Http404, HttpResponseRedirect
 from django.shortcuts import render, get_object_or_404
 from django.utils.translation import gettext_lazy as _
 
 from .models import Event, Player, Submission
 from .forms import SubmissionForm, PlayerForm
+from .utils import get_player_info_for_user
 
 
 def active_event(request):
@@ -49,5 +52,56 @@ def new_submission(request, event):
         return HttpResponseRedirect(request.GET.get('next', '/'))
     raise Http404('Tämmöstä ei oo')
 
+
+
+def edit_submission(request, event, submission_id):
+    if request.user.is_authenticated:
+        player = get_player_info_for_user(request.user)
+    else:
+        return HttpResponseRedirect('/')
+    event = get_object_or_404(Event, slug=event)
+    submission = get_object_or_404(Submission, id=submission_id, event=event, hidden=False, players__in=[player['id']])
+
+    if request.method == 'POST':
+        form = SubmissionForm(request.POST)
+
+        if form.is_valid():
+            form = form.save(commit=False)
+            submission.game_title = form.game_title
+            submission.publish_year = form.publish_year
+            submission.console = form.console
+            submission.console_display = form.console_display
+            submission.category = form.category
+            submission.estimate = form.estimate
+            submission.personal_best = form.personal_best
+            submission.time_constraints = form.time_constraints
+            submission.description = form.description
+            submission.priority = form.priority
+            submission.save()
+            request.session['previous_form'] = None
+            messages.add_message(request, messages.SUCCESS, _('Ilmoittautuminen onnistui!'))
+        else:
+            request.session['previous_form'] = request.POST
+            messages.add_message(request, messages.ERROR, _('Ilmoittautuminen epäonnistui, tarkista lomake.'))
+        return HttpResponseRedirect(request.GET.get('next', '/'))
+
+    if request.method == 'GET':
+
+        form = SubmissionForm(initial=vars(submission))
+        event_duration = (event.end - event.start).days
+        event_days = []
+        for d in range(event_duration + 1):
+            event_days.append(event.start + datetime.timedelta(days=d))
+
+        context = {
+            'event': event,
+            'event_days': event_days,
+            'require_authentication': True,
+            'form': form,
+            'submission_id': submission_id,
+        }
+        return render(request, 'marathon/edit_submission.html', context)
+    raise Http404('Tämmöstä ei oo')
+
 def thanks(request):
     return