Merge branch 'appointments-dev' into 'master'

Appointments dev

See merge request !3

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

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">

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)