diff --git a/smash/web/templates/appointments/index.html b/smash/web/templates/appointments/index.html index 53fce7068cd7ed5f07cbaaf42144c559e2da8023..3e35a34f8672051eaef93d2a2c22d3b68566d9a4 100644 --- a/smash/web/templates/appointments/index.html +++ b/smash/web/templates/appointments/index.html @@ -41,7 +41,7 @@ <tr> <td>{{ planned.visit.subject.first_name }} {{ planned.visit.subject.last_name }}</td> <td> - <a href="{% url 'web.views.subject_details' planned.visit.subject.id %}" type="button" class="btn btn-block btn-default">Subject's details</a> + <a href="{% url 'web.views.subject_edit' planned.visit.subject.id %}" type="button" class="btn btn-block btn-default">Subject's details</a> </td> <td> {{ planned.datetime_when }} diff --git a/smash/web/templates/subjects/edit.html b/smash/web/templates/subjects/edit.html index 3f227a3196a3f2dfed056621a4e1a292fe3b54bd..6b74afe21d9be5cc7e1269ced44a9b272754b3cd 100644 --- a/smash/web/templates/subjects/edit.html +++ b/smash/web/templates/subjects/edit.html @@ -26,6 +26,7 @@ <div class="box box-info"> <div class="box-header with-border"> <a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default" onclick="history.back()">Go back (without changes)</a> + <a href="{% url 'web.views.subject_visit_details' id %}" type = "button" class="btn btn-block btn-default">Subject's visits</a> </div> {% comment %} <div class="box-header with-border"> diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html index 9212f52b7b24dcbabd7f0d3b32fca919732bf600..991e049ceeaeba1c2294375208eaa7440bfee197 100644 --- a/smash/web/templates/subjects/index.html +++ b/smash/web/templates/subjects/index.html @@ -39,7 +39,6 @@ <th class="filter-select filter-exact" data-placeholder="Select location">Default location</th> <th>Dead</th> <th>Resigned</th> - <th>Details</th> <th>Edit</th> </tr> </thead> @@ -64,7 +63,6 @@ <td>{{ subject.get_default_appointment_location_display }}</td> <td>{% if subject.dead %} YES {% else %} NO {% endif %} </td> <td>{% if subject.resigned %} YES {% else %} NO {% endif %} </td> - <td><a href="{% url 'web.views.subject_details' subject.id %}" type="button" class="btn btn-block btn-default">Details</a></td> <td><a href="{% url 'web.views.subject_edit' subject.id %}" type="button" class="btn btn-block btn-default">Edit</a></td> </tr> {% endfor %} diff --git a/smash/web/urls.py b/smash/web/urls.py index fd7a2f8a936c658c3b356240c93993e1efe0a48f..ea8bf2f3561129cce5ce01aad3ba9378d88f595d 100644 --- a/smash/web/urls.py +++ b/smash/web/urls.py @@ -41,7 +41,6 @@ urlpatterns = [ url(r'^subjects$', views.subjects, name='web.views.subjects'), url(r'^subjects/no_visit$', views.subject_no_visits, name='web.views.subject_no_visits'), url(r'^subjects/add$', views.subject_add, name='web.views.subject_add'), - url(r'^subjects/details/(?P<id>\d+)$', views.subject_details, name='web.views.subject_details'), url(r'^subjects/subject_visit_details/(?P<id>\d+)$', views.subject_visit_details, name='web.views.subject_visit_details'), url(r'^subjects/edit/(?P<id>\d+)$', views.subject_edit, name='web.views.subject_edit'), url(r'^subjects/delete/(?P<id>\d+)$', views.subject_delete, name='web.views.subject_delete'), diff --git a/smash/web/views.py b/smash/web/views.py index f90a0d4c146d590d0f0249b47fe0dbf165681229..c1b7b59a8b37efde78343d79acc040bcdf6db8a6 100644 --- a/smash/web/views.py +++ b/smash/web/views.py @@ -319,14 +319,6 @@ def subject_no_visits(request): return wrap_response(request, 'subjects/index.html', context) -def subject_details(request, id): - the_subject = get_object_or_404(Subject, id=id) - form = SubjectDetailForm(instance=the_subject) - sid = id - - return wrap_response(request, 'subjects/details.html', {'form': form, 'sid': sid}) - - def subject_edit(request, id): the_subject = get_object_or_404(Subject, id=id) if request.method == 'POST':