From b67e508f6119b6eba5a8abe7d6d886347d6e4bed Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr>
Date: Fri, 20 Jul 2018 13:28:43 +0200
Subject: [PATCH] filter for pubs in compounds list is >cutoff value, not <
cf #67
Former-commit-id: b28c53e4ac700a6b5ec0c9b2c6e8bf263f4cd24a
---
ippisite/ippidb/views.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py
index 7da5396c..49c8d4f5 100644
--- a/ippisite/ippidb/views.py
+++ b/ippisite/ippidb/views.py
@@ -137,13 +137,13 @@ class IppiWizard(NamedUrlSessionWizardView):
})
-def process_cutoff_value(name, context, request, annotation=None):
+def process_cutoff_value(name, context, request, cutoff_dir='l'):
c = context['compounds']
context[name+'_max'] = str(int(math.ceil(float(c.aggregate(Max(name))[name + '__max']))))
context[name+'_min'] = str(int(math.floor(float(c.aggregate(Min(name))[name + '__min']))))
if request.GET.get(name):
context[name] = request.GET.get(name)
- filter_dict = {name + '__lte': context[name]}
+ filter_dict = {name + '__' + cutoff_dir + 'te': context[name]}
context['compounds'] = context['compounds'].filter(**filter_dict)
else:
context[name] = context[name+'_max']
@@ -170,7 +170,7 @@ def compound_list(request):
context = process_cutoff_value('molecular_weight', context, request)
context = process_cutoff_value('a_log_p', context, request)
context = process_cutoff_value('nb_donor_h', context, request)
- context = process_cutoff_value('pubs', context, request)
+ context = process_cutoff_value('pubs', context, request, 'g')
selected_families = PpiFamily.objects.filter(id__in=request.GET.getlist('family'))
families = PpiFamily.objects.exclude(id__in=request.GET.getlist('family'))
selected_ppis = Ppi.objects.filter(id__in=request.GET.getlist('ppi'))
--
GitLab