From 6420368a284624ccc871d98ac24ac1b6446be92f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20H=C3=A4ttasch?=
<benjamin.haettasch@fachschaft.informatik.tu-darmstadt.de>
Date: Tue, 29 Nov 2022 00:18:48 +0100
Subject: [PATCH] Minor improvements
Load custom css in admin interface, too
Fix lading of locales in scheduler
Improve icon in scheduler
Reduce SQL query amount in scheduler
---
AKModel/templates/AKModel/load_fullcalendar_availabilities.html | 2 +-
AKScheduling/templates/admin/AKScheduling/scheduling.html | 2 +-
AKScheduling/views.py | 2 +-
static_common/common/css/admin-bootstrap.css | 1 +
4 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/AKModel/templates/AKModel/load_fullcalendar_availabilities.html b/AKModel/templates/AKModel/load_fullcalendar_availabilities.html
index 2d218668..287946c9 100644
--- a/AKModel/templates/AKModel/load_fullcalendar_availabilities.html
+++ b/AKModel/templates/AKModel/load_fullcalendar_availabilities.html
@@ -7,7 +7,7 @@
<script src="{% static "common/vendor/moment/moment-with-locales.js" %}"></script>
<script src="{% static "common/js/availabilities.js" %}"></script>
-{% with 'common/vendor/fullcalendar/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
+{% with 'common/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
{% if LANGUAGE_CODE != "en" %}
{# Locale 'en' is included in main.js and does not exist separately #}
<script src="{% static locale_file %}"></script>
diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html
index 50ab859c..52be9830 100644
--- a/AKScheduling/templates/admin/AKScheduling/scheduling.html
+++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html
@@ -198,7 +198,7 @@
table_html += '<tr><td>';
if(response[i].level_display==='{% trans "Violation" %}')
- table_html += '{% fa5_icon "exclamation-circle" "fas" %}';
+ table_html += '{% fa5_icon "exclamation-triangle" "fas" %}';
else
table_html += '{% fa5_icon "info-circle" "fas" %}';
diff --git a/AKScheduling/views.py b/AKScheduling/views.py
index 3b40d07c..0834c4f7 100644
--- a/AKScheduling/views.py
+++ b/AKScheduling/views.py
@@ -30,7 +30,7 @@ class SchedulingAdminView(AdminViewMixin, FilterByEventSlugMixin, ListView):
context_object_name = "slots_unscheduled"
def get_queryset(self):
- return super().get_queryset().filter(start__isnull=True).order_by('ak__track')
+ return super().get_queryset().filter(start__isnull=True).select_related().order_by('ak__track')
def get_context_data(self, *, object_list=None, **kwargs):
context = super().get_context_data(object_list=object_list, **kwargs)
diff --git a/static_common/common/css/admin-bootstrap.css b/static_common/common/css/admin-bootstrap.css
index c0b4714c..44e323b3 100644
--- a/static_common/common/css/admin-bootstrap.css
+++ b/static_common/common/css/admin-bootstrap.css
@@ -4,3 +4,4 @@
*/
@import "/static/common/css/bootstrap.css";
@import "../../admin/css/base.css";
+@import "/static/common/css/custom.css";
--
GitLab