Commit da1726c7ce55a3d576f770c75d4a1226bfb3845d

Authored by fbormann
1 parent c63d5b36

improved pie chart to render better

amadeus/static/js/charts/home.js
... ... @@ -22,14 +22,14 @@ var resource_donut_chart = {
22 22 var padding = 30;
23 23 var radius = Math.min(width, height) / 2 - padding;
24 24  
25   - var color = d3.scaleOrdinal(d3.schemeCategory20c);
  25 + var color = d3.scaleOrdinal(d3.schemeCategory20);
26 26 var new_div = d3.select(".carousel-inner").append("div").attr("class","item");
27 27 var svg = new_div.append("svg").attr("width", width).attr("height", height)
28 28 .style("margin","auto")
29 29 .style("display","block")
30 30 .append('g')
31 31 .attr('transform', 'translate(' + (width / 2) +
32   - ',' + (height / 2 ) + ')');
  32 + ',' + (height / 2 + padding ) + ')');
33 33  
34 34  
35 35  
... ... @@ -41,7 +41,7 @@ var resource_donut_chart = {
41 41 svg.append("text")
42 42 .attr("text-anchor", "middle")
43 43 .attr("x",0 )
44   - .attr("y", -height/2 + padding)
  44 + .attr("y", -height/2 )
45 45 .style("font-size", "30px")
46 46 .text("Recursos mais utilizados");
47 47  
... ...
amadeus/templates/base.html
... ... @@ -30,7 +30,7 @@
30 30 <link rel="stylesheet" type="text/css" href="{% static 'css/jPages.css' %}">
31 31  
32 32 <script type="text/javascript" src="{% static 'bootstrap-3.3.7/js/bootstrap.min.js' %}"></script>
33   - <script type="text/javascript" src="{% static 'js/bootstrap-acessibility2.min.js' %}"></script>
  33 + <!--<script type="text/javascript" src="{% static 'js/bootstrap-acessibility2.min.js' %}"></script>-->
34 34 <script type="text/javascript" src="{% static 'material/js/material.min.js' %}"></script>
35 35 <script type="text/javascript" src="{% static 'material/js/ripples.min.js' %}"></script>
36 36 <script type="text/javascript" src="{% static 'js/moment-with-locales.js' %}"></script>
... ...