diff --git a/ippisite/ippidb/templates/ppi_card.html b/ippisite/ippidb/templates/biblio_card.html similarity index 82% rename from ippisite/ippidb/templates/ppi_card.html rename to ippisite/ippidb/templates/biblio_card.html index 64fb070d8d8a6e6310f13871034b2c59c45d438b..a5fe82f8105425ad7bff6521d688cf885268061c 100644 --- a/ippisite/ippidb/templates/ppi_card.html +++ b/ippisite/ippidb/templates/biblio_card.html @@ -7,12 +7,6 @@ <div id="mainnav"> </div> <div class="inner-wrap"> - <nav class="breadcrumb" role="navigation"> - <div id="breadcrumb-label" class="breadcrumb-label">You are here</div> - <div aria-labelledby="breadcrumb-label"> - Fonction Fil d'Arianne - </div> - </nav> <div id="main-wrapper" class="page"> <div id="main"> <div id="content" class="main-content"> @@ -37,13 +31,13 @@ <div class="card"> <div class="card-body"> <ul class="list-group"> - <li class="list-group-item">Cytotoxicity data: {% if bibliography.cytotox %}✓{% else %}✗{% endif %}</li> - <li class="list-group-item"><i>in silico</i> study: {% if bibliography.in_silico %}✓{% else %}✗{% endif %}</li> - <li class="list-group-item"><i>in vitro</i> study: {% if bibliography.in_vitro %}✓{% else %}✗{% endif %}</li> - <li class="list-group-item"><i>in vivo</i> study: {% if bibliography.in_vivo %}✓{% else %}✗{% endif %}</li> - <li class="list-group-item"><i>in cellulo</i> study: {% if bibliography.in_cellulo %}✓{% else %}✗{% endif %}</li> - <li class="list-group-item">pharmacokinetic study: {% if bibliography.pharmacokinetic %}✓{% else %}✗{% endif %}</li> - <li class="list-group-item">X-ray study: {% if bibliography.x_ray %}✓{% else %}✗{% endif %}</li> + <li class="list-group-item">Cytotoxicity data: {% include "bool_value.html" with bool_value=bibliography.cytotox %}</li> + <li class="list-group-item"><i>in silico</i> study {% include "bool_value.html" with bool_value=bibliography.in_silico %}</li> + <li class="list-group-item"><i>in vitro</i> study: {% include "bool_value.html" with bool_value=bibliography.in_vitro %}</li> + <li class="list-group-item"><i>in vivo</i> study: {% include "bool_value.html" with bool_value=bibliography.in_vivo %}</li> + <li class="list-group-item"><i>in cellulo</i> study: {% include "bool_value.html" with bool_value=bibliography.in_cellulo %}</li> + <li class="list-group-item">pharmacokinetic study: {% include "bool_value.html" with bool_value=bibliography.pharmacokinetic %}</li> + <li class="list-group-item">X-ray study: {% include "bool_value.html" with bool_value=bibliography.xray %}</li> </ul> </div> </div> diff --git a/ippisite/ippidb/templates/biblio_list.html b/ippisite/ippidb/templates/biblio_list.html new file mode 100644 index 0000000000000000000000000000000000000000..833a9cd98a81e63ec408876ace54020f13ba459b --- /dev/null +++ b/ippisite/ippidb/templates/biblio_list.html @@ -0,0 +1,28 @@ +{% extends "base.html" %} + + +{% block title %}bibliographies{% endblock %} + +{% block content %} +<div id="mainnav"> +</div> +<div class="inner-wrap"> + <div id="main-wrapper" class="page"> + <div id="main"> + <div id="content" class="main-content"> + <main role="main"> +{% if bibliographies %} + <ul> + {% for biblio in bibliographies %} + <li><a href="/biblio/{{ biblio.source }}{{ biblio.id_source}}">{{ biblio.title }}</a></li> + {% endfor %} + </ul> +{% else %} + <p>No bibliographies available.</p> +{% endif %} + </main><!-- .site-main --> + </div> + </div><!-- div main --> + </div> +</div> +{% endblock %} diff --git a/ippisite/ippidb/templates/bool_value.html b/ippisite/ippidb/templates/bool_value.html new file mode 100644 index 0000000000000000000000000000000000000000..909cd33e3cd5c3070ebf95e3b5b72f7a1ec945e5 --- /dev/null +++ b/ippisite/ippidb/templates/bool_value.html @@ -0,0 +1 @@ +{% if bool_value is True %}<span class="text-success">✓</span>{% else %}<span class="text-secondary">✗</span>{% endif %} diff --git a/ippisite/ippidb/urls.py b/ippisite/ippidb/urls.py index 9228d00d4e7feba2d7cb392cc9bccc68ed9bc681..db30318d2128fc1ae68e54de0ecd870a7fe2e37a 100644 --- a/ippisite/ippidb/urls.py +++ b/ippisite/ippidb/urls.py @@ -19,7 +19,8 @@ urlpatterns = [ url(r'^query$', views.query, name='query'), url(r'^query/pharma/$', views.pharma, name='pharma'), url(r'^query/chemical/$', views.chemical, name='chemical'), - url(r'^biblio_ppi/(?P<biblio_id>\d+)$', views.ppi_card, name='biblio_ppi_card'), + url(r'^biblio/(?P<source>\w{2})(?P<id_source>\d+)$', views.biblio_card, name='biblio_card'), + url(r'^biblio/$', views.biblio_list, name='biblio_list'), url(r'^tutorials$', views.tutorials, name='tutorials'), url(r'^admin-session$', views.adminSession, name='admin-session'), url(r'^admin-session/add/(?P<step>.+)/$', diff --git a/ippisite/ippidb/views.py b/ippisite/ippidb/views.py index 7e8e889edb07a45dbd59f1123b2dae5ab4ff296b..1412c96dff5ddbbb79fc7a404bb9c1ca43cd325b 100644 --- a/ippisite/ippidb/views.py +++ b/ippisite/ippidb/views.py @@ -128,11 +128,15 @@ class IppiWizard(NamedUrlSessionWizardView): 'form_data': [form.cleaned_data for form in form_list], }) -def ppi_card(request, biblio_id): +def biblio_list(request): + bibliographies = Bibliography.objects.all() + return render(request, 'biblio_list.html', {'bibliographies':bibliographies}) + +def biblio_card(request, source, id_source): try: - bibliography = Bibliography.objects.get(pk=biblio_id) + bibliography = Bibliography.objects.get(source=source, id_source=id_source) except Bibliography.DoesNotExist: - raise Http404("No bibliography data for %s" % biblio_id) + raise Http404("No bibliography data for %s:%s" % (source, id_source)) refs = RefCompoundBiblio.objects.filter(bibliography_id = bibliography.id) - return render(request, 'ppi_card.html', {'bibliography': bibliography, + return render(request, 'biblio_card.html', {'bibliography': bibliography, 'compound_biblios': refs})