diff --git a/sigi/admin/filterspecs.py b/sigi/admin/filterspecs.py index 204a5a9..d320f19 100644 --- a/sigi/admin/filterspecs.py +++ b/sigi/admin/filterspecs.py @@ -1,4 +1,3 @@ -from django.db import models from django.contrib.admin.filterspecs import FilterSpec, ChoicesFilterSpec from django.utils.encoding import smart_unicode from django.utils.safestring import mark_safe diff --git a/sigi/manage.py b/sigi/manage.py index ba83f81..5e78ea9 100755 --- a/sigi/manage.py +++ b/sigi/manage.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python2.4 +#!/usr/bin/env python from django.core.management import execute_manager try: import settings # Assumed to be in the same directory. diff --git a/sigi/templates/index.html b/sigi/templates/index.html index 814439b..cd8a59f 100644 --- a/sigi/templates/index.html +++ b/sigi/templates/index.html @@ -1,46 +1,11 @@ {% extends "admin/index.html" %} -{% load charts i18n %} {% block title %}Dashboard | SIGI{% endblock %} - {% block content_title %}

Dashboard

{% endblock %} {% block content %} - -{% chart as convenios %} - {% chart-size 340 160 %} - {% chart-type "pie" %} - {% chart-labels "Conveniadas" "Não conveniadas" "Não aderidas" %} - {% chart-data convenios_chart_data %} -{% endchart %} - -{% chart as regioes %} - {% chart-size 320 160 %} - {% chart-type "column-stacked" %} - {% chart-bar-width "40" %} - {% chart-labels "Centro-O" "Norte" "Nordeste" "Sudeste" "Sul" %} - {% chart-data regioes_chart_data.0 regioes_chart_data.1 %} - {% chart-legend "Conveniadas" "Total" %} - {% chart-colors "ff9900,ffc266" %} -{% endchart %} -
-
-

Convênios

-

Convênios com as Casas Legislativas

-

- -

-
- -
-

Convênios

-

Casas Legislativas conveniadas por região

-

- -

-
- + {% include "snippets/modules/charts-convenios.html" %}
{% endblock %} diff --git a/sigi/templates/snippets/modules/charts-convenios.html b/sigi/templates/snippets/modules/charts-convenios.html new file mode 100644 index 0000000..7fc5cb5 --- /dev/null +++ b/sigi/templates/snippets/modules/charts-convenios.html @@ -0,0 +1,34 @@ +{% load charts %} + +{% chart as convenios %} + {% chart-size 340 160 %} + {% chart-type "pie" %} + {% chart-labels "Conveniadas" "Não conveniadas" "Não aderidas" %} + {% chart-data convenios_chart_data %} +{% endchart %} + +{% chart as regioes %} + {% chart-size 320 160 %} + {% chart-type "column-stacked" %} + {% chart-bar-width "40" %} + {% chart-labels "Centro-O" "Norte" "Nordeste" "Sudeste" "Sul" %} + {% chart-data regioes_chart_data.0 regioes_chart_data.1 %} + {% chart-legend "Conveniadas" "Total" %} + {% chart-colors "ff9900,ffc266" %} +{% endchart %} + +
+

Convênios

+

Convênios com as Casas Legislativas

+

+ +

+
+ +
+

Convênios

+

Casas Legislativas conveniadas por região

+

+ +

+