about summary refs log tree commit diff
path: root/uploader/templates/genotypes
diff options
context:
space:
mode:
Diffstat (limited to 'uploader/templates/genotypes')
-rw-r--r--uploader/templates/genotypes/add-genotypes-records-base.html39
-rw-r--r--uploader/templates/genotypes/add-genotypes-records-csv.html146
-rw-r--r--uploader/templates/genotypes/base.html38
-rw-r--r--uploader/templates/genotypes/create-dataset.html16
-rw-r--r--uploader/templates/genotypes/index.html194
-rw-r--r--uploader/templates/genotypes/list-genotypes.html149
-rw-r--r--uploader/templates/genotypes/list-markers.html22
-rw-r--r--uploader/templates/genotypes/macro-display-dataset-card.html24
-rw-r--r--uploader/templates/genotypes/select-population.html25
-rw-r--r--uploader/templates/genotypes/view-dataset.html21
10 files changed, 433 insertions, 241 deletions
diff --git a/uploader/templates/genotypes/add-genotypes-records-base.html b/uploader/templates/genotypes/add-genotypes-records-base.html
new file mode 100644
index 0000000..bf3812f
--- /dev/null
+++ b/uploader/templates/genotypes/add-genotypes-records-base.html
@@ -0,0 +1,39 @@
+{%extends "genotypes/base.html"%}
+{%from "flash_messages.html" import flash_all_messages%}
+
+{%block title%}Genotypes{%endblock%}
+
+{%block pagetitle%}Genotypes{%endblock%}
+
+{%block contents%}
+
+<div class="row">
+  <form id="frm-add-genotypes-records"
+        method="POST"
+        enctype="multipart/form-data"
+        action="{{url_for(
+                'species.populations.genotypes.add_genotype_records',
+                species_id=species.SpeciesId, population_id=population.Id,
+                dataset_id=dataset.Id)}}"
+        data-resumable-target="{{url_for('files.resumable_upload_post')}}">
+    <legend>Add New Genotype Records</legend>
+
+    {%block frm_add_genotypes_records_elements%}{%endblock%}
+
+    <div class="form-group">
+      <input type="submit"
+             value="upload genotypes"
+             class="btn btn-primary" />
+    </div>
+  </form>
+</div>
+
+<div class="row">
+  <h2 class="heading" id="page-documentation">Help</h2>
+  {%block page_documentation%}{%endblock%}
+</div>
+{%endblock%}
+
+
+{%block javascript%}
+{%endblock%}
diff --git a/uploader/templates/genotypes/add-genotypes-records-csv.html b/uploader/templates/genotypes/add-genotypes-records-csv.html
new file mode 100644
index 0000000..58dbe81
--- /dev/null
+++ b/uploader/templates/genotypes/add-genotypes-records-csv.html
@@ -0,0 +1,146 @@
+{%extends "genotypes/add-genotypes-records-base.html"%}
+{%from "phenotypes/macro-display-preview-table.html" import display_preview_table%}
+{%from "macro-csv-fields.html" import display_csv_fields, display_csv_fields_documentation%}
+{%from "phenotypes/macro-display-resumable-elements.html" import display_resumable_elements%}
+
+{%block frm_add_genotypes_records_elements%}
+<div class="form-text help-block">
+  <p>You can add new genotype records here.</p>
+</div>
+
+{{display_csv_fields()}}
+
+<div class="form-group">
+  <div class="non-resumable-elements">
+    <label for="finput-genotypes-records-file" class="form-label">
+      genotypes records</label>
+    <input id="finput-genotypes-records-file"
+           name="genotypes-records-file"
+           class="form-control"
+           type="file"
+           data-preview-table="tbl-preview-geno-records"
+           required="required"  />
+    <span class="form-text text-muted">
+      Provide a file that contains only the genotypes records,
+      <a href="#docs-file-genotypes-records-csv"
+         title="Documentation of the genotypes records file format.">
+        the documentation for the expected format of the file</a>.</span>
+  </div>
+  {{display_resumable_elements(
+  "resumable-genotypes-records-file",
+  "Genotypes records",
+  '<p>Drag and drop the CSV file here, that contains the genotype records you
+    want to add.</p>
+
+  <p>Please see the
+    <a href="#docs-file-genotypes-records"
+       title="Documentation of the genotypes records data file format.">
+      "Genotypes records" documentation</a> section below for more
+    information on the expected format of the file provided here.</p>')}}
+  {{display_preview_table("tbl-preview-geno-records", "genotypes records")}}
+</div>
+
+<div class="">
+  <h4 class="subheading">Genotype Encoding</h4>
+  <div class="form-text help-block">
+    <p>The symbols in your genotype file need to be mapped to known values to
+      enable mapping.</p>
+  </div>
+
+  <div class="form-group">
+    <div class="row mb-3">
+      <label for="txt-geno-encoding-mat"
+             class="col-form-label col-sm-2">Maternal</label>
+      <div class="col-sm-10">
+        <div class="input-group">
+        <input type="text"
+               maxlength="3"
+               id="txt-geno-encoding-mat"
+               name="geno_encoding_mat"
+               class="form-control" />
+        <div class="input-group-append">
+          <span class="input-group-text">Value = -1</span>
+        </div>
+        </div>
+      </div>
+      <span class="form-text text-muted col-sm-12">
+        Enter the symbol in your file that represents the allele inherited from
+        the mother. This allele will be mapped to the value -1.</span>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <div class="row mb-3">
+      <label for="txt-geno-encoding-pat"
+             class="col-form-label col-sm-2">Paternal</label>
+      <div class="col-sm-10">
+        <div class="input-group">
+          <input type="text"
+                 maxlength="3"
+                 id="txt-geno-encoding-pat"
+                 name="geno_encoding_pat"
+                 class="form-control" />
+          <div class="input-group-append">
+            <span class="input-group-text">Value = 1</span>
+          </div>
+        </div>
+      </div>
+      <span class="form-text text-muted">
+        Enter the symbol in your file that represents the allele inherited from
+        the father. This allele will be mapped to the value 1.</span>
+    </div>
+  </div>
+
+  <div class="form-group">
+    <div class="row mb-3">
+      <label for="txt-geno-encoding-het"
+             class="col-form-label col-sm-2">Heterozygous (value = 0)</label>
+      <div class="col-sm-10">
+        <div class="input-group">
+          <input type="text"
+                 maxlength="3"
+                 id="txt-geno-encoding-het"
+                 name="geno_encoding_het"
+                 class="form-control" />
+          <div class="input-group-append">
+            <span class="input-group-text">Value = 0</span>
+          </div>
+        </div>
+      </div>
+      <span class="form-text text-muted">
+        Enter the symbol in your file that represents the allele inherited from
+        both parents. This allele will be mapped to the value 0.</span>
+    </div>
+  </div>
+</div>
+{%endblock%}
+
+{%block page_documentation%}
+{{super()}}
+
+<h3 class="sub-heading">CSV file metadata</h3>
+{{display_csv_fields_documentation()}}
+{%endblock%}
+
+{%block javascript%}
+{{super()}}
+<script src="{{url_for('base.node_modules',
+             filename='resumablejs/resumable.js')}}"></script>
+<script src="/static/js/files.js"></script>
+
+<script type="text/javascript">
+  $(function(evt) {
+      
+      var preview_tables_to_elements_map = {
+          "#tbl-preview-geno-records": "#finput-genotypes-records-file",
+      };
+
+      makeResumableObject(
+          form_id="frm-add-genotypes-records",
+          file_input_id="finput-genotypes-records-file",
+          resumable_element_id="resumable-genotypes-records-file",
+          preview_table_id="tbl-preview-geno-records",
+          filetypes=["csv", "tsv", "txt", "geno"]);
+  });
+</script>
+{%endblock%}
diff --git a/uploader/templates/genotypes/base.html b/uploader/templates/genotypes/base.html
index 7d61312..c2abc63 100644
--- a/uploader/templates/genotypes/base.html
+++ b/uploader/templates/genotypes/base.html
@@ -1,23 +1,23 @@
 {%extends "populations/base.html"%}
