From d82ea14670e98d7f118d153de9d3f60672e800f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20=20MENAGER?= <herve.menager@pasteur.fr>
Date: Wed, 11 Apr 2018 09:13:34 +0200
Subject: [PATCH] compound best pXC50 activity is for all types of activity
registered
and not only pIC50+pEC50 (discussed with @osperand)
Former-commit-id: b5e46f34952deba8ed94ecddee199e999f9940de
---
ippisite/ippidb/models.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/ippisite/ippidb/models.py b/ippisite/ippidb/models.py
index 4758dfe3..ed714f81 100644
--- a/ippisite/ippidb/models.py
+++ b/ippisite/ippidb/models.py
@@ -410,14 +410,14 @@ class Compound(models.Model):
@property
def best_pXC50_activity(self):
- return self.compoundactivityresult_set.filter(activity_type__in=['pIC50','pEC50']).aggregate(Max('activity'))['activity__max']
+ return self.compoundactivityresult_set.aggregate(Max('activity'))['activity__max']
@property
def best_pXC50_compound_activity_result(self):
best_pXC50_activity = self.best_pXC50_activity
if best_pXC50_activity is None:
return None
- return self.compoundactivityresult_set.filter(activity_type__in=['pIC50','pEC50'], activity=best_pXC50_activity)[0]
+ return self.compoundactivityresult_set.filter(activity=best_pXC50_activity)[0]
@property
def le(self):
--
GitLab