Merge branch 'copy-from-ticdesk' into 'master'

Reformat and cleanup

See merge request !1

aleksis/apps/paweljong/templates/paweljong/print/list_attendance.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block extra_head %}
-    <link rel="stylesheet" href="{% static 'ticdesk.css' %}">
+    <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
 {% endblock %}
 
 {% block browser_title %}{{ group }} — {% trans "attendance list" %}{% endblock %}

aleksis/apps/paweljong/templates/paweljong/print/list_participants.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block extra_head %}
-    <link rel="stylesheet" href="{% static 'css/ticdesk/ticdesk.css' %}">
+     <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
 {% endblock %}
 
 {% block browser_title %}{{ group }} — {% trans "participant list" %}{% endblock %}
@@ -21,8 +21,6 @@
                 <th class="table-print">{% trans "First name" %}</th>
                 <th class="table-print">{% trans "Date of birth" %}</th>
                 <th class="table-print">{% trans "Mobile number" %}</th>
-                <th class="table-print">{% trans "School" %}</th>
-                <th class="table-print">{% trans "Class" %}</th>
             </tr>
         </thead>
         <tbody>
@@ -43,8 +41,6 @@
                     <td class="table-print">{{ person.first_name }}</td>
                     <td class="table-print">{{ person.date_of_birth }}</td>
                     <td class="table-print">{{ person.mobile_number }}</td>
-                    <td class="table-print">{{ person.school }}</td>
-                    <td class="table-print">{{ person.school_class }}</td>
                 </tr>
             {% endfor %}
         </tbody>

aleksis/apps/paweljong/templates/paweljong/print/list_sign.html

@@ -6,7 +6,7 @@
 {% endblock %}
 
 {% block extra_head %}
-    <link rel="stylesheet" href="{% static 'ticdesk.css' %}">
+     <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
 {% endblock %}
 
 {% block browser_title %}{{ group }} — {% trans "signature list" %}{% endblock %}

aleksis/apps/paweljong/templates/paweljong/print/voucher.html

@@ -5,6 +5,10 @@
     {% trans "Voucher for "%} {{ voucher.event }}
 {% endblock %}
 
+{% block extra_head %}
+  <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
+{% endblock %}
+
 {% block browser_title %}{% trans "Voucher for "%} {{ voucher.event }}{% endblock %}
 
 {% block content %}
@@ -14,7 +18,7 @@
         <h3>{{ voucher.event }}<h3>
         <h4>{{ voucher.code }}</h4>
         <p>{% trans "Voucher for" %} {{ voucher.person.first_name }} {{ voucher.person.last_name }} {% trans "to visit event" %} {{ voucher.event }} {% trans "on" %} {{ voucher.event.date_event }} {% trans "at" %} {{ voucher.event.place }}!</p>
-        <p>{% trans "To use the voucher, register for the event " %} <a href="{% url 'register_event_by_id' voucher.event.id %}">{% trans "here" %}</a></p>
+        <p>{% trans "To use the voucher, register for the event " %} <a href="{% url 'register_event_by_pk' voucher.event.pk %}">{% trans "here" %}</a></p>
     </div>
 
 {% endblock %}

aleksis/apps/paweljong/templates/paweljong/term/create.html

