diff --git a/appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java b/appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java index 9fa28ec25ce3e1c698d6527ee261d76ae4d1c525..6d17297e7e541c23d252bd544dbca7a0e01e74af 100644 --- a/appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java +++ b/appointment-import/src/main/java/smash/appointment/parse/PrcFlyingParser.java @@ -150,7 +150,7 @@ public class PrcFlyingParser extends SubjectParser { } @Override protected String parseToBeSeenAt(Row row) { - return "P"; + return "F"; } @Override diff --git a/smash/web/templates/visits/details.html b/smash/web/templates/visits/details.html index ae9ae29df2b6f2511bd7aa09e0adbccccab4c509..75b43f024c878ee78d91c1ef74e3cca90cae5d6e 100644 --- a/smash/web/templates/visits/details.html +++ b/smash/web/templates/visits/details.html @@ -26,6 +26,7 @@ <div class="box box-info"> <div class="box-header with-border"> <a href="{% url 'web.views.visits' %}" class="btn btn-block btn-default" onclick="history.back()">Back</a> + <a href="{% url 'web.views.subject_visit_details' visit.subject.id %}" type = "button" class="btn btn-block btn-default">Subject's visits</a> </div> <div class="box-header with-border"> diff --git a/smash/web/views.py b/smash/web/views.py index af3596fd90d77341f9c0622d0c84c8629f8d3415..cf176e0b28466425d2ff9da8cb4c22575b214fdb 100644 --- a/smash/web/views.py +++ b/smash/web/views.py @@ -254,7 +254,14 @@ def visit_details(request, id): vform = VisitDetailForm(instance=displayedVisit) sform = SubjectDetailForm(instance=displayedSubject) - return wrap_response(request, 'visits/details.html', {'vform': vform, 'sform': sform, 'loApp': listOfAppointments, 'visFinished': visFinished,'canFinish': canFinish, 'vid': vid, 'visit': displayedVisit}) + return wrap_response(request, 'visits/details.html', { + 'vform': vform, + 'sform': sform, + 'loApp': listOfAppointments, + 'visFinished': visFinished, + 'canFinish': canFinish, + 'vid': vid, + 'visit': displayedVisit}) def visit_mark(request, id, as_what): visit = get_object_or_404(Visit, id=id)