Skip to content
Snippets Groups Projects

Virus visit column changes

Merged Carlos Vega requested to merge virus_visit_column_changes into master
1 file
+ 1
1
Compare changes
  • Side-by-side
  • Inline
@@ -10,7 +10,7 @@
{% block ui_active_tab %}'subjects'{% endblock ui_active_tab %}
{% block page_header %}List of visits{% endblock page_header %}
{% block page_description %}{% endblock page_description %}
{% block page_description %}Latest visit first{% endblock page_description %}
{% block title %}{{ block.super }} - List of subject's visits {% endblock %}
@@ -36,25 +36,25 @@
{% for element in display %}
<div class="box box-widget widget-user-2">
<div class="widget-user-header bg-green">
<h3 class="widget-user-username">{{ element.4 }}</h3>
<h3 class="widget-user-username">Visit {{ element.visit_number | display_visit_number }}</h3>
<h5 class="widget-user-desc">
{% if element.2 %}(Finished)
{% if element.finished %}(Finished)
{% else %}(Not finished)
{% endif %}
<a href="{% url 'web.views.visit_details' element.3 %}"><font color="#D3D3D3">Details
<a href="{% url 'web.views.visit_details' element.visit_id %}"><font color="#D3D3D3">Details
>>></font></a>
</h5>
</div>
<div class="box-footer">
{% if not element.2 %}
{% if not element.finished %}
<div>
<a href="{% url 'web.views.appointment_add' element.3 %}" class="btn btn-app">
<a href="{% url 'web.views.appointment_add' element.visit_id %}" class="btn btn-app">
<i class="fa fa-plus"></i>
Add new appointment
</a>
</div>
{% endif %}
{% for field in element.0 %}
{% for field in element.visit_form %}
{% if not field|is_checkbox %}
<div class="col-md-6 form-group {% if field.errors %}has-error{% endif %} {% if field|is_checkbox %}multi-checkboxes{% endif %}">
<label class="col-sm-4 control-label">{{ field.label }}</label>
@@ -67,7 +67,7 @@
<span class="help-block">{{ field.errors }}</span>{% endif %}
</div>
{% else %}
{% include 'includes/visit_appointment_types_field.html' with field=field appointments=element.1 readonly="true" %}
{% include 'includes/visit_appointment_types_field.html' with field=field appointments=element.appointments readonly="true" %}
{% endif %}
{% endfor %}
</div>
@@ -79,7 +79,7 @@
<h3 class="widget-user-username">Visit's appointments</h3>
</div>
<div class="box-footer">
{% if element.1 %}
{% if element.appointments %}
<table id="table" class="table table-bordered table-striped">
<thead>
<tr>
@@ -93,7 +93,7 @@
</tr>
</thead>
<tbody>
{% for app in element.1 %}
{% for app in element.appointments %}
<tr>
<td>{{ forloop.counter }}</td>
<td style="background-color:{{ app.color }} !important">
Loading