From b7e124971b2e1bc3c6d48558c165f50d64be9d6f Mon Sep 17 00:00:00 2001
From: Piotr Gawron <piotr.gawron@uni.lu>
Date: Tue, 14 Mar 2017 16:23:10 +0100
Subject: [PATCH] list of subjects contain information about postponed subjects
and info about country and language is removed
---
.../templates/includes/tablesorter.tfoot.html | 4 ++--
smash/web/templates/subjects/index.html | 17 +++--------------
2 files changed, 5 insertions(+), 16 deletions(-)
diff --git a/smash/web/templates/includes/tablesorter.tfoot.html b/smash/web/templates/includes/tablesorter.tfoot.html
index d345ac6c..b5b5536a 100644
--- a/smash/web/templates/includes/tablesorter.tfoot.html
+++ b/smash/web/templates/includes/tablesorter.tfoot.html
@@ -1,6 +1,6 @@
<tfoot>
<tr>
- <th colspan="7" class="ts-pager form-inline">
+ <th colspan="8" class="ts-pager form-inline">
<div class="btn-group btn-group-sm" role="group">
<button type="button" class="btn btn-default first"><span class="glyphicon glyphicon-step-backward"></span></button>
<button type="button" class="btn btn-default prev"><span class="glyphicon glyphicon-backward"></span></button>
@@ -19,4 +19,4 @@
<select class="form-control input-sm pagenum" title="Select page number"></select>
</th>
</tr>
-</tfoot>
\ No newline at end of file
+</tfoot>
diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html
index 991e049c..889fb48d 100644
--- a/smash/web/templates/subjects/index.html
+++ b/smash/web/templates/subjects/index.html
@@ -34,11 +34,10 @@
<th>Screening</th>
<th>First name</th>
<th>Last name</th>
- <th>Country</th>
- <th data-sorter="false" data-filter="false">Languages</th>
<th class="filter-select filter-exact" data-placeholder="Select location">Default location</th>
<th>Dead</th>
<th>Resigned</th>
+ <th>Postponed</th>
<th>Edit</th>
</tr>
</thead>
@@ -52,17 +51,10 @@
<td>{{ subject.screening_number }}</td>
<td>{{ subject.first_name }}</td>
<td>{{ subject.last_name }}</td>
- <td>{{ subject.country }}</td>
- <td>
- {% autoescape off %}
- {% for language in subject.languages.all %}
- {{language.image_img}}
- {% endfor %}
- {% endautoescape %}
- </td>
<td>{{ subject.get_default_appointment_location_display }}</td>
<td>{% if subject.dead %} YES {% else %} NO {% endif %} </td>
<td>{% if subject.resigned %} YES {% else %} NO {% endif %} </td>
+ <td>{% if subject.postponed %} YES {% else %} NO {% endif %} </td>
<td><a href="{% url 'web.views.subject_edit' subject.id %}" type="button" class="btn btn-block btn-default">Edit</a></td>
</tr>
{% endfor %}
@@ -94,10 +86,7 @@
filter_cssFilter: "form-control",
},
headers: {
- 5: { sorter: false},
- 8: { sorter: false},
- 9: { sorter: false},
- 10: { sorter: false}
+ 0: { sorter: true},
}
}).tablesorterPager({
container: $(".ts-pager"),
--
GitLab