diff --git a/smash/web/api_views.py b/smash/web/api_views.py index 649c4f351d7404c335cb39365f7151bed5d5df39..3fa93eccb4cf6603d27f102e572fec82a54c31c3 100644 --- a/smash/web/api_views.py +++ b/smash/web/api_views.py @@ -93,16 +93,16 @@ def get_subjects_filtered(subjects, filters): result = result.filter(nd_number__contains=value) elif column == "screening_number": result = result.filter(screening_number__contains=value) + elif column == "dead": + result = result.filter(dead=(value=="true")) + elif column == "resigned": + result = result.filter(resigned=(value=="true")) + elif column == "postponed": + result = result.filter(postponed=(value=="true")) else: print row # elif order_column == "default_location": # result = subjects.order_by(order_direction + 'default_location') - # elif order_column == "dead": - # result = subjects.order_by(order_direction + 'dead') - # elif order_column == "resigned": - # result = subjects.order_by(order_direction + 'resigned') - # elif order_column == "postponed": - # result = subjects.order_by(order_direction + 'postponed') return result diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html index f203816cfb2366c2990626221f4253c51dcfd2df..f637cd2345449cb56f48c931060e1908c1c5ed45 100644 --- a/smash/web/templates/subjects/index.html +++ b/smash/web/templates/subjects/index.html @@ -59,8 +59,12 @@ <th> <div name="yes_no_filter">---</div> </th> - <th>Resigned</th> - <th>Postponed</th> + <th> + <div name="yes_no_filter">---</div> + </th> + <th> + <div name="yes_no_filter">---</div> + </th> </tr> </tfoot> @@ -114,6 +118,13 @@ .draw(); } }); + $('select', this.footer()).on('keyup change', function () { + if (that.search() !== this.value) { + that + .search(this.value) + .draw(); + } + }); }); }); </script>