diff --git a/smash/web/models/study_visit_list.py b/smash/web/models/study_visit_list.py index e16c334ec9a97fcf953ea49fe36a454c0ccf49ba..3c49f094601deca34dc2d7199fdc5c26d4c96f1e 100644 --- a/smash/web/models/study_visit_list.py +++ b/smash/web/models/study_visit_list.py @@ -12,7 +12,7 @@ VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS = "APPROACHING_WITHOUT_APPOINTMENTS" VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT = "APPROACHING_FOR_MAIL_CONTACT" VISIT_LIST_CHOICES = { - VISIT_LIST_GENERIC: 'Generic', + VISIT_LIST_GENERIC: 'Generic visit list', VISIT_LIST_EXCEEDED_TIME: 'exceeded visit time', VISIT_LIST_UNFINISHED: 'unfinished visits', VISIT_LIST_MISSING_APPOINTMENTS: 'visits with missing appointments', diff --git a/smash/web/templates/visits/index.html b/smash/web/templates/visits/index.html index eb25d83536ca7336b78e770abc4c2e9aae082f63..568fa57a2118dbec974a425ead6e3e0349d490c5 100644 --- a/smash/web/templates/visits/index.html +++ b/smash/web/templates/visits/index.html @@ -10,10 +10,10 @@ {% endblock styles %} {% block ui_active_tab %}'visits'{% endblock ui_active_tab %} -{% block page_header %}Visits{% endblock page_header %} +{% block page_header %}{{ list_description }}{% endblock page_header %} {% block page_description %}{% endblock page_description %} -{% block title %}{{ block.super }} - Visits{% endblock %} +{% block title %}{{ block.super }} - {{ list_description }}{% endblock %} {% block breadcrumb %} {% include "visits/breadcrumb.html" %} @@ -40,6 +40,7 @@ function getVisitEditUrl(id) { return "{% url 'web.views.visit_details' 12345678 %}".replace(/12345678/, id); } + $.get("{% url 'web.api.visits.columns' visit_list_type %}", function (data) { createVisitsTable({ locations_url: "{% url 'web.api.locations' %}", diff --git a/smash/web/views/visit.py b/smash/web/views/visit.py index 7a1e821b71fe0b36b4b49d0ac2de19eaadefa8af..96dde765288b7b54fd87468952d6a742e2fd133a 100644 --- a/smash/web/views/visit.py +++ b/smash/web/views/visit.py @@ -6,7 +6,7 @@ from django.shortcuts import get_object_or_404, redirect from notifications import waiting_for_appointment from web.models.study_visit_list import VISIT_LIST_GENERIC, VISIT_LIST_MISSING_APPOINTMENTS, \ VISIT_LIST_APPROACHING_WITHOUT_APPOINTMENTS, VISIT_LIST_APPROACHING_FOR_MAIL_CONTACT, VISIT_LIST_EXCEEDED_TIME, \ - VISIT_LIST_UNFINISHED + VISIT_LIST_UNFINISHED, VISIT_LIST_CHOICES from . import wrap_response from ..forms import VisitDetailForm, VisitAddForm, SubjectDetailForm, StudySubjectDetailForm from ..models import Visit, Appointment, StudySubject, MailTemplate @@ -15,7 +15,11 @@ logger = logging.getLogger(__name__) def show_visits(request, visit_list_type): - return wrap_response(request, 'visits/index.html', {'visit_list_type': visit_list_type}) + context = { + 'visit_list_type': visit_list_type, + 'list_description': VISIT_LIST_CHOICES[visit_list_type] + } + return wrap_response(request, 'visits/index.html', context) def visits(request):