add a spinner so that there is no error

broadinstitute · Jun 5, 2019 · 713c694 · 713c694
1 parent ec0acef
commit 713c694
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 37 deletions.
diff --git a/grails-app/views/gait/gaitInfo.gsp b/grails-app/views/gait/gaitInfo.gsp
@@ -89,38 +89,6 @@ ul.nav-tabs > li.active > a { background-color: #fff !important; }
             <h3><em style="font-weight: 900;"><%=variantIdentifier%></em></h3>
 
 
-            %{--If its gene Gait page then allowExperimentChoice = 0 and 'geneName':'geneName'--}%
-            %{--<g:if test="${geneName?.equals('')}">--}%
-
-                %{--<g:render template="/templates/burdenTestSharedTemplate" model="['variantIdentifier': variantIdentifier, 'accordionHeaderClass': 'accordion-heading']" />--}%
-
-                %{--<g:render template="/widgets/burdenTestShared" model="['variantIdentifier': variantIdentifier,--}%
-                                                                       %{--'accordionHeaderClass': 'accordion-heading',--}%
-                                                                       %{--'modifiedTitle': 'Variant Interactive burden test',--}%
-                                                                       %{--'modifiedGaitSummary': 'The Genetic Association Interactive Tool (GAIT) allows you to compute the disease or phenotype burden for this gene, using custom sets of variants, samples, and covariates. In order to protect patient privacy, GAIT will only allow visualization or analysis of data from more than 100 individuals.',--}%
-                                                                       %{--'allowExperimentChoice': 1,--}%
-                                                                       %{--'allowPhenotypeChoice': 1,--}%
-                                                                       %{--'allowStratificationChoice': 0,--}%
-                                                                       %{--'grsVariantSet':'',--}%
-                                                                       %{--'geneName':'']"/>--}%
-            %{--</g:if>--}%
-
-            %{--<g:else>--}%
-                %{--<g:render template="/templates/burdenTestSharedTemplate" model="['variantIdentifier': '', 'accordionHeaderClass': 'accordion-heading']" />--}%
-
-                %{--<g:render template="/widgets/burdenTestShared" model="['variantIdentifier': '',--}%
-                                                                       %{--'accordionHeaderClass': 'accordion-heading',--}%
-                                                                       %{--'modifiedTitle': 'Gene Interactive burden test',--}%
-                                                                       %{--'modifiedGaitSummary': 'The Genetic Association Interactive Tool (GAIT) allows you to compute the disease or phenotype burden for this gene, using custom sets of variants, samples, and covariates. In order to protect patient privacy, GAIT will only allow visualization or analysis of data from more than 100 individuals.',--}%
-                                                                       %{--'allowExperimentChoice': 1,--}%
-                                                                       %{--'allowPhenotypeChoice': 1,--}%
-                                                                       %{--'allowStratificationChoice': 1,--}%
-                                                                       %{--'grsVariantSet':'',--}%
-                                                                       %{--'geneName':geneName]"/>--}%
-
-            %{--</g:else>--}%
-
-
             <g:render template="/templates/burdenTestSharedTemplate" model="['variantIdentifier': variantIdentifier, 'accordionHeaderClass': 'accordion-heading']" />
 
 

diff --git a/grails-app/views/informational/modules.gsp b/grails-app/views/informational/modules.gsp
@@ -55,6 +55,7 @@
             "use strict";
 
             function goToSelectedItem(item) {
+                var loading = $('#spinner').show();
                 window.location.href = "${createLink(controller:'gait', action:'gaitInfo')}" +"/" + item;
             }
 
@@ -175,10 +176,6 @@
                             <div class="form-inline">
                                 <input id="generalized-input" value="" type="text" class="form-control input-default" style="width: 100%;">
                             </div>
-
-
-                            <!--<div id="generalized-go" class="btn dk-t2d-blue dk-tutorial-button dk-right-column-buttons-compact" type="button" style="margin-top: 10px;">Launch Custom Association Analysis</div>-->
-
                             </td>
                         </tr>
                     </g:if>
@@ -193,7 +190,6 @@
 
                         </td>
                         <td>
-
                             <label>Select phenotype</label>
                             <div id="phenotypeDropdownWrapper">
 

diff --git a/grails-app/views/templates/_burdenTestSharedTemplate.gsp b/grails-app/views/templates/_burdenTestSharedTemplate.gsp
@@ -20,6 +20,7 @@
         </div>
 
         <div class="col-md-offset-4 col-md-4 vcenter center burden-test-btn-wrapper">
+
             <button name="singlebutton" style="height: 50px; z-index: 10;" id="singleRunButton"
                                                    class="btn btn-primary btn-lg burden-test-btn vcenter"
                                                    onclick="mpgSoftware.burdenTestShared.immediateFilterAndRun('${createLink(controller: "variantInfo", action: "metadataAjax")}',

diff --git a/web-app/js/lib/dport/burdenTestShared.js b/web-app/js/lib/dport/burdenTestShared.js
@@ -230,6 +230,9 @@ mpgSoftware.burdenTestShared = (function () {
 
 
     var initializeGaitUi = function (selectorInWhichToInsert, valuesToInsert) {
+        $(window).on('load', function(){
+            $('#singleRunButton').fadeOut(5000);
+        })
         $(selectorInWhichToInsert).empty().append(Mustache.render($('#mainGaitHolder')[0].innerHTML, valuesToInsert));
     };
 
@@ -328,6 +331,8 @@ mpgSoftware.burdenTestShared = (function () {
 
 
     var refreshTopOfGaitDisplay = function (data, params) {
+        $('.caatSpinner').show();
+
         var phenotypeDropdown = $(params.dropDownPhenoSelector);
         var stratifyDesignationDropdown = $(params.stratifyDesignation);
         var linkToTypeaheadUrl = params.linkToTypeaheadUrl;