Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Corrige ocorrência de múltiplas requisições ajax #32

Merged
merged 3 commits into from
Nov 10, 2021
Merged

Corrige ocorrência de múltiplas requisições ajax #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c1bb6f8
melhora função para esconder e exibir git loading
rafaelpezzuto Nov 10, 2021
6b56d39
melhora nomes de variáveis em js de template
rafaelpezzuto Nov 10, 2021
3f3fa3c
corrige função para atualizar tela de busca (impede que haja repetiçã…
rafaelpezzuto Nov 10, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions app/core/static/js/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,18 +19,6 @@ function createMessage(msg, alert_class){
return divAlert;
}

function ingressPackageDownloadToggleSpinner(){
var btnSearchPackage = document.getElementById('btnSearchPackage');
var divSpinner = document.getElementById('searchPackageLoading');
if (divSpinner.style.display == "none") {
divSpinner.style.display = 'block';
btnSearchPackage.setAttribute('disabled', 'disabled');
} else {
divSpinner.style.display = 'none';
btnSearchPackage.removeAttribute('disabled');
}
}

function ingressPackageDownloadCreateTable(data){
tableBody = document.getElementById('resultSearchPackagesTableBody')

Expand Down Expand Up @@ -66,3 +54,13 @@ function ingressPackageDownloadCreateTable(data){
}
}
}

function showLoader(loader, button){
loader.style.display = 'block';
button.setAttribute('disabled', 'disabled');
}

function hideLoader(loader, button){
loader.style.display = 'none';
button.removeAttribute('disabled');
}
57 changes: 30 additions & 27 deletions app/core/templates/ingress/package_download.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,11 @@ <h1 class="h4 pt-5">{% trans 'Search package' %}</h1>
<label for="pid" class="form-label">{% trans 'Document identifier' %}</label>
<input required type="text" name="pid" autofocus id="pid" class="form-control" placeholder="{% trans 'Enter a document identifier' %}" value="{{ pid }}">
</div>
<button id="btnSearchPackage" type="submit" class="btn btn-primary">{% trans 'Search' %}</button>
<button id="buttonSearch" type="submit" class="btn btn-primary">{% trans 'Search' %}</button>
</form>
</div>
</div>
<div id='searchPackageLoading' style="display: none;" role="status">
<div id='divLoader' style="display: none;" role="status">
<div class="spinner-border text-primary">
<span class="sr-only">{% trans 'Loading' %}...</span>
</div>
Expand All @@ -52,39 +52,42 @@ <h2 class="h4">{% trans 'Results for document' %} <strong>{{ pid }}</strong></h2

</div>
<script type="text/javascript">
var xhr;
var checkStatus = '{{ check_status }}';
var intervals = {}
var loader = document.getElementById('divLoader');
var button = document.getElementById('buttonSearch');
var requested = false;
var timer;

function update(){
xhr = $.ajax({
url: '/task/update_status/?task_id={{ task_id }}',
type: 'GET',
success: function(result) {
divSpinner = document.createElement('div');
divSpinner.classList.add('spinner-border');
divSpinner.setAttribute('role', 'status');
function checkTaskStatus() {
if (!requested){
$.ajax({
url: '/task/update_status/?task_id={{ task_id }}',
type: 'GET',
success: function(result) {
// mostra loader e desativa botão pesquisar
showLoader(loader, button);

spanLoading = document.createElement('span');
spanLoading.classList.add('sr-only');
spanLoading.text = "{% trans 'Loading' %}...";
if (result.data && 'doc_pkgs' in result.data) {
// adiciona conteúdo à tabela
ingressPackageDownloadCreateTable(result.data);

divSpinner.appendChild(spanLoading);
// impede que requisições continuem sendo realizadas
requested = true;
window.clearTimeout(timer);

$('user-package-download-results').add(divSpinner);

if (result.data && 'doc_pkgs' in result.data) {
clearInterval(intervals[0]);
ingressPackageDownloadCreateTable(result.data);
ingressPackageDownloadToggleSpinner();
// remove loader e reativa botão pesquisar
hideLoader(loader, button);
}
}
}
});
});
}
}

if (checkStatus) {
intervals[0] = setInterval(update, 200);
ingressPackageDownloadToggleSpinner();
if(checkStatus){
checkTaskStatus();
var timer = setInterval(function(){
checkTaskStatus();
}, 2000);
}
</script>
{% endblock %}