From d41dcdf51abe0b7c5e35b2fefb6d313a429694dc Mon Sep 17 00:00:00 2001
From: HanseGucker <hansegucker@gmail.com>
Date: Sun, 22 Jul 2018 16:28:58 +0200
Subject: [PATCH] Restructure untisconnect
---
schoolapps/schoolapps/urls.py | 7 +------
schoolapps/timetable/views.py | 3 +--
schoolapps/untisconnect/admin.py | 3 ---
schoolapps/{timetable => untisconnect}/parse.py | 7 +------
.../templates/untisconnect/test.html | 6 ------
schoolapps/untisconnect/tests.py | 3 ---
schoolapps/untisconnect/urls.py | 6 ------
schoolapps/untisconnect/views.py | 16 ----------------
8 files changed, 3 insertions(+), 48 deletions(-)
delete mode 100755 schoolapps/untisconnect/admin.py
rename schoolapps/{timetable => untisconnect}/parse.py (98%)
delete mode 100755 schoolapps/untisconnect/templates/untisconnect/test.html
delete mode 100755 schoolapps/untisconnect/tests.py
delete mode 100755 schoolapps/untisconnect/urls.py
delete mode 100755 schoolapps/untisconnect/views.py
diff --git a/schoolapps/schoolapps/urls.py b/schoolapps/schoolapps/urls.py
index 37d959fb9..88c4c2a93 100755
--- a/schoolapps/schoolapps/urls.py
+++ b/schoolapps/schoolapps/urls.py
@@ -35,11 +35,6 @@ urlpatterns = [
#######
path('aub/', include('aub.urls')),
- #################
- # UNTIS CONNECT #
- #################
- path('untis/', include('untisconnect.urls')),
-
#############
# TIMETABLE #
#############
@@ -48,7 +43,7 @@ urlpatterns = [
#########
# Admin #
#########
- path('settings/', include('dbsettings.urls')),
+ path('settings/', include('dbsettings.urls')),
path('admin/', admin.site.urls),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
diff --git a/schoolapps/timetable/views.py b/schoolapps/timetable/views.py
index f03f66a3b..842d01318 100755
--- a/schoolapps/timetable/views.py
+++ b/schoolapps/timetable/views.py
@@ -1,8 +1,7 @@
from django.contrib.auth.decorators import login_required
from django.http import Http404
from django.shortcuts import render
-from untisconnect.api import *
-from .parse import *
+from untisconnect.parse import *
try:
from schoolapps.untisconnect.api import *
diff --git a/schoolapps/untisconnect/admin.py b/schoolapps/untisconnect/admin.py
deleted file mode 100755
index 8c38f3f3d..000000000
--- a/schoolapps/untisconnect/admin.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.contrib import admin
-
-# Register your models here.
diff --git a/schoolapps/timetable/parse.py b/schoolapps/untisconnect/parse.py
similarity index 98%
rename from schoolapps/timetable/parse.py
rename to schoolapps/untisconnect/parse.py
index 2bd372e3e..9c7b7cd5a 100755
--- a/schoolapps/timetable/parse.py
+++ b/schoolapps/untisconnect/parse.py
@@ -48,12 +48,7 @@ class LessonTime(object):
self.rooms = rooms
-from untisconnect.api import *
-
-try:
- from schoolapps.untisconnect.api import *
-except Exception:
- pass
+from .api import *
def clean_array(a, conv=None):
diff --git a/schoolapps/untisconnect/templates/untisconnect/test.html b/schoolapps/untisconnect/templates/untisconnect/test.html
deleted file mode 100755
index 3640a0c7c..000000000
--- a/schoolapps/untisconnect/templates/untisconnect/test.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>UNTIS CONNECTING SYSTEM</h1>
-{{ teachers }}
-
-{% for teacher in teachers %}
- <p>{{ teacher.first_name }} {{ teacher.name }}</p>
-{% endfor %}
\ No newline at end of file
diff --git a/schoolapps/untisconnect/tests.py b/schoolapps/untisconnect/tests.py
deleted file mode 100755
index 7ce503c2d..000000000
--- a/schoolapps/untisconnect/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/schoolapps/untisconnect/urls.py b/schoolapps/untisconnect/urls.py
deleted file mode 100755
index 193ccea91..000000000
--- a/schoolapps/untisconnect/urls.py
+++ /dev/null
@@ -1,6 +0,0 @@
-from django.urls import path
-from . import views
-
-urlpatterns = [
- path('', views.test, name='untisconnect_test')
-]
diff --git a/schoolapps/untisconnect/views.py b/schoolapps/untisconnect/views.py
deleted file mode 100755
index f15e66c01..000000000
--- a/schoolapps/untisconnect/views.py
+++ /dev/null
@@ -1,16 +0,0 @@
-from django.contrib.auth.decorators import login_required
-from django.shortcuts import render
-
-
-# Create your views here.
-from .api import get_all_teachers, get_all_classes
-
-
-@login_required
-def test(request):
- teachers = get_all_teachers()
- classes = get_all_classes()
- context = {
- 'teachers': teachers
- }
- return render(request, 'untisconnect/test.html', context=context)
--
GitLab