+{%from "populations/macro-display-population-card.html" import display_sui_population_card%}
+{%from "genotypes/macro-display-dataset-card.html" import display_dataset_card%}
 
-{%block lvl3_breadcrumbs%}
-<li {%if activelink=="genotypes"%}
-    class="breadcrumb-item active"
-    {%else%}
-    class="breadcrumb-item"
-    {%endif%}>
-  {%if population is mapping%}
-  <a href="{{url_for('species.populations.genotypes.list_genotypes',
-           species_id=species.SpeciesId,
-           population_id=population.Id)}}">
-    {%if dataset is defined and dataset is mapping%}
-    {{dataset.Name}}
-    {%else%}
-    Genotypes
-    {%endif%}</a>
-  {%else%}
-  <a href="{{url_for('species.populations.genotypes.index')}}">Genotypes</a>
-  {%endif%}
+{%block breadcrumbs%}
+{{super()}}
+<li class="breadcrumb-item">
+  <a href="{{url_for('species.populations.genotypes.index',
+           species_id=species['SpeciesId'],
+           population_id=population['Id'])}}">
+    genotype
+  </a>
 </li>
-{%block lvl4_breadcrumbs%}{%endblock%}
+{%endblock%}
+
+
+{%block sidebarcontents%}
+{%if dataset is defined and dataset is not none%}
+{{display_dataset_card(species, population, dataset)}}
+{%else%}
+{{display_sui_population_card(species, population)}}
+{%endif%}
 {%endblock%}
