subject list with no visits/contact required added to be handled

dynamically

smash/web/api_views.py

@@ -4,7 +4,8 @@ from django.contrib.auth.decorators import login_required
 from django.http import JsonResponse
 
 from models import Subject, Worker, AppointmentType, Location
-from views.subject import SUBJECT_LIST_GENERIC
+from views.subject import SUBJECT_LIST_GENERIC, SUBJECT_LIST_NO_VISIT, SUBJECT_LIST_REQUIRE_CONTACT
+from views.notifications import get_subjects_with_no_visit, get_subjects_with_reminder
 
 
 @login_required
@@ -62,6 +63,10 @@ def units(request):
 def get_subjects(request, type):
     if type == SUBJECT_LIST_GENERIC:
         return Subject.objects.all()
+    elif type == SUBJECT_LIST_NO_VISIT:
+        return get_subjects_with_no_visit(request.user)
+    elif type == SUBJECT_LIST_REQUIRE_CONTACT:
+        return get_subjects_with_reminder(request.user)
     else:
         raise TypeError("Unknown query type: " + type)
 

smash/web/views/subject.py

@@ -8,14 +8,13 @@ from ..forms import SubjectAddForm, SubjectEditForm, VisitDetailForm, get_prefix
 from ..models import Subject, Worker
 
 SUBJECT_LIST_GENERIC = "GENERIC"
+SUBJECT_LIST_NO_VISIT = "NO_VISIT"
+SUBJECT_LIST_REQUIRE_CONTACT = "REQUIRE_CONTACT"
 
 def subjects(request):
-    subjects_list = Subject.objects.order_by('-last_name')
     context = {
-        'subjects_list': subjects_list,
         'list_type': SUBJECT_LIST_GENERIC,
     }
-
     return wrap_response(request, 'subjects/index.html', context)
 
 
@@ -33,20 +32,16 @@ def subject_add(request):
 
 
 def subject_no_visits(request):
-    subjects_list = get_subjects_with_no_visit(request.user).order_by('-last_name')
     context = {
-        'subjects_list': subjects_list
+        'list_type': SUBJECT_LIST_NO_VISIT,
     }
-
     return wrap_response(request, 'subjects/index.html', context)
 
 
 def subject_require_contact(request):
-    subjects_list = get_subjects_with_reminder(request.user).order_by('-last_name')
     context = {
-        'subjects_list': subjects_list
+        'list_type': SUBJECT_LIST_REQUIRE_CONTACT,
     }
-
     return wrap_response(request, 'subjects/index.html', context)