VGL tracker update

_includes/table_vgl.html

@@ -1,9 +1,10 @@
 {% assign tableItems = include.items | split: ", " %}
 {% assign tableFileParam = {{include.file}} %}
 {% assign tableFile = site.data[tableFileParam] %}
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
-    <link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/bootstrap-table.min.css">
+
+<link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.6.3/css/all.css" integrity="sha384-UHRtZLI+pbxtHCWp1t77Bi1L4ZtiqrqD80Kn4Z8NTSRyMA2Fd33n5dQ8lWUE00s/" crossorigin="anonymous">
+<link rel="stylesheet" href="https://unpkg.com/[email protected]/dist/bootstrap-table.min.css">
 
  <div class="container">         
 <small>
@@ -21,83 +22,86 @@
     <option value="phase2">VGP Phase 2</option>
     <option value="phase3">VGP Phase 3</option>
     <option value="phase4">VGP Phase 4</option>
+    <option value="all">All</option>
   </select>
 </div>
-<table id="table" data-sort-name="score" data-sort-order="desc" class="table table-sm" data-toolbar=".toolbar" data-pagination="true" data-page-size="20" data-search="true" data-search-align="right" data-show-columns="true" data-sort-name="score" data-sort-order="desc">
+<table id="table" class="table table-sm" data-toolbar=".toolbar" data-pagination="true" data-page-size="20" data-search="true" data-search-align="right" data-show-columns="true" data-sort-name="status" data-sort-order="asc">
   <thead class="thead-light">
            <tr>
- <th data-visible="false" data-switchable="false">Score</th>
               <th data-visible="false" data-switchable="false" data-sortable="true" data-field="source">Source</th>
-             <th data-width="80">Id</th>
-            <th data-width="150">Scientific Name</th>
+             <th data-width="80" data-sortable="true">Id</th>
+            <th data-width="150" >Scientific Name</th>
             <th data-width="150">Common Name</th>
-              <th data-visible="false" data-switchable="false">Class</th>
-              <th data-visible="false"data-sortable="true">Order</th>
-             <th data-visible="false" data-sortable="true">Family</th>
-            <th data-width="20" data-halign="center" data-sortable="true">PB</th>
-            <th data-width="20" data-halign="center" data-sortable="true">BN</th>
-            <th data-width="20" data-halign="center" data-sortable="true">HiC</th>
-            <th data-width="20" data-halign="center" data-sortable="true">10X</th>
-            <th data-width="20" data-halign="center" data-sortable="true">Ilm</th>
-            <th data-width="20" data-halign="center" data-sortable="true">asm</th>
+              <th data-width="150" data-visible="false" data-switchable="false">Class</th>
+              <th data-width="150" data-visible="false"data-sortable="true">Order</th>
+             <th data-width="150" data-visible="false" data-sortable="true">Family</th>
+            <th data-width="15" data-halign="center" data-sortable="false">PB</th>
+            <th data-width="15" data-halign="center" data-sortable="false">BN</th>
+            <th data-width="15" data-halign="center" data-sortable="false">HiC</th>
+            <th data-width="15" data-halign="center" data-sortable="false">10X</th>
+            <th data-width="15" data-halign="center" data-sortable="false">Ilm</th>
+            <th data-width="90" data-halign="left" data-sortable="true" data-field="status">Status</th>
              <th data-visible="false" data-switchable="false" data-field="phase">Phase</th>
          </tr>
   </thead>
 
      <tbody>
-    {% for entry in site.data.project_stats_vgl.toc %}
+    {% for entry in site.data.table_tracker.toc %}
         <tr>             
-           <td>{{ entry.score }}</td/>
-           <td>{{ entry.source }}</td/>
-           <td>{{ entry.VGPId }}</td/>
-           <td><i>{{ entry.scientific }}</i></td>
-          <td>{{ entry.common }}</td/>
-             <td>{{ entry.classes }}</td/>
-    <td>{{ entry.orders }}</td/>
-<td>{{ entry.families }}</td/>
-          {% if entry.links.PB == "#" %}
-                   <td style="text-align: center;"  data-order="{{ entry.techs.PB }}"><img src="assets\img\{{ entry.techs.PB }}.png" width="15" height="15"/></td>
+           <td>{{ entry.hub }}</td/>
+           <td>{{ entry.vglId }}</td/>
+           <td><i>{{ entry.scientific_name }}</i></td>
+          <td>{{ entry.common_name }}</td/>
+             <td>{{ entry.class }}</td/>
+    <td>{{ entry.order }}</td/>
+<td>{{ entry.family }}</td/>
+   {% if entry.techs.PB.url == "#" %}
+                   <td style="text-align: center;"  data-order="{{ entry.techs.PB.status }}"><img src="assets\img\{{ entry.techs.PB.status }}.png" width="15" height="15"/></td>
           {% else %}