diff --git a/uploader/templates/genotypes/create-dataset.html b/uploader/templates/genotypes/create-dataset.html
index 10331c1..7f435a1 100644
--- a/uploader/templates/genotypes/create-dataset.html
+++ b/uploader/templates/genotypes/create-dataset.html
@@ -35,13 +35,13 @@
              id="txt-geno-dataset-name"
              name="geno-dataset-name"
              required="required"
-             class="form-control" />
+             class="form-control"
+             value="{{population.Name}}Geno"
+             readonly="readonly" />
       <small class="form-text text-muted">
         <p>This is a short representative, but constrained name for the genotype
-          dataset.<br />
-          The field will only accept letters ('A-Za-z'), numbers (0-9), hyphens
-          and underscores. Any other character will cause the name to be
-          rejected.</p></small>
+          dataset. It is used internally by GeneNetwork.</p>
+      </small>
     </div>
 
     <div class="form-group">
@@ -50,7 +50,8 @@
              id="txt-geno-dataset-fullname"
              name="geno-dataset-fullname"
              required="required"
-             class="form-control" />
+             class="form-control"
+             value="{{population.Name}} Genotypes" />
       <small class="form-text text-muted">
         <p>This is a longer, more descriptive name for your dataset.</p></small>
     </div>
@@ -61,7 +62,8 @@
       <input type="text"
              id="txt-geno-dataset-shortname"
              name="geno-dataset-shortname"
-             class="form-control" />
+             class="form-control"
+             value="{{population.Name}}Geno" />
       <small class="form-text text-muted">
         <p>A short name for your dataset. If you leave this field blank, the
           short name will be set to the same value as the
diff --git a/uploader/templates/genotypes/index.html b/uploader/templates/genotypes/index.html
index b50ebc5..1c3483d 100644
--- a/uploader/templates/genotypes/index.html
+++ b/uploader/templates/genotypes/index.html
@@ -1,32 +1,200 @@
 {%extends "genotypes/base.html"%}
 {%from "flash_messages.html" import flash_all_messages%}
-{%from "species/macro-select-species.html" import select_species_form%}
 
 {%block title%}Genotypes{%endblock%}
 
 {%block pagetitle%}Genotypes{%endblock%}
 
-
 {%block contents%}
 {{flash_all_messages()}}
 
