From cf3519d78daf0275b225e57c526f6f937524e943 Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Wed, 14 Feb 2018 13:06:32 +0100
Subject: [PATCH] visit list contain description what kind of list is it
---
smash/web/models/study_visit_list.py | 2 +-
smash/web/templates/visits/index.html | 5 +++--
smash/web/views/visit.py | 8 ++++++--
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/smash/web/models/study_visit_list.py b/smash/web/models/study_visit_list.py
index e16c334e..3c49f094 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 eb25d835..568fa57a 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 7a1e821b..96dde765 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):
--
GitLab