diff --git a/AKScheduling/api.py b/AKScheduling/api.py index af73c791053ddab2e6922f8b69610914640d9ff6..b7ab7fbd1adb2290c79ac0d59e06ccbb7fd19b72 100644 --- a/AKScheduling/api.py +++ b/AKScheduling/api.py @@ -48,7 +48,7 @@ class EventsView(LoginRequiredMixin, EventSlugMixin, ListView): "start": timezone.localtime(slot.start, self.event.timezone).strftime("%Y-%m-%d %H:%M:%S"), "end": timezone.localtime(slot.end, self.event.timezone).strftime("%Y-%m-%d %H:%M:%S"), "backgroundColor": slot.ak.category.color, - "borderColor": "#ff291d" if slot.fixed else slot.ak.category.color, + "borderColor": "#2c3e50" if slot.fixed else '#e74c3c' if slot.constraintviolation_set.count() > 0 else slot.ak.category.color, "constraint": 'roomAvailable', "editable": not slot.fixed, 'url': str(reverse('admin:AKModel_akslot_change', args=[slot.pk])), diff --git a/AKScheduling/templates/admin/AKScheduling/scheduling.html b/AKScheduling/templates/admin/AKScheduling/scheduling.html index daa19367185fc94f8e38ff7d1112ce2dc4f3cce9..9a140a4cf8614cc97067d333fe821992697cefac 100644 --- a/AKScheduling/templates/admin/AKScheduling/scheduling.html +++ b/AKScheduling/templates/admin/AKScheduling/scheduling.html @@ -22,6 +22,10 @@ .fc-v-event, .tooltip { white-space: pre-line; } + + .fc-v-event { + border-width: 4px; + } </style> <script>