diff --git a/smash/web/templates/appointments/edit.html b/smash/web/templates/appointments/edit.html index 44a3ca2709e203ba4573717b306d30fcf6790aba..dc1df827cfd7967dbad32f7e7e69ae79545bacd9 100644 --- a/smash/web/templates/appointments/edit.html +++ b/smash/web/templates/appointments/edit.html @@ -35,7 +35,7 @@ </div> <div class="box box-info"> - <form method="post" action="" enctype="multipart/form-data" class="form-horizontal"> + <form method="post" action="" enctype="multipart/form-data" class="form-horizontal"> {% csrf_token %} <fieldset> <div class="box-header with-border"> @@ -136,6 +136,11 @@ </div><!-- /.box-footer --> </form> </div> + + {% if appointment.visit.subject.study.columns.vouchers %} + {% include 'includes/subject_vouchers_box.html' with subject=appointment.visit.subject %} + {% endif %} + {% include 'includes/mail_templates_box.html' with instance_id=appointment.id %} {% if appointment.visit %} {% include 'includes/contact_attempts_box.html' with subject=appointment.visit.subject contact_attempts=contact_attempts appointment_id=appointment.id %} diff --git a/smash/web/views/appointment.py b/smash/web/views/appointment.py index 6d64acd468487ffc1a569241661c309d5b12f5ae..fac01b5a1d1aabe6537fb641e13612734b3a6e76 100644 --- a/smash/web/views/appointment.py +++ b/smash/web/views/appointment.py @@ -139,7 +139,6 @@ def appointment_edit(request, id): 'appointment_form': appointment_form, 'study_subject_form': study_subject_form, 'subject_form': subject_form, - 'id': id, 'appointment': the_appointment, 'contact_attempts': contact_attempts, 'mail_templates': MailTemplate.get_appointment_mail_templates(languages)