+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% block page_title %}{% blocktrans %}Create term{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Create term{% endblocktrans %}{% endblock %}
+
+{% block extra_head %}
+    {{ form.media.css }}
+{% endblock %}
+
+{% block content %}
+  <form method="post">
+    {% csrf_token %}
+    {% form form=form %}{% endform %}
+    {% include "core/partials/save_button.html" %}
+  </form>
+
+  {{ form.media.js }}
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/feedback_aspect/edit.html → aleksis/apps/paweljong/templates/paweljong/term/edit.html

 {% extends "core/base.html" %}
 {% load material_form i18n %}
 
-{% block page_title %}{% blocktrans %}Edit feedback aspect{% endblocktrans %}{% endblock %}
-{% block browser_title %}{% blocktrans %}Edit feedback aspect{% endblocktrans %}{% endblock %}
+{% block page_title %}{% blocktrans %}Edit term{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Edit term{% endblocktrans %}{% endblock %}
+
+{% block extra_head %}
+    {{ form.media.css }}
+{% endblock %}
 
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    {% form form=edit_feedback_aspect_form %}{% endform %}
+    {% form form=form %}{% endform %}
     {% include "core/partials/save_button.html" %}
   </form>
+  {{ form.media.js }}
 {% endblock %}

aleksis/apps/paweljong/templates/paweljong/term/list.html

+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% load render_table from django_tables2 %}
+
+{% block page_title %}{% blocktrans %}Terms{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Terms{% endblocktrans %}{% endblock %}
+
+{% block content %}
+
+    <a class="btn colour-primary waves-effect waves-light" href="{% url 'create_term' %}">{% trans "Create term" %}</a>
+    {% render_table table %}
+
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/voucher/create.html

+{% extends "core/base.html" %}
+{% load material_form i18n any_js %}
+
+{% block page_title %}{% blocktrans %}Create voucher{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Create voucher{% endblocktrans %}{% endblock %}
+
+{% block extra_head %}
+    {{ form.media.css }}
+    {% include_css "select2-materialize" %}
+{% endblock %}
+
+{% block content %}
+  <form method="post">
+    {% csrf_token %}
+    {% form form=form %}{% endform %}
+    {% include "core/partials/save_button.html" %}
+  </form>
+  {{ form.media.js }}
+  {% include_js "select2-materialize" %}
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/voucher/edit.html

 {% extends "core/base.html" %}
-{% load material_form i18n %}
+{% load material_form i18n any_js %}
 
 {% block page_title %}{% blocktrans %}Edit voucher{% endblocktrans %}{% endblock %}
 {% block browser_title %}{% blocktrans %}Edit voucher{% endblocktrans %}{% endblock %}
 
+{% block extra_head %}
+    {{ form.media.css }}
+    {% include_css "select2-materialize" %}
+{% endblock %}
+
 {% block content %}
   <form method="post">
     {% csrf_token %}
-    {% form form=edit_voucher_form %}{% endform %}
+    {% form form=form %}{% endform %}
     {% include "core/partials/save_button.html" %}
   </form>
+  {{ form.media.js }}
+  {% include_js "select2-materialize" %}
 {% endblock %}

aleksis/apps/paweljong/templates/templated_email/event_created.email

@@ -18,10 +18,6 @@
     {% for owner in new_event.group.owners.all %}
         * {{ owner }}
     {% endfor %}
-    * {% trans "Feedback aspects" %}:
-    {% for aspect in new_event.feedback_aspects.all %}
-         * {{ aspect }}
-    {% endfor %}
 
     {% blocktrans with sender=person %}
         The event was created by {{ sender }}
@@ -52,12 +48,6 @@
                 <li> {{ owner }}</li>
             {% endfor %}
 	    </ul>
-            <li> {% trans "Feedback aspects" %}</li>
-            <ul>
-            {% for aspect in new_event.feedback_aspects.all %}
-                 <li> {{ aspect }}</li>
-            {% endfor %}
-            </ul>
 	</ul>
     </blockquote>
 

aleksis/apps/paweljong/templates/templated_email/event_feedback.html

-{% load i18n %}
-
-{% block subject %} {% trans "New feedback on" %} {{ feedback.event }} {% endblock %}
-
-{% block plain %}
-    {% blocktrans with feedback.event=feedback.event %}New feedback on: {{ feedback.event }}{% endblocktrans %}
-
-    *** {% trans "Event" %} *****
-
-    * {% trans "Event" %}: {{ feedback.event }}
-
-    **** {% trans "Person " %} ****
-
-    * {% trans "Name" %}: {{ feedback.person }}
-    * {% trans "Date of birth" %}: {{ feedback.person.date_of_birth }}
-    * {% trans "Email address" %}: {{ feedback.person.email }}
-
-    **** {% trans "Comments" %} ****
-
-    * {% trans "Private comment" %}: {{ feedback.comment_private }}
-    * {% trans "Public comment" %}: {{ feedback.comment_public }}
-    * {% trans "Public comment info" %}: {{ feedback.comment_public_info }}
-
-    **** {% trans 'Photos' %} ****
-    
-    {% for photo in feedback.photos %}
-        * {{ photo }}
-    {% endfor %}
-    * {% trans "Photo licence" %}: {{ feedback.photos_licence }}
-
-
-    {% trans "Your AlekSIS team" %}
-{% endblock %}
-
-{% block html %}
-<main>
-    <p>{% blocktrans with new_feedback.event=new_feedback.event %}New feedback.event: {{ feedback.event}}{% endblocktrans %}</p>
-
-    <blockquote>
-        <h5>{% trans "Event" %}</h5>
-            <ul>
-                <li>{% trans "Event" %}: {{ feedback.event.feedback.event }}</li>
-            </ul>
-        <h5>{% trans "Person" %</h5>
-        <ul>
-            <li>{% trans "Name" %}: {{ feedback.event.person }}</li>
-            <li>{% trans "Date of birth" %}: {{ feedback.event.date_of_birth }}</li>
-            <li>{% trans "Email address" %}: {{ feedback.event.person.email }}</li>
-        </ul>
-        <h5>{% trans "Comments" %}</h5>
-        <ul>
-            <li>{% trans "Private comment" %}: {{ feedback.comment_private }}</li>
-            <li>{% trans "Public comment" %}: {{ feedback.comment_public }}</li>
-            <li>{% trans "Public comment info" %}: {{ feedback.comment_public_info }}</li>
-        </ul>
-        <h5>{% trans "Photos" %}</h5>
-        {% for photo in feedback.photos %}
-          <img src="{{ photo }}" alt="Feedback photo"></img>
-        {% endfor %}
-        <ul>
-          <li>{% trans "Photo licence" %}: {{ feedback.photos_licence }}</li>
-        </ul>
-    </blockquote>
-
-    <p>
-        <i>{% trans "Your AlekSIS team" %}</i>
-    </p>
-</main>
-{% endblock %}

aleksis/apps/paweljong/templates/templated_email/event_registred.email → aleksis/apps/paweljong/templates/templated_email/event_registered.email

@@ -9,7 +9,7 @@
 
     * {% trans "Event" %}: {{ registration.event }}
 
-    **** {% trans "Person " %} ****
+    **** {% trans "Person" %} ****
 
     * {% trans "Name" %}: {{ registration.person }}
     * {% trans "Date of birth" %}: {{ registration.date_of_birth }}
@@ -34,11 +34,21 @@
         * {% trans "IBAN" %}: {{ registration.iban }}
     {% endif %}
 
-    **** {% trans "Declarations" %} ****
+    **** {% trans "Additional" %} ****
 
-    * {% trans "Consent by parents" %}: {{ registration.accept_terms }}
-    * {% trans "Data protection" %}: {{ registration.accept_data }}
-    * {% trans "Terms and conditions" %}: {{ registration.accept_general_terms }}
+    {% if registration.extended_data %}
+      {% for field, value in registration.extended_data.items %}
+          * {{ field }}: {{ value }}
+      {% endfor %}
+    {% endif %}
+
+    **** {% trans "Consents" %} ****
+
+    {% if registration.accepted_terms %}
+      {% for term in registration.accepted_terms.all %}
+          * {{ term.title }}: {% trans "Accepted" %}
+      {% endfor %}
+    {% endif %}
 
     {% trans "Your AlekSIS team" %}
 {% endblock %}
@@ -52,7 +62,7 @@
             <ul>
                 <li>{% trans "Event" %}: {{ registration.event }}</li>
             </ul>
-        <h5>{% trans "Person " %</h5>
+        <h5>{% trans "Person" %}</h5>
         <ul>
             <li>{% trans "Name" %}: {{ registration.person }}</li>
             <li>{% trans "Date of birth" %}: {{ registration.date_of_birth }}</li>
@@ -77,12 +87,24 @@
 	        <li>{% trans "IBAN" %}: {{ registration.iban }}</li>
 	    {% endif %}
 	</ul>
-	<h5>{% trans "Declarations" %}</h5>
-	<ul>
-	    <li>{% trans "Consent by parents" %}: {{ registration.accept_terms }}</li>
-	    <li>{% trans "Data protection" %}: {{ registration.accept_data }}</li>
-	    <li>{% trans "Terms and conditions" %}: {{ registration.accept_general_terms }}</li>
-	</ul>
+	<h5>{% trans "Additional" %}</h5>
+        {% if registration.extended_data %}
+          <ul>
+          {% for field, value in registration.extended_data.items %}
+            <li>
+              {{ field }}: {{ value }}
+            </li>
+          {% endfor %}
+          <ul>
+        {% endif %}
+        <h5>{% trans "Consents" %}</h5>
+	{% if registration.accepted_terms %}
+          <ul>
+          {% for term in registration.accepted_terms.all %}
+            <li>{{ term.title }}: {% trans "Accepted" %}</li>
+          {% endfor %}
+          </ul>
+        {% endif %}
     </blockquote>
 
     <p>

aleksis/apps/paweljong/templatetags/coerce.py

+from django import template
+
+register = template.Library()
+
+
+@register.filter
+def coerce_max(value, arg):
+    return arg if value > arg else value
+
+
+@register.filter
+def coerce_min(value, arg):
+    return arg if value < arg else value

aleksis/apps/paweljong/urls.py

 from django.urls import path
 
+from aleksis.apps.postbuero.forms import MailAddForm
+
 from . import views
+from .forms import (
+    RegisterEventAccount,
+    RegisterEventAdditional,
+    RegisterEventConsent,
+    RegisterEventContactDetails,
+    RegisterEventFinancial,
+    RegisterEventGuardians,
+)
+
+register_forms = [
+    ("email", MailAddForm),
+    ("register", RegisterEventAccount),
+    ("contact_details", RegisterEventContactDetails),
+    ("guardians", RegisterEventGuardians),
+    ("additional", RegisterEventAdditional),
+    ("financial", RegisterEventFinancial),
+    ("consent", RegisterEventConsent),
+]
+condition_dict = {
+    "email": views.is_email_needed,
+    "register": views.is_person_anonymous,
+}
 
 urlpatterns = [
-    path("event/<int:id_>/edit", views.edit_event, name="edit_event_by_id"),
-    path("event/<int:id_>/feedback", views.feedback_event, name="feedback_event_by_id"),
-    path("event/<int:id_>/register", views.register_event, name="register_event_by_id"),
-    path("events/create", views.edit_event, name="create_event"),
-    path("events/manage", views.ManageEvents.as_view(), name="manage_events"),
-    path("events/", views.events, name="events"),
-    path("vouchers/create", views.edit_voucher, name="create_vouchers"),
-    path("vouchers/<int:id_>/delete", views.delete_voucher, name="delete_voucher_by_id"),
-    path("vouchers/<int:id_>/edit", views.edit_voucher, name="edit_voucher_by_id"),
-    path("vouchers/<int:id_>/print", views.print_voucher, name="print_voucher_by_id"),
+    path("event/<slug:slug>/edit", views.EditEventView.as_view(), name="edit_event_by_slug"),
+    path(
+        "event/<slug:slug>/register",
+        views.RegisterEventWizardView.as_view(register_forms, condition_dict=condition_dict),
+        name="register_event_by_slug",
+    ),
+    path("event/<slug:slug>", views.EventFullView.as_view(), name="event_by_name"),
+    path(
+        "event/<slug:slug>/start",
+        views.RegisterEventStart.as_view(),
+        name="register_event_by_slug_start",
+    ),
+    path("misc/set_email_needed/<slug:slug>", views.set_email_needed, name="set_email_needed"),
+    path("events/create", views.CreateEventView.as_view(), name="create_event"),
+    path("events/manage", views.manage_events, name="manage_events"),
+    path("vouchers/create", views.VoucherCreateView.as_view(), name="create_vouchers"),
+    path(
+        "vouchers/<int:pk>/delete", views.VoucherDeleteView.as_view(), name="delete_voucher_by_pk"
+    ),
+    path("vouchers/<int:pk>/edit", views.VoucherEditView.as_view(), name="edit_voucher_by_pk"),
+    path("vouchers/<int:pk>/print", views.print_voucher, name="print_voucher_by_pk"),
     path("vouchers/", views.vouchers, name="vouchers"),
     path("event/lists/generate", views.generate_lists, name="generate_lists"),
     path("event/registrations/list", views.registrations, name="registrations"),
-    path("event/registrations/<int:id_>", views.registration, name="registration_by_id"),
     path(
-        "event/registrations/<int:id_>/edit",
-        views.edit_registration,
-        name="edit_registration_by_id",
+        "event/registrations/<int:pk>",
+        views.EventRegistrationDetailView.as_view(),
+        name="registration_by_pk",
+    ),
+    path(
+        "event/registrations/<int:pk>/edit",
+        views.EventRegistrationEditView.as_view(),
+        name="edit_registration_by_pk",
+    ),
+    path(
+        "event/registrations/<int:pk>/delete",
+        views.EventRegistrationDeleteView.as_view(),
+        name="delete_registration_by_pk",
     ),
     path(
-        "event/registrations/<int:id_>/delete",
-        views.delete_registration,
-        name="delete_registration_by_id",
+        "event/terms/list",
+        views.TermListView.as_view(),
+        name="terms",
     ),
-    path("event/feedback_aspects/list", views.feedback_aspects, name="feedback_aspects"),
     path(
-        "event/feedback_aspects/create",
-        views.edit_feedback_aspect,
-        name="create_feedback_aspect",
+        "event/terms/create",
+        views.TermCreateView.as_view(),
+        name="create_term",
     ),
     path(
-        "event/feedback_aspects/<int:id_>/edit",
-        views.edit_feedback_aspect,
-        name="edit_feedback_aspect_by_id",
+        "event/terms/<int:pk>/edit",
+        views.TermEditView.as_view(),
+        name="edit_term_by_pk",
     ),
 ]

aleksis/apps/paweljong/util.py

 import os
-import random
-import string
 from tempfile import mkstemp
 from textwrap import wrap
 
@@ -76,11 +74,3 @@ def upload_file_to_media_url(file, subdir="", prefix="upload_"):
     url = "%s/%s/%s" % (settings.MEDIA_URL, subdir, basename)
 
     return url
-
-
-def generate_code():
-    alphabet = string.ascii_uppercase + string.digits
-    length = 8
-    code = "".join(random.choice(alphabet) for _ in range(length))  # noqa
-
-    return code

pyproject.toml

@@ -8,11 +8,10 @@ readme = "README.rst"
 include = ["CHANGELOG.rst", "LICENCE.rst", "aleksis/**/*.mo"]
 
 description = "AlekSIS (School Information System) — App Paweljong (Camp/Event management)"
-authors = ["Dominik George <dominik.george@teckids.org>"]
+authors = ["Tom Teichler <tom.teichler@teckids.org>", "Dominik George <dominik.george@teckids.org>"]
 license = "EUPL-1.2-or-later"
-homepage = "https://aleksis.org"
-repository = "https://edugit.org/Teckids/hacknfun//AlekSIS-App-Paweljong"
-documentation = "https://aleksis.org/official/AlekSIS/docs/html/"
+homepage = "https://hacknfun.camp"
+repository = "https://edugit.org/Teckids/hacknfun/AlekSIS-App-Paweljong"
 classifiers = [
     "Environment :: Web Environment",
     "Intended Audience :: Education",
@@ -26,8 +25,11 @@ secondary = true
 
 [tool.poetry.dependencies]
 python = "^3.9"
-aleksis-core = "^2.2"
+aleksis-core = "^2.7"
 django-iban-field = "^0.8"
+django-formtools = "^2.3"
+django-starfield = "^1.0"
+aleksis-app-postbuero = "1.0+20220218233830.a212f707"
 
 [tool.poetry.dev-dependencies]
 aleksis-builddeps = "*"

tox.ini

@@ -35,6 +35,7 @@ commands =
 
 [testenv:build]
 commands_pre =
+    poetry install
     poetry run sh -c "cd aleksis; aleksis-admin compilemessages"
 commands = poetry build
 
@@ -46,6 +47,11 @@ commands =
     poetry run isort aleksis/
     poetry run black aleksis/
 
+[testenv:makemessages]
+commands =
+    poetry run aleksis-admin makemessages --no-wrap -e html,txt,py,email -i static -l ar -l de_DE -l fr -l nb_NO -l tr_TR -l la
+    poetry run aleksis-admin makemessages --no-wrap -d djangojs -i **/node_modules -l ar -l de_DE -l fr -l nb_NO -l tr_TR -l la
+
 [flake8]
 max_line_length = 100
 exclude = migrations,tests