+
+{%if dataset is defined and dataset is not none%}
+
+<div class="row">
+  <h2>Genotype Data</h2>
+
+  <div class="row">
+    <div class="col">
+      <p>
+        <a href="{{url_for(
+                 'species.populations.genotypes.add_genotype_records',
+                 species_id=species.SpeciesId, population_id=population.Id,
+                 dataset_id=dataset.Id)}}"
+           class="btn btn-primary">
+          Add genotype records
+        </a>
+      </p>
+    </div>
+  </div>
+
+  <div class="table-responsive">
+    <table id="tbl-genotype-records" class="table compact stripe cell-border">
+      <thead>
+        <tr>
+          <th title="">#</th>
+          <th title="">Index</th>
+          <th title="Locus of marker on the chromosome">Locus</th>
+          <th title="Chromosome">Chr</th>
+          <th title="Physical location of marker in centimorgans">cM</th>
+          <th title="Physical location of marker in megabasepairs">Mb</th>
+          {%for sample in samples%}
+          <th title="Data for sample {{sample}}">{{sample}}</th>
+          {%endfor%}
+        </tr>
+      </thead>
+
+      <tbody>
+        {%for record in genotype_records%}
+        <tr>
+          <td>
+            <input type="checkbox"
+                   id="chk-geno-record-{{record.Id}}"
+                   name="geno_record_id"
+                   value="{{record.Id}}" />
+          </td>
+          <td>{{record.index}}</td>
+          <td>{{record.Name}}</td>
+          <td>{{record.Chr}}</td>
+          <td>{{record.cM}}</td>
+          <td>{{record.Mb}}</td>
+          {%for sample in samples%}
+          <td>{{record.data[sample]}}</td>
+          {%endfor%}
+        </tr>
+        {%else%}
+        <tr>
+          <td colspan="6" class="text-info">
+            There are no records
+          </td>
+        </tr>
+        {%endfor%}
+      </tbody>
+    </table>
+  </div>
+</div>
+
 <div class="row">
-  <p>
-    This section allows you to upload genotype information for your experiments,
-    in the case that you have not previously done so.
-  </p>
-  <p>
-    We'll need to link the genotypes to the species and population, so do please
-    go ahead and select those in the next two steps.
-  </p>
+  <h2>Genotype Encoding</h2>
+  <p>The numerical values in the table above are mapped from the following allele symbols:</p>
+
+  <table class="table">
+    <thead>
+      <tr>
+        <th>Allele Type</th>
+        <th>Allele Symbol</th>
+        <th>Mapped To</th>
+      </tr>
+    </thead>
+
+    <tbody>
+      {%for row in genocode%}
+      <tr>
+        <td {%if row.AlleleType == 'mat'%}
+            title="Maternal allele"
+            {%elif row.AlleleType == "pat"%}
+            title="Paternal allele"
+            {%elif row.AlleleType == "het"%}
+            title="Heterozygous allele"
+            {%else%}
+            title="Unknown allele"
+            {%endif%}>
+          {{row.AlleleType}}</td>
+        <td>{{row.AlleleSymbol}}</td>
+        <td>{{row.DatabaseValue if row.DatabaseValue is not none}}</td>
+      </tr>
+      {%else%}
+      <tr>
+        <td colspan="3" class="text-info">
+          There is no genotype encoding defined for this data.
+        </td>
+      </tr>
+      {%endfor%}
+    </tbody>
+  </table>
 </div>
 
+{%else%}
+
 <div class="row">
-  {{select_species_form(url_for("species.populations.genotypes.index"),
-  species)}}
+  <p>We need to create a dataset to hold the genotype information for this
+    species/population, before we can proceed to upload the genotype data.</p>
+  <p>Please click the button below to create the dataset.</p>
+
+  <div class="col">
+  <a href="{{url_for('species.populations.genotypes.create_dataset', species_id=species.SpeciesId, population_id=population.Id)}}"
+     class="btn btn-primary">create genotype dataset</a>
+  </div>
 </div>
+
+{%endif%}
+
 {%endblock%}
 
+
 {%block javascript%}
