Skip to content
This repository was archived by the owner on Feb 26, 2025. It is now read-only.

Commit 713c694

Browse files
committed
add a spinner so that there is no error
1 parent ec0acef commit 713c694

File tree

4 files changed

+7
-37
lines changed

4 files changed

+7
-37
lines changed

grails-app/views/gait/gaitInfo.gsp

-32
Original file line numberDiff line numberDiff line change
@@ -89,38 +89,6 @@ ul.nav-tabs > li.active > a { background-color: #fff !important; }
8989
<h3><em style="font-weight: 900;"><%=variantIdentifier%></em></h3>
9090

9191

92-
%{--If its gene Gait page then allowExperimentChoice = 0 and 'geneName':'geneName'--}%
93-
%{--<g:if test="${geneName?.equals('')}">--}%
94-
95-
%{--<g:render template="/templates/burdenTestSharedTemplate" model="['variantIdentifier': variantIdentifier, 'accordionHeaderClass': 'accordion-heading']" />--}%
96-
97-
%{--<g:render template="/widgets/burdenTestShared" model="['variantIdentifier': variantIdentifier,--}%
98-
%{--'accordionHeaderClass': 'accordion-heading',--}%
99-
%{--'modifiedTitle': 'Variant Interactive burden test',--}%
100-
%{--'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.',--}%
101-
%{--'allowExperimentChoice': 1,--}%
102-
%{--'allowPhenotypeChoice': 1,--}%
103-
%{--'allowStratificationChoice': 0,--}%
104-
%{--'grsVariantSet':'',--}%
105-
%{--'geneName':'']"/>--}%
106-
%{--</g:if>--}%
107-
108-
%{--<g:else>--}%
109-
%{--<g:render template="/templates/burdenTestSharedTemplate" model="['variantIdentifier': '', 'accordionHeaderClass': 'accordion-heading']" />--}%
110-
111-
%{--<g:render template="/widgets/burdenTestShared" model="['variantIdentifier': '',--}%
112-
%{--'accordionHeaderClass': 'accordion-heading',--}%
113-
%{--'modifiedTitle': 'Gene Interactive burden test',--}%
114-
%{--'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.',--}%
115-
%{--'allowExperimentChoice': 1,--}%
116-
%{--'allowPhenotypeChoice': 1,--}%
117-
%{--'allowStratificationChoice': 1,--}%
118-
%{--'grsVariantSet':'',--}%
119-
%{--'geneName':geneName]"/>--}%
120-
121-
%{--</g:else>--}%
122-
123-
12492
<g:render template="/templates/burdenTestSharedTemplate" model="['variantIdentifier': variantIdentifier, 'accordionHeaderClass': 'accordion-heading']" />
12593

12694

grails-app/views/informational/modules.gsp

+1-5
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@
5555
"use strict";
5656
5757
function goToSelectedItem(item) {
58+
var loading = $('#spinner').show();
5859
window.location.href = "${createLink(controller:'gait', action:'gaitInfo')}" +"/" + item;
5960
}
6061
@@ -175,10 +176,6 @@
175176
<div class="form-inline">
176177
<input id="generalized-input" value="" type="text" class="form-control input-default" style="width: 100%;">
177178
</div>
178-
179-
180-
<!--<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>-->
181-
182179
</td>
183180
</tr>
184181
</g:if>
@@ -193,7 +190,6 @@
193190

194191
</td>
195192
<td>
196-
197193
<label>Select phenotype</label>
198194
<div id="phenotypeDropdownWrapper">
199195

grails-app/views/templates/_burdenTestSharedTemplate.gsp

+1
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
</div>
2121
2222
<div class="col-md-offset-4 col-md-4 vcenter center burden-test-btn-wrapper">
23+
2324
<button name="singlebutton" style="height: 50px; z-index: 10;" id="singleRunButton"
2425
class="btn btn-primary btn-lg burden-test-btn vcenter"
2526
onclick="mpgSoftware.burdenTestShared.immediateFilterAndRun('${createLink(controller: "variantInfo", action: "metadataAjax")}',

web-app/js/lib/dport/burdenTestShared.js

+5
Original file line numberDiff line numberDiff line change
@@ -230,6 +230,9 @@ mpgSoftware.burdenTestShared = (function () {
230230

231231

232232
var initializeGaitUi = function (selectorInWhichToInsert, valuesToInsert) {
233+
$(window).on('load', function(){
234+
$('#singleRunButton').fadeOut(5000);
235+
})
233236
$(selectorInWhichToInsert).empty().append(Mustache.render($('#mainGaitHolder')[0].innerHTML, valuesToInsert));
234237
};
235238

@@ -328,6 +331,8 @@ mpgSoftware.burdenTestShared = (function () {
328331

329332

330333
var refreshTopOfGaitDisplay = function (data, params) {
334+
$('.caatSpinner').show();
335+
331336
var phenotypeDropdown = $(params.dropDownPhenoSelector);
332337
var stratifyDesignationDropdown = $(params.stratifyDesignation);
333338
var linkToTypeaheadUrl = params.linkToTypeaheadUrl;

0 commit comments

Comments
 (0)