{% translate "You have already joined the collective rating, but there are no submissions yet." %}
+ {% else %} + + {% endif %} {% endblock %} diff --git a/pretalx_musicrate/templates/pretalx_musicrate/present.html b/pretalx_musicrate/templates/pretalx_musicrate/present.html index 35398ad..ba384b8 100644 --- a/pretalx_musicrate/templates/pretalx_musicrate/present.html +++ b/pretalx_musicrate/templates/pretalx_musicrate/present.html @@ -1,11 +1,17 @@ {% extends "pretalx_musicrate/submission_base.html" %} {% load compress %} +{% load i18n %} {% load static %} -{% block submission_content %} +{% block submission_header %} {% if next %} {% compress js %} - + {% endcompress %} {% endif %} {% endblock %} + +{% block submission_content %} + {% translate "Show Join QR Code" %} + +{% endblock %} diff --git a/pretalx_musicrate/templates/pretalx_musicrate/qrcode.html b/pretalx_musicrate/templates/pretalx_musicrate/qrcode.html index 7444a2f..7d78c98 100644 --- a/pretalx_musicrate/templates/pretalx_musicrate/qrcode.html +++ b/pretalx_musicrate/templates/pretalx_musicrate/qrcode.html @@ -1,4 +1,5 @@ {% extends "cfp/event/base.html" %} +{% load i18n %} {% load qrcode %} {% block content %} @@ -6,4 +7,8 @@ {% qrcode contents %} {{ contents | urlize }} + {% if last_submission %} +/", RatingView.as_view(), name="rating"),
]
),
),
diff --git a/pretalx_musicrate/views.py b/pretalx_musicrate/views.py
index 073da58..c1fd85d 100644
--- a/pretalx_musicrate/views.py
+++ b/pretalx_musicrate/views.py
@@ -2,22 +2,28 @@ from hmac import compare_digest
from django.contrib import messages
from django.http import JsonResponse
-from django.shortcuts import redirect
+from django.shortcuts import get_object_or_404, redirect
from django.urls import reverse
from django.utils.functional import cached_property
-from django.utils.translation import gettext_lazy as _
+from django.utils.translation import gettext_lazy as _, ngettext
from django.views.generic import FormView, TemplateView, View
from django.views.generic.detail import SingleObjectMixin
from django_context_decorator import context
from pretalx.common.mixins.views import EventPermissionRequired
-from .forms import MusicrateSettingsForm
+from .forms import MusicrateSettingsForm, RatingForm
+from .models import Juror, Rating
class JoinView(TemplateView):
template_name = "pretalx_musicrate/join.html"
def validate_token(self, token):
+ try:
+ self.juror = Juror.objects.get(token=token)
+ return True
+ except Juror.DoesNotExist:
+ self.juror = None
if compare_digest(
token.encode("utf-8"),
self.request.event.pretalx_musicrate_settings.join_token.encode("utf-8"),
@@ -28,17 +34,55 @@ class JoinView(TemplateView):
def get_context_data(self, token_valid=False, **kwargs):
context = super().get_context_data(**kwargs)
+ context["juror"] = self.juror
context["token_valid"] = token_valid
return context
def get(self, request, *args, token, **kwargs):
token_valid = self.validate_token(token)
+ if self.juror is not None:
+ submission = (
+ self.juror.last_submission
+ or self.request.event.pretalx_musicrate_settings.last_submission
+ or self.request.event.submissions.filter(
+ submission_type__in=self.request.event.pretalx_musicrate_settings.submission_types.all()
+ )
+ .order_by("created")
+ .first()
+ )
+ if submission is not None:
+ return redirect(
+ "plugins:pretalx_musicrate:rating",
+ event=self.request.event.slug,
+ token=self.juror.token,
+ code=submission.code,
+ )
return super().get(request, *args, token_valid=token_valid, **kwargs)
def post(self, request, *args, token, **kwargs):
token_valid = self.validate_token(token)
if token_valid:
- return redirect(request.path)
+ if self.juror is None:
+ self.juror = Juror.objects.create(
+ event=self.request.event,
+ last_submission=self.request.event.pretalx_musicrate_settings.last_submission,
+ )
+ submission = (
+ self.juror.last_submission
+ or self.request.event.pretalx_musicrate_settings.last_submission
+ or self.request.event.submissions.filter(
+ submission_type__in=self.request.event.pretalx_musicrate_settings.submission_types.all()
+ )
+ .order_by("created")
+ .first()
+ )
+ if submission is not None:
+ return redirect(
+ "plugins:pretalx_musicrate:rating",
+ event=self.request.event.slug,
+ token=self.juror.token,
+ code=submission.code,
+ )
return self.render_to_response(
self.get_context_data(token_valid=token_valid, **kwargs)
)
@@ -80,6 +124,14 @@ class QRCodeView(EventPermissionRequired, TemplateView):
},
)
)
+ context["last_submission"] = (
+ self.request.event.pretalx_musicrate_settings.last_submission
+ or self.request.event.submissions.filter(
+ submission_type__in=self.request.event.pretalx_musicrate_settings.submission_types.all()
+ )
+ .order_by("created")
+ .first()
+ )
return context
@@ -174,6 +226,62 @@ class SubmissionMixin(SingleObjectMixin):
)
+class RatingView(FormView, SubmissionMixin):
+ template_name = "pretalx_musicrate/rating.html"
+ form_class = RatingForm
+
+ @cached_property
+ def juror(self):
+ return get_object_or_404(
+ Juror, token=self.request.resolver_match.kwargs["token"]
+ )
+
+ @context
+ @cached_property
+ def can_continue(self):
+ return self.submission.ratings.filter(juror=self.juror).exists()
+
+ def get_form(self, form_class=None):
+ if form_class is None:
+ form_class = self.get_form_class()
+ try:
+ instance = Rating.objects.get(submission=self.submission, juror=self.juror)
+ except Rating.DoesNotExist:
+ instance = None
+ return form_class(instance=instance, **self.get_form_kwargs())
+
+ def get_success_url(self):
+ return self.request.path
+
+ def form_valid(self, form):
+ obj = form.save(commit=False)
+ obj.submission = self.submission
+ obj.juror = self.juror
+ obj.save()
+ try:
+ self.juror.last_submission = self.submission
+ self.juror.save()
+ except Exception:
+ pass
+ messages.success(self.request, _("Saved!"))
+ return super().form_valid(form)
+
+ def get(self, request, *args, **kwargs):
+ self.object = self.get_object()
+ if (
+ (settings := self.request.event.pretalx_musicrate_settings).last_submission
+ is not None
+ and self.object.created > settings.last_submission.created
+ ):
+ return redirect(
+ self.request.resolver_match.view_name,
+ event=self.request.event.slug,
+ token=self.juror.token,
+ code=settings.last_submission.code,
+ )
+ return super().get(request, *args, **kwargs)
+
+
class PresenterView(EventPermissionRequired, SubmissionMixin, TemplateView):
permission_required = "orga.view_submissions"
template_name = "pretalx_musicrate/present.html"
@@ -185,11 +293,37 @@ class PresenterView(EventPermissionRequired, SubmissionMixin, TemplateView):
def get(self, request, *args, **kwargs):
self.object = self.get_object()
+ if (
+ (settings := self.request.event.pretalx_musicrate_settings).last_submission
+ is None
+ or self.object.created > settings.last_submission.created
+ ):
+ try:
+ settings.last_submission = self.object
+ settings.save()
+ except Exception:
+ pass
return super().get(request, *args, **kwargs)
-class MayAdvanceView(EventPermissionRequired, View):
+class MayAdvanceView(EventPermissionRequired, SubmissionMixin, View):
permission_required = "orga.view_submissions"
def get(self, request, *args, **kwargs):
- return JsonResponse(True, safe=False)
+ num_ratings = self.submission.ratings.count()
+ num_jurors = self.request.event.jurors.count()
+ return JsonResponse(
+ {
+ "mayAdvance": num_ratings
+ >= int(
+ num_jurors
+ * self.request.event.pretalx_musicrate_settings.advance_threshold
+ ),
+ "statusText": ngettext(
+ "%(num_ratings)d of %(num_jurors)d has rated this submission",
+ "%(num_ratings)d of %(num_jurors)d have rated this submission",
+ num_ratings,
+ )
+ % {"num_jurors": num_jurors, "num_ratings": num_ratings},
+ }
+ )