-<script type="text/javascript" src="/static/js/species.js"></script>
+<script type="text/javascript">
+  $(function() {
+      var genoRecordsUrl = "{{url_for('species.populations.genotypes.index', species_id=species.SpeciesId, population_id=population.Id)}}";
+
+      var dtGenotypeRecords = false;
+      fetch(genoRecordsUrl, {
+          method: "POST",
+          headers: {
+              "Accept": "application/json",
+              "Content-Type": "application/json"
+          },
+          body: JSON.stringify({})
+      })
+          .then(response => response.json())
+          .then(recordsData => {
+              var records = recordsData.genotype_records;
+              var samples = recordsData.samples_order;
+              var columns = [
+                  {
+                      data: function(record) {
+                          return `<input type="checkbox"`
+                              + `id="chk-geno-record-` + record.Id + `"`
+                              + `name="geno_record_id"`
+                              + `value="` + record.Id + `"`
+                              + ` />`;
+                      }
+                  },
+                  {data: "index"},
+                  {data: "Name"},
+                  {data: "Chr"},
+                  {data: "cM"},
+                  {data: "Mb"}
+              ].concat(samples.map((sample) => {
+                  return {data: (record) => record.data[sample]};
+              }));
+
+              dtGenotypeRecords = buildDataTable(
+                  "#tbl-genotype-records",
+                  [],
+                  columns,
+                  {
+                      serverSide: true,
+                      ajax: {
+                          url: genoRecordsUrl,
+                          dataSrc: "genotype_records",
+                          recordsTotal: "total_genotype_records",
+                          recordsFiltered: "fetched_genotype_records"
+                      },
+                      paging: true,
+                      scroller: true,
+                      scrollY: "50vh",
+                      scrollCollapse: false,
+                      layout: {
+                          top: "info",
+                          topStart: null,
+                          topEnd: null,
+                          bottom: null,
+                          bottomStart: null,
+                          bottomEnd: null
+                      }
+                  });
+          });
+  });
+</script>
 {%endblock%}
