Verified Commit 20d0100d authored by Hueser, Christian (FWCC) - 138593's avatar Hueser, Christian (FWCC) - 138593
Browse files

Past events should not have a waiting list text and badge

* Reorder checks which case is at hand.
* Put check whether event is a past event as the very first check.
* Check whether or not registration_state is 'over'.
parent 06406dbc
Pipeline #43346 passed with stages
in 7 minutes and 4 seconds
......@@ -33,8 +33,6 @@
A) Registration period is not given.
B) Registration period is given.
4) Registration period is over.
a) Registration period is not given.
b) Registration period is given.
(Do not display any registration information badges.)
*) Everything else, case for which no registration information
template should be displayed.
......@@ -76,11 +74,13 @@
{% endif %}
{% endif %}
{% if booked_out == true and
{% if registration_state != "over" and
booked_out == true and
has_waiting_list == false %}
<!-- Registration link selection: Case 3a -->
{% include events/event_fully_booked_out_badge.html %}
{% elsif booked_out == true and
{% elsif registration_state != "over" and
booked_out == true and
has_waiting_list == true %}
<!-- Registration link selection: Case 3bA and 3bB -->
{% include events/event_waiting_list_badge.html %}
......
......@@ -31,8 +31,6 @@
A) Registration period is not given.
B) Registration period is given.
4) Registration period is over.
a) Registration period is not given.
b) Registration period is given.
*) Everything else, case for which no registration information
template should be displayed.
{% endcomment %}
......@@ -72,8 +70,11 @@
{% endif %}
{% endif %}
{% if booked_out == true and
has_waiting_list == false %}
{% if registration_state == "over" %}
<!-- Registration link selection: Case 4 -->
The registration period is over.
{% elsif booked_out == true and
has_waiting_list == false %}
<!-- Registration link selection: Case 3a -->
{% include events/event_fully_booked_out_badge.html %}
The event is completely booked out and there is no waiting list.
......@@ -124,10 +125,6 @@
{{ include.event.registration_period.to | date_to_long_string }}
</strong>
or until the event is booked out.
{% elsif registration_state == "over" and
period_given == true %}
<!-- Registration link selection: Case 4a and 4b -->
The registration period is over.
{% elsif period_given == false and
has_link == true %}
<!-- Registration link selection: Case 2bA -->
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment