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

[dashboard][Study Progression] Add tooltip visualising of Total in line chart #8123

Merged
merged 8 commits into from
Sep 6, 2022
Merged

[dashboard][Study Progression] Add tooltip visualising of Total in line chart #8123

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
0fee38a
[statistics][studyprogression] added total visualisation in line chart
satvik-tha-god Jun 17, 2022
952e926
[statistics][studyprogression] added total line css
satvik-tha-god Jun 17, 2022
927ca30
[statistics][studyprogression] minor spelling fix
satvik-tha-god Jun 17, 2022
c42d2ea
[statistics] moved the css back into the module
satvik-tha-god Aug 1, 2022
db9945c
[dashboard] Update recruitment.css removed line
satvik-tha-god Aug 2, 2022
f1d2d70
[dahsboard] Update recruitment.css removed line
satvik-tha-god Aug 2, 2022
d9d5c7e
Merge branch 'aces:main' into 2022_06_17_study_progression_total
satvik-tha-god Aug 13, 2022
060c21a
retrigger checks
satvik-tha-god Aug 13, 2022
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
3 changes: 3 additions & 0 deletions modules/statistics/css/recruitment.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,6 @@
background-color: #2FA4E7;
}

.c3-chart-line.c3-target.c3-target-Total{
display: none !important;
}
34 changes: 28 additions & 6 deletions modules/statistics/js/studyprogression.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,38 @@ $(document).ready(function() {
dataset.push(data.datasets[i].name);
processedData.push(dataset.concat(data.datasets[i].data));
}
var totals = new Array();
totals.push("Total");
for(var j=0; j<data.datasets[0].data.length; j++){
var total=0;
for(var i=0;i<data.datasets.length;i++){
total+=parseInt(data.datasets[i].data[j]);
}
totals.push(total);
}
processedData.push(totals);
return processedData;
}

function maxY(data){
var maxi=0;
for(var j=0; j<data.datasets[0].data.length; j++){
for(var i=0;i<data.datasets.length;i++){
maxi=Math.max(maxi,parseInt(data.datasets[i].data[j]));
}
}
return maxi;
}


// AJAX to get scan line chart data
$.ajax({
url: loris.BaseURL + '/statistics/charts/scans_bymonth',
type: 'get',
success: function(data) {
let lengendNames = [];
let legendNames = [];
for (let j=0; j<data.datasets.length; j++) {
lengendNames.push(data.datasets[j].name);
legendNames.push(data.datasets[j].name);
}
let scanLineData = formatLineData(data);
scanLineChart = c3.generate({
Expand All @@ -74,6 +94,7 @@ $(document).ready(function() {
}
},
y: {
max: maxY(data),
label: 'Scans'
}
},
Expand All @@ -87,7 +108,7 @@ $(document).ready(function() {
d3.select('.scanChartLegend')
.insert('div', '.scanChart')
.attr('class', 'legend')
.selectAll('div').data(lengendNames).enter()
.selectAll('div').data(legendNames).enter()
.append('div')
.attr('data-id', function(id) {
return id;
Expand Down Expand Up @@ -119,9 +140,9 @@ $(document).ready(function() {
url: loris.BaseURL + '/statistics/charts/siterecruitment_line',
type: 'get',
success: function(data) {
let lengendNames = [];
let legendNames = [];
for (let j=0; j<data.datasets.length; j++) {
lengendNames.push(data.datasets[j].name);
legendNames.push(data.datasets[j].name);
}
let recruitmentLineData = formatLineData(data);
recruitmentLineChart = c3.generate({
Expand All @@ -146,6 +167,7 @@ $(document).ready(function() {
}
},
y: {
max: maxY(data),
label: 'Candidates registered'
}
},
Expand All @@ -159,7 +181,7 @@ $(document).ready(function() {
d3.select('.recruitmentChartLegend')
.insert('div', '.recruitmentChart')
.attr('class', 'legend')
.selectAll('div').data(lengendNames).enter()
.selectAll('div').data(legendNames).enter()
.append('div')
.attr('data-id', function(id) {
return id;
Expand Down