diff --git a/smash/web/api_views/subject.py b/smash/web/api_views/subject.py index 9368d26c2cfbdd89c16876695b29501fc8e26469..4aead296fcda779bf13106b762c0004e436d2699 100644 --- a/smash/web/api_views/subject.py +++ b/smash/web/api_views/subject.py @@ -63,6 +63,8 @@ def get_subjects_order(subjects, order_column, order_direction): result = subjects.order_by(order_direction + 'dead') elif order_column == "resigned": result = subjects.order_by(order_direction + 'resigned') + elif order_column == "information_sent": + result = subjects.order_by(order_direction + 'information_sent') elif order_column == "postponed": result = subjects.order_by(order_direction + 'postponed') return result @@ -87,6 +89,8 @@ def get_subjects_filtered(subjects, filters): result = result.filter(resigned=(value == "true")) elif column == "postponed": result = result.filter(postponed=(value == "true")) + elif column == "information_sent": + result = result.filter(information_sent=(value == "true")) elif column == "default_location": result = result.filter(default_location=value) elif column == "": @@ -165,6 +169,7 @@ def serialize_subject(subject): "dead": get_yes_no(subject.dead), "resigned": get_yes_no(subject.resigned), "postponed": get_yes_no(subject.postponed), + "information_sent": get_yes_no(subject.information_sent), "id": subject.id, } return result diff --git a/smash/web/migrations/0029_auto_20170404_1616.py b/smash/web/migrations/0029_auto_20170404_1616.py new file mode 100644 index 0000000000000000000000000000000000000000..1f24145c9d554209b21b3912e58f62d89cee4862 --- /dev/null +++ b/smash/web/migrations/0029_auto_20170404_1616.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.3 on 2017-04-04 14:16 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('web', '0028_location_color_of_flying_team'), + ] + + operations = [ + migrations.AddField( + model_name='subject', + name='information_sent', + field=models.BooleanField(default=False, verbose_name=b'Information sent'), + ), + migrations.AddField( + model_name='subject', + name='pd_in_family', + field=models.BooleanField(default=False, verbose_name=b'PD in family'), + ), + ] diff --git a/smash/web/models/subject.py b/smash/web/models/subject.py index aa7d746cdfe6d43a8b5720a67cba72c0c0cf012c..499b977741cafab600a13ce2a9304f7ad663338b 100644 --- a/smash/web/models/subject.py +++ b/smash/web/models/subject.py @@ -149,6 +149,14 @@ class Subject(models.Model): default=False, editable=True ) + information_sent = models.BooleanField( + verbose_name='Information sent', + default=False + ) + pd_in_family = models.BooleanField( + verbose_name='PD in family', + default=False, + ) resigned = models.BooleanField( verbose_name='Resigned', default=False, diff --git a/smash/web/templates/subjects/index.html b/smash/web/templates/subjects/index.html index 2b52622dfe6d5e1841bbb89ea2c2390e28c7f803..05229e970349539827b8d9ad19613ec901e47dd4 100644 --- a/smash/web/templates/subjects/index.html +++ b/smash/web/templates/subjects/index.html @@ -39,6 +39,7 @@ <th>Deceased</th> <th>Resigned</th> <th>Postponed</th> + <th>Info sent</th> <th>Edit</th> </tr> </thead> @@ -68,6 +69,9 @@ <th> <div name="yes_no_filter">---</div> </th> + <th> + <div name="yes_no_filter">---</div> + </th> </tr> </tfoot> @@ -117,10 +121,11 @@ {"data": "dead"}, {"data": "resigned"}, {"data": "postponed"}, + {"data": "information_sent"}, {"data": null}, ], columnDefs: [{ - "targets": 8, + "targets": 9, "data": "id", "defaultContent": '<a href="#" type="button" class="btn btn-block btn-default">Edit</a>' }]