.editorconfig

@@ -1,5 +0,0 @@
-root = true
-
-[*.{html,js}]
-indent_size = 4
-indent_style = space

pretalx_musicrate/__init__.py

@@ -1 +1 @@
-__version__ = "2025.1.0.dev0"
+__version__ = "0.15.0"

pretalx_musicrate/forms.py

@@ -37,6 +37,12 @@ class MusicrateSettingsForm(I18nModelForm):
             "link_questions",
             "advance_threshold",
         )
+        widgets = {
+            "submission_types": forms.SelectMultiple(attrs={"class": "select2"}),
+            "genre_question": forms.Select(attrs={"class": "select2"}),
+            "origin_question": forms.Select(attrs={"class": "select2"}),
+            "link_questions": forms.SelectMultiple(attrs={"class": "select2"}),
+        }
         field_classes = {
             "submission_types": SafeModelMultipleChoiceField,
             "genre_question": SafeModelChoiceField,

pretalx_musicrate/locale/de_DE/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: pretalx-musicrate 0.9.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-11-02 19:23+0100\n"
+"POT-Creation-Date: 2024-02-14 22:24+0100\n"
 "PO-Revision-Date: 2024-02-14 22:30+0100\n"
 "Last-Translator: Luca <Luca@hackerspace-bamberg.de>\n"
 "Language-Team: Luca <Luca@hackerspace-bamberg.de>\n"
@@ -18,7 +18,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 3.4.1\n"
 
-#: pretalx_musicrate/apps.py:12 pretalx_musicrate/signals.py:59
+#: pretalx_musicrate/apps.py:12
 msgid "pretalx-musicrate"
 msgstr "pretalx-musicrate"
 
@@ -26,7 +26,7 @@ msgstr "pretalx-musicrate"
 msgid "pretalx plugin for rating music"
 msgstr "pretalx-Plugin zur Bewertung von Musik"
 
-#: pretalx_musicrate/forms.py:79
+#: pretalx_musicrate/forms.py:85
 msgid "require all"
 msgstr "alle voraussetzen"
 
@@ -71,95 +71,100 @@ msgid "The name of the submission's assignee"
 msgstr "Der Name der für die Einreichung zuständigen Person"
 
 #: pretalx_musicrate/signals.py:35
-msgid "Sessions, but better"
+msgid "Proposals, but better"
-msgstr "Vorträge, aber besser"
+msgstr "Einreichungen, aber besser"
 
 #: pretalx_musicrate/signals.py:45
 msgid "Collective Rating"
 msgstr "Anhörtag"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/assignee.html:5
+#: pretalx_musicrate/templates/pretalx_musicrate/assignee.html:6
 #, python-format
 msgid "Assignee for %(quotation_open)s%(title)s%(quotation_close)s"
 msgstr "Zuständige*r für %(quotation_open)s%(title)s%(quotation_close)s"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:43
+#: pretalx_musicrate/templates/pretalx_musicrate/assignee.html:16
+#: pretalx_musicrate/templates/pretalx_musicrate/settings.html:22
+msgid "Save"
+msgstr "Speichern"
+
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:23
 msgid "proposal"
 msgid_plural "proposals"
 msgstr[0] "Einreichung"
 msgstr[1] "Einreichungen"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:72
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:46
 msgid "Search"
 msgstr "Suche"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:77
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:51
 #, python-format
 msgid "List filtered by answers to question \"%(question)s\"."
 msgstr "Liste gefiltert nach Antworten zur Frage \"%(question)s\"."
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:82
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:56
 msgid "Remove filter"
 msgstr "Filter entfernen"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:93
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:67
 msgid "Rating"
 msgstr "Bewertung"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:94
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:68
 msgid "Sort by rating (0-10)"
 msgstr "Nach Bewertung sortieren (0-10)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:95
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:69
 msgid "Sort by rating (10-0)"
 msgstr "Nach Bewertung sortieren (10-0)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:98
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:72
 msgid "Title"
 msgstr "Titel"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:99
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:73
 msgid "Sort by title (a-z)"
 msgstr "Nach Titel sortieren (a-z)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:100
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:74
 msgid "Sort by title (z-a)"
 msgstr "Nach Titel sortieren (z-a)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:104
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:78
 msgid "Type"
 msgstr "Typ"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:108
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:82
 msgid "State"
 msgstr "Status"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:109
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:83
 msgid "Sort by state (a-z)"
 msgstr "Nach Status sortieren (a-z)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:110
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:84
 msgid "Sort by state (z-a)"
 msgstr "Nach Status sortieren (z-a)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:113
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:87
 msgid "Assignee"
 msgstr "Zuständige*r"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:114
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:88
 msgid "Sort by assignee (a-z)"
 msgstr "Nach Zuständiger*m sortieren (a-z)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:115
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:89
 msgid "Sort by assignee (z-a)"
 msgstr "Nach Zuständiger*m sortieren (z-a)"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:154
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:128
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:162
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:136
 msgid "edit"
 msgstr "bearbeiten"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:167
+#: pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html:141
 msgid "Delete"
 msgstr "Löschen"
 
@@ -186,11 +191,11 @@ msgstr "Mitmach-QR-Code anzeigen"
 msgid "Go to collective rating"
 msgstr "Zum Anhörtag"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/settings.html:7
+#: pretalx_musicrate/templates/pretalx_musicrate/settings.html:8
 msgid "pretalx-musicrate settings"
 msgstr "pretalx-musicrate-Einstellungen"
 
-#: pretalx_musicrate/templates/pretalx_musicrate/settings.html:12
+#: pretalx_musicrate/templates/pretalx_musicrate/settings.html:30
 msgid "Export ratings"
 msgstr "Bewertungen exportieren"
 

pretalx_musicrate/migrations/0005_juror_musicratesettings_last_submission_rating_and_more.py

@@ -1,7 +1,7 @@
 # Generated by Django 4.2.8 on 2023-12-15 18:27
 
 import django.db.models.deletion
-import pretalx.common.models.mixins
+import pretalx.common.mixins.models
 from django.db import migrations, models
 
 import pretalx_musicrate.models
@@ -51,8 +51,8 @@ class Migration(migrations.Migration):
                 "abstract": False,
             },
             bases=(
-                pretalx.common.models.mixins.LogMixin,
+                pretalx.common.mixins.models.LogMixin,
-                pretalx.common.models.mixins.FileCleanupMixin,
+                pretalx.common.mixins.models.FileCleanupMixin,
                 models.Model,
             ),
         ),

