From 6747635a72b21222c382b79de69465b8a87445cf Mon Sep 17 00:00:00 2001 From: fmareuil <fmareuil@pasteur.fr> Date: Mon, 11 Jan 2021 12:44:58 +0100 Subject: [PATCH] glabalstat first commit --- ippisite/ippidb/templates/targetcentric.html | 3 +++ ippisite/ippidb/templates/targetcentric_networks.html | 3 +++ ippisite/ippidb/urls.py | 1 + ippisite/ippidb/views/__init__.py | 2 +- ippisite/ippidb/views/targetcentric.py | 9 ++++++++- 5 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ippisite/ippidb/templates/targetcentric.html b/ippisite/ippidb/templates/targetcentric.html index c425f8e1..2fdbbe93 100644 --- a/ippisite/ippidb/templates/targetcentric.html +++ b/ippisite/ippidb/templates/targetcentric.html @@ -41,6 +41,9 @@ <div> <a href="{% url 'networks' %}"><strong>See the complete cavities network</strong></a> </div> + <div> + <a href="{% url 'globalstat' %}"><strong>See the global cavities space</strong></a> + </div> <div class="card"> <div id="accordion"> <div class="card"> diff --git a/ippisite/ippidb/templates/targetcentric_networks.html b/ippisite/ippidb/templates/targetcentric_networks.html index 8084a3e0..4d3faf1e 100644 --- a/ippisite/ippidb/templates/targetcentric_networks.html +++ b/ippisite/ippidb/templates/targetcentric_networks.html @@ -16,6 +16,9 @@ {% block breadcrumb %} <a href="{% url 'networks' %}" class="breadNav-link">Query cavities</a> > Cavity {% endblock %} </div> </nav> + <div> + <a href="{% url 'globalstat' %}"><strong>See the global cavities space</strong></a> + </div> <div class="card"> <div class="input-group"> <div class="btn-group mr-3"> diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py index c94bbcba..582b69c9 100644 --- a/ippisite/ippidb/urls.py +++ b/ippisite/ippidb/urls.py @@ -27,6 +27,7 @@ urlpatterns = [ url(r"^about-pca/$", views.about_pca, name="pca"), url(r"^targetcentric/$", views.PDBView.as_view(), name="cavities"), url(r"^targetcentric/networks$", views.NetworkView.as_view(), name="networks"), + url(r"^targetcentric/globalstat$", views.GlobalTargetCentricView.as_view(), name="globalstat"), url(r"^api/", include(ROUTER.urls)), url(r"^compounds/$", views.CompoundListView.as_view(), name="compound_list"), url( diff --git a/ippisite/ippidb/views/__init__.py b/ippisite/ippidb/views/__init__.py index e0914075..e9b36f9f 100644 --- a/ippisite/ippidb/views/__init__.py +++ b/ippisite/ippidb/views/__init__.py @@ -11,7 +11,7 @@ iPPI-DB views """ from django.contrib.auth.decorators import login_required from django.shortcuts import render -from .targetcentric import PdbViewSet, DistanceViewSet, PDBView, NetworkView +from .targetcentric import PdbViewSet, DistanceViewSet, PDBView, NetworkView, GlobalTargetCentricView from .contribute import ippidb_wizard_view, admin_session_view from .compound_query import ( CompoundListView, diff --git a/ippisite/ippidb/views/targetcentric.py b/ippisite/ippidb/views/targetcentric.py index 7be52606..207f3b87 100644 --- a/ippisite/ippidb/views/targetcentric.py +++ b/ippisite/ippidb/views/targetcentric.py @@ -4,7 +4,7 @@ iPPI-DB targetcentric views and related classes from itertools import product from functools import reduce from operator import add -from django.views.generic import ListView +from django.views.generic import ListView, TemplateView from django.contrib import messages from django.db.models import Case, When, Value, IntegerField, F, Q from rest_framework import viewsets @@ -305,3 +305,10 @@ class NetworkView(ListView): def get_queryset(self): queryset = self.model.objects.all() return queryset.order_by("number") + + +class GlobalTargetCentricView(TemplateView): + """ + Global informations on cavities + """ + template_name = "targetcentric_global.html" \ No newline at end of file -- GitLab