add filter on number of H donors in compounds list

Former-commit-id: 4553bb7b7ccdac8ffecba46b8e203e66a84ad7a4

ippisite/ippidb/templates/compound_list.html

@@ -40,10 +40,11 @@
        {% include "multiselection_button.html" with label="Bound complex" param_name="boundcomplex" %}
        {% include "slider_button.html" with label="Molecular weight" param_name="molecular_weight" %}
        {% include "slider_button.html" with label="AlogP" param_name="a_log_p" %}
+       {% include "slider_button.html" with label="H donors" param_name="nb_donor_h" %}
         </div>
         <div class="row">
         <span class="col-md-6"><span>{{ compounds.paginator.count }} compounds</span>
-            {% if selected_ppis or selected_diseases or selected_taxonomies or selected_boundcomplexes or molecular_weight != molecular_weight_max or a_log_p != a_log_p_max %}
+            {% if selected_ppis or selected_diseases or selected_taxonomies or selected_boundcomplexes or molecular_weight != molecular_weight_max or a_log_p != a_log_p_max or nb_donor_h != nb_donor_h_max%}
                 <span>&nbsp;-&nbsp;filters:&nbsp;</span>
                 {% if selected_ppis %}
                     {% for selected in selected_ppis %}
@@ -71,6 +72,9 @@
                 {% if a_log_p != a_log_p_max %}
                     {% include "slider_badge.html" with param_name="a_log_p" param_value=a_log_p param_label="AlogP cutoff" %}
                 {% endif %}
+                {% if nb_donor_h != nb_donor_h_max %}
+                    {% include "slider_badge.html" with param_name="nb_donor_h" param_value=nb_donor_h param_label="H donors" %}
+                {% endif %}
             {% endif %}
         </span>
         <div class="dropdown">
@@ -144,5 +148,6 @@
   {% include "multiselection_modal.html" with label="Bound complex" selected_list=selected_boundcomplexes unselected_list=boundcomplexes param_name="boundcomplex" all_param_name="boundcomplexes_all" all_param_value=boundcomplexes_all %}
   {% include "slider_modal.html" with label="Molecular Weight" param_name="molecular_weight" param_min=molecular_weight_min param_max=molecular_weight_max param_value=molecular_weight step='0.01' param_label='Select a cutoff value for the molecular weight of the compounds to be selected'%}
   {% include "slider_modal.html" with label="AlogP" param_name="a_log_p" param_min=a_log_p_min param_max=a_log_p_max param_value=a_log_p step='0.01' param_label='Select a cutoff value for the AlogP of the compounds to be selected'%}
+  {% include "slider_modal.html" with label="H donors" param_name="nb_donor_h" param_min=nb_donor_h_min param_max=nb_donor_h_max param_value=nb_donor_h step='1' param_label='Select a cutoff value for the number of H donors in the compounds to be selected'%}
 
 {% endblock %}

ippisite/ippidb/views.py

@@ -175,8 +175,8 @@ def biblio_card(request, source, id_source):
                                                 'tad_ppis': tad_ppis}) 
 
 def process_cutoff_value(name, context, request):
-    context[name+'_max'] = Compound.objects.all().aggregate(Max(name))[name + '__max'].to_eng_string()
-    context[name+'_min'] = Compound.objects.all().aggregate(Min(name))[name + '__min'].to_eng_string()
+    context[name+'_max'] = str(Compound.objects.all().aggregate(Max(name))[name + '__max']) #.to_eng_string()
+    context[name+'_min'] = str(Compound.objects.all().aggregate(Min(name))[name + '__min']) #.to_eng_string()
     if request.GET.get(name):
         context[name] = request.GET.get(name)
         filter_dict = {name + '__lte': context[name]}
@@ -205,6 +205,7 @@ def compound_list(request):
     context['compounds'] = compounds
     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)
     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'))