diff --git a/RIGS/templates/RIGS/event_table.html b/RIGS/templates/RIGS/event_table.html index ce366d2f..b7d8bcd6 100644 --- a/RIGS/templates/RIGS/event_table.html +++ b/RIGS/templates/RIGS/event_table.html @@ -11,7 +11,7 @@ {% for event in events %} {% endif %} + {{ event.get_status_display }}

@@ -37,7 +38,7 @@ at {{ event.venue }} {% endif %}

- {% if event.is_rig %} + {% if event.is_rig and not event.cancelled %}
{{ event.person.name }} {% if event.organisation %} @@ -52,26 +53,28 @@ {% endif %} -
- {% if event.meet_at %} -
Crew meet
-
{{ event.meet_at|date:"H:i" }}
{{ event.meet_at|date:"(Y-m-d)" }}
- {% endif %} - {% if event.start_time %} -
Event starts
-
- {{ event.start_time|date:"H:i" }}
- {{ event.start_date|date:"(Y-m-d)" }} -
- {% endif %} - {% if event.end_time and event.start_time != event.end_time %} -
Event ends
-
- {{ event.end_time|date:"H:i" }}
- {{ event.end_date|date:"(Y-m-d)" }} -
- {% endif %} -
+ {% if not event.cancelled %} +
+ {% if event.meet_at %} +
Crew meet
+
{{ event.meet_at|date:"H:i" }}
{{ event.meet_at|date:"(Y-m-d)" }}
+ {% endif %} + {% if event.start_time %} +
Event starts
+
+ {{ event.start_time|date:"H:i" }}
+ {{ event.start_date|date:"(Y-m-d)" }}
+
+ {% endif %} + {% if event.end_time and event.start_time != event.end_time %} +
Event ends
+
+ {{ event.end_time|date:"H:i" }}
+ {{ event.end_date|date:"(Y-m-d)" }} +
+ {% endif %} +
+ {% endif %} {% if event.mic or not event.is_rig %}