Merge pull request #31 from Katharineum/feature/dbsettings-for-term

Restructure untisconnect (#26)

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)
 

schoolapps/timetable/views.py

 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 *

schoolapps/untisconnect/admin.py

-from django.contrib import admin
-
-# Register your models here.

schoolapps/timetable/parse.py → 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):

schoolapps/untisconnect/templates/untisconnect/test.html

-<h1>UNTIS CONNECTING SYSTEM</h1>
-{{ teachers }}
-
-{% for teacher in teachers %}
-    <p>{{ teacher.first_name }} {{ teacher.name }}</p>
-{% endfor %}
\ No newline at end of file

schoolapps/untisconnect/tests.py

-from django.test import TestCase
-
-# Create your tests here.

schoolapps/untisconnect/urls.py

-from django.urls import path
-from . import views
-
-urlpatterns = [
-    path('', views.test, name='untisconnect_test')
-]

schoolapps/untisconnect/views.py

-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)