Merge branch '520-fix-scheduling' into 'main'

Fix and improve scheduling

See merge request kif/akplanning!225

AKScheduling/api.py

@@ -165,7 +165,7 @@ class EventSerializer(serializers.ModelSerializer):
 
         # Updated room if needed (pk changed -- otherwise, no need for an additional database lookup)
         new_room_id = validated_data.get('room')["pk"]
-        if instance.room.pk != new_room_id:
+        if instance.room is None or instance.room.pk != new_room_id:
             instance.room = get_object_or_404(Room, pk=new_room_id)
 
         instance.save()

AKScheduling/templates/admin/AKScheduling/manage_tracks.html

@@ -224,7 +224,7 @@
             <ul data-id="None" data-sync="false" class="ak-list">
                 {% for ak in aks_without_track %}
                     <li data-ak-id="{{ ak.pk }}" data-bs-toggle="tooltip" data-placement="top" title="">
-                        {{ ak.name }} ({{ ak.category }})
+                        {{ ak.name }} <span style="color:{{ ak.category.color }}">({{ ak.category }})</span>
                     </li>
                 {% endfor %}
             </ul>