Use echarts dependency from CDN

cidadedemocratica · Oct 25, 2018 · ba5c5dd · ba5c5dd
1 parent eea7eac
commit ba5c5dd
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 21 deletions.
diff --git a/src/ej_reports/jinja2/ej_reports/scatter.jinja2 b/src/ej_reports/jinja2/ej_reports/scatter.jinja2
@@ -19,32 +19,29 @@
 {% block javascript_body %}
     {{ super() }}
     {% if plot_data is defined %}
-        <script src="http://echarts.baidu.com/gallery/vendors/echarts/echarts.min.js"></script>
-        <script src="http://echarts.baidu.com/gallery/vendors/echarts-gl/echarts-gl.min.js"></script>
-        <script src="http://echarts.baidu.com/gallery/vendors/echarts-stat/ecStat.min.js"></script>
-        <script src="http://echarts.baidu.com/gallery/vendors/echarts/extension/dataTool.min.js"></script>
-        <script src="http://echarts.baidu.com/gallery/vendors/echarts/map/js/china.js"></script>
-        <script src="http://echarts.baidu.com/gallery/vendors/echarts/map/js/world.js"></script>
-        <script src="https://api.map.baidu.com/api?v=2.0&ak=ZUONbpqGBsYGXNIYHicvbAbM"></script>
-        <script src="http://echarts.baidu.com/gallery/vendors/echarts/extension/bmap.min.js"></script>
-        <script src="http://echarts.baidu.com/gallery/vendors/simplex.js"></script>
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/echarts/4.1.0/echarts.min.js"></script>
+{#        <script src="http://echarts.baidu.com/gallery/vendors/echarts/echarts.min.js"></script>#}
+{#        <script src="http://echarts.baidu.com/gallery/vendors/echarts-gl/echarts-gl.min.js"></script>#}
+{#        <script src="http://echarts.baidu.com/gallery/vendors/echarts-stat/ecStat.min.js"></script>#}
+{#        <script src="http://echarts.baidu.com/gallery/vendors/echarts/extension/dataTool.min.js"></script>#}
+{#        <script src="http://echarts.baidu.com/gallery/vendors/echarts/map/js/china.js"></script>#}
+{#        <script src="http://echarts.baidu.com/gallery/vendors/echarts/map/js/world.js"></script>#}
+{#        <script src="https://api.map.baidu.com/api?v=2.0&ak=ZUONbpqGBsYGXNIYHicvbAbM"></script>#}
+{#        <script src="http://echarts.baidu.com/gallery/vendors/echarts/extension/bmap.min.js"></script>#}
+{#        <script src="http://echarts.baidu.com/gallery/vendors/simplex.js"></script>#}
         <script>
             var dom = document.getElementById("container");
             var myChart = echarts.init(dom);
-            var app = {};
-            var data_from_django = {{ plot_data }};
-            console.log(data_from_django)
-            option = null;
-            option = {
+            var plotData = {{ plot_data }};
+            var option = {
                 xAxis: {},
                 yAxis: {},
                 series: [{
-                    symbolSize: 20,
-                    data: data_from_django,
+                    symbolSize: 10,
+                    data: plotData,
                     type: 'scatter'
                 }]
             };
-            ;
             if (option && typeof option === "object") {
                 myChart.setOption(option, true);
             }

diff --git a/src/ej_reports/routes.py b/src/ej_reports/routes.py
@@ -1,19 +1,19 @@
+import json
+
 import numpy as np
 import pandas as pd
 from django.contrib.auth import get_user_model
 from django.http import HttpResponse
 from django.utils.translation import ugettext_lazy as _, ugettext as __
-import json
+from hyperpython.components import html_table, hyperlink
+from sklearn.decomposition import PCA
 
 from boogie.router import Router
 from boogie.rules import proxy_seq
 from ej_clusters.math import get_raw_votes, get_votes
 from ej_conversations.models import Conversation
 from ej_dataviz import render_dataframe
 from ej_math import VoteStats
-from hyperpython.components import html_table, hyperlink
-
-from sklearn.decomposition import PCA
 
 urlpatterns = Router(
     template=['ej_reports/{name}.jinja2', 'generic.jinja2'],