From e4cb741d0e5ea1f4671c527a0a938664b71850ea Mon Sep 17 00:00:00 2001 From: Frederick Muriuki Muriithi Date: Tue, 3 May 2022 11:56:40 +0300 Subject: Put contents into "container" divs to get similar styling Put the contents of the partial correlations pages between the
tags to take advantage of the existing styling of the content, especially regarding margins and paddings. --- .../partial_correlations/pcorrs_error.html | 90 ++--- .../partial_correlations/pcorrs_poll_results.html | 8 +- .../pcorrs_results_presentation.html | 440 +++++++++++---------- .../pcorrs_select_operations.html | 208 +++++----- 4 files changed, 377 insertions(+), 369 deletions(-) diff --git a/wqflask/wqflask/templates/partial_correlations/pcorrs_error.html b/wqflask/wqflask/templates/partial_correlations/pcorrs_error.html index 36847f57..2bcb5e02 100644 --- a/wqflask/wqflask/templates/partial_correlations/pcorrs_error.html +++ b/wqflask/wqflask/templates/partial_correlations/pcorrs_error.html @@ -3,51 +3,53 @@ {% block content %} -
-
-
- - - -

ERROR

- -

- This error is not what we wanted to see. Unfortunately errors - are part of all software systems and we need to resolve this - together. -

-

- It is important to report this ERROR so we can fix it for everyone. -

- -

- Report to the GeneNetwork team by recording the steps you take - to reproduce this ERROR. Next to those steps, copy-paste below - stack trace, either as - a new - issue or E-mail this full page to one of the developers - directly. -

+
+
+
+
+ + + +

ERROR

+ +

+ This error is not what we wanted to see. Unfortunately errors + are part of all software systems and we need to resolve this + together. +

+

+ It is important to report this ERROR so we can fix it for everyone. +

+ +

+ Report to the GeneNetwork team by recording the steps you take + to reproduce this ERROR. Next to those steps, copy-paste below + stack trace, either as + a new + issue or E-mail this full page to one of the developers + directly. +

+
+ +

+ (GeneNetwork error: {{message[:128]}}) +

+ +

+ To check if this already a known issue, search the + issue + tracker. +

+ + Toggle full stack trace +
+ 
+	  GeneNetwork {{ version }} {% for line in stack %} {{ line }}
+	  {% endfor %}
+
+
+
- -

- (GeneNetwork error: {{message[:128]}}) -

- -

- To check if this already a known issue, search the - issue - tracker. -

- - Toggle full stack trace -
- 
-      GeneNetwork {{ version }} {% for line in stack %} {{ line }}
-      {% endfor %}
-
-
-
diff --git a/wqflask/wqflask/templates/partial_correlations/pcorrs_poll_results.html b/wqflask/wqflask/templates/partial_correlations/pcorrs_poll_results.html index 47acc294..05bd4cbd 100644 --- a/wqflask/wqflask/templates/partial_correlations/pcorrs_poll_results.html +++ b/wqflask/wqflask/templates/partial_correlations/pcorrs_poll_results.html @@ -9,7 +9,9 @@ {%block content%} -

Computing partial correlations...

-Image indicating computation of partial correlations is ongoing +
+

Computing partial correlations...

+ Image indicating computation of partial correlations is ongoing +
{%endblock%} diff --git a/wqflask/wqflask/templates/partial_correlations/pcorrs_results_presentation.html b/wqflask/wqflask/templates/partial_correlations/pcorrs_results_presentation.html index c109f24b..53175053 100644 --- a/wqflask/wqflask/templates/partial_correlations/pcorrs_results_presentation.html +++ b/wqflask/wqflask/templates/partial_correlations/pcorrs_results_presentation.html @@ -10,232 +10,234 @@ {%endblock%} {%block content%} -

- Primary Trait

- - {{primary["dataset_type"]}}/{{primary["trait_name"]}} - [{{primary["symbol"] }} on Chr {{primary["chr"]}} @ {{primary["mb"]}}]: - {{primary["description"]}} - --- FROM: {{primary["dataset_name"]}} -

-

Control Traits

- {%for trait in controls:%} - - {{trait["dataset_type"]}}/{{trait["trait_name"]}} - [{{trait["symbol"] }} on Chr {{trait["chr"]}} @ {{trait["mb"]}}]: - {{trait["description"]}} - --- FROM: {{trait["dataset_name"]}}
- {%endfor%} -

+
+

+ Primary Trait

+ + {{primary["dataset_type"]}}/{{primary["trait_name"]}} + [{{primary["symbol"] }} on Chr {{primary["chr"]}} @ {{primary["mb"]}}]: + {{primary["description"]}} + --- FROM: {{primary["dataset_name"]}} +

+

Control Traits

+ {%for trait in controls:%} + + {{trait["dataset_type"]}}/{{trait["trait_name"]}} + [{{trait["symbol"] }} on Chr {{trait["chr"]}} @ {{trait["mb"]}}]: + {{trait["description"]}} + --- FROM: {{trait["dataset_name"]}}
+ {%endfor%} +

-
- {%if dataset_type == "Publish":%} - - - - - - - - - - - - - - - - - +
+ {%if dataset_type == "Publish":%} +
IndexRecordPhenotypeAuthorsYearNPartial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p(partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}){%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})delta {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}
+ + + + + + + + + + + + + + + + - - {%for trait in correlations:%} - - - - - - - - - - - - - - - {%endfor%} - -
IndexRecordPhenotypeAuthorsYearNPartial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p(partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}){%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})delta {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}
- - {{trait["trait_name"]}} - - - {{trait["post_publication_description"]}}{{trait["authors"]}}{{trait["year"]}}{{trait["noverlap"]}} - {{format_number(trait.get("partial_corr"))}} - - {{format_number(trait.get("partial_corr_p_value"))}} - - {{format_number(trait.get("corr"))}} - - {{format_number(trait.get("corr_p_value"))}} - - {{format_number(trait.get("delta"))}} -
- {%endif%} + + {%for trait in correlations:%} + + + + + + {{trait["trait_name"]}} + + + + {{trait["post_publication_description"]}} + {{trait["authors"]}} + {{trait["year"]}} + {{trait["noverlap"]}} + + {{format_number(trait.get("partial_corr"))}} + + + {{format_number(trait.get("partial_corr_p_value"))}} + + + {{format_number(trait.get("corr"))}} + + + {{format_number(trait.get("corr_p_value"))}} + + + {{format_number(trait.get("delta"))}} + + + {%endfor%} + + + {%endif%} - {%if dataset_type == "Geno":%} - - - - - - - - - - - - - - - - + {%if dataset_type == "Geno":%} +
IndexLocusChrMegabaseNPartial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p(partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}){%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})delta {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}
+ + + + + + + + + + + + + + + - - {%for trait in correlations:%} - - - - - - - - - - - - - - {%endfor%} - -
IndexLocusChrMegabaseNPartial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p(partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}){%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})delta {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}
- - {{trait["trait_name"]}} - - {{trait["chr"]}}{{trait["mb"]}}{{trait["noverlap"]}} - {{format_number(trait.get("partial_corr"))}} - - {{format_number(trait.get("partial_corr_p_value"))}} - - {{format_number(trait.get("corr"))}} - - {{format_number(trait.get("corr_p_value"))}} - - {{format_number(trait.get("delta"))}} -
- {%endif%} + + {%for trait in correlations:%} + + + + + + {{trait["trait_name"]}} + + + {{trait["chr"]}} + {{trait["mb"]}} + {{trait["noverlap"]}} + + {{format_number(trait.get("partial_corr"))}} + + + {{format_number(trait.get("partial_corr_p_value"))}} + + + {{format_number(trait.get("corr"))}} + + + {{format_number(trait.get("corr_p_value"))}} + + + {{format_number(trait.get("delta"))}} + + + {%endfor%} + + + {%endif%} - {%if dataset_type == "ProbeSet":%} - - - - - - - - - - - - - - - - - - - - - - - - + {%if dataset_type == "ProbeSet":%} +
IndexRecordGene IDHomologene IDSymbolDescriptionChrMegabaseMean ExprNSample Partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Sample p(partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})Sample {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Sample p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})delta {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Lit CorrTissue {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Tissue p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})
+ + + + + + + + + + + + + + + + + + + + + + + - - {%for trait in correlations:%} - - - - - - - - - - - - - - - - - - - - - - {%endfor%} - -
IndexRecordGene IDHomologene IDSymbolDescriptionChrMegabaseMean ExprNSample Partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Sample p(partial {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})Sample {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Sample p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})delta {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Lit CorrTissue {%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%}Tissue p({%if "spearman" in (method | lower):%}rho{%else:%}r{%endif%})
- - {{trait["trait_name"]}} - - {{trait["geneid"]}}{{trait["homologeneid"]}}{{trait["symbol"]}}{{trait["description"]}}{{trait["chr"]}}{{trait["mb"]}}{{trait["mean_expr"]}}{{trait["noverlap"]}} - {{format_number(trait.get("partial_corr"))}} - - {{format_number(trait.get("partial_corr_p_value"))}} - - {{format_number(trait.get("corr"))}} - - {{format_number(trait.get("corr_p_value"))}} - - {{format_number(trait.get("delta"))}} - - {{format_number(trait.get("l_corr"))}} - - {{format_number(trait.get("tissue_corr"))}} - - {{format_number(trait.get("tissue_p_value"))}} -
- {%endif%} + + {%for trait in correlations:%} + + + + + + {{trait["trait_name"]}} + + + {{trait["geneid"]}} + {{trait["homologeneid"]}} + {{trait["symbol"]}} + {{trait["description"]}} + {{trait["chr"]}} + {{trait["mb"]}} + {{trait["mean_expr"]}} + {{trait["noverlap"]}} + + {{format_number(trait.get("partial_corr"))}} + + + {{format_number(trait.get("partial_corr_p_value"))}} + + + {{format_number(trait.get("corr"))}} + + + {{format_number(trait.get("corr_p_value"))}} + + + {{format_number(trait.get("delta"))}} + + + {{format_number(trait.get("l_corr"))}} + + + {{format_number(trait.get("tissue_corr"))}} + + + {{format_number(trait.get("tissue_p_value"))}} + + + {%endfor%} + + + {%endif%} +
{%endblock%} diff --git a/wqflask/wqflask/templates/partial_correlations/pcorrs_select_operations.html b/wqflask/wqflask/templates/partial_correlations/pcorrs_select_operations.html index e541f31b..4b5bc635 100644 --- a/wqflask/wqflask/templates/partial_correlations/pcorrs_select_operations.html +++ b/wqflask/wqflask/templates/partial_correlations/pcorrs_select_operations.html @@ -14,110 +14,111 @@ {%endblock%} {%block content%} -
- {%with messages = get_flashed_messages(with_categories=true)%} - {%if messages:%} -
    - {%for category, message in messages:%} -
  • {{message}}
    • - {%endfor%} -
- {%endif%} - {%endwith%} +
+ + {%with messages = get_flashed_messages(with_categories=true)%} + {%if messages:%} +
    + {%for category, message in messages:%} +
  • {{message}}
    • + {%endfor%} +
+ {%endif%} + {%endwith%} - - - - - - - - - - - - - - - - - + +
Primary (X)Controls (Z)IgnoredDatasetTrait IDSymbolDescriptionLocationMeanMax LRSMax LRS Location Chr and Mb
+ + + + + + + + + + + + + + + - - {%for trait in traits:%} - - - - - - - - - - - - - {%endfor%} - -
Primary (X)Controls (Z)IgnoredDatasetTrait IDSymbolDescriptionLocationMeanMax LRSMax LRS Location Chr and Mb
- - - - - - {{trait.get("dataset", "_")}} - {{trait.get("trait_name", "_")}}{{trait.get("symbol", "_")}}{{trait.get("description", "_")}}{{trait.get("location", "_")}}{{trait.get("mean", "_")}}{{trait.get("lrs", "_")}}{{trait.get("lrs_location", "_")}}
+ + {%for trait in traits:%} + + + + + + + + + + + {{trait.get("dataset", "_")}} + {{trait.get("trait_name", "_")}} + {{trait.get("symbol", "_")}} + {{trait.get("description", "_")}} + {{trait.get("location", "_")}} + {{trait.get("mean", "_")}} + {{trait.get("lrs", "_")}} + {{trait.get("lrs_location", "_")}} + + {%endfor%} + + -
- - -
+
+ + +
-
- - + {%if target_dbs:%} + {%for item in target_dbs:%} + {%if "description" in item.keys():%} + + {%else:%} + {%for group, opts in item.items()%} + {%if opts | length > 0:%} + + {%for item2 in opts:%} + + {%endfor%} + + {%endif%} {%endfor%} - - {%endif%} - {%endfor%} - {%endif%} - {%endfor%} - {%endif%} - -
+ {%endif%} + {%endfor%} + {%endif%} + +
-
+
- - + + +
{%endblock%} {%block js%} -- cgit v1.2.3