diff --git a/uploader/templates/genotypes/list-genotypes.html b/uploader/templates/genotypes/list-genotypes.html
deleted file mode 100644
index 0f074fd..0000000
--- a/uploader/templates/genotypes/list-genotypes.html
+++ /dev/null
@@ -1,149 +0,0 @@
-{%extends "genotypes/base.html"%}
-{%from "flash_messages.html" import flash_all_messages%}
-{%from "populations/macro-display-population-card.html" import display_population_card%}
-
-{%block title%}Genotypes{%endblock%}
-
-{%block pagetitle%}Genotypes{%endblock%}
-
-{%block lvl4_breadcrumbs%}
-<li {%if activelink=="list-genotypes"%}
-    class="breadcrumb-item active"
-    {%else%}
-    class="breadcrumb-item"
-    {%endif%}>
-  <a href="{{url_for('species.populations.genotypes.list_genotypes',
-           species_id=species.SpeciesId,
-           population_id=population.Id)}}">List genotypes</a>
-</li>
-{%endblock%}
-
-{%block contents%}
-{{flash_all_messages()}}
-
-<div class="row">
-  <h2>Genetic Markers</h2>
-  <p>There are a total of {{total_markers}} currently registered genetic markers
-    for the "{{species.FullName}}" species. You can click
-    <a href="{{url_for('species.populations.genotypes.list_markers',
-             species_id=species.SpeciesId,
-             population_id=population.Id)}}"
-       title="View genetic markers for species '{{species.FullName}}">
-      this link to view the genetic markers
-    </a>.
-  </p>
-</div>
-
-<div class="row">
-  <h2>Genotype Encoding</h2>
-  <p>
-    The genotype encoding used for the "{{population.FullName}}" population from
-    the "{{species.FullName}}" species is as shown in the table below.
-  </p>
-  <table class="table">
-
-    <thead>
-      <tr>
-        <th>Allele Type</th>
-        <th>Allele Symbol</th>
-        <th>Allele Value</th>
-      </tr>
-    </thead>
-
-    <tbody>
-      {%for row in genocode%}
-      <tr>
-        <td>{{row.AlleleType}}</td>
-        <td>{{row.AlleleSymbol}}</td>
-        <td>{{row.DatabaseValue if row.DatabaseValue is not none else "NULL"}}</td>
-      </tr>
-      {%else%}
-      <tr>
-        <td colspan="7" class="text-info">
-          <span class="glyphicon glyphicon-exclamation-sign"></span>
-          There is no explicit genotype encoding defined for this population.
-        </td>
-      </tr>
-      {%endfor%}
-    </tbody>
-  </table>
-
-  {%if genocode | length < 1%}
-  <a href="#add-genotype-encoding"
-     title="Add a genotype encoding system for this population"
-     class="btn btn-primary not-implemented">
-    add genotype encoding
-    </a>
-  {%endif%}
-</div>
-
-<div class="row text-danger">
-  <h3>Some Important Concepts to Consider/Remember</h3>
-  <ul>
-    <li>Reference vs. Non-reference alleles</li>
-    <li>In <em>GenoCode</em> table, items are ordered by <strong>InbredSet</strong></li>
-  </ul>
-  <h3>Possible references</h3>
-  <ul>
-    <li>https://mr-dictionary.mrcieu.ac.uk/term/genotype/</li>
-    <li>https://www.ncbi.nlm.nih.gov/pmc/articles/PMC7363099/</li>
-  </ul>
-</div>
-
-<div class="row">
-  <h2>Genotype Datasets</h2>
-
-  <p>The genotype data is organised under various genotype datasets. You can
-    click on the link for the relevant dataset to view a little more information
-    about it.</p>
-
-  {%if dataset is not none%}
-    <table class="table">
-      <thead>
-        <tr>
-          <th>Name</th>
-          <th>Full Name</th>
-        </tr>
-      </thead>
-
-      <tbody>
-        <tr>
-          <td>{{dataset.Name}}</td>
-          <td><a href="{{url_for('species.populations.genotypes.view_dataset',
-                       species_id=species.SpeciesId,
-                       population_id=population.Id,
-                       dataset_id=dataset.Id)}}"
-                 title="View details regarding and manage dataset '{{dataset.FullName}}'">
-              {{dataset.FullName}}</a></td>
-        </tr>
-      </tbody>
-    </table>
-  {%else%}
-  <p class="text-warning">
-    <span class="glyphicon glyphicon-exclamation-sign"></span>
-    There is no genotype dataset defined for this population.
-  </p>
-  <p>
-    <a href="{{url_for('species.populations.genotypes.create_dataset',
-             species_id=species.SpeciesId,
-             population_id=population.Id)}}"
-       title="Create a new genotype dataset for the '{{population.FullName}}' population for the '{{species.FullName}}' species."
-       class="btn btn-primary">
-      create new genotype dataset</a></p>
-  {%endif%}
-</div>
-<div class="row text-warning">
-  <p>
-    <span class="glyphicon glyphicon-exclamation-sign"></span>
-    <strong>NOTE</strong>: Currently the GN2 (and related) system(s) expect a
-    single genotype dataset. If there is more than one, the system apparently
-    fails in unpredictable ways.
-  </p>
-  <p>Fix this to allow multiple datasets, each with a different assembly from
-    all the rest.</p>
-</div>
-{%endblock%}
-
-{%block sidebarcontents%}
-{{display_population_card(species, population)}}
-{%endblock%}
diff --git a/uploader/templates/genotypes/list-markers.html b/uploader/templates/genotypes/list-markers.html
index a705ae3..22189c7 100644
--- a/uploader/templates/genotypes/list-markers.html
+++ b/uploader/templates/genotypes/list-markers.html
@@ -1,20 +1,18 @@
 {%extends "genotypes/base.html"%}
 {%from "flash_messages.html" import flash_all_messages%}
-{%from "species/macro-display-species-card.html" import display_species_card%}
 
 {%block title%}Genotypes: List Markers{%endblock%}
 
 {%block pagetitle%}Genotypes: List Markers{%endblock%}
 
-{%block lvl4_breadcrumbs%}
-<li {%if activelink=="list-markers"%}
-    class="breadcrumb-item active"
-    {%else%}
-    class="breadcrumb-item"
-    {%endif%}>
+{%block breadcrumbs%}
+{{super()}}
+<li class="breadcrumb-item">
   <a href="{{url_for('species.populations.genotypes.list_markers',
-           species_id=species.SpeciesId,
-           population_id=population.Id)}}">List markers</a>
+           species_id=species['SpeciesId'],
+           population_id=population['Id'])}}">
+    markers
+  </a>
 </li>
 {%endblock%}
 
@@ -59,7 +57,7 @@
   <table class="table">
     <thead>
       <tr>
-        <th title="">#</th>
+        <th title="">Index</th>
         <th title="">Marker Name</th>
         <th title="Chromosome">Chr</th>
         <th title="Physical location of the marker in megabasepairs">
