diff --git a/smash/web/templates/subjects/visitdetails.html b/smash/web/templates/subjects/visitdetails.html index 48e83c48efbb7eaf8126a427c62051a4bffeb5be..02933fd2130c2d74e2f8953bc92b5beca2078ea7 100644 --- a/smash/web/templates/subjects/visitdetails.html +++ b/smash/web/templates/subjects/visitdetails.html @@ -24,6 +24,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.visit_add' id %}" type = "button" class="btn btn-block btn-default">Add visit</a> </div> <div class="box-body"> @@ -113,6 +114,7 @@ {% endfor %} </form> + </div><!-- /.box-body --> </div> diff --git a/smash/web/urls.py b/smash/web/urls.py index 1f5142ff85958ff21c9829df0732fbe47c4ac77b..dd2a30e7cabca3a023ea8dd60001b24df0438cd7 100644 --- a/smash/web/urls.py +++ b/smash/web/urls.py @@ -31,6 +31,7 @@ urlpatterns = [ url(r'visits/approaching$', views.approaching_visits_without_appointments, name='web.views.approaching_visits_without_appointments'), url(r'visits/details/(?P<id>\d+)$', views.visit_details, name='web.views.visit_details'), url(r'visits/add$', views.visit_add, name='web.views.visit_add'), + url(r'visits/add/(?P<subject_id>\d+)$', views.visit_add, name='web.views.visit_add'), url(r'visit/mark/(?P<id>\d+)/(?P<as_what>[A-z]+)$', views.visit_mark, name='web.views.visit_mark'), url(r'subjects$', views.subjects, name='web.views.subjects'), diff --git a/smash/web/views.py b/smash/web/views.py index 4d08e63455df7a56684021a83d9c308a6ee87aef..a8d50376e13aa94dfd262497dbc9cd9c997e6a2e 100644 --- a/smash/web/views.py +++ b/smash/web/views.py @@ -235,14 +235,19 @@ def visit_mark(request, id, as_what): -def visit_add(request): +def visit_add(request, subject_id = -1): if request.method == 'POST': form = VisitAddForm(request.POST, request.FILES) if form.is_valid(): form.save() return redirect(visits) else: - form = VisitAddForm() + subjects = Subject.objects.filter(id=subject_id) + subject = None + if len(subjects)>0: + subject = subjects[0] + form = VisitAddForm(initial={'subject':subject}) + return wrap_response(request, 'visits/add.html', {'form': form}) @@ -334,7 +339,7 @@ def subject_visit_details(request, id): #print len(endlist) #print endlist[0] - return wrap_response(request, 'subjects/visitdetails.html', {'display': endlist}) + return wrap_response(request, 'subjects/visitdetails.html', {'display': endlist, "id":id}) def doctors(request): doctors_list = Worker.objects.order_by('-last_name')