format indel output

AndersenLab · Aug 30, 2020 · 4fca9e3 · 4fca9e3
1 parent 1876ff0
commit 4fca9e3
Show file tree

Hide file tree

Showing 9 changed files with 331 additions and 221 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -3,7 +3,7 @@ language: bash
 install:
 - openssl aes-256-cbc -K $encrypted_53077b9a3e95_key -iv $encrypted_53077b9a3e95_iv -in env_config.zip.enc -out env_config.zip -d
 - unzip -qo env_config.zip
-- export VERSION_NUM=1-5-0
+- export VERSION_NUM=1-5-1
 - export APP_CONFIG=master
 - if [ "${TRAVIS_BRANCH}" != "master" ]; then export APP_CONFIG=development; fi;
 - export GAE_VERSION=${APP_CONFIG}-${VERSION_NUM}

diff --git a/base/static/css/styles.css b/base/static/css/styles.css
@@ -579,4 +579,8 @@ article {
 #glyph {
   width: 850px;
   height: 300px;
+}
+
+.btn-link {
+    cursor: pointer;
 }
diff --git a/base/templates/tools/indel_primer.html b/base/templates/tools/indel_primer.html
@@ -1,16 +1,14 @@
 {% extends "_layouts/default.html" %}
 
 {% block custom_head %}
-	<script type="text/javascript" src="//igv.org/web/release/2.6.2/dist/igv.min.js"></script>
-	<link rel="stylesheet" href="//cdn.datatables.net/1.10.21/css/jquery.dataTables.min.css" />
-	<script type="text/javascript" src="//cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
-	<script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js"></script>
+    <script src="//cdnjs.cloudflare.com/ajax/libs/underscore.js/1.5.2/underscore-min.js"></script>
+    <script type="text/javascript" src="//igv.org/web/release/2.6.2/dist/igv.min.js"></script>
+    <link rel="stylesheet" href="//cdn.datatables.net/1.10.21/css/jquery.dataTables.min.css" />
+    <script type="text/javascript" src="//cdn.datatables.net/1.10.21/js/jquery.dataTables.min.js"></script>
 {% endblock %}
 
 
 {% block content %}
-<strong>Coming Soon</strong>
-{#
 {% from "macros.html" import render_field %}
 
 <div class="container-fluid">
@@ -39,7 +37,6 @@
 		<table id="results" class='table table-striped table-hover table-compact'></table>
 	</div>
 </div>
-#}
 
 {% endblock %}
 
@@ -103,7 +100,8 @@
 				data: $('form').serialize(),
 				success: function(data) {
                     results = data["results"]
-                    _.each(results, function(x) { console.log(x);  x['generate_primers'] = `<div id="generate_primers" site="${x['CHROM']}:${x["START"]}-${x["END"]}" class='btn-link'>Generate Primers</div>` })
+                    _.each(results, function(x) { x['generate_primers'] = `<div site="${x['CHROM']}:${x["START"]}-${x['END']}" svtype="${x['SVTYPE']}" size="${x["END"]-x["START"]}" class='btn-link generate-primers'>Generate Primers</div>` })
+
 					// Handle errors
 					$(".form-error").remove();
 					if (Object.keys(data).indexOf("errors") > -1) {
@@ -178,30 +176,37 @@
 								name: strain,
 								type: "annotation",
 								features: items,
-							}
-							browser.loadTrack(igvTrack)
-						}
+                            }
+                            browser.loadTrack(igvTrack)
+                        }
+
+                        // Activate primer generation links
+                        $(".generate-primers").on("click", function(e) {
+                            console.log("Submitted")
+
+                            $(this).text("Please Wait...")
+
+                            var data = {
+                                site: $(this).attr("site"),
+                                strain_1: $("#strain_1").val(),
+                                strain_2: $("#strain_2").val(),
+                                size: $(this).attr("size"),
+                                svtype: $(this).attr("svtype")
+                            }
+                            $.ajax({
+                                    type: "POST",
+                                    url: "{{ url_for('indel_primer.submit_indel_primer') }}",
+                                    data: JSON.stringify(data),
+                                    contentType: "application/json; charset=utf-8",
+                                    dataType: 'json',
+                                    success:function(result){
+                                        window.location = `indel_primer/result/${result.data_hash}`
+                                    }
+                            })
+                        });
+
 					}
                     query_running = false;
-
-                    // Activate primer generation links
-                    $("#generate_primers").on("click", function(e) {
-                        var data = {
-                            site: $(this).attr("site"),
-                            strain_1: $("#strain_1").val(),
-                            strain_2: $("#strain_2").val()
-                        }
-                        $.ajax({
-                                type: "POST",
-                                url: "{{ url_for('indel_primer.submit_indel_primer') }}",
-                                data: JSON.stringify(data),
-                                contentType: "application/json; charset=utf-8",
-                                dataType: 'json',
-                                success:function(result){
-                                    window.location = `indel_primer/result/${result.data_hash}`
-                                }
-                        })
-                    });
 
 				}
             });
@@ -216,9 +221,6 @@
 			}
 		}
 	});
-
-	// Initial request
-    submitForm()
 
 });
 </script>