Skip to content
Snippets Groups Projects
Commit ea89a77d authored by Benjamin Hättasch's avatar Benjamin Hättasch
Browse files

Show unscheduled slots in scheduler grouped by tracks

parent 6bb63bdb
No related branches found
No related tags found
1 merge request!102Show unscheduled slots in scheduler grouped by tracks
Pipeline #22545 passed
...@@ -184,11 +184,17 @@ ...@@ -184,11 +184,17 @@
<div id="planCalendar"></div> <div id="planCalendar"></div>
</div> </div>
<div class="col-md-2 col-lg-2" id="unscheduled-slots"> <div class="col-md-2 col-lg-2" id="unscheduled-slots">
{% for slot in slots_unscheduled %} {% regroup slots_unscheduled by ak.track as slots_unscheduled_by_track_list %}
<div class="unscheduled-slot badge badge-primary" style='background-color: {{ slot.ak.category.color }}' {% for track_slots in slots_unscheduled_by_track_list %}
data-event='{ "title": "{{ slot.ak.short_name }}", "duration": {"hours": "{{ slot.duration|unlocalize }}"}, "constraint": "roomAvailable", "description": "{{ slot.ak.details | escapejs }}", "slotID": "{{ slot.pk }}", "backgroundColor": "{{ slot.ak.category.color }}"}' data-details="{{ slot.ak.details }}">{{ slot.ak.short_name }} {% if track_slots.grouper %}
({{ slot.duration }} h)<br>{{ slot.ak.owners_list }} <h5 class="mt-2">{{ track_slots.grouper }}</h5>
</div> {% endif %}
{% for slot in track_slots.list %}
<div class="unscheduled-slot badge badge-primary" style='background-color: {{ slot.ak.category.color }}'
data-event='{ "title": "{{ slot.ak.short_name }}", "duration": {"hours": "{{ slot.duration|unlocalize }}"}, "constraint": "roomAvailable", "description": "{{ slot.ak.details | escapejs }}", "slotID": "{{ slot.pk }}", "backgroundColor": "{{ slot.ak.category.color }}"}' data-details="{{ slot.ak.details }}">{{ slot.ak.short_name }}
({{ slot.duration }} h)<br>{{ slot.ak.owners_list }}
</div>
{% endfor %}
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
......
...@@ -25,7 +25,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView): ...@@ -25,7 +25,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
context_object_name = "slots_unscheduled" context_object_name = "slots_unscheduled"
def get_queryset(self): def get_queryset(self):
return super().get_queryset().filter(start__isnull=True) return super().get_queryset().filter(start__isnull=True).order_by('ak__track')
def get_context_data(self, *, object_list=None, **kwargs): def get_context_data(self, *, object_list=None, **kwargs):
context = super().get_context_data(object_list=object_list, **kwargs) context = super().get_context_data(object_list=object_list, **kwargs)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment