From c4e5e9705ccbf85165e8be8b0a1d51e78764c5ce Mon Sep 17 00:00:00 2001
From: "Tibor Bossanyi (Freelancer)" <tibor.bossanyi@delti.com>
Date: Tue, 27 Jul 2021 16:21:34 +0200
Subject: [PATCH] BO 1.23+2 module controlling fixes

---
 Dockerfile                                                 | 2 +-
 aitrainer_backoffice/aitrainer_backoffice/settings/prod.py | 4 ++--
 aitrainer_backoffice/controlling/apps.py                   | 5 +++++
 requirements.txt                                           | 4 +++-
 4 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 565f331..b26d0ef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.7
 WORKDIR /aitrainer_backoffice
 ADD . /aitrainer_backoffice/
+RUN /usr/local/bin/python -m pip install --upgrade pip
 RUN apt-get update && apt-get install vim -y
 RUN pip3 install uwsgi
 COPY requirements.txt ./
@@ -8,7 +9,6 @@ RUN pip install --no-cache-dir -r requirements.txt
 
 COPY uwsgi_params /var/www/aitrainer.info/
 COPY .key ./
-#ENV DJANGO_KEY=45u49283495j2435294234
 ENV DJANGO_SETTINGS_MODULE=aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
 
 
diff --git a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
index f7b49f9..35be5e4 100644
--- a/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
+++ b/aitrainer_backoffice/aitrainer_backoffice/settings/prod.py
@@ -34,7 +34,7 @@ ALLOWED_HOSTS = ['62.171.188.119', 'localhost', 'andio.eu', 'aitrainer.info','ai
 
 INSTALLED_APPS = [
     'aitrainer_backoffice.aitrainer_backoffice',
-    'controlling.apps.ControllingConfig',
+    'aitrainer_backoffice.controlling.apps.ControllingConfigLive',
     'django.contrib.admin',
     'django.contrib.auth',
     'django.contrib.contenttypes',
@@ -176,6 +176,6 @@ CACHES = {
 }
 
 CRONJOBS = [
-    ('4 */1 * * *', 'controlling.cron.sync_customers')
+    ('4 */1 * * *', 'aitrainer_backoffice.controlling.cron.sync_customers')
 ]
 
diff --git a/aitrainer_backoffice/controlling/apps.py b/aitrainer_backoffice/controlling/apps.py
index 50e6d1e..ad33b7a 100644
--- a/aitrainer_backoffice/controlling/apps.py
+++ b/aitrainer_backoffice/controlling/apps.py
@@ -4,3 +4,8 @@ from django.apps import AppConfig
 class ControllingConfig(AppConfig):
     app_label = 'controlling'
     name = 'controlling'
+
+
+class ControllingConfigLive(AppConfig):
+    app_label = 'controlling'
+    name = 'aitrainer_backoffice.controlling'
diff --git a/requirements.txt b/requirements.txt
index 4d32457..6ac81f0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,4 +12,6 @@ setuptools==49.2.0
 mysqlclient==2.0.1
 requests==2.24.0
 pillow==7.2.0
-gunicorn==20.0.4
\ No newline at end of file
+gunicorn==20.0.4
+django-crontab==0.7.1
+django-admin-rangefilter==0.8.1
\ No newline at end of file