Wrap conducting data analysis js inside onload. (#70)

vitorfs · Sep 8, 2021 · 1df5909 · 1df5909
1 parent 0b83620
commit 1df5909
Show file tree

Hide file tree

Showing 5 changed files with 94 additions and 84 deletions.
diff --git a/parsifal/apps/reviews/conducting/static/js/conducting_data_analysis.js b/parsifal/apps/reviews/conducting/static/js/conducting_data_analysis.js
@@ -1,90 +1,92 @@
-google.load('visualization', '1.0', {'packages':['corechart']});
-google.setOnLoadCallback(drawChartCallback);
+$(function () {
+    google.load('visualization', '1.0', {'packages':['corechart']});
+    google.setOnLoadCallback(drawChartCallback);
 
-function drawChartCallback() {
-  drawChart();
-  drawYearLines();
-}
-
-function drawPieChart(rows) {
-  var data = new google.visualization.DataTable();
-  data.addColumn('string', 'Source');
-  data.addColumn('number', 'Number of Aticles');
-  data.addRows(rows);
-  var options = {'height': 400};
-  var chart = new google.visualization.PieChart(document.getElementById('articles-selection-pie'));
-  chart.draw(data, options);
-}
-
-function drawColumnChart(rows) {
-  var data = google.visualization.arrayToDataTable(rows);
-  var options = {
-    vAxis: {title: 'Number of Articles',  titleTextStyle: {color: '#3A3D40'}},
-    'height': 400
-  };
-  var chart = new google.visualization.ColumnChart(document.getElementById('articles-selection-column'));
-  chart.draw(data, options);
-}
+    function drawChartCallback() {
+      drawChart();
+      drawYearLines();
+    }
 
-function drawLineChart(rows) {
-  var data = google.visualization.arrayToDataTable(rows);
-  var options = {
-    vAxis: {title: 'Number of Articles',  titleTextStyle: {color: '#3A3D40'}},
-    'height': 400
-  };
-  var chart = new google.visualization.LineChart(document.getElementById('articles-selection-line'));
-  chart.draw(data, options);
-}
+    function drawPieChart(rows) {
+      var data = new google.visualization.DataTable();
+      data.addColumn('string', 'Source');
+      data.addColumn('number', 'Number of Articles');
+      data.addRows(rows);
+      var options = {'height': 400};
+      var chart = new google.visualization.PieChart(document.getElementById('articles-selection-pie'));
+      chart.draw(data, options);
+    }
 
-function drawChart() {
-  $.ajax({
-    url: '/reviews/conducting/articles_selection_chart/',
-    data: {'review-id': $("#review-id").val()},
-    type: 'get',
-    cache: false,
-    beforeSend: function () {
-      $("#articles-selection-pie").spinner(false);
-      $("#articles-selection-column").spinner(false);
-    },
-    success: function (data) {
-      var source_data = data.split(",");
-      var rows_pie = [];
-      var rows_chart = [['Source', 'Selected', 'Accepted']];
-      for (var i = source_data.length - 1; i >= 0; i--) {
-        row = source_data[i].split(":");
-        rows_pie.push([row[0], parseInt(row[1])]);
-        rows_chart.push([row[0], parseInt(row[1]), parseInt(row[2])]);
+    function drawColumnChart(rows) {
+      var data = google.visualization.arrayToDataTable(rows);
+      var options = {
+        vAxis: {title: 'Number of Articles',  titleTextStyle: {color: '#3A3D40'}},
+        'height': 400
       };
-      drawPieChart(rows_pie);
-      drawColumnChart(rows_chart);
-    },
-    complete: function () {
-      $("#articles-selection-pie").spinner();
-      $("#articles-selection-column").spinner();
+      var chart = new google.visualization.ColumnChart(document.getElementById('articles-selection-column'));
+      chart.draw(data, options);
     }
-  });
-}
 
-function drawYearLines() {
-  $.ajax({
-    url: '/reviews/conducting/articles_per_year/',
-    data: {'review-id': $("#review-id").val()},
-    type: 'get',
-    cache: false,
-    beforeSend: function () {
-      $("#articles-selection-line").spinner(false);
-    },
-    success: function (data) {
-      var source_data = data.split(",");
-      var rows = [['Year', 'Number of Articles']];
-      for (var i = source_data.length - 1; i >= 0; i--) {
-        row = source_data[i].split(":");
-        rows.push([row[0], parseInt(row[1])]);
+    function drawLineChart(rows) {
+      var data = google.visualization.arrayToDataTable(rows);
+      var options = {
+        vAxis: {title: 'Number of Articles',  titleTextStyle: {color: '#3A3D40'}},
+        'height': 400
       };
-      drawLineChart(rows);
-    },
-    complete: function () {
-      $("#articles-selection-line").spinner();
+      var chart = new google.visualization.LineChart(document.getElementById('articles-selection-line'));
+      chart.draw(data, options);
+    }
+
+    function drawChart() {
+      $.ajax({
+        url: '/reviews/conducting/articles_selection_chart/',
+        data: {'review-id': $("#review-id").val()},
+        type: 'get',
+        cache: false,
+        beforeSend: function () {
+          $("#articles-selection-pie").spinner(false);
+          $("#articles-selection-column").spinner(false);
+        },
+        success: function (data) {
+          var source_data = data.split(",");
+          var rows_pie = [];
+          var rows_chart = [['Source', 'Selected', 'Accepted']];
+          for (var i = source_data.length - 1; i >= 0; i--) {
+            row = source_data[i].split(":");
+            rows_pie.push([row[0], parseInt(row[1])]);
+            rows_chart.push([row[0], parseInt(row[1]), parseInt(row[2])]);
+          }
+          drawPieChart(rows_pie);
+          drawColumnChart(rows_chart);
+        },
+        complete: function () {
+          $("#articles-selection-pie").spinner();
+          $("#articles-selection-column").spinner();
+        }
+      });
+    }
+
+    function drawYearLines() {
+      $.ajax({
+        url: '/reviews/conducting/articles_per_year/',
+        data: {'review-id': $("#review-id").val()},
+        type: 'get',
+        cache: false,
+        beforeSend: function () {
+          $("#articles-selection-line").spinner(false);
+        },
+        success: function (data) {
+          var source_data = data.split(",");
+          var rows = [['Year', 'Number of Articles']];
+          for (var i = source_data.length - 1; i >= 0; i--) {
+            row = source_data[i].split(":");
+            rows.push([row[0], parseInt(row[1])]);
+          }
+          drawLineChart(rows);
+        },
+        complete: function () {
+          $("#articles-selection-line").spinner();
+        }
+      });
     }
-  });
-}
+});
diff --git a/parsifal/apps/reviews/conducting/templates/conducting/conducting_data_analysis.html b/parsifal/apps/reviews/conducting/templates/conducting/conducting_data_analysis.html
@@ -1,10 +1,12 @@
 {% extends 'conducting/conducting.html' %}
 
-{% load static %}
+{% load compress static %}
 
 {% block javascript %}
   <script src="https://www.google.com/jsapi"></script>
-  <script src="{% static 'js/conducting_data_analysis.js' %}"></script>
+  {% compress js %}
+    <script src="{% static 'js/conducting_data_analysis.js' %}"></script>
+  {% endcompress %}
 {% endblock javascript %}
 
 {% block tab_content %}

diff --git a/parsifal/newsfragments/.gitignore b/parsifal/newsfragments/.gitignore
@@ -0,0 +1 @@
+!.gitignore
diff --git a/parsifal/newsfragments/69.bugfix b/parsifal/newsfragments/69.bugfix
@@ -0,0 +1 @@
+Fix data analysis load state for charts
diff --git a/pyproject.toml b/pyproject.toml
@@ -22,3 +22,7 @@ exclude = '''
   | migrations
 )/
 '''
+
+[tool.towncrier]
+package = "parsifal"
+filename = "CHANGELOG.md"