ILB
/
sigi
mirror of https://github.com/interlegis/sigi.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Migrando os graficos Pie de diagnosticos

producao
Breno Teixeira 11 years ago
parent
0713268149
commit
8bef2c21c8
2 changed files with 82 additions and 84 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 17
      sigi/apps/diagnosticos/templates/diagnosticos/graficos.html
  2. 137
      sigi/apps/diagnosticos/views.py

17
sigi/apps/diagnosticos/templates/diagnosticos/graficos.html
View File

@ -4,8 +4,11 @@
{% block extrahead %}
<script type="text/javascript" src="http://code.jquery.com/jquery-1.6.4.min.js"></script>
<script type="text/javascript" src="{{ STATIC_URL }}js/Chart.min.js"></script>
<script src="http://code.highcharts.com/highcharts.js"></script>
<script language=javascript>
jQuery(document).ready(function () {
jQuery("form#categoria select").change(function () {
jQuery("form#categoria").submit()
});
@ -13,14 +16,16 @@ jQuery(document).ready(function () {
jQuery("#perguntas a").click(function(event){
event.preventDefault();
id = jQuery(this).attr('id')
output_id = '#output_'+id
var id = jQuery(this).attr('id')
var output_id = 'output_'+id
jQuery.ajax({
url: jQuery(this).attr('href'),
data: output_id,
success: function(data) {
jQuery("img", output_id).attr('src',data['url'])
jQuery("img", output_id).slideDown()
var ctx = document.getElementById("myChart").getContext("2d");
var myNewChart = new Chart(ctx).Pie(data);
},
error: function(errorSender, errorMsg) {
jQuery(output_id).html(errorSender + ' ' + errorMsg);
}
@ -49,8 +54,8 @@ jQuery(document).ready(function () {
<li>
{% if pergunta.datatype == 'many' or pergunta.datatype == 'one' %}
<a id="{{ pergunta.name }}" href="/diagnosticos/api/?id={{ pergunta.name }}"><p>{{ pergunta.title }}</p></a>
<div id="output_{{ pergunta.name }}" class="grafico">
<img style="display:none"/>
<div id="output_{{ pergunta.name }}">
<canvas id="myChart" width="400" height="400"></canvas>
</div>
{% else %}
<p>{{ pergunta.title }}</p>

137
sigi/apps/diagnosticos/views.py
View File

@ -1,12 +1,13 @@
# -*- coding: utf8 -*-
import new
from django.http import HttpResponse, QueryDict
import json
from itertools import cycle
from django.http import HttpResponse
from django.utils import simplejson
from django.shortcuts import render_to_response, get_object_or_404, redirect
from django.shortcuts import render_to_response, get_object_or_404
from django.template import RequestContext
from django.views.decorators.cache import never_cache
from geraldo.generators import PDFGenerator
from sigi.apps.diagnosticos.urls import LOGIN_REDIRECT_URL
from sigi.apps.utils.decorators import login_required
@ -14,7 +15,7 @@ from sigi.apps.diagnosticos.decorators import validate_diagnostico
from sigi.apps.diagnosticos.models import Diagnostico, Categoria, Pergunta
from sigi.apps.casas.models import Funcionario
from sigi.apps.diagnosticos.forms import (DiagnosticoMobileForm,
CasaLegislativaMobileForm, FuncionariosMobileForm)
CasaLegislativaMobileForm, FuncionariosMobileForm)
from sigi.apps.contatos.models import Telefone
from sigi.shortcuts import render_to_pdf
@ -47,9 +48,9 @@ def categorias(request, id_diagnostico):
ultima_categoria = request.session.get('ultima_categoria', 0)
context = RequestContext(request, {'categorias': categorias,
'diagnostico': diagnostico, 'ultima_categoria': ultima_categoria})
'diagnostico': diagnostico, 'ultima_categoria': ultima_categoria})
return render_to_response('diagnosticos/diagnosticos_categorias_list.html',
context)
context)
@never_cache
@ -80,7 +81,7 @@ def categoria_detalhes(request, id_diagnostico, id_categoria):
if request.method == "POST":
form = DiagnosticoMobileForm(request.POST,
instance=diagnostico, category=id_categoria)
instance=diagnostico, category=id_categoria)
if form.is_valid():
form.save()
resposta = {
@ -96,12 +97,12 @@ def categoria_detalhes(request, id_diagnostico, id_categoria):
return HttpResponse(json, mimetype="application/json")
else:
form = DiagnosticoMobileForm(instance=diagnostico,
category=id_categoria)
category=id_categoria)
context = RequestContext(request, {'form': form, 'categoria': categoria,
'diagnostico': diagnostico})
'diagnostico': diagnostico})
return render_to_response('diagnosticos/diagnosticos_categorias_form.html',
context)
context)
@never_cache
@ -118,7 +119,7 @@ def categoria_casa_legislativa(request, id_diagnostico):
if request.method == "POST":
form = CasaLegislativaMobileForm(request.POST,
instance=casa_legislativa)
instance=casa_legislativa)
if form.is_valid():
form.save()
resposta = {
@ -136,7 +137,7 @@ def categoria_casa_legislativa(request, id_diagnostico):
form = CasaLegislativaMobileForm(instance=casa_legislativa)
context = RequestContext(request, {'form': form,
'diagnostico': diagnostico, 'casa_legislativa': casa_legislativa})
'diagnostico': diagnostico, 'casa_legislativa': casa_legislativa})
return render_to_response(
'diagnosticos/diagnosticos_categoria_casa_legislativa_form.html',
context)
@ -176,7 +177,7 @@ def categoria_contatos(request, id_diagnostico):
'erros' : {},
'fones' : {},
'clean' : (),
}
}
# valida e salva um formulario por vez
for form in forms:
@ -199,8 +200,8 @@ def categoria_contatos(request, id_diagnostico):
for form_telefones in form.telefones.forms:
if not form_telefones.is_valid():
if (form_telefones.fields['id'].initial is not None
and form_telefones.fields['tipo'].initial == 'I'
and form_telefones.fields['numero'].initial is None):
and form_telefones.fields['tipo'].initial == 'I'
and form_telefones.fields['numero'].initial is None):
if Telefone.objects.filter(pk=form_telefones.fields['id'].initial).exists():
Telefone.objects.get(pk=form_telefones.fields['id'].initial).delete()
if not resposta['fones'].has_key(form.prefix):
@ -216,12 +217,13 @@ def categoria_contatos(request, id_diagnostico):
return HttpResponse(json, mimetype="application/json")
else:
forms = [FuncionariosMobileForm(prefix=f.setor, instance=f)
for f, c in funcionarios]
for f, c in funcionarios]
context = RequestContext(request, {'forms': forms,
'diagnostico': diagnostico, 'casa_legislativa': casa_legislativa})
'diagnostico': diagnostico, 'casa_legislativa': casa_legislativa})
return render_to_response('diagnosticos/diagnosticos_categoria_contatos_form.html',
context)
context)
def diagnostico_pdf(request, id_diagnostico):
diagnostico = Diagnostico.objects.get(pk=id_diagnostico)
@ -253,16 +255,17 @@ def diagnostico_pdf(request, id_diagnostico):
schemas_by_categoria.append((categoria,schemas))
context = RequestContext(request, {
'pagesize':'A4',
'casa_legislativa': casa_legislativa,
'funcionarios': funcionarios,
'diagnostico': diagnostico,
'schemas_by_categoria': schemas_by_categoria,
'pagesize':'A4',
'casa_legislativa': casa_legislativa,
'funcionarios': funcionarios,
'diagnostico': diagnostico,
'schemas_by_categoria': schemas_by_categoria,
})
return render_to_pdf('diagnosticos/diagnostico_pdf.html', context)
#return render_to_response('diagnosticos/diagnostico_pdf.html', context)
def graficos(request):
categorias = Categoria.objects.all()
@ -275,7 +278,8 @@ def graficos(request):
'perguntas': perguntas,
})
return render_to_response('diagnosticos/graficos.html',
context)
context)
def percentage(fraction, population):
try:
@ -283,61 +287,50 @@ def percentage(fraction, population):
except ValueError:
return ''
def grafico_api(request):
colors = ['ffff00', 'cc7900', 'ff0000', '92d050', '006600', '0097cc', '002776', 'ae78d6', 'ff00ff', '430080',
'28d75c', '0000ff', 'fff200']
graph_url = "http://chart.apis.google.com/chart"
#graph_params = QueryDict("chxt=y&chbh=a&chco=A2C180,3D7930")
graph_params = QueryDict("")
graph_params = graph_params.copy() # to make it mutable
width = request.REQUEST.get('width', '800')
height = request.REQUEST.get('height', '300')
graph_params.update({'chs': width + 'x' + height})
colors = cycle(['#7cb5ec',
'#434348',
'#90ed7d',
'#f7a35c',
'#8085e9',
'#f15c80',
'#e4d354',
'#8085e8',
'#8d4653',
'#91e8e1', ])
highlights = cycle(['#B0D3F4',
'#8E8E91',
'#BCF4B1',
'#FAC89D',
'#B3B6F2',
'#F79DB3',
'#EFE598',
'#B3B6F1',
'#BB9098',
'#BDF1ED', ])
pergunta_slug = request.REQUEST.get('id', None)
pergunta = get_object_or_404(Pergunta, name=pergunta_slug)
if pergunta.datatype == 'one':
total = sum([r[1] for r in pergunta.group_choices()])
choices = [str(r[1]) for r in pergunta.group_choices()]
legend = [percentage(r[1],total) + " " + str(r[0]) for r in pergunta.group_choices()]
colors = ['ff0000', 'fff200', '0000ff', '28d75c'] + ["%0.6x" % (0x48d1 + (0xda74 * c))
for c in range(0,len(pergunta.group_choices()))]
graph_params.update({
'cht': 'p',
'chd': 't:' + ",".join(choices),
'chdl': '' + "|".join(legend),
'chco': '' + '|'.join(colors[:len(pergunta.group_choices())])
})
elif pergunta.datatype == 'many':
total = sum([r[1] for r in pergunta.group_choices()])
percent = [str(float(r[1])*100/total) for r in pergunta.group_choices()]
choices = [str(r[1]) for r in pergunta.group_choices()]
legend = [str(r[0]) for r in pergunta.group_choices()]
colors = ['ffff00', 'cc7900', 'ff0000', '92d050', '006600', '0097cc', '002776', 'ae78d6', 'ff00ff', '430080'] + \
["%0.6x" % (0x48d1 + (0xda74 * c)) for c in range(0,len(pergunta.group_choices()))]
graph_params.update({
'cht': 'bvg',
'chxt': 'y',
'chd': 't:' + ",".join(percent),
'chdl': '' + "|".join(legend),
'chl': '' + "|".join(choices),
'chco': '' + '|'.join(colors[:len(pergunta.group_choices())])
})
response = {
"type": "photo",
"width": width,
"height": height,
"title": pergunta.title,
"url": graph_url + "?" + graph_params.urlencode(),
"provider_name": "SIGI",
"provider_url": "https://intranet.interlegis.gov.br/sigi/"
}
json = simplejson.dumps(response)
return HttpResponse(json, mimetype="application/json")
list_perguntas = pergunta.group_choices()
list_perguntas = [{'label': k.title,
'value': v,
'color': colors.next(),
'highlight': highlights.next()}
for k, v in list_perguntas]
# list_perguntas = [[k.title, v, colors.next(), highlights.next()] for k, v in list_perguntas]
# elif pergunta.datatype == 'many':
jsonn = json.dumps(list_perguntas, sort_keys=True, indent=4, separators=(',', ': '))
return HttpResponse(jsonn, content_type="application/json")
def municipios_diagnosticados(self):
municipios = []

Write Preview
Loading…
Cancel
Save