Skip to content

Commit 6d98e63

Browse files
vitorfsvitorfs
authored
Merge pull request #75 from vitorfs/dev
Release v2.0.3
2 parents 0b83620 + 3c71f18 commit 6d98e63

File tree

11 files changed

+334
-316
lines changed

11 files changed

+334
-316
lines changed

‎CHANGELOG.md‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Parsifal 2.0.3 (2021-09-08)
2+
===========================
3+
4+
Bugfixes
5+
--------
6+
7+
- Fix data analysis load state for charts (#69)
8+
- Fix keyboard arrow navigation on study selection page. (#71)
9+
- Fix search scopus results rendering when there is no data. (#73)

‎parsifal/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
from parsifal.utils.version import get_version
22

3-
VERSION = (2, 0, 2, "final", 0)
3+
VERSION = (2, 0, 3, "final", 0)
44

55
__version__ = get_version(VERSION)

‎parsifal/apps/reviews/conducting/static/js/conducting_data_analysis.js‎

Lines changed: 84 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -1,90 +1,92 @@
1-
google.load('visualization', '1.0', {'packages':['corechart']});
2-
google.setOnLoadCallback(drawChartCallback);
1+
$(function () {
2+
google.load('visualization', '1.0', {'packages':['corechart']});
3+
google.setOnLoadCallback(drawChartCallback);
34

4-
function drawChartCallback() {
5-
drawChart();
6-
drawYearLines();
7-
}
8-
9-
function drawPieChart(rows) {
10-
var data = new google.visualization.DataTable();
11-
data.addColumn('string', 'Source');
12-
data.addColumn('number', 'Number of Aticles');
13-
data.addRows(rows);
14-
var options = {'height': 400};
15-
var chart = new google.visualization.PieChart(document.getElementById('articles-selection-pie'));
16-
chart.draw(data, options);
17-
}
18-
19-
function drawColumnChart(rows) {
20-
var data = google.visualization.arrayToDataTable(rows);
21-
var options = {
22-
vAxis: {title: 'Number of Articles', titleTextStyle: {color: '#3A3D40'}},
23-
'height': 400
24-
};
25-
var chart = new google.visualization.ColumnChart(document.getElementById('articles-selection-column'));
26-
chart.draw(data, options);
27-
}
5+
function drawChartCallback() {
6+
drawChart();
7+
drawYearLines();
8+
}
289

29-
function drawLineChart(rows) {
30-
var data = google.visualization.arrayToDataTable(rows);
31-
var options = {
32-
vAxis: {title: 'Number of Articles', titleTextStyle: {color: '#3A3D40'}},
33-
'height': 400
34-
};
35-
var chart = new google.visualization.LineChart(document.getElementById('articles-selection-line'));
36-
chart.draw(data, options);
37-
}
10+
function drawPieChart(rows) {
11+
var data = new google.visualization.DataTable();
12+
data.addColumn('string', 'Source');
13+
data.addColumn('number', 'Number of Articles');
14+
data.addRows(rows);
15+
var options = {'height': 400};
16+
var chart = new google.visualization.PieChart(document.getElementById('articles-selection-pie'));
17+
chart.draw(data, options);
18+
}
3819

39-
function drawChart() {
40-
$.ajax({
41-
url: '/reviews/conducting/articles_selection_chart/',
42-
data: {'review-id': $("#review-id").val()},
43-
type: 'get',
44-
cache: false,
45-
beforeSend: function () {
46-
$("#articles-selection-pie").spinner(false);
47-
$("#articles-selection-column").spinner(false);
48-
},
49-
success: function (data) {
50-
var source_data = data.split(",");
51-
var rows_pie = [];
52-
var rows_chart = [['Source', 'Selected', 'Accepted']];
53-
for (var i = source_data.length - 1; i >= 0; i--) {
54-
row = source_data[i].split(":");
55-
rows_pie.push([row[0], parseInt(row[1])]);
56-
rows_chart.push([row[0], parseInt(row[1]), parseInt(row[2])]);
20+
function drawColumnChart(rows) {
21+
var data = google.visualization.arrayToDataTable(rows);
22+
var options = {
23+
vAxis: {title: 'Number of Articles', titleTextStyle: {color: '#3A3D40'}},
24+
'height': 400
5725
};
58-
drawPieChart(rows_pie);
59-
drawColumnChart(rows_chart);
60-
},
61-
complete: function () {
62-
$("#articles-selection-pie").spinner();
63-
$("#articles-selection-column").spinner();
26+
var chart = new google.visualization.ColumnChart(document.getElementById('articles-selection-column'));
27+
chart.draw(data, options);
6428
}
65-
});
66-
}
6729

68-
function drawYearLines() {
69-
$.ajax({
70-
url: '/reviews/conducting/articles_per_year/',
71-
data: {'review-id': $("#review-id").val()},
72-
type: 'get',
73-
cache: false,
74-
beforeSend: function () {
75-
$("#articles-selection-line").spinner(false);
76-
},
77-
success: function (data) {
78-
var source_data = data.split(",");
79-
var rows = [['Year', 'Number of Articles']];
80-
for (var i = source_data.length - 1; i >= 0; i--) {
81-
row = source_data[i].split(":");
82-
rows.push([row[0], parseInt(row[1])]);
30+
function drawLineChart(rows) {
31+
var data = google.visualization.arrayToDataTable(rows);
32+
var options = {
33+
vAxis: {title: 'Number of Articles', titleTextStyle: {color: '#3A3D40'}},
34+
'height': 400
8335
};
84-
drawLineChart(rows);
85-
},
86-
complete: function () {
87-
$("#articles-selection-line").spinner();
36+
var chart = new google.visualization.LineChart(document.getElementById('articles-selection-line'));
37+
chart.draw(data, options);
38+
}
39+
40+
function drawChart() {
41+
$.ajax({
42+
url: '/reviews/conducting/articles_selection_chart/',
43+
data: {'review-id': $("#review-id").val()},
44+
type: 'get',
45+
cache: false,
46+
beforeSend: function () {
47+
$("#articles-selection-pie").spinner(false);
48+
$("#articles-selection-column").spinner(false);
49+
},
50+
success: function (data) {
51+
var source_data = data.split(",");
52+
var rows_pie = [];
53+
var rows_chart = [['Source', 'Selected', 'Accepted']];
54+
for (var i = source_data.length - 1; i >= 0; i--) {
55+
row = source_data[i].split(":");
56+
rows_pie.push([row[0], parseInt(row[1])]);
57+
rows_chart.push([row[0], parseInt(row[1]), parseInt(row[2])]);
58+
}
59+
drawPieChart(rows_pie);
60+
drawColumnChart(rows_chart);
61+
},
62+
complete: function () {
63+
$("#articles-selection-pie").spinner();
64+
$("#articles-selection-column").spinner();
65+
}
66+
});
67+
}
68+
69+
function drawYearLines() {
70+
$.ajax({
71+
url: '/reviews/conducting/articles_per_year/',
72+
data: {'review-id': $("#review-id").val()},
73+
type: 'get',
74+
cache: false,
75+
beforeSend: function () {
76+
$("#articles-selection-line").spinner(false);
77+
},
78+
success: function (data) {
79+
var source_data = data.split(",");
80+
var rows = [['Year', 'Number of Articles']];
81+
for (var i = source_data.length - 1; i >= 0; i--) {
82+
row = source_data[i].split(":");
83+
rows.push([row[0], parseInt(row[1])]);
84+
}
85+
drawLineChart(rows);
86+
},
87+
complete: function () {
88+
$("#articles-selection-line").spinner();
89+
}
90+
});
8891
}
89-
});
90-
}
92+
});

0 commit comments

Comments
 (0)