pretalx_musicrate/signals.py

@@ -32,7 +32,7 @@ def pretalx_musicrate_nav_event(sender, request, **kwargs):
             "active": request.resolver_match.view_name
             == "plugins:pretalx_musicrate:enhanced_list",
             "icon": "sticky-note-o",
-            "label": _("Sessions, but better"),
+            "label": _("Proposals, but better"),
             "url": reverse(
                 "plugins:pretalx_musicrate:enhanced_list",
                 kwargs={"event": request.event.slug},
@@ -56,7 +56,7 @@ def pretalx_musicrate_settings(sender, request, **kwargs):
         return []
     return [
         {
-            "label": _("pretalx-musicrate"),
+            "label": "pretalx-musicrate",
             "url": reverse(
                 "plugins:pretalx_musicrate:settings.musicrate",
                 kwargs={"event": request.event.slug},

pretalx_musicrate/static/pretalx_musicrate/submission_filter.js

@@ -1,14 +1,11 @@
-onReady(() => {
+document.addEventListener("DOMContentLoaded", function() {
-    const updateRequireAllVisibility = () => {
+  const updateRequireAllVisibility = () => {
-        if (document.querySelector("#id_tags").value) {
+    if (document.querySelector("#id_tags").value) {
-            document.querySelector("#requireAll").classList.remove("d-none")
+      document.querySelector("#requireAll").classList.remove("d-none")
-        } else {
+    } else {
-            document.querySelector("#requireAll").classList.add("d-none")
+      document.querySelector("#requireAll").classList.add("d-none")
-        }
     }
-
+  }
-    document
+  $("#id_tags").on("change", updateRequireAllVisibility)
-        .querySelector("#id_tags")
+  updateRequireAllVisibility()
-        .addEventListener("change", updateRequireAllVisibility)
-    updateRequireAllVisibility()
 })

pretalx_musicrate/templates/pretalx_musicrate/assignee.html

@@ -1,8 +1,22 @@
 {% extends "orga/base.html" %}
+{% load bootstrap4 %}
 {% load i18n %}
 
 {% block content %}
     <h2>{% blocktranslate with title=submission.title %}Assignee for {{ quotation_open }}{{ title }}{{ quotation_close }}{% endblocktranslate %}</h2>
-    {% include "orga/includes/base_form.html" %}
+    <form method="post">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        {% bootstrap_field form.user layout='event' %}
+        <div class="submit-group panel">
+            <span></span>
+            <span>
+                <button type="submit" class="btn btn-success btn-lg">
+                    <i class="fa fa-check"></i>
+                    {% translate "Save" %}
+                </button>
+            </span>
+        </div>
+    </form>
 {% endblock %}
 

pretalx_musicrate/templates/pretalx_musicrate/enhanced_list.html

@@ -1,37 +1,17 @@
 {% extends "orga/base.html" %}
+{% load bootstrap4 %}
 {% load compress %}
 {% load i18n %}
 {% load rules %}
 {% load static %}
+{% load url_replace %}
 
 {% block scripts %}
     {% compress js %}
-        <script defer src="{% static "orga/js/submission_filter.js" %}"></script>
+        <script src="{% static "orga/js/submission_filter.js" %}"></script>
     {% endcompress %}
     {% compress js %}
-        <script defer src="{% static "pretalx_musicrate/submission_filter.js" %}"></script>
+        <script src="{% static "pretalx_musicrate/submission_filter.js" %}"></script>
-    {% endcompress %}
-{% endblock %}
-
-{% block stylesheets %}
-    {% compress css %}
-        <style>
-            .search-form {
-                #requireAll .form-group {
-                    margin-bottom: 0;
-                }
-
-                #requireAll label {
-                    display: inline-block;
-                    color: #6c757d;
-                }
-            }
-
-            #requireAll .form-group-inline {
-                flex-direction: row;
-                align-items: center;
-            }
-        </style>
     {% endcompress %}
 {% endblock %}
 
@@ -49,26 +29,20 @@
 
     <div class="submit-group search-submit-group">
         <form class="search-form">
-            {{ filter_form.q.as_field_group }}
+            {% bootstrap_field filter_form.q %}
-            {% if show_submission_types and filter_form.submission_type %}{{ filter_form.submission_type.as_field_group }}{% endif %}
+            {% if show_submission_types and filter_form.submission_type %}{% bootstrap_field filter_form.submission_type %}{% endif %}
             <div class="d-flex flex-column form-group">
-                {{ filter_form.state.as_field_group }}
+                {% bootstrap_field filter_form.state layout='inline' %}
-                <div id="pending" class="ml-1 d-none">{{ filter_form.pending_state__isnull.as_field_group }}</div>
+                <div id="pending" class="d-none">{% bootstrap_field filter_form.pending_state__isnull layout='inline' %}</div>
             </div>
-            {% if filter_form.track %}{{ filter_form.track.as_field_group }}{% endif %}
+            {% if filter_form.track %}{% bootstrap_field filter_form.track %}{% endif %}
             {% if filter_form.tags %}
                 <div class="d-flex flex-column form-group">
-                    {{ filter_form.tags.as_field_group }}
+                    {% bootstrap_field filter_form.tags layout='inline' %}
-                    <div id="requireAll" class="ml-1 d-none">{{ filter_form.require_all_tags.as_field_group }}</div>
+                    <div id="requireAll" class="d-none">{% bootstrap_field filter_form.require_all_tags layout='inline' %}</div>
                 </div>
             {% endif %}
-            {% if filter_form.content_locale %}{{ filter_form.content_locale.as_field_group }}{% endif %}
+            {% if filter_form.content_locale %}{% bootstrap_field filter_form.content_locale %}{% endif %}
-            {# These fields are hidden, but included to keep question search intact #}
-            {% if request.GET.question %} <input type="hidden" name="question" value="{{ request.GET.question }}"> {% endif %}
-            {% if request.GET.answer__options %} <input type="hidden" name="answer__options" value="{{ request.GET.answer__options }}"> {% endif %}
-            {% if request.GET.answer %} <input type="hidden" name="answer" value="{{ request.GET.answer }}"> {% endif %}
-            {% if request.GET.unanswered %} <input type="hidden" name="unanswered" value="{{ request.GET.unanswered }}"> {% endif %}
-
             <button class="btn btn-success" type="submit">{% translate "Search" %}</button>
         </form>
         {% if filter_form.is_valid and filter_form.cleaned_data.question %}
@@ -77,7 +51,7 @@
                 {% blocktranslate trimmed with question=filter_form.cleaned_data.question.question %}
                     List filtered by answers to question "{{ question }}".
                 {% endblocktranslate %}
-                <a href="{% querystring question="" answer="" answer__options="" %}" class="text-muted">
+                <a href="?{% url_replace request 'question' '' 'answer' '' 'answer__options' '' %}" class="text-muted">
                     <span class="fa fa-times"></span>
                     {% translate "Remove filter" %}
                 </a>
@@ -91,13 +65,13 @@
                 <tr>
                     <th>
                         {% translate "Rating" %}
-                        <a href="{% querystring sort="score__value" %}"><i class="fa fa-caret-down" title="{% translate "Sort by rating (0-10)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' 'score__value' %}"><i class="fa fa-caret-down" title="{% translate "Sort by rating (0-10)" %}"></i></a>
-                        <a href="{% querystring sort="-score__value" %}"><i class="fa fa-caret-up" title="{% translate "Sort by rating (10-0)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' '-score__value' %}"><i class="fa fa-caret-up" title="{% translate "Sort by rating (10-0)" %}"></i></a>
                     </th>
                     <th>
                         {% translate "Title" %}
-                        <a href="?{% querystring sort="title" %}"><i class="fa fa-caret-down" title="{% translate "Sort by title (a-z)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' 'title' %}"><i class="fa fa-caret-down" title="{% translate "Sort by title (a-z)" %}"></i></a>
-                        <a href="?{% querystring sort="-title" %}"><i class="fa fa-caret-up" title="{% translate "Sort by title (z-a)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' '-title' %}"><i class="fa fa-caret-up" title="{% translate "Sort by title (z-a)" %}"></i></a>
                     </th>
                     {% if show_submission_types  %}
                         <th>
@@ -106,13 +80,13 @@
                     {% endif %}
                     <th>
                         {% translate "State" %}
-                        <a href="?{% querystring sort="state" %}"><i class="fa fa-caret-down" title="{% translate "Sort by state (a-z)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' 'state' %}"><i class="fa fa-caret-down" title="{% translate "Sort by state (a-z)" %}"></i></a>
-                        <a href="?{% querystring sort="-state" %}"><i class="fa fa-caret-up" title="{% translate "Sort by state (z-a)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' '-state' %}"><i class="fa fa-caret-up" title="{% translate "Sort by state (z-a)" %}"></i></a>
                     </th>
                     <th>
                         {% translate "Assignee" %}
-                        <a href="?{% querystring sort="assignee" %}"><i class="fa fa-caret-down" title="{% translate "Sort by assignee (a-z)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' 'assignee' %}"><i class="fa fa-caret-down" title="{% translate "Sort by assignee (a-z)" %}"></i></a>
-                        <a href="?{% querystring sort="-assignee" %}"><i class="fa fa-caret-up" title="{% translate "Sort by assignee (z-a)" %}"></i></a>
+                        <a href="?{% url_replace request 'sort' '-assignee' %}"><i class="fa fa-caret-up" title="{% translate "Sort by assignee (z-a)" %}"></i></a>
                     </th>
                     {% if can_change_submission %}
                         <th></th>

pretalx_musicrate/templates/pretalx_musicrate/settings.html

@@ -1,11 +1,29 @@
 {% extends "orga/base.html" %}
+{% load bootstrap4 %}
 {% load compress %}
 {% load i18n %}
 {% load static %}
 
 {% block content %}
     <h2>{% translate "pretalx-musicrate settings" %}</h2>
-    {% include "orga/includes/base_form.html" %}
+    <form method="post">
+        {% csrf_token %}
+        {% bootstrap_form_errors form %}
+        {% bootstrap_field form.submission_types layout='event' %}
+        {% bootstrap_field form.genre_question layout='event' %}
+        {% bootstrap_field form.origin_question layout='event' %}
+        {% bootstrap_field form.link_questions layout='event' %}
+        {% bootstrap_field form.advance_threshold layout='event' %}
+        <div class="submit-group panel">
+            <span></span>
+            <span>
+                <button type="submit" class="btn btn-success btn-lg">
+                    <i class="fa fa-check"></i>
+                    {% translate "Save" %}
+                </button>
+            </span>
+        </div>
+    </form>
     <hr>
     <a class="btn btn-success btn-lg btn-block" href="{% url "plugins:pretalx_musicrate:export" event=request.event.slug %}">
         <i class="fa fa-download"></i>

pretalx_musicrate/urls.py

@@ -1,5 +1,4 @@
-from django.urls import include, path, re_path
+from django.urls import include, path
-from pretalx.event.models.event import SLUG_REGEX
 
 from .views import (
     AssigneeView,
@@ -14,8 +13,8 @@ from .views import (
 )
 
 urlpatterns = [
-    re_path(
+    path(
-        rf"^orga/event/(?P<event>{SLUG_REGEX})/",
+        "orga/event/<slug:event>/",
         include(
             [
                 path(
@@ -40,8 +39,8 @@ urlpatterns = [
             ]
         ),
     ),
-    re_path(
+    path(
-        rf"^(?P<event>{SLUG_REGEX})/p/pretalx_musicrate/",
+        "<slug:event>/p/pretalx_musicrate/",
         include(
             [
                 path("", QRCodeView.as_view(), name="qrcode"),

pretalx_musicrate/views.py

@@ -14,7 +14,7 @@ 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.views.mixins import EventPermissionRequired
+from pretalx.common.mixins.views import EventPermissionRequired
 from pretalx.orga.views.submission import BaseSubmissionList, SubmissionList
 from pretalx.submission.models import Submission