Skip to content
Snippets Groups Projects

#70 allow subject edit in appointment edit view

Merged #70 allow subject edit in appointment edit view
70-edit-appointment into master
Merged Valentin Groues requested to merge 70-edit-appointment into master
Compare
and
6 files
+ 121
− 87
Compare changes
  • Side-by-side
  • Inline
Files
6
smash/web/templates/appointments/edit.html
+ 46
− 48
@@ -35,55 +35,51 @@
@@ -35,55 +35,51 @@
<form method="post" action="" class="form-horizontal">
<form method="post" action="" class="form-horizontal">
{% csrf_token %}
{% csrf_token %}
 
<fieldset>
 
<div class="box-header with-border">
 
<h3 class="box-title">Appointment's details</h3>
 
</div>
 
<div class="box-body">
 
{% for field in form %}
 
<div class="col-md-6 form-group {% if field.errors %}has-error{% endif %} {% if field|is_checkbox %}multi-checkboxes{% endif %}">
 
<label for="{# TODO #}" class="col-sm-4 control-label">
 
{{ field.label }}
 
</label>
 
 
<div class="col-sm-8">
 
{{ field|add_class:'form-control' }}
 
</div>
<div class="box-body">
{% if field.errors %}
{% for field in form %}
<span class="help-block">
<div class="col-md-6 form-group {% if field.errors %}has-error{% endif %} {% if field|is_checkbox %}multi-checkboxes{% endif %}">
{{ field.errors }}
 
</span>
 
{% endif %}
 
</div>
 
{% endfor %}
 
<div class="col-md-6 form-group">
<label for="{# TODO #}" class="col-sm-4 control-label">
<label for="{# TODO #}" class="col-sm-4 control-label">
{{ field.label }}
Status:
</label>
</label>
<div class="col-sm-8">
<div class="btn-group-vertical col-sm-8">
{{ field|add_class:'form-control' }}
<label class="btn btn-primary">{{ appointment.status }}</label>
 
<a href="{% url 'web.views.appointment_mark' id 'finished' %}"
 
class="btn btn-warning btn-block">Mark as finished</a>
 
<a href="{% url 'web.views.appointment_mark' id 'cancelled' %}"
 
class="btn btn-warning btn-block">Mark as cancelled</a>
 
<a href="{% url 'web.views.appointment_mark' id 'no_show' %}"
 
class="btn btn-warning btn-block">Mark as no show</a>
</div>
</div>
{% if field.errors %}
<span class="help-block">
{{ field.errors }}
</span>
{% endif %}
</div>
{% endfor %}
<div class="col-md-6 form-group">
<label for="{# TODO #}" class="col-sm-4 control-label">
Status:
</label>
<div class="btn-group-vertical col-sm-8">
<label class="btn btn-primary">{{ appointment.status }}</label>
<a href="{% url 'web.views.appointment_mark' id 'finished' %}"
class="btn btn-warning btn-block">Mark as finished</a>
<a href="{% url 'web.views.appointment_mark' id 'cancelled' %}"
class="btn btn-warning btn-block">Mark as cancelled</a>
<a href="{% url 'web.views.appointment_mark' id 'no_show' %}"
class="btn btn-warning btn-block">Mark as no show</a>
</div>
</div>
</div>
</div><!-- /.box-body -->
</div><!-- /.box-body -->
<div class="box-footer">
<div class="col-sm-6">
<button type="submit" class="btn btn-block btn-success">Save</button>
</div>
<div class="col-sm-6">
<a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default"
onclick="history.back()">Cancel</a>
</div>
</div><!-- /.box-footer -->
<div class="box-header with-border">
</fieldset>
<h3 class="box-title">Subject's details</h3>
<fieldset>
</div>
<div class="box-header with-border">
 
<h3 class="box-title">Subject's details</h3>
 
</div>
<form class="form-horizontal">
<div class="box-body">
<div class="box-body">
{% for field in subject_form %}
{% for field in subject_form %}
<div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
<div class="col-md-6 form-group {% if field.errors %}has-error{% endif %}">
@@ -92,7 +88,7 @@
@@ -92,7 +88,7 @@
</label>
</label>
<div class="col-sm-8">
<div class="col-sm-8">
{{ field|disable|add_class:'form-control' }}
{{ field|add_class:'form-control' }}
</div>
</div>
{% if field.errors %}
{% if field.errors %}
@@ -105,13 +101,15 @@
@@ -105,13 +101,15 @@
</div><!-- /.box-body -->
</div><!-- /.box-body -->
<div class="box-footer">
<div class="box-footer">
<a href="{% url 'web.views.subject_edit' appointment.visit.subject.id %}" type="button"
<div class="col-sm-6">
class="btn btn-block btn-default">Edit subject</a>
<button type="submit" class="btn btn-block btn-success">Save</button>
<a href="{% url 'web.views.subjects' %}" class="btn btn-block btn-default"
</div>
onclick="history.back()">Back</a>
<div class="col-sm-6">
 
<a href="{% url 'web.views.appointments' %}" class="btn btn-block btn-default"
 
onclick="history.back()">Cancel</a>
 
</div>
</div><!-- /.box-footer -->
</div><!-- /.box-footer -->
</form>
</fieldset>
</form>
</form>
</div>
</div>
{% endblock %}
{% endblock %}