@@ -99,7 +97,3 @@
 </div>
 {%endif%}
 {%endblock%}
-
-{%block sidebarcontents%}
-{{display_species_card(species)}}
-{%endblock%}
diff --git a/uploader/templates/genotypes/macro-display-dataset-card.html b/uploader/templates/genotypes/macro-display-dataset-card.html
new file mode 100644
index 0000000..2b197d4
--- /dev/null
+++ b/uploader/templates/genotypes/macro-display-dataset-card.html
@@ -0,0 +1,24 @@
+{%from "populations/macro-display-population-card.html" import display_sui_population_card%}
+
+{%macro display_dataset_card(species, population, dataset)%}
+{{display_sui_population_card(species, population)}}
+<div class="row">
+  <table class="table">
+    <caption>Current genotype dataset</caption>
+    <tbody>
+      <tr>
+        <th>Name</th>
+        <td>{{dataset.Name}}</td>
+      </tr>
+      <tr>
+        <th>Full Name</th>
+        <td>{{dataset.FullName}}</td>
+      </tr>
+      <tr>
+        <th>Short Name</th>
+        <td>{{dataset.ShortName}}</td>
+      </tr>
+    </tbody>
+  </table>
+</div>
+{%endmacro%}
diff --git a/uploader/templates/genotypes/select-population.html b/uploader/templates/genotypes/select-population.html
deleted file mode 100644
index acdd063..0000000
--- a/uploader/templates/genotypes/select-population.html
+++ /dev/null
@@ -1,25 +0,0 @@
-{%extends "genotypes/base.html"%}
-{%from "flash_messages.html" import flash_all_messages%}
-{%from "species/macro-display-species-card.html" import display_species_card%}
-{%from "populations/macro-select-population.html" import select_population_form%}
-
-{%block title%}Genotypes{%endblock%}
-
-{%block pagetitle%}Genotypes{%endblock%}
-
-
-{%block contents%}
-{{flash_all_messages()}}
-
-<div class="row">
-  {{select_population_form(url_for("species.populations.genotypes.select_population", species_id=species.SpeciesId), species, populations)}}
-</div>
-{%endblock%}
-
-{%block sidebarcontents%}
-{{display_species_card(species)}}
-{%endblock%}
-
-{%block javascript%}
-<script type="text/javascript" src="/static/js/populations.js"></script>
-{%endblock%}
diff --git a/uploader/templates/genotypes/view-dataset.html b/uploader/templates/genotypes/view-dataset.html
index e7ceb36..d95a8e3 100644
--- a/uploader/templates/genotypes/view-dataset.html
+++ b/uploader/templates/genotypes/view-dataset.html
@@ -1,21 +1,17 @@
 {%extends "genotypes/base.html"%}
 {%from "flash_messages.html" import flash_all_messages%}
-{%from "populations/macro-display-population-card.html" import display_population_card%}
 
 {%block title%}Genotypes: View Dataset{%endblock%}
 
 {%block pagetitle%}Genotypes: View Dataset{%endblock%}
 
-{%block lvl4_breadcrumbs%}
-<li {%if activelink=="view-dataset"%}
-    class="breadcrumb-item active"
-    {%else%}
-    class="breadcrumb-item"
-    {%endif%}>
+{%block breadcrumbs%}
+{{super()}}
+<li class="breadcrumb-item">
   <a href="{{url_for('species.populations.genotypes.view_dataset',
            species_id=species.SpeciesId,
            population_id=population.Id,
-           dataset_id=dataset.Id)}}">view dataset</a>
+           dataset_id=dataset.Id)}}">dataset</a>
 </li>
 {%endblock%}
 
@@ -50,12 +46,9 @@
 <div class="row">
   <h2>Genotype Data</h2>
 
-  <p class="text-danger">
-    Provide link to enable uploading of genotype data here.</p>
+  <div class="col" style="margin-bottom: 3px;">
+    <a href="#" class="btn btn-primary not-implemented">upload genotypes</a>
+  </div>
 </div>
 
 {%endblock%}
-
-{%block sidebarcontents%}
-{{display_population_card(species, population)}}
-{%endblock%}