Skip to content
Snippets Groups Projects
Commit 151614c1 authored by Benjamin Hättasch's avatar Benjamin Hättasch Committed by Nadja Geisler
Browse files

Show AK messages on event status page

parent 57814e22
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
AKModel/templates/admin/AKModel/status.html
+ 91
− 74
View file @ 151614c1
...@@ -7,88 +7,105 @@ ...@@ -7,88 +7,105 @@
{% block title %}{% trans "Status" %}: {{event}}{% endblock %} {% block title %}{% trans "Status" %}: {{event}}{% endblock %}
{% block content %} {% block content %}
<h2><a href="{% url 'admin:AKModel_event_change' event.pk %}">{{event}}</a></h2>
{% timezone event.timezone %} {% timezone event.timezone %}
<h5>{{ event.start }} - {{ event.end }}</h5> <h2><a href="{% url 'admin:AKModel_event_change' event.pk %}">{{event}}</a></h2>
<h5>{{ event.start }} - {{ event.end }}</h5>
<h3 class="block-header">{% trans "Categories" %}</h3> <div class="row">
{% if event.akcategory_set.count == 0 %} <div class="col-md-8">
<p class="text-danger">{% trans "No categroies yet" %}</p> <h3 class="block-header">{% trans "Categories" %}</h3>
{% else %} {% if event.akcategory_set.count == 0 %}
<p> <p class="text-danger">{% trans "No categroies yet" %}</p>
{{ event.akcategory_set.count }}: {% else %}
{% for category in event.akcategory_set.all %} <p>
{% if forloop.counter0 > 0 %} {{ event.akcategory_set.count }}:
&middot; {% for category in event.akcategory_set.all %}
{% if forloop.counter0 > 0 %}
&middot;
{% endif %}
<a href="{% url 'admin:AKModel_akcategory_change' category.pk %}">{{ category }}</a>
({{ category.ak_set.count }})
{% endfor %}
</p>
{% endif %} {% endif %}
<a href="{% url 'admin:AKModel_akcategory_change' category.pk %}">{{ category }}</a> <a class="btn btn-success" href="{% url 'admin:AKModel_akcategory_add' %}">{% trans "Add category" %}</a>
({{ category.ak_set.count }})
{% endfor %}
</p>
{% endif %}
<a class="btn btn-success" href="{% url 'admin:AKModel_akcategory_add' %}">{% trans "Add category" %}</a>
<h3 class="block-header">{% trans "Rooms" %}</h3> <h3 class="block-header">{% trans "Rooms" %}</h3>
{% if event.room_set.count == 0 %} {% if event.room_set.count == 0 %}
<p class="text-danger">{% trans "No rooms yet" %}</p> <p class="text-danger">{% trans "No rooms yet" %}</p>
{% else %} {% else %}
<p> <p>
{{ event.room_set.count }}: {{ event.room_set.count }}:
{% for room in event.room_set.all %} {% for room in event.room_set.all %}
{% if forloop.counter0 > 0 %} {% if forloop.counter0 > 0 %}
&middot; &middot;
{% endif %}
<a href="{% url 'admin:AKModel_room_change' room.pk %}">{{ room }}</a>
{% endfor %}
</p>
{% endif %} {% endif %}
<a href="{% url 'admin:AKModel_room_change' room.pk %}">{{ room }}</a> <a class="btn btn-success" href="{% url 'admin:AKModel_room_add' %}">{% trans "Add Room" %}</a>
{% endfor %}
</p>
{% endif %}
<a class="btn btn-success" href="{% url 'admin:AKModel_room_add' %}">{% trans "Add Room" %}</a>
<h3 class="block-header">{% trans "AKs" %}</h3> <h3 class="block-header">{% trans "AKs" %}</h3>
{% if event.ak_set.count == 0 %} {% if event.ak_set.count == 0 %}
<p class="text-danger">{% trans "No AKs yet" %}</p> <p class="text-danger">{% trans "No AKs yet" %}</p>
{% else %} {% else %}
<table> <table>
<tbody> <tbody>
<tr> <tr>
<td>{% trans "AKs" %}</td><td>{{ event.ak_set.count }}</td> <td>{% trans "AKs" %}</td><td>{{ event.ak_set.count }}</td>
</tr> </tr>
<tr> <tr>
<td>{% trans "Slots" %}</td><td>{{ event.akslot_set.count }}</td> <td>{% trans "Slots" %}</td><td>{{ event.akslot_set.count }}</td>
</tr> </tr>
<tr> <tr>
<td>{% trans "Unscheduled Slots" %}</td><td> <td>{% trans "Unscheduled Slots" %}</td><td>
{% if "AKScheduling"|check_app_installed %} {% if "AKScheduling"|check_app_installed %}
<a href="{% url 'admin:slots_unscheduled' event_slug=event.slug %}"> <a href="{% url 'admin:slots_unscheduled' event_slug=event.slug %}">
{{ unscheduled_slots_count }} {{ unscheduled_slots_count }}
</a> </a>
{% else %} {% else %}
{{ unscheduled_slots_count }} {{ unscheduled_slots_count }}
{% endif %} {% endif %}
</td> </td>
</tr> </tr>
</tbody> </tbody>
</table> </table>
<a class="btn btn-success" href="{% url 'admin:ak_csv_export' event_slug=event.slug %}">{% trans "Export AKs as CSV" %}</a> <a class="btn btn-success" href="{% url 'admin:ak_csv_export' event_slug=event.slug %}">{% trans "Export AKs as CSV" %}</a>
{% endif %}
<h3 class="block-header">{% trans "Requirements" %}</h3>
{% if event.akrequirement_set.count == 0 %}
<p class="text-danger">{% trans "No requirements yet" %}</p>
{% else %}
<p>
{{ event.akrequirement_set.count }}:
{% for requirement in event.akrequirement_set.all %}
{% if forloop.counter0 > 0 %}
&middot;
{% endif %} {% endif %}
<a href="{% url 'admin:AKModel_akrequirement_change' requirement.pk %}">{{ requirement }}</a>
({{ requirement.ak_set.count }})
{% endfor %}
</p>
{% endif %}
<a class="btn btn-success" href="{% url 'admin:AKModel_akrequirement_add' %}">{% trans "Add Requirement" %}</a>
<h3 class="block-header">{% trans "Requirements" %}</h3>
{% if event.akrequirement_set.count == 0 %}
<p class="text-danger">{% trans "No requirements yet" %}</p>
{% else %}
<p>
{{ event.akrequirement_set.count }}:
{% for requirement in event.akrequirement_set.all %}
{% if forloop.counter0 > 0 %}
&middot;
{% endif %}
<a href="{% url 'admin:AKModel_akrequirement_change' requirement.pk %}">{{ requirement }}</a>
({{ requirement.ak_set.count }})
{% endfor %}
</p>
{% endif %}
<a class="btn btn-success" href="{% url 'admin:AKModel_akrequirement_add' %}">{% trans "Add Requirement" %}</a>
</div>
<div class="col-md-4">
<h3 class="block-header">{% trans "Messages" %}</h3>
<table class="table table-striped">
{% for message in ak_messages %}
<tr><td>
<span class="text-secondary float-right">
{{ message.timestamp|date:"Y-m-d H:i:s" }}
</span>
<h5><a href="{% url 'submit:ak_detail' event_slug=message.ak.event.slug pk=message.ak.pk %}">{{ message.ak }}</a></h5>
<p>{{ message.text }}</p>
</td></tr>
{% endfor %}
</table>
</div>
</div>
{% endtimezone %} {% endtimezone %}
{% endblock %} {% endblock %}
AKModel/views.py
+ 2
− 1
View file @ 151614c1
...@@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _ ...@@ -6,7 +6,7 @@ from django.utils.translation import gettext_lazy as _
from django.views.generic import TemplateView, DetailView, ListView from django.views.generic import TemplateView, DetailView, ListView
from rest_framework import viewsets, permissions, mixins from rest_framework import viewsets, permissions, mixins
from AKModel.models import Event, AK, AKSlot, Room, AKTrack, AKCategory, AKOwner from AKModel.models import Event, AK, AKSlot, Room, AKTrack, AKCategory, AKOwner, AKOrgaMessage
from AKModel.serializers import AKSerializer, AKSlotSerializer, RoomSerializer, AKTrackSerializer, AKCategorySerializer, \ from AKModel.serializers import AKSerializer, AKSlotSerializer, RoomSerializer, AKTrackSerializer, AKCategorySerializer, \
AKOwnerSerializer AKOwnerSerializer
...@@ -132,6 +132,7 @@ class EventStatusView(AdminViewMixin, DetailView): ...@@ -132,6 +132,7 @@ class EventStatusView(AdminViewMixin, DetailView):
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
context["unscheduled_slots_count"] = context["event"].akslot_set.filter(start=None).count context["unscheduled_slots_count"] = context["event"].akslot_set.filter(start=None).count
context["site_url"] = reverse_lazy("dashboard:dashboard_event", kwargs={'slug': context["event"].slug}) context["site_url"] = reverse_lazy("dashboard:dashboard_event", kwargs={'slug': context["event"].slug})
context["ak_messages"] = AKOrgaMessage.objects.filter(ak__event=context["event"])
return context return context
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment