Skip to content
Snippets Groups Projects
Commit 3700cbad authored by Piotr Gawron's avatar Piotr Gawron
Browse files

visit can be added when all there is no active visit

parent 15ee3857
No related branches found
No related tags found
1 merge request!69visit can be added when all there is no active visit
Pipeline #
......@@ -25,8 +25,10 @@
<div class="box-header with-border">
<a href="{% url 'web.views.subject_edit' id %}"
class="btn btn-block btn-default">Subject</a>
<a href="{% url 'web.views.visit_add' id %}" type="button" class="btn btn-block btn-default">Add
visit</a>
{% if allow_add_visit %}
<a href="{% url 'web.views.visit_add' id %}" type="button" class="btn btn-block btn-default">
Add visit</a>
{% endif %}
</div>
<div class="box-body">
......
......@@ -42,6 +42,14 @@ class SubjectsViewTests(TestCase):
response = self.client.get(reverse('web.views.subject_visit_details', kwargs={'id': subject.id}))
self.assertEqual(response.status_code, 200)
self.assertFalse("Add visit" in response.content)
def test_render_subject_visit_details(self):
subject = create_subject()
response = self.client.get(reverse('web.views.subject_visit_details', kwargs={'id': subject.id}))
self.assertEqual(response.status_code, 200)
self.assertTrue("Add visit" in response.content)
def test_save_subject_edit(self):
subject = create_subject()
......
......@@ -82,9 +82,10 @@ def subject_edit(request, id):
def subject_visit_details(request, id):
subjects = get_object_or_404(Subject, id=id)
visits = subjects.visit_set.all()
subject_to_be_viewed = get_object_or_404(Subject, id=id)
visits = subject_to_be_viewed.visit_set.all()
visits_data = []
allow_add_visit = True
for visit in visits:
appointments = visit.appointment_set.all()
finished = visit.is_finished
......@@ -92,5 +93,8 @@ def subject_visit_details(request, id):
visit_title = visit.follow_up_title()
visit_form = VisitDetailForm(instance=visit)
visits_data.append((visit_form, appointments, finished, visit_id, visit_title))
if not visit.is_finished:
allow_add_visit = False
return wrap_response(request, 'subjects/visitdetails.html', {'display': visits_data, "id": id})
return wrap_response(request, 'subjects/visitdetails.html',
{'display': visits_data, "id": id, "allow_add_visit": allow_add_visit})
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment