From d87521b4dc34f554069e60e9808b5a114b8dc7a9 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Tue, 6 Sep 2022 18:59:45 +0000
Subject: Fix mistake from generalize_tables merge
---
wqflask/wqflask/templates/search_result_page.html | 313 ++++++++++------------
1 file changed, 137 insertions(+), 176 deletions(-)
diff --git a/wqflask/wqflask/templates/search_result_page.html b/wqflask/wqflask/templates/search_result_page.html
index 9cbff200..3b01f4a6 100644
--- a/wqflask/wqflask/templates/search_result_page.html
+++ b/wqflask/wqflask/templates/search_result_page.html
@@ -241,187 +241,148 @@
} catch(err){
return escape(data.description)
}
- },
- {
- 'title': "Index",
- 'type': "natural",
- 'width': "35px",
- "searchable": false,
- "orderable": false,
- 'targets': 1,
- 'data': "index"
}
- {% if dataset.type == 'ProbeSet' %},
- {
- 'title': "Record",
- 'type': "natural-minus-na",
- 'data': null,
- 'width': "{{ max_widths.display_name * 8 }}px",
- 'targets': 2,
- 'render': function(data) {
- return '' + data.display_name + ''
- }
- },
- {
- 'title': "Symbol",
- 'type': "natural",
- 'width': "{{ max_widths.symbol * 8 }}px",
- 'targets': 3,
- 'data': "symbol"
- },
- {
- 'title': "Description",
- 'type': "natural",
- 'data': null,
- 'targets': 4,
- 'render': function(data) {
- try {
+ },
+ {
+ 'title': "
Location
",
+ 'type': "natural-minus-na",
+ 'width': "130px",
+ 'targets': 5,
+ 'data': "location"
+ },
+ {
+ 'title': "Mean
",
+ 'type': "natural-minus-na",
+ 'width': "40px",
+ 'data': "mean",
+ 'targets': 6,
+ 'orderSequence': [ "desc", "asc"]
+ },
+ {
+ 'title': "Peak
",
+ 'type': "natural-minus-na",
+ 'data': "lod_score",
+ 'width': "60px",
+ 'targets': 7,
+ 'orderSequence': [ "desc", "asc"]
+ },
+ {
+ 'title': "Peak Location
",
+ 'type': "natural-minus-na",
+ 'width': "130px",
+ 'targets': 8,
+ 'data': "lrs_location"
+ },
+ {
+ 'title': "Effect
",
+ 'type': "natural-minus-na",
+ 'data': "additive",
+ 'width': "65px",
+ 'targets': 9,
+ 'orderSequence': [ "desc", "asc"]
+ }{% elif dataset.type == 'Publish' %},
+ {
+ 'title': "Record",
+ 'type': "natural-minus-na",
+ 'width': "{{ max_widths.display_name * 9 }}px",
+ 'data': null,
+ 'targets': 2,
+ 'render': function(data) {
+ return '' + data.display_name + ''
+ }
+ },
+ {
+ 'title': "Description",
+ 'type': "natural",
+ {% if (max_widths.description * 7) < 500 %}
+ 'width': "{{ max_widths.description * 7 }}px",
+ {% else %}
+ 'width': "500px",
+ {% endif %}
+ 'data': null,
+ 'targets': 3,
+ 'render': function(data) {
+ try {
return decodeURIComponent(escape(data.description))
- } catch(err){
- return escape(data.description)
- }
- }
- },
- {
- 'title': "Location
",
- 'type': "natural-minus-na",
- 'width': "130px",
- 'targets': 5,
- 'data': "location"
- },
- {
- 'title': "Mean
",
- 'type': "natural-minus-na",
- 'width': "40px",
- 'data': "mean",
- 'targets': 6,
- 'orderSequence': [ "desc", "asc"]
- },
- {
- 'title': "Peak
",
- 'type': "natural-minus-na",
- 'data': "lod_score",
- 'width': "60px",
- 'targets': 7,
- 'orderSequence': [ "desc", "asc"]
- },
- {
- 'title': "Peak Location
",
- 'type': "natural-minus-na",
- 'width': "130px",
- 'targets': 8,
- 'data': "lrs_location"
- },
- {
- 'title': "Effect
",
- 'type': "natural-minus-na",
- 'data': "additive",
- 'width': "65px",
- 'targets': 9,
- 'orderSequence': [ "desc", "asc"]
- }{% elif dataset.type == 'Publish' %},
- {
- 'title': "Record",
- 'type': "natural-minus-na",
- 'width': "{{ max_widths.display_name * 9 }}px",
- 'data': null,
- 'targets': 2,
- 'render': function(data) {
- return '' + data.display_name + ''
- }
- },
- {
- 'title': "Description",
- 'type': "natural",
- {% if (max_widths.description * 7) < 500 %}
- 'width': "{{ max_widths.description * 7 }}px",
- {% else %}
- 'width': "500px",
- {% endif %}
- 'data': null,
- 'targets': 3,
- 'render': function(data) {
- try {
- return decodeURIComponent(escape(data.description))
- } catch(err){
- return data.description
- }
+ } catch(err){
+ return data.description
}
- },
- {
- 'title': "Mean
",
- 'type': "natural-minus-na",
- 'width': "60px",
- 'data': "mean",
- 'targets': 4,
- 'orderSequence': [ "desc", "asc"]
- },
- {
- 'title': "Authors",
- 'type': "natural",
- {% if (max_widths.authors * 5) < 500 %}
- 'width': "{{ max_widths.authors * 5 }}px",
- {% else %}
- 'width': "500px",
- {% endif %}
- 'data': "authors_display",
- 'targets': 5
- },
- {
- 'title': "Year
",
- 'type': "natural-minus-na",
- 'data': null,
- 'width': "50px",
- 'targets': 6,
- 'render': function(data) {
- if (data.pubmed_id != "N/A"){
- return '' + data.pubmed_text + ''
- } else {
- return data.pubmed_text
- }
- },
- 'orderSequence': [ "desc", "asc"]
- },
- {
- 'title': "Peak
",
- 'type': "natural-minus-na",
- 'data': "lod_score",
- 'targets': 7,
- 'width': "60px",
- 'orderSequence': [ "desc", "asc"]
- },
- {
- 'title': "Peak Location
",
- 'type': "natural-minus-na",
- 'width': "125px",
- 'targets': 8,
- 'data': "lrs_location"
- },
- {
- 'title': "Effect
",
- 'type': "natural-minus-na",
- 'width': "60px",
- 'data': "additive",
- 'targets': 9,
- 'orderSequence': [ "desc", "asc"]
- }{% elif dataset.type == 'Geno' %},
- {
- 'title': "Record",
- 'type': "natural-minus-na",
- 'width': "{{ max_widths.display_name * 9 }}px",
- 'data': null,
- 'targets': 2,
- 'render': function(data) {
- return '' + data.display_name + ''
+ }
+ },
+ {
+ 'title': "Mean
",
+ 'type': "natural-minus-na",
+ 'width': "60px",
+ 'data': "mean",
+ 'targets': 4,
+ 'orderSequence': [ "desc", "asc"]
+ },
+ {
+ 'title': "Authors",
+ 'type': "natural",
+ {% if (max_widths.authors * 5) < 500 %}
+ 'width': "{{ max_widths.authors * 5 }}px",
+ {% else %}
+ 'width': "500px",
+ {% endif %}
+ 'data': "authors_display",
+ 'targets': 5
+ },
+ {
+ 'title': "Year
",
+ 'type': "natural-minus-na",
+ 'data': null,
+ 'width': "50px",
+ 'targets': 6,
+ 'render': function(data) {
+ if (data.pubmed_id != "N/A"){
+ return '' + data.pubmed_text + ''
+ } else {
+ return data.pubmed_text
}
},
- {
- 'title': "Location
",
- 'type': "natural-minus-na",
- 'width': "125px",
- 'targets': 2,
- 'data': "location"
- }{% endif %}
+ 'orderSequence': [ "desc", "asc"]
+ },
+ {
+ 'title': "Peak
",
+ 'type': "natural-minus-na",
+ 'data': "lod_score",
+ 'targets': 7,
+ 'width': "60px",
+ 'orderSequence': [ "desc", "asc"]
+ },
+ {
+ 'title': "Peak Location
",
+ 'type': "natural-minus-na",
+ 'width': "125px",
+ 'targets': 8,
+ 'data': "lrs_location"
+ },
+ {
+ 'title': "Effect
",
+ 'type': "natural-minus-na",
+ 'width': "60px",
+ 'data': "additive",
+ 'targets': 9,
+ 'orderSequence': [ "desc", "asc"]
+ }{% elif dataset.type == 'Geno' %},
+ {
+ 'title': "Record",
+ 'type': "natural-minus-na",
+ 'width': "{{ max_widths.display_name * 9 }}px",
+ 'data': null,
+ 'targets': 2,
+ 'render': function(data) {
+ return '' + data.display_name + ''
+ }
+ },
+ {
+ 'title': "Location
",
+ 'type': "natural-minus-na",
+ 'width': "125px",
+ 'targets': 2,
+ 'data': "location"
+ }{% endif %}
];
tableSettings = {
--
cgit v1.2.3