diff options
| -rw-r--r-- | wqflask/wqflask/templates/show_metadata_details.html | 186 | ||||
| -rw-r--r-- | wqflask/wqflask/templates/show_trait.html | 12 | ||||
| -rw-r--r-- | wqflask/wqflask/views.py | 12 |
3 files changed, 0 insertions, 210 deletions
diff --git a/wqflask/wqflask/templates/show_metadata_details.html b/wqflask/wqflask/templates/show_metadata_details.html deleted file mode 100644 index ffb197e2..00000000 --- a/wqflask/wqflask/templates/show_metadata_details.html +++ /dev/null @@ -1,186 +0,0 @@ -<table class="table metadata"> - {% if metadata.accession_id %} - <tr> - <td><b>Title:</b></td> - <td><div>{{ metadata.accession_id }} {% if metadata.title %}: {{ metadata.title }} {% endif %}</div></td> - </tr> - {% endif %} - - {% if metadata.geo_series %} - <tr> - <td><b>Geo Series:</b></td> - <td><div>{{ metadata.geo_series|safe }}</div></td> - </tr> - {% endif %} - - {% if metadata.dataset_group %} - <tr> - <td><b>Dataset Group:</b></td> - <td><div>{{ metadata.dataset_group }}</div></td> - </tr> - {% endif %} - - {% if metadata.species_name %} - <tr> - <td><b>Species:</b></td> - <td><div>{{ metadata.species_name }}</div></td> - </tr> - {% endif %} - - {% if metadata.inbred_set_name %} - <tr> - <td><b>Group:</b></td> - <td><div>{{ metadata.inbred_set_name }}</div></td> - </tr> - {% endif %} - - {% if metadata.investigators %} - <tr> - <td><b>Investigator(s):</b></td> - <td><div>{{ metadata.investigators.name }}, {{ metadata.investigators.city }}, {{ metadata.investigators.country }} </div></td> - </tr> - {% endif %} - - {% if metadata.tissue_name %} - <tr> - <td><b>Tissue:</b></td> - <td> - {% if metadata.about_tissue %} - <div></div> - <details> - <summary><b title="Click to view tissue information">{{ metadata.tissue_name }}</b></summary> - <b>About the tissue used to generate this set of data:</b> - <div>{{ metadata.about_tissue|safe }}</div> - </details> - {% else %} - {{ metadata.tissue_name }} - {% endif %} - </td> - </tr> - {% endif %} - - {% if metadata.platform_name %} - <tr> - <td><b>Platforms:</b></td> - <td> - {% if metadata.about_platform %} - <details> - <summary><b title="Click to view platform information">{{ metadata.platform_name }}</b></summary> - <b>About the array platform:</b> - {{ metadata.about_platform|safe }} - </details> - {% else %} - {{ metadata.platform_name }} - {% endif %} - </td> - </tr> - {% endif %} - - {% if metadata.normalization_name %} - <tr> - <td><b>Normalization:</b></td> - <td> - {{ metadata.normalization_name }} - </td> - </tr> - {% endif %} - - {% if metadata.summary %} - <tr> - <td></td> - <td> - <details> - <summary><b title="Click to view summary">Summary</b></summary> - {{ metadata.summary|safe }} - </details> - </td> - </tr> - {% endif %} - - - {% if metadata.about_cases %} - <tr> - <td></td> - <td> - <details> - <summary><b title="Click to view case information">About the cases used to generate this set of data</b></summary> - {{ metadata.about_cases|safe }} - </details> - </td> - </tr> - {% endif %} - - {% if metadata.about_data_processing %} - <tr> - <td></td> - <td> - <details> - <summary><b title="Click to view data values and processing">About Data Values and Data Processing</b></summary> - {{ metadata.about_data_processing|safe }} - </details> - </td> - </tr> - {% endif %} - - {% if metadata.notes %} - <tr> - <td></td> - <td> - <details> - <summary><b>Notes</b></summary> - {{ metadata.notes|safe }} - </details> - </td> - </tr> - {% endif %} - - {% if metadata.experiment_design %} - <tr> - <td></td> - <td> - <details> - <summary><b>Experiment Type</b></summary> - {{ metadata.experiment_design|safe }} - </details> - </td> - </tr> - {% endif %} - - {% if metadata.contributors %} - <tr> - <td></td> - <td> - <details> - <summary><b>Contributor(s)</b></summary> - {{ metadata.contributors|safe }} - </details> - </td> - </tr> - {% endif %} - - {% if metadata.citation %} - <tr> - <td> - <td> - <details> - <summary><b>Citation</b></summary> - {{ metadata.citation|safe }} - </details> - </td> - </tr> - {% endif %} - - {% if metadata.acknowledgment %} - <tr> - <td></td> - <td> - <details> - <summary><b>Data source acknowledgment</b></summary> - {{ metadata.acknowledgment|safe }} - </details> - </td> - </tr> - {% endif %} - - -</table> diff --git a/wqflask/wqflask/templates/show_trait.html b/wqflask/wqflask/templates/show_trait.html index c394af30..97b613e3 100644 --- a/wqflask/wqflask/templates/show_trait.html +++ b/wqflask/wqflask/templates/show_trait.html @@ -57,18 +57,6 @@ {% include 'show_trait_details.html' %} </div> </div> - {% if metadata %} - <div class="panel-heading" data-toggle="collapse" data-parent="#accordion" data-target="#collapseMeta"> - <h3 class="panel-title"> - <span class="glyphicon glyphicon-chevron-down"></span> Data Set Group: {{ dataset.fullname }} - </h3> - </div> - <div id="collapseMeta" class="panel-collapse collapse in"> - <div class="panel-body"> - {% include 'show_metadata_details.html' %} - </div> - </div> - {% endif %} </div> <div class="panel panel-default"> <div class="panel-heading stats_panel" data-toggle="collapse" data-parent="#accordion" data-target="#collapseTwo"> diff --git a/wqflask/wqflask/views.py b/wqflask/wqflask/views.py index 188dc27b..243c79b2 100644 --- a/wqflask/wqflask/views.py +++ b/wqflask/wqflask/views.py @@ -509,20 +509,8 @@ def show_trait_page(): template_vars.js_data = json.dumps(template_vars.js_data, default=json_default_handler, indent=" ") - # Should there be any mis-configurations, things will still - # work. - metadata = {} - try: - metadata = requests.get( - urljoin( - GN3_LOCAL_URL, - f"/api/metadata/dataset/{request.args.get('dataset')}") - ).json() - except: - metadata = {} return render_template( "show_trait.html", - metadata=metadata, **{ **template_vars.__dict__, "user": privileges_data["user"], |