From 1161cec692aa0e115435e9bd7b6b5fd03fb0efc3 Mon Sep 17 00:00:00 2001 From: Munyoki Kilyungi Date: Wed, 31 May 2023 19:53:41 +0300 Subject: Delete trait metadata from the show_traits page * wqflask/wqflask/templates/show_metadata_details.html: Delete. * wqflask/wqflask/templates/show_trait.html: Delete if block that checks includes trait metadata. * wqflask/wqflask/views.py: Remove "metadata". Signed-off-by: Munyoki Kilyungi --- .../wqflask/templates/show_metadata_details.html | 186 --------------------- wqflask/wqflask/templates/show_trait.html | 12 -- wqflask/wqflask/views.py | 12 -- 3 files changed, 210 deletions(-) delete mode 100644 wqflask/wqflask/templates/show_metadata_details.html (limited to 'wqflask') 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 @@ - - {% if metadata.accession_id %} - - - - - {% endif %} - - {% if metadata.geo_series %} - - - - - {% endif %} - - {% if metadata.dataset_group %} - - - - - {% endif %} - - {% if metadata.species_name %} - - - - - {% endif %} - - {% if metadata.inbred_set_name %} - - - - - {% endif %} - - {% if metadata.investigators %} - - - - - {% endif %} - - {% if metadata.tissue_name %} - - - - - {% endif %} - - {% if metadata.platform_name %} - - - - - {% endif %} - - {% if metadata.normalization_name %} - - - - - {% endif %} - - {% if metadata.summary %} - - - - - {% endif %} - - - {% if metadata.about_cases %} - - - - - {% endif %} - - {% if metadata.about_data_processing %} - - - - - {% endif %} - - {% if metadata.notes %} - - - - - {% endif %} - - {% if metadata.experiment_design %} - - - - - {% endif %} - - {% if metadata.contributors %} - - - - - {% endif %} - - {% if metadata.citation %} - - - - {% endif %} - - {% if metadata.acknowledgment %} - - - - - {% endif %} - - -
Title:
{{ metadata.accession_id }} {% if metadata.title %}: {{ metadata.title }} {% endif %}
Geo Series:
{{ metadata.geo_series|safe }}
Dataset Group:
{{ metadata.dataset_group }}
Species:
{{ metadata.species_name }}
Group:
{{ metadata.inbred_set_name }}
Investigator(s):
{{ metadata.investigators.name }}, {{ metadata.investigators.city }}, {{ metadata.investigators.country }}
Tissue: - {% if metadata.about_tissue %} -
-
- {{ metadata.tissue_name }} - About the tissue used to generate this set of data: -
{{ metadata.about_tissue|safe }}
-
- {% else %} - {{ metadata.tissue_name }} - {% endif %} -
Platforms: - {% if metadata.about_platform %} -
- {{ metadata.platform_name }} - About the array platform: - {{ metadata.about_platform|safe }} -
- {% else %} - {{ metadata.platform_name }} - {% endif %} -
Normalization: - {{ metadata.normalization_name }} -
-
- Summary - {{ metadata.summary|safe }} -
-
-
- About the cases used to generate this set of data - {{ metadata.about_cases|safe }} -
-
-
- About Data Values and Data Processing - {{ metadata.about_data_processing|safe }} -
-
-
- Notes - {{ metadata.notes|safe }} -
-
-
- Experiment Type - {{ metadata.experiment_design|safe }} -
-
-
- Contributor(s) - {{ metadata.contributors|safe }} -
-
- -
- Citation - {{ metadata.citation|safe }} -
-
-
- Data source acknowledgment - {{ metadata.acknowledgment|safe }} -
-
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' %} - {% if metadata %} -
-

- Data Set Group: {{ dataset.fullname }} -

-
-
-
- {% include 'show_metadata_details.html' %} -
-
- {% endif %}
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"], -- cgit v1.2.3