- Some changes

requirements.txt

@@ -6,7 +6,7 @@ django_pdb
 django-material
 django-filter
 django_react_templatetags
-kanboard
 PyPDF2
 martor
-django_widget_tweaks
\ No newline at end of file
+django_widget_tweaks
+python-memcached
\ No newline at end of file

schoolapps/schoolapps/settings.py

@@ -154,20 +154,29 @@ AUTH_LDAP_MIRROR_GROUPS = True
 AUTH_LDAP_CACHE_GROUPS = True
 AUTH_LDAP_GROUP_CACHE_TIMEOUT = 300
 
-# Keep ModelBackend around for per-user permissions and maybe a local
-# superuser.
+# Keep ModelBackend around for per-user permissions and maybe a local superuser.
 AUTHENTICATION_BACKENDS = (
     'django_auth_ldap.backend.LDAPBackend',
     'django.contrib.auth.backends.ModelBackend',
 )
 
-logger = logging.getLogger('django_auth_ldap')
-logger.addHandler(logging.StreamHandler())
 if DEBUG:
+    logger = logging.getLogger('django_auth_ldap')
+    logger.addHandler(logging.StreamHandler())
     logger.setLevel(logging.DEBUG)
 
 # Media
 MEDIA_URL = '/media/'
 MEDIA_ROOT = os.path.join(BASE_DIR, 'media')
 
-#DBSETTINGS_USE_CACHE = False
+# Use cache for db settings (only on production)
+DBSETTINGS_USE_CACHE = not DEBUG
+
+# Cache configs (only on production)
+if not DEBUG:
+    CACHES = {
+        'default': {
+            'BACKEND': 'django.core.cache.backends.memcached.MemcachedCache',
+            'LOCATION': '127.0.0.1:11211',
+        }
+    }

schoolapps/timetable/migrations/0011_merge_20191113_1655.py

+# Generated by Django 2.2.6 on 2019-11-13 15:55
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ('timetable', '0010_auto_20190818_0910'),
+        ('timetable', '0010_auto_20190825_1238'),
+    ]
+
+    operations = [
+    ]

schoolapps/untisconnect/plan.py

@@ -176,7 +176,6 @@ def get_plan(type, id, smart=False, monday_of_week=None, force_update=False):
                         element_container.is_hol = True
                         element_container.element.holiday_reason = hols_for_weekday[time.day - 1][0].name
 
-
                     if type != TYPE_ROOM or i == room_index:
                         # Add this container object to the LessonContainer object in the plan array
                         plan[time.hour - 1][0][time.day - 1].append(element_container)
@@ -241,5 +240,5 @@ def get_plan(type, id, smart=False, monday_of_week=None, force_update=False):
                     for j in range(event.event.from_lesson - 1, event.event.to_lesson):
                         plan[j][0][i].append(element_container)
 
-    cache.update(plan)
+    cache.update((plan, hols_for_weekday))
     return plan, hols_for_weekday