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

Fix fullcalendar issues by switching import order

Move background event color to scheduling init code instead of every single background event
parent 5b05047b
Branches
No related tags found
No related merge requests found
......@@ -2,8 +2,8 @@
{% load i18n %}
{% get_current_language as LANGUAGE_CODE %}
<script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script>
<link href='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.css' %}' rel='stylesheet'/>
<script src='{% static 'AKPlan/vendor/fullcalendar-scheduler/main.js' %}'></script>
{% with 'AKPlan/vendor/fullcalendar-scheduler/locales/'|add:LANGUAGE_CODE|add:'.js' as locale_file %}
{% if LANGUAGE_CODE != "en" %}
......
......@@ -72,7 +72,6 @@ class RoomAvailabilitiesView(LoginRequiredMixin, EventSlugMixin, ListView):
"resourceId": a.room.id,
"start": timezone.localtime(a.start, self.event.timezone).strftime("%Y-%m-%d %H:%M:%S"),
"end": timezone.localtime(a.end, self.event.timezone).strftime("%Y-%m-%d %H:%M:%S"),
"backgroundColor": "#28B62C",
"display": 'background',
"groupId": 'roomAvailable',
} for a in context["availabilities"]],
......
......@@ -127,7 +127,6 @@
eventChange: updateEvent,
eventReceive: updateEvent,
editable: true,
dropable: true,
drop: function (info) {
info.draggedEl.parentNode.removeChild(info.draggedEl);
},
......@@ -135,6 +134,7 @@
nowIndicator: true,
eventTextColor: '#fff',
eventColor: '#127ba3',
eventBackgroundColor: '#28B62C',
datesAboveResources: true,
resourceAreaHeaderContent: '{% trans "Room" %}',
resources: '{% url "model:scheduling-resources-list" event_slug=event.slug %}',
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment