Skip to content

statistics: replace $.ajax with lorisFetch #10497

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

Open
Montekkundan wants to merge 1 commit into
base: main
Choose a base branch
from
Open

statistics: replace $.ajax with lorisFetch #10497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 15 additions & 9 deletions modules/statistics/js/form_stats_MRI.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*global document, $*/
var lorisFetch = window.lorisFetch || fetch;
$('#selectall').click(
function(event) {
if(this.checked) {
Expand Down Expand Up @@ -45,14 +46,19 @@ function updateMRITab() {
}
);

var request = $.ajax(
{
url: loris.BaseURL + '/statistics/stats_MRI/?dynamictabs=dynamictabs&MRIProject=' + (MRIProject==null ? "" : MRIProject.value) + '&MRIsite=' + MRIsite.value + '&Scans=' + scanArray,
type: 'GET',
data: 'html',
success: function(response) {
$('#mri').html(response);
lorisFetch(
loris.BaseURL + '/statistics/stats_MRI/?dynamictabs=dynamictabs&MRIProject=' +
(MRIProject==null ? "" : MRIProject.value) + '&MRIsite=' + MRIsite.value +
'&Scans=' + scanArray,
{credentials: 'same-origin'}
)
.then(function(response) {
if (!response.ok) {
throw new Error('request_failed');
}
}
);
return response.text();
})
.then(function(response) {
$('#mri').html(response);
});
}
25 changes: 15 additions & 10 deletions modules/statistics/js/form_stats_behavioural.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,22 @@
/*global document, $, window, scrollContent*/
var lorisFetch = window.lorisFetch || fetch;
function updateBehaviouralTab() {
var BehaviouralProject = document.getElementById("BehaviouralProject");
var request = $.ajax(
{
url: loris.BaseURL + '/statistics/stats_behavioural/?dynamictabs=dynamictabs&BehaviouralProject=' + (BehaviouralProject==null ? "" : BehaviouralProject.value),
type: 'GET',
data: 'html',
success: function (response) {
$('#data_entry').html(response);
$(".dynamictable").DynamicTable();
lorisFetch(
loris.BaseURL + '/statistics/stats_behavioural/?dynamictabs=dynamictabs&BehaviouralProject=' +
(BehaviouralProject==null ? "" : BehaviouralProject.value),
{credentials: 'same-origin'}
)
.then(function(response) {
if (!response.ok) {
throw new Error('request_failed');
}
}
);
return response.text();
})
.then(function(response) {
$('#data_entry').html(response);
$(".dynamictable").DynamicTable();
});
}
function checkOverflow() {
'use strict';
Expand Down
27 changes: 17 additions & 10 deletions modules/statistics/js/form_stats_demographic.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,24 @@
/*global document, $*/
var lorisFetch = window.lorisFetch || fetch;
function updateDemographicTab() {
var DemographicSite = document.getElementById("DemographicSite");
var DemographicProject = document.getElementById("DemographicProject");
var DemographicInstrument = document.getElementById("DemographicInstrument");
var request = $.ajax(
{
url: loris.BaseURL + '/statistics/stats_demographic/?dynamictabs=dynamictabs&DemographicSite=' + DemographicSite.value + '&DemographicProject=' + (DemographicProject==null ? "" : DemographicProject.value)+'&DemographicInstrument='+DemographicInstrument.value,
type: 'GET',
data: 'html',
success: function(response) {
$('#demographics').html(response);
$(".dynamictable").DynamicTable();
lorisFetch(
loris.BaseURL + '/statistics/stats_demographic/?dynamictabs=dynamictabs&DemographicSite=' +
DemographicSite.value + '&DemographicProject=' +
(DemographicProject==null ? "" : DemographicProject.value) +
'&DemographicInstrument=' + DemographicInstrument.value,
{credentials: 'same-origin'}
)
.then(function(response) {
if (!response.ok) {
throw new Error('request_failed');
}
}
);
return response.text();
})
.then(function(response) {
$('#demographics').html(response);
$(".dynamictable").DynamicTable();
});
}
76 changes: 45 additions & 31 deletions modules/statistics/js/table_statistics.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
/*global document, $*/
var lorisFetch = window.lorisFetch || fetch;
$('#showVL').click(
function(event) {
if(this.checked) {
Expand All @@ -21,48 +22,61 @@ function updateDemographicInstrument() {
var DemographicSite = document.getElementById("DemographicSite");
var DemographicInstrument = document.getElementById("DemographicInstrument");

var request = $.ajax(
{
url: loris.BaseURL + '/statistics/stats_demographic/?dynamictabs=dynamictabs&DemographicSite=' + DemographicSite.value + '&DemographicInstrument=' + DemographicInstrument.value,
type: 'GET',
data: 'html',
success: function(page){
$('#demographics').html(page);
$(".dynamictable").DynamicTable();
lorisFetch(
loris.BaseURL + '/statistics/stats_demographic/?dynamictabs=dynamictabs&DemographicSite=' +
DemographicSite.value + '&DemographicInstrument=' + DemographicInstrument.value,
{credentials: 'same-origin'}
)
.then(function(response) {
if (!response.ok) {
throw new Error('request_failed');
}
}
);
return response.text();
})
.then(function(page){
$('#demographics').html(page);
$(".dynamictable").DynamicTable();
});
}

function updateBehaviouralInstrument() {
var BehaviouralSite = document.getElementById("BehaviouralSite");
var BehaviouralInstrument = document.getElementById("BehaviouralInstrument");
var BehaviouralProject = document.getElementById("BehaviouralProject");
var request = $.ajax(
{
url: loris.BaseURL + '/statistics/stats_behavioural/?dynamictabs=dynamictabs&BehaviouralSite=' + BehaviouralSite.value + '&BehaviouralInstrument=' + (BehaviouralProject==null ? "" : BehaviouralProject.value) + '&BehaviouralProject=' + BehaviouralProject.value,
type: 'GET',
data: 'html',
success: function(page) {
$('#data_entry').html(page);
$(".dynamictable").DynamicTable();
lorisFetch(
loris.BaseURL + '/statistics/stats_behavioural/?dynamictabs=dynamictabs&BehaviouralSite=' +
BehaviouralSite.value + '&BehaviouralInstrument=' +
(BehaviouralProject==null ? "" : BehaviouralProject.value) +
'&BehaviouralProject=' + BehaviouralProject.value,
{credentials: 'same-origin'}
)
.then(function(response) {
if (!response.ok) {
throw new Error('request_failed');
}
}
);
return response.text();
})
.then(function(page) {
$('#data_entry').html(page);
$(".dynamictable").DynamicTable();
});
}
function updateMRITable() {
var selectedMRI_TYPE = document.getElementById("mri_type");
var MRIProject = document.getElementById("MRIProject");
var request = $.ajax(
{
url: loris.BaseURL + '/statistics/stats_MRI/?dynamictabs=dynamictabs&mri_type=' + selectedMRI_TYPE.value +
'&MRIProject=' + (MRIProject==null ? "" : MRIProject.value),
type: 'GET',
data: 'html',
success: function(page) {
$('#mri').html(page);
$(".dynamictable").DynamicTable();
lorisFetch(
loris.BaseURL + '/statistics/stats_MRI/?dynamictabs=dynamictabs&mri_type=' +
selectedMRI_TYPE.value + '&MRIProject=' + (MRIProject==null ? "" : MRIProject.value),
{credentials: 'same-origin'}
)
.then(function(response) {
if (!response.ok) {
throw new Error('request_failed');
}
}
);
return response.text();
})
.then(function(page) {
$('#mri').html(page);
$(".dynamictable").DynamicTable();
});
}
Loading