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

Reformat and cleanup

See merge request !1

aleksis/apps/paweljong/preferences.py

@@ -24,12 +24,3 @@ class WWSPostUrl(StringPreference):
     default = ""
     required = False
     verbose_name = _("POST url for Sympa")
-
-
-@site_preferences_registry.register
-class ChannelChoices(StringPreference):
-    section = paweljong
-    name = "channel_choices"
-    default = ""
-    requred = False
-    verbose_name = _("Channel choices")

aleksis/apps/paweljong/rules.py

@@ -9,7 +9,7 @@ from aleksis.core.util.predicates import (
     is_group_member,
 )
 
-from .models import Event, EventRegistration, FeedbackAspect, Voucher
+from .models import Event, EventRegistration, Terms, Voucher
 from .predicates import (
     is_own_registration,
     is_own_voucher,
@@ -104,9 +104,8 @@ is_own_voucher_predicate = has_person & (is_own_voucher)
 rules.add_perm("paweljong.is_own_voucher_rule", is_own_voucher_predicate)
 
 
-# View feedback aspects
-view_feedback_aspects_predicate = has_person & (
-    has_global_perm("paweljong.view_feedback_aspect")
-    | has_any_object("paweljong.view_feedback_aspect", FeedbackAspect)
+# View terms
+view_terms_predicate = has_person & (
+    has_global_perm("paweljong.view_term") | has_any_object("paweljong.view_term", Terms)
 )
-rules.add_perm("paweljong.view_feedback_aspects_rule", view_feedback_aspects_predicate)
+rules.add_perm("paweljong.view_terms_rule", view_terms_predicate)

aleksis/apps/paweljong/settings.py

+INSTALLED_APPS = ["django_starfield", "formtools"]

aleksis/apps/paweljong/static/css/paweljong.css

+img.max-size-600 {
+    max-width: 600px;
+    max-height: 600px;
+}
+
+img.person-photo-print {
+    max-height: 100px;
+}
+
+time.icon {
+	font-size: 1em; /* change icon size */
+	display: block;
+	position: relative;
+	width: 7em;
+	height: 7em;
+	background-color: #fff;
+	border-radius: 0.6em;
+	box-shadow: 0 1px 0 #bdbdbd, 0 2px 0 #fff, 0 3px 0 #bdbdbd, 0 4px 0 #fff, 0 5px 0 #bdbdbd, 0 0 0 1px #bdbdbd;
+	overflow: hidden;
+}
+
+time.icon * {
+	display: block;
+	width: 100%;
+	font-size: 1em;
+	font-weight: bold;
+	font-style: normal;
+	text-align: center;
+}
+
+time.icon strong {
+	position: absolute;
+	top: 0;
+	padding: 0.4em 0;
+	color: #fff;
+	background-color: #FF6600;
+	border-bottom: 1px dashed #FF9955;
+	box-shadow: 0 2px 0 #FF9955;
+}
+
+time.icon em {
+	position: absolute;
+	bottom: 0.3em;
+	color: #005EBE;
+}
+
+time.icon span {
+	font-size: 2.8em;
+	letter-spacing: -0.05em;
+	padding-top: 0.8em;
+	color: #0606FA;
+}

aleksis/apps/paweljong/tables.py

@@ -4,38 +4,6 @@ import django_tables2 as tables
 from django_tables2.utils import A
 
 
-class EventsTable(tables.Table):
-    class Meta:
-        attrs = {"class": "responsive-table highlight"}
-
-    display_name = tables.Column(verbose_name=_("Event"))
-    date_event = tables.Column(verbose_name=_("Date"))
-    max_participants = tables.Column(verbose_name=_("Max. participants"))
-    date_registration = tables.Column(verbose_name=_("Registration until"))
-
-    short_name = tables.LinkColumn(
-        "register_event_by_id",
-        args=[A("id")],
-        verbose_name=_("Register"),
-        text=_("Register"),
-    )
-
-
-class ParticipatedEventsTable(tables.Table):
-    class Meta:
-        attrs = {"class": "responsive-table highlight"}
-
-    display_name = tables.Column(verbose_name=_("Event"))
-    date_event = tables.Column(verbose_name=_("Date"))
-
-    short_name = tables.LinkColumn(
-        "feedback_event_by_id",
-        args=[A("id")],
-        verbose_name=_("Feedback"),
-        text=_("Feedback"),
-    )
-
-
 class ManageEventsTable(tables.Table):
     class Meta:
         attrs = {"class": "responsive-table highlight"}
@@ -45,8 +13,11 @@ class ManageEventsTable(tables.Table):
     max_participants = tables.Column(verbose_name=_("Max. participants"))
     date_registration = tables.Column(verbose_name=_("Registration until"))
 
-    short_name = tables.LinkColumn(
-        "edit_event_by_id", args=[A("id")], verbose_name=_("Edit"), text=_("Edit")
+    edit = tables.LinkColumn(
+        "edit_event_by_slug",
+        args=[A("linked_group__short_name")],
+        verbose_name=_("Edit"),
+        text=_("Edit"),
     )
 
 
@@ -59,16 +30,16 @@ class VouchersTable(tables.Table):
     code = tables.Column(verbose_name=_("Code"))
     person = tables.Column(verbose_name=_("Person"))
     deleted = tables.LinkColumn(
-        "delete_voucher_by_id",
+        "delete_voucher_by_pk",
         args=[A("id")],
         verbose_name=_("Delete"),
         text=_("Delete"),
     )
     edit = tables.LinkColumn(
-        "edit_voucher_by_id", args=[A("id")], verbose_name=_("Edit"), text=_("Edit")
+        "edit_voucher_by_pk", args=[A("id")], verbose_name=_("Edit"), text=_("Edit")
     )
     print_voucher = tables.LinkColumn(
-        "print_voucher_by_id", args=[A("id")], verbose_name=_("Print"), text=_("Print")
+        "print_voucher_by_pk", args=[A("id")], verbose_name=_("Print"), text=_("Print")
     )
 
 
@@ -78,23 +49,23 @@ class EventRegistrationsTable(tables.Table):
 
     person = tables.Column()
     event = tables.Column()
-    date_registred = tables.Column()
+    date_registered = tables.Column()
     view = tables.LinkColumn(
-        "registration_by_id",
+        "registration_by_pk",
         args=[A("id")],
         verbose_name=_("View registration"),
         text=_("View"),
     )
 
 
-class FeedbackAspectsTable(tables.Table):
+class TermsTable(tables.Table):
     class Meta:
         attrs = {"class": "responsive-table highlight"}
 
-    aspect = tables.Column()
+    title = tables.Column()
 
     edit = tables.LinkColumn(
-        "edit_feedback_aspect_by_id",
+        "edit_term_by_pk",
         args=[A("id")],
         verbose_name=_("Edit"),
         text=_("Edit"),

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

+{% extends "core/base.html" %}
+{% load material_form i18n any_js %}
+
+{% block page_title %}{% blocktrans %}Create event{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Create event{% 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>
+  {% include_js "select2-materialize" %}
+  {{ form.media.js }}
+
+{% endblock %}

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

@@ -5,7 +5,7 @@
 {% block browser_title %}{% blocktrans %}Edit event{% endblocktrans %}{% endblock %}
 
 {% block extra_head %}
-    {{ edit_event_form.media.css }}
+    {{ form.media.css }}
     {% include_css "select2-materialize" %}
 {% endblock %}
 
@@ -13,10 +13,10 @@
 
   <form method="post">
     {% csrf_token %}
-    {% form form=edit_event_form %}{% form %}
+    {% form form=form %}{% form %}
     {% include "core/partials/save_button.html" %}
   </form>
   {% include_js "select2-materialize" %}
-  {{ edit_event_form.media.js }}
+  {{ form.media.js }}
 
 {% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/feedback.html

-{% extends "core/base.html" %}
-{% load material_form i18n %}
-
-{% block page_title %}{% blocktrans %}Feedback on an event{% endblocktrans %}{% endblock %}
-{% block browser_title %}{% blocktrans %}Feedback on an event{% endblocktrans %}{% endblock %}
-
-{% block content %}
- <h5>
-  {% blocktrans %}Feedback on{% endblocktrans %} {{ event.display_name }}
- </h5>
-
- <div class="row">
-  <div class="col s12 m12">
-   <div class="card info">
-    <div class="card-content">
-     <span class="card-title">{% blocktrans %}How does the feedback work?{% endblocktrans %}</span>
-     <p>
-      {% blocktrans %}
-       The feedback consists of three parts.
-      {% endblocktrans %}
-     </p>
-     <ul>
-      <li>
-       {% blocktrans %}Evaluation of the program points from 1 (not good) to 5 (very good){% endblocktrans %}
-      </li>
-      <li>
-       {% blocktrans %}Private commentary where you can tell us what you liked, what didn't, what we should do differently, etc.{% endblocktrans %}
-      </li>
-      <li>
-       {% blocktrans %}Comment for the report, which helps us and other children to learn as much as possible about the event. What you have experienced yourself is very interesting for the next participants!{% endblocktrans %}
-      </li>
-     </ul>
-     <p>
-      {% blocktrans %}Your feedback will be emailed to us. We may contact you again.{% endblocktrans %}
-     </p>
-    </div>
-   </div>
-  </div>
- </div>
-
-  <form method="post" enctype="multiform/formdata">
-    {% csrf_token %}
-    {% form form=feedback_form %}{% endform %}
-    {% include "core/partials/save_button.html" %}
-  </form>
-{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/full.html

+{% extends "core/base.html" %}
+{% load material_form i18n any_js coerce static %}
+
+{% block browser_title %}{% blocktrans %}Event{% endblocktrans %} {{ event.display_name }}{% endblock %}
+
+{% block extra_head %}
+  <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
+{% endblock %}
+
+{% block content %}
+
+ <div class="card">
+   <div class="card-content">
+     <div class="row">
+       <div class="col s1">
+         <time datetime="{{ event.date_event|date:'Y-m-d' }}" class="icon">
+           <em>{{ event.date_event|date:'l' }}</em>
+           <strong>{{ event.date_event|date:'F' }}</strong>
+           <span>{{ event.date_event|date:'d' }}</span>
+         </time>
+       </div>
+       <div class="col s11">
+         <span class="card-title">
+          {{ event.display_name }}
+         </span>
+         <ul>
+           <li>
+             {{ event.description }}
+           </li>
+           <br />
+           <li>
+             {% blocktrans %}
+               The event takes place in <strong>{{ event.place }}</strong>
+               (Information on overnight stays and shared trips see description)
+             {% endblocktrans %}
+           </li>
+           <li>
+             {% trans "Registration possible until" %} <strong>{{ event.date_registration }}</strong>
+           </li>
+           <li>
+             {% trans "Cost" %}: <strong>{{ event.cost }} €</strong> {% trans "incl. program, overnight stays, trips and meals" %}
+             {% trans "(if part of the event)" %}
+           </li>
+           <li>
+             {% trans "Booked participants slots" %}: <strong>{{ event.linked_group.members.count }} {% trans "of" %} {{ event.max_participants }}</strong>
+           </li>
+           <div class="progress">
+             <div class="determinate" style="min-width: 2em;width:{{ event.booked_percentage|coerce_max:100|floatformat:0 }}%">
+             </div>
+           </div>
+           <p class="center">{{ event.booked_percentage|coerce_max:100 }} %</p>
+         </ul>
+       </div>
+     </div>
+   </div>
+   <div class="card-action">
+     {% if can_register and not is_authenticated %}
+       <a href="{% url "register_event_by_slug_start" event.linked_group.short_name %}">{% trans "Register now" %}</a>
+     {% elif can_register and is_authenticated %}
+       <a href="{% url "register_event_by_slug" event.linked_group.short_name %}">{% trans "Register now" %}</a>
+     {% else %}
+       <a href="#">{% trans "Not available" %}</a>
+     {% endif %}
+   </div>
+ </div>
+
+ {{ event.information | safe }}
+
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/manage.html

 {% extends "core/base.html" %}
-{% load i18n %}
+{% load material_form i18n %}
+
 {% load render_table from django_tables2 %}
 
 {% block page_title %}{% blocktrans %}Manage events{% endblocktrans %}{% endblock %}
 {% block browser_title %}{% blocktrans %}Manage events{% endblocktrans %}{% endblock %}
 
 {% block content %}
- <h5>
-  {% blocktrans %}Upcoming events{% endblocktrans %}
- </h5>
 
- {% render_table object_list %}
+  <h5>{% trans "Filter events" %}</h5>
+  <form method="get">
+    {% form form=events_filter.form %}{% endform %}
+    {% trans "Search" as caption %}
+    {% include "core/partials/save_button.html" with caption=caption icon="search" %}
+    <button type="reset" class="btn red waves-effect waves-light">
+      <i class="material-icons left">clear</i>
+      {% trans "Clear" %}
+    </button>
+    <a class="btn colour-primary waves-effect waves-light" href="{% url 'create_event' %}">{% trans "Create event" %}</a>
+  </form>
+
+  <h5>{% trans "Selected events" %}</h5>
+  {% render_table events_table %}
 
 {% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/register.html

-{% extends "core/base.html" %}
-{% load material_form i18n %}
-
-{% block page_title %}{% blocktrans %}Event registration{% endblocktrans %}{% endblock %}
-{% block browser_title %}{% blocktrans %}Event registration{% endblocktrans %}{% endblock %}
-
-{% block content %}
- <h5>
-  {% blocktrans %}Registration for{% endblocktrans %} {{ event.display_name }}
- </h5>
-
- <div class="row">
-  <div class="col s12 m6">
-   <div class="card info">
-    <div class="card-content">
-     <span class="card-title">{% blocktrans %}Information for parents{% endblocktrans %}</span>
-     <p>
-      {% blocktrans %}
-       Please go through the registration with your child.  It is important
-       to us to train important skills in dealing with the Internet and
-       responsibility in general with the registration.
-      {% endblocktrans %}
-     </p>
-    </div>
-    <div class="card-content">
-     <span class="card-title">{% blocktrans %}Information for children{% endblocktrans %}</span>
-     <p>
-      {% blocktrans %}
-       Please read everything carefully with your parents and then send your
-       registration together with them!
-      {% endblocktrans %}
-     </p>
-    </div>    
-   </div>
-  </div>
-  <div class="col s12 m6">
-   <div class="card info">
-    <div class="card-content">
-     <span class="card-title">{% blocktrans %}Information about the event{% endblocktrans %}</span>
-     <p>
-      {% blocktrans %}
-       Please read the
-      {% endblocktrans %}
-      
-      <a href="{{ event.website }}">
-       {% blocktrans %}
-        website of the event
-       {% endblocktrans %}
-      </a>
-      
-      {% blocktrans %}
-       carefully together with your parents.
-      {% endblocktrans %}
-     </p>
-     <ul>
-      <li>
-       {% blocktrans %}
-        The event will take place from
-       {% endblocktrans %}
-
-       {{ event.date_event }}
-
-       {% blocktrans %}
-       at
-       {% endblocktrans %}
-
-       {{ event.l }}
-
-      </li>
-      <li>
-       {% blocktrans %}
-        Registration is possible until
-       {% endblocktrans %}
-
-       {{ event.date_registration }};
-
-       {% blocktrans %}
-        the number of participants is limited to
-       {% endblocktrans %}
-       
-       {{ event.max_participants }}
-
-       {% blocktrans %}
-        participants
-       {% endblocktrans %}.
-      </li>
-      <li>
-       {% blocktrans %}
-        The participation fee is
-       {% endblocktrans %}
-
-       {{ event.cost }} €
-
-       {% blocktrans %}
-        and must be paid in advance and within 7 days after receipt of the
-        invoice.  Cancellation with reimbursement is possible until
-       {% endblocktrans %}
-
-       {{ event.date_retraction }}
-
-       {% blocktrans %}
-        and only for good reason.
-       {% endblocktrans %}
-      </li>
-     </ul>
-    </div>
-   </div>
-  </div>
- </div>
-
- <form method="post">
-   {% csrf_token %}
-   {% form form=register_form %}{% endform %}
-   {% include "core/partials/save_button.html" %}
- </form>
-{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/register_additional.html

-{% extends "ticdesk/base_with_info_sidebar.html" %}
-{% load  i18n %}
-
-{% block page_title %}{% blocktrans %}Zusätzliche Angaben zur Veranstaltungsanmeldung{% endblocktrans %}{% endblock %}
-
-{% block content_info_children %}
- {% blocktrans %}
-  Bitte lies dir mit deinen Eltern gemeinsam alles genau durch und schicke
-  deine Anmeldung dann mit ihnen gemeinsam ab!
- {% endblocktrans %}
-{% endblock %}
-
-{% block content_info_parents %}
- {% blocktrans %}
-  Bitte gehen Sie die Anmeldung mit Ihrem Kind gemeinsam durch. Uns ist es
-  wichtig, schon mit der Anmeldung wichtige Kompetenzen im Umgang mit dem
-  Internet und Verantwortung im Allgemeinen zu trainieren.
- {% endblocktrans %}
-{% endblock %}
-
-{% block content %}
- <h5>
-  {% blocktrans %}Zusätzliche Angaben zu{% endblocktrans %} {{ event.display_name }}
- </h5>
-
- {% if error %}
-  <div class="alert alert-danger">
-   <div class="alert-heading">
-    {% blocktrans %}Fehler{% endblocktrans %}
-   </div>
-   <hr>
-    <p>
-     {{ error }}
-    </p>
-  </div>
- {% elif success %}
-  <div class="alert alert-success">
-   <div class="alert-heading">
-    {% blocktrans %}Anmeldung erfolgreich{% endblocktrans %}
-   </div>
-   <hr>
-    <p>
-     {% blocktrans %}
-      Du hast deien Angaben erfolgreich eingesendet.
-     {% endblocktrans %}
-    </p>
-  </div>
- {% else %}
-  <form method="post">
-   {% csrf_token %}
-   {% bootstrap_form register_form %}
-   <input type="submit" value="{% blocktrans %}Absenden{% endblocktrans %}" />
-  </form>
- {% endif %}
-{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/register_start.html

+{% extends "core/base.html" %}
+{% load i18n static %}
+
+{% block browser_title %}{% blocktrans %}Register for{% endblocktrans %} {{ event.display_name }}{% endblock %}
+
+{% block extra_head %}
+  <link rel="stylesheet" href="{% static 'css/paweljong.css' %}"/>
+{% endblock %}
+
+{% block content %}
+
+ <div class="card">
+   <div class="card-content">
+     <div class="row">
+       <div class="col s12">
+         <span class="card-title">
+          {{ event.display_name }}
+         </span>
+         <p>
+           {% blocktrans %}
+           Welcome to the registration for this event! Please make sure to fill in
+           the registration yourself, as the child who wants to participate.
+           You should fill in the registration together with a parent (or other legal
+           guardian).
+           {% endblocktrans %}
+         </p>
+         <p>
+           {% blocktrans %}
+           We ask parents to not fill in the registration on behalf of their child.
+           {% endblocktrans %}
+         </p>
+         <p>
+           {% blocktrans %}
+           Every participant needs a personal e-mail address. This address must be one
+           that you, the participating child, check and read yourself, not one owned by your
+           parents. Of course, we will always send important information to your parents as well.
+           {% endblocktrans %}
+         </p>
+         <p>
+           {% blocktrans %}
+           If you do not have a personal e-mail address yet, and do not want or cannot register
+           one with one of the "big" providers (keep in mind that Google, Outlook, etc. are
+           allowed from 16 years only, and often collect and analyse your private mail), you can
+           register an e-mail address with us.
+           {% endblocktrans %}
+         </p>
+         <p>
+           {% blocktrans %}
+           If you already have a user account with Teckids, do not register a new one. Login
+           with your existing username and password. If you have forgotten your password, please
+           send us an e-mail (pelase do this yourself, with the help of your parents, if needed).
+           {% endblocktrans %}
+         </p>
+       </div>
+     </div>
+   </div>
+   <div class="card-tabs">
+     <ul class="tabs tabs-fixed-width">
+       {% if can_register %}
+       <li class="tab">
+         <a href="#already_registered">
+           {% trans "I already have an account" %}
+         </a>
+       </li>
+       <li class="tab">
+         <a href="#without_email">
+           {% trans "I have a personal email address" %}
+         </a>
+       </li>
+       <li class="tab">
+         <a href="#with_email">
+            {% trans "I don't have a personal email address" %}
+         </a>
+       </li>
+       {% else %}
+       <li class="tab">
+         <a href="#not_possible">{% trans "Not available" %}</a>
+       </li>
+     {% endif %}
+   </div>
+   <div class="card-content grey lighten-4">
+     {% if can_register %}
+     <div id="already_registered">
+       <p>
+         {% blocktrans %}
+         If you already have a Teckids account, please login here. If you forgot your password,
+         or have problems logging in, please send us an e-mail.
+         {% endblocktrans %}
+       </p>
+       <a href="{% url "login" %}?next=/app/paweljong/event/{{ event.linked_group.short_name }}/register">{% trans "Login" %}</a>
+     </div>
+     <div id="with_email">
+       <p>
+         {% blocktrans %}
+         You can now choose a personal e-mail address hosted on our servers.
+         For information about receiving mails, see <a
+         href="https://leopard.institute/pages/services.html">
+         https://leopard.institute/pages/services.html</a>
+         {% endblocktrans %}
+       </p>
+       <a href="{% url "set_email_needed" event.linked_group.short_name %}">{% trans "Register now" %}</a>
+     </div>
+     <div id="without_email">
+       <p>
+         {% blocktrans %}
+         You will be asked for your existing, personal e-mail address. Please remember
+         that you should not use an address owned by your parents. If you do not have
+         a personal e-mail address, please choose the respective option instead!
+         {% endblocktrans %}
+       </p>
+       <a href="{% url "register_event_by_slug" event.linked_group.short_name %}">{% trans "Register now" %}</a>
+     </div>
+     {% else %}
+     <div id="not_possible">
+       <p>
+         {% blocktrans %}
+         Registration is no longer possible.
+         {% endblocktrans %}
+     </div>
+     {% endif %}
+   </div>
+ </div>
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/register_wizard.html

+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% block browser_title %}{{ browser_title }}{% endblock %}
+{% block page_title %}{{ page_title }}{% endblock %}
+
+{% block content %}
+ <div class="row">
+  <div class="col s12">
+   <div class="card info">
+    <div class="card-content">
+     <span class="card-title">{{ info_title }}</span>
+     <p>
+       {{ info_text | safe }}
+     </p>
+    </div>
+   </div>
+  </div>
+ </div>
+
+ <form method="post" enctype="multipart/form-data">
+     {% csrf_token %}
+     {{ wizard.form.media }}
+     {{ wizard.management_form }}
+     {% if wizard.form.forms %}
+         {{ wizard.form.management_form }}
+         {% for form in wizard.form.forms %}
+             {% form form=form %}{% endform %}
+         {% endfor %}
+     {% else %}
+         {% form form=wizard.form %}{% endform %}
+     {% endif %}
+ 
+     {% if wizard.steps.prev %}
+         <button type="submit" value="{{ wizard.steps.first }}" class="btn waves-effect waves-light color-primary" name="wizard_goto_step">
+             <i class="material-icons left">first_page</i>
+             {% trans "first step" %}
+         </button>
+         <button type="submit" value="{{ wizard.steps.prev }}" class="btn waves-effect waves-light color-secondary" name="wizard_goto_step">
+             <i class="material-icons left">arrow_back_ios</i>
+             {% trans "previous step" %}
+         </button>
+     {% endif %}
+     {% trans "Next" as caption %}
+     {% include "core/partials/save_button.html" with caption=caption icon="navigate_next" %}
+ </form>
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/register_wizard_consent.html

+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% block browser_title %}{{ browser_title }}{% endblock %}
+{% block page_title %}{{ page_title }}{% endblock %}
+
+{% block content %}
+ <div class="row">
+  <div class="col s12">
+   <div class="card info">
+    <div class="card-content">
+     <span class="card-title">{{ info_title }}</span>
+     <p>
+       {{ info_text | safe }}
+     </p>
+    </div>
+   </div>
+  </div>
+ </div>
+
+ <div class="row">
+  {% for term in event.terms.all %}
+  <div class="col s12">
+   <div class="card">
+     <div class="card-content">
+      <span class="card-title">{{ term.title }}</span>
+      {{ term.term | safe}}
+     </div>
+    </div>
+  </div>
+  {% endfor %}
+ </div>
+
+ <h5>{% trans "Consents" %}</h5>
+ <form method="post" enctype="multipart/form-data">
+     {% csrf_token %}
+     {{ wizard.form.media }}
+     {{ wizard.management_form }}
+     {% if wizard.form.forms %}
+         {{ wizard.form.management_form }}
+         {% for form in wizard.form.forms %}
+             {% form form=form %}{% endform %}
+         {% endfor %}
+     {% else %}
+         {% form form=wizard.form %}{% endform %}
+     {% endif %}
+ 
+     {% if wizard.steps.prev %}
+         <button type="submit" value="{{ wizard.steps.first }}" class="btn waves-effect waves-light color-primary" name="wizard_goto_step">
+             <i class="material-icons left">first_page</i>
+             {% trans "first step" %}
+         </button>
+         <button type="submit" value="{{ wizard.steps.prev }}" class="btn waves-effect waves-light color-secondary" name="wizard_goto_step">
+             <i class="material-icons left">arrow_back_ios</i>
+             {% trans "previous step" %}
+         </button>
+     {% endif %}
+     {% trans "Next" as caption %}
+     {% include "core/partials/save_button.html" with caption=caption icon="navigate_next" %}
+ </form>
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event/registered.html

+{% extends "core/base.html" %}
+{% load material_form i18n %}
+
+{% block page_title %}{% blocktrans %}Registered successfully{% endblocktrans %}{% endblock %}
+{% block browser_title %}{% blocktrans %}Registered successfully{% endblocktrans %}{% endblock %}
+
+{% block content %}
+
+
+  {{ form_data }}
+
+{% endblock %}

aleksis/apps/paweljong/templates/paweljong/event_registration/full.html

@@ -10,20 +10,20 @@
 {% block content %}
   <h4>{{ registration }} </h4>
 
-  {% has_perm 'ticdesk.manage_registration' user registration as can_manage_registration %}
-  {% has_perm 'ticdesk.delete_registration' user registration as can_delete_registration %}
+  {% has_perm 'paweljong.manage_registration' user registration as can_manage_registration %}
+  {% has_perm 'paweljong.delete_registration' user registration as can_delete_registration %}
 
   {% if can_manage_registration or can_manage_registration_preferences or can_delete_registration %}
     <p>
       {% if can_manage_registration %}
-        <a href="{% url 'edit_registration_by_id' registration.id %}" class="btn waves-effect waves-light">
+        <a href="{% url 'edit_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light">
           <i class="material-icons left">edit</i>
           {% trans "Edit" %}
         </a>
       {% endif %}
 
       {% if can_delete_registration %}
-        <a href="{% url 'delete_registration_by_id' registration.id %}" class="btn waves-effect waves-light red">
+        <a href="{% url 'delete_registration_by_pk' registration.pk %}" class="btn waves-effect waves-light red">
           <i class="material-icons left">delete</i>
           {% trans "Delete" %}
         </a>
@@ -98,6 +98,15 @@
             <td colspan="3">{{ registration.person.date_of_birth|date }}</td>
           </tr>
         {% endif %}
+        <tr>
+          <td></td>
+          <td>
+            <i class="material-icons small">school</i>
+          </td>
+          <td>{{ registration.school_class }}</td>
+          <td>{{ registration.school }}</td>
+          <td>{{ registration.school_place }}</td>
+        </tr>
       </table>
     </div>
     <div class="col s12 m12">
@@ -107,25 +116,69 @@
           <td>
             <i class="material-icons small">local_activity</a>
           </td>
-          <td colspan="3"><a href="{% url 'edit_event_by_id' registration.event.id %}">{{ registration.event }}</a></td>
+          <td colspan="3"><a href="{% url 'edit_event_by_slug' registration.event.linked_group.short_name %}">{{ registration.event }}</a></td>
         </tr>
         <tr>
           <td>
-            <i class="material-icons small">redeem</a>
+            <i class="material-icons small">redeem</i>
           </td>
-          <td colspan="3">{{ registration.donation }}</td>
+          <td colspan="3">{{ registration.donation }}€</td>
         </tr>
         <tr>
           <td>
-            <i class="material-icons small">payment</a>
+            <i class="material-icons small">payment</i>
           </td>
           <td>{% trans "SEPA direct debit" %}: {{ registration.accept_sepa }}</td>
           {% if registration.accept_sepa %}
             <td>{% trans "IBAN" %}: {{ registration.iban }}</td>
           {% endif %}
         </tr>
+        {% if registration.extended_data %}
+          {% for field, value in registration.extended_data.items %}
+            <tr>
+              <td>
+                {{ field }}
+              </td>
+              <td>
+                {{ value }}
+              </td>
+            </tr>
+          {% endfor %}
+        {% endif %}
+        {% if registration.accepted_terms %}
+          {% for term in registration.accepted_terms.all %}
+            <tr>
+              <td>
+                {{ term }}
+              </td>
+              <td>
+                {% trans "Accepted" %}
+              </td>
+            </tr>
+          {% endfor %}
+        {% endif %}
+
+        <tr>
+          <tr>
+            <td>
+              <i class="material-icons small">medical_services</i>
+            </td>
+            <td>
+              {{ registration.medical_information }}
+            </td>
+          </tr>
+        </tr>
+        <tr>
+          <tr>
+            <td>
+              <i class="material-icons small">question_answer</i>
+            </td>
+            <td>
+              {{ registration.comment }}
+            </td>
+          </tr>
+        </tr>
       </table>
-      </p>
     </div>
   </div>
 

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

-{% extends "core/base.html" %}
-{% load material_form i18n %}
-
-{% load render_table from django_tables2 %}
-
-{% block page_title %}{% blocktrans %}Feedback aspects{% endblocktrans %}{% endblock %}
-{% block browser_title %}{% blocktrans %}Feedback aspects{% endblocktrans %}{% endblock %}
-
-{% block content %}
-
-  <h5>{% trans "Filter feedback_aspects" %}</h5>
-  <form method="get">
-    {% form form=feedback_aspects_filter.form %}{% endform %}
-    {% trans "Search" as caption %}
-    {% include "core/partials/save_button.html" with caption=caption icon="search" %}
-    <button type="reset" class="btn red waves-effect waves-light">
-      <i class="material-icons left">clear</i>
-      {% trans "Clear" %}
-    </button>
-    <a class="btn colour-primary waves-effect waves-light" href="{% url 'create_feedback_aspect' %}">{% trans "Create feedback aspect" %}</a>
-  </form>
-
-  <h5>{% blocktrans %}Selected feedback aspects{% endblocktrans %}</h5>
-    {% render_table feedback_aspects_table %}
-
-{% endblock %}

aleksis/apps/paweljong/templates/paweljong/print/corona.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 "Corona" %}{% endblock %}