Skip to content
Snippets Groups Projects

Subject additional fields added

Merged Piotr Gawron requested to merge 85-subject into master
8 files
+ 111
17
Compare changes
  • Side-by-side
  • Inline
Files
8
@@ -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
Loading