diff --git a/smash/web/api_views.py b/smash/web/api_views.py index dd85b867003244017ff6acf2c8b1ee705c3c5120..bf4cc61ba54e654a5b8d8bf354c869d9f5120640 100644 --- a/smash/web/api_views.py +++ b/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) diff --git a/smash/web/views/subject.py b/smash/web/views/subject.py index 85a305b8575d1151ac3061e5736f9c052f233aab..de6034350eff85f42a20c5d6b64ea32cf84990f8 100644 --- a/smash/web/views/subject.py +++ b/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)