-                    <td style="text-align: center;" data-order="{{ entry.techs.PB }}"><a href="{{ entry.links.PB }}" target="_blank"><img src="assets\img\{{ entry.techs.PB }}.png" width="15" height="15"/></a></td>
+                    <td style="text-align: center;" data-order="{{ entry.techs.PB.status }}"><a href="{{ entry.techs.PB.url }}" target="_blank"><img src="assets\img\{{ entry.techs.PB.status }}.png" width="15" height="15"/></a></td>
            {% endif %}   
 
-           {% if entry.links.BN == "#" %}
-                   <td style="text-align: center;" data-order="{{ entry.techs.BN }}"><img src="assets\img\{{ entry.techs.BN }}.png" width="15" height="15"/></td>
+           {% if entry.techs.BN.url == "#" %}
+                   <td style="text-align: center;" data-order="{{ entry.techs.BN.status }}"><img src="assets\img\{{ entry.techs.BN.status }}.png" width="15" height="15"/></td>
           {% else %}
-                    <td style="text-align: center;" data-order="{{ entry.techs.BN }}"><a href="{{ entry.links.BN }}" target="_blank"><img src="assets\img\{{ entry.techs.BN }}.png" width="15" height="15"/></a></td>
+                   <td style="text-align: center;" data-order="{{ entry.techs.BN.status }}"><a href="{{ entry.techs.BN.url }}" target="_blank"><img src="assets\img\{{ entry.techs.BN.status }}.png" width="15" height="15"/></a></td>
            {% endif %} 
 
-           {% if entry.links.HiC == "#" %}
-                   <td style="text-align: center;" data-order="{{ entry.techs.HiC }}"><img src="assets\img\{{ entry.techs.HiC }}.png" width="15" height="15"/></td>
+           {% if entry.techs.HiC.url == "#" %}
+                   <td style="text-align: center;" data-order="{{ entry.techs.HiC.status }}"><img src="assets\img\{{ entry.techs.HiC.status }}.png" width="15" height="15"/></td>
           {% else %}
-                    <td style="text-align: center;" data-order="{{ entry.techs.HiC }}"><a href="{{ entry.links.HiC }}" target="_blank"><img src="assets\img\{{ entry.techs.HiC }}.png" width="15" height="15"/></a></td>
+                    <td style="text-align: center;" data-order="{{ entry.techs.HiC.status }}"><a href="{{ entry.techs.HiC.url }}" target="_blank"><img src="assets\img\{{ entry.techs.HiC.status }}.png" width="15" height="15"/></a></td>
            {% endif %} 
 
-             {% if entry.links.10X == "#" %}
-                   <td style="text-align: center;" data-order="{{ entry.techs.10X }}"><img src="assets\img\{{ entry.techs.10X }}.png" width="15" height="15"/></td>
+             {% if entry.techs.10X.url == "#" %}
+                   <td style="text-align: center;" data-order="{{ entry.techs.10X.status }}"><img src="assets\img\{{ entry.techs.10X.status }}.png" width="15" height="15"/></td>
           {% else %}
-                    <td style="text-align: center;" data-order="{{ entry.techs.10X }}"><a href="{{ entry.links.10X }}" target="_blank"><img src="assets\img\{{ entry.techs.10X }}.png" width="15" height="15"/></a></td>
+                    <td style="text-align: center;" data-order="{{ entry.techs.10X.status }}"><a href="{{ entry.techs.10X.url }}" target="_blank"><img src="assets\img\{{ entry.techs.10X.status }}.png" width="15" height="15"/></a></td>
            {% endif %} 
 
-            {% if entry.links.Ilm == "#" %}
-                   <td style="text-align: center;" data-order="{{ entry.techs.Ilm }}"><img src="assets\img\{{ entry.techs.Ilm }}.png" width="15" height="15"/></td>
+            {% if entry.techs.Ilm.url == "#" %}
+                   <td style="text-align: center;" data-order="{{ entry.techs.Ilm.status }}"><img src="assets\img\{{ entry.techs.Ilm.status }}.png" width="15" height="15"/></td>
           {% else %}
-                    <td style="text-align: center;" data-order="{{ entry.techs.Ilm }}"><a href="{{ entry.links.Ilm }}" target="_blank"><img src="assets\img\{{ entry.techs.Ilm }}.png" width="15" height="15"/></a></td>
+                    <td style="text-align: center;" data-order="{{ entry.techs.Ilm.status }}"><a href="{{ entry.techs.Ilm.url }}" target="_blank"><img src="assets\img\{{ entry.techs.Ilm.status }}.png" width="15" height="15"/></a></td>
            {% endif %}
 
-           {% if entry.links.asm == "#" %}
-                  <td style="text-align: center;" data-order="{{ entry.techs.asm }}"><img src="assets\img\{{ entry.asm }}.png" height="15"/></td>
+	{% if entry.status != "0-data_queued" %}
+           {% if entry.asm == "#" %}
+                   <td style="text-align: center;" data-order="{{ entry.status }}"><span style="opacity:0;">{{ entry.status | slice: 0, 1 }}</span><img src="assets\img\{{ entry.status }}.png" width="90"/></td>
           {% else %}
-                   <td style="text-align: center;" data-order="{{ entry.techs.asm }}" ><a href="{{ entry.links.asm }}" target="_blank"><img src="assets\img\{{ entry.asm }}.png" height="15"/></a></td>
+                    <td style="text-align: center;" data-order="{{ entry.status }}"><span style="opacity:0;">{{ entry.status | slice: 0, 1 }}</span><a href="{{ entry.asm }}" target="_blank"><img src="assets\img\{{ entry.status }}.png" width="90"/></a></td>
            {% endif %}
-          <td>{{ entry.VGPphase }}</td/> 
+       {% else %}
+             <td style="text-align: center;" data-order="{{ entry.status }}"><span style="opacity:0;">9</span><img src="assets\img\{{ entry.status }}.png" width="90"/></td>
+	{% endif %}
+          <td>{{ entry.vgp_phase }}</td/> 
          </tr>
     {% endfor %}
     </tbody>
 
 </table>
 
-<i>Last updated: {{ site.data.project_stats_vgl.info }}</i></small>
+<i>Last updated: {{ site.data.table_tracker.info }}</i></small>
 </div>
 <script src="https://cdn.jsdelivr.net/npm/jquery/dist/jquery.min.js"></script>
     <script src="https://cdn.jsdelivr.net/npm/[email protected]/dist/umd/popper.min.js"></script>
@@ -138,6 +142,9 @@
             if(selValue=="phase4"){
                 $table.bootstrapTable('filterBy', {phase: ["phase1","phase2","phase3","phase4"]})
             }
+	    if(selValue=="all"){
+                $table.bootstrapTable('filterBy', {phase: ["phase1","phase2","phase3","phase4","other"]})
+            }
         }
     });   
 

_layouts/default.html

@@ -49,11 +49,6 @@
         <th  class="th-sm">N/A</th>
         <td style="text-align: left;"><img src="assets\img\4.png" width="15" height="15"/></td>
     </tr>
-          <tr>
-        <th  class="th-sm">Exists</th>
-        <td style="text-align: left;"><img src="assets\img\5.png" width="15" height="15"/></td>
-    </tr>
-
   </tbody>
                 </table>
     </div>

index.html

@@ -2,14 +2,6 @@
 layout: default
 title: Home
 ---
-<ul class="nav nav-tabs" id="myTab" role="tablist">
-  <li class="nav-item" role="presentation">
-    <a class="nav-link active" id="home-tab" data-bs-toggle="tab" href="#home" role="tab" aria-controls="home" aria-selected="true">Project status</a>
-  </li>
-</ul>
-<br>
-<div class="tab-content" id="myTabContent">
-  <div class="tab-pane fade show active" id="home" role="tabpanel" aria-labelledby="home-tab">
-  <div><br>{% include table_vgl.html file="project_stats_vgl.yml" caption="Project tracking" %}</div>
-  </div>
-</div>
+
+
+<div><br><br>{% include table_vgl.html file="table_tracker.yml" caption="Project tracking" %}</div>