From e0f522e3667c725a8b75927105d306bf935fdee6 Mon Sep 17 00:00:00 2001 From: Breno Teixeira Date: Mon, 28 Jul 2014 16:19:53 -0300 Subject: [PATCH] Migrando os graficos Pie da app diagnosticos para Chartjs --- .../templates/diagnosticos/graficos.html | 114 ++++++++++-------- sigiStatic/css/style.css | 2 +- 2 files changed, 62 insertions(+), 54 deletions(-) diff --git a/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html b/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html index 661e4b0..7a13e48 100644 --- a/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html +++ b/sigi/apps/diagnosticos/templates/diagnosticos/graficos.html @@ -3,66 +3,74 @@ {% block content_title %}

Graficos dos Diagnósticos

{% endblock %} {% block extrahead %} - - - - + + + + error: function(errorSender, errorMsg) { + jQuery(output_id).html(errorSender + ' ' + errorMsg); + } + }); + + return false + }); + }); + {% endblock %} {% block content %} -
-
- {% csrf_token %} - -
-
-
    - {% for pergunta in perguntas %} -
  • - {% if pergunta.datatype == 'many' or pergunta.datatype == 'one' %} -

    {{ pergunta.title }}

    - - {% else %} -

    {{ pergunta.title }}

    - {% endif %} -
  • - {% endfor %} -
-
-
+
+
+ {% csrf_token %} + +
+
+
    + {% for pergunta in perguntas %} +
  • + {% if pergunta.datatype == 'many' or pergunta.datatype == 'one' %} +

    {{ pergunta.title }}

    + + {% else %} +

    {{ pergunta.title }}

    + {% endif %} +
  • + {% endfor %} +
+
+
{% endblock %} \ No newline at end of file diff --git a/sigiStatic/css/style.css b/sigiStatic/css/style.css index 685d20c..5ec83e2 100644 --- a/sigiStatic/css/style.css +++ b/sigiStatic/css/style.css @@ -1,4 +1,4 @@ -#canvas-holder-1, #canvas-holder-2 { +div[id^=canvas] { padding: 20px 20px 20px 20px; min-height: 180px; position: relative;