Add VFs to locus and orthogroup views.

docs/CHANGELOG.md

@@ -21,6 +21,7 @@ to [Common Changelog](https://common-changelog.org)
 
 ### Added
 
+- Add VFs to locus and orthogroup views. ([#71](https://github.com/metagenlab/zDB/pull/71)) (Niklaus Jo
 - Add new statistics to home view. ([#70](https://github.com/metagenlab/zDB/pull/70)) (Niklaus Johner)
 - Add GWAS views. The associations are calculated using Scoary2. ([#62](https://github.com/metagenlab/zDB/pull/62)) (Niklaus Johner)
 - Add VF details view. ([#58](https://github.com/metagenlab/zDB/pull/58)) (Niklaus Johner)

webapp/assets/css/style_FILE_zDB.css

@@ -172,6 +172,10 @@
     margin: 10px 10px 10px 10px
 }
 
+.panel > div > .table {
+    margin-bottom: 0;
+}
+
 .jumbotron {
     padding-top: 10px;
     padding-bottom: 10px;

webapp/chlamdb/templatetags/custom_tags.py

@@ -3,6 +3,11 @@
 register = template.Library()
 
 
+@register.filter
+def attrvalue(obj, key):
+    return getattr(obj, key, "")
+
+
 @register.filter
 def keyvalue(dict, key):
     return dict.get(key)

webapp/chlamdb/urls.py

@@ -2,8 +2,8 @@
 from django.urls import re_path
 from django.views.generic import TemplateView
 from django.views.generic.base import RedirectView
-from views import (entry_lists, fam, gwas, hits_extraction, tabular_comparison,
-                   venn, views)
+from views import (entry_lists, fam, gwas, hits_extraction, locus,
+                   tabular_comparison, venn, views)
 
 favicon_view = RedirectView.as_view(url='/assets/favicon.ico', permanent=True)
 
@@ -25,12 +25,12 @@
     re_path(r'^pfam_comparison', tabular_comparison.PfamComparisonView.as_view(), name="pfam_comparison"),  # noqa
     re_path(r'^pan_genome/([a-zA-Z0-9_]+)', views.PanGenome.as_view(), name="pan_genome"),  # noqa
     re_path(r'^orthogroup_comparison', tabular_comparison.OrthogroupComparisonView.as_view(), name="orthogroup_comparison"),  # noqa
-    re_path(r'^orthogroup/([a-zA-Z0-9_\.\-]+)', views.orthogroup, name="orthogroup"),  # noqa
+    re_path(r'^orthogroup/([a-zA-Z0-9_\.\-]+)', locus.Orthogroup.as_view(), name="orthogroup"),  # noqa
     re_path(r'^module_comparison/$', views.module_comparison, name="module_comparison"),  # noqa
     re_path(r'^module_cat_info/([a-zA-Z0-9_\.]+)/([a-zA-Z0-9_\.\+-]+)$', views.module_cat_info, name="module_cat_info"),  # noqa
-    re_path(r'^locusx/([a-zA-Z0-9_\.\-]+)/([a-zA-Z0-9_\.\-]+)', views.locusx, name="locusx"),  # noqa
-    re_path(r'^locusx/([a-zA-Z0-9_\.\-]+)', views.locusx, name="locusx"),
-    re_path(r'^locusx$', views.locusx, name="locusx"),
+    re_path(r'^locusx/([a-zA-Z0-9_\.\-]+)/([a-zA-Z0-9_\.\-]+)', locus.LocusX.as_view(), name="locusx"),  # noqa
+    re_path(r'^locusx/([a-zA-Z0-9_\.\-]+)', locus.LocusX.as_view(), name="locusx"),
+    re_path(r'^locusx$', locus.LocusX.as_view(), name="locusx"),
     re_path(r'^ko_venn_subset/([a-zA-Z0-9_\.\+-]+)$', venn.VennKoSubsetView.as_view(), name="ko_venn_subset"),  # noqa
     re_path(r'^ko_comparison', tabular_comparison.KoComparisonView.as_view(), name="ko_comparison"),  # noqa
     re_path(r'^ko_barchart/$', views.KoBarchart.as_view(), name="ko_barchart"),

webapp/templates/chlamdb/entry_list.html

@@ -18,12 +18,12 @@
             {% include "chlamdb/menu.html" %}
             {% include "chlamdb/extract_nav_tabs_template.html" with active_tab="index" %}
             <br><br><br>
-            <table id="pfam_table">
+            <table id="pfam_table" class="table table-striped">
               <thead>
                 <tr>
-                  <td></td>
+                  <th></th>
                   {% for header in table_headers %}
-                    <td>{{ header }}</td>
+                    <th>{{ header }}</th>
                   {% endfor %}
                 </tr>
               </thead>

webapp/templates/chlamdb/home.html

@@ -89,7 +89,7 @@ <h3 class="title">The database contains:</h3>
                           {% endif %}
                           {% if optional2status|keyvalue:"BLAST_swissprot" == 1 %}
                             <li class="summary_data">
-                              <b>{{number_swissprot}}  </b>VF genes
+                              <b>{{number_swissprot}}  </b>Swissprot homologs
                             </li>
                           {% endif %}
                           <br>