From e3b3727804af76062cefb036d54c131c362ffe0e Mon Sep 17 00:00:00 2001 From: Sesostris Vieira Date: Mon, 13 Jun 2016 15:23:01 -0300 Subject: [PATCH 01/63] Atualiza para Django 1.9.6 --- requirements/dev-requirements.txt | 8 +++--- requirements/requirements.txt | 26 +++++++++---------- requirements/test-requirements.txt | 16 ++++++------ sigi/apps/casas/admin.py | 4 +-- sigi/apps/casas/models.py | 8 +++--- sigi/apps/contatos/models.py | 10 +++---- sigi/apps/convenios/models.py | 8 +++--- sigi/apps/diagnosticos/forms.py | 2 +- sigi/apps/diagnosticos/models.py | 4 +-- .../templates/diagnosticos/mapa.html | 2 +- sigi/apps/diagnosticos/widgets.py | 6 ++--- sigi/apps/inventario/admin.py | 6 ++--- sigi/apps/inventario/models.py | 6 ++--- sigi/apps/metas/templates/metas/mapa.html | 2 +- sigi/apps/metas/views.py | 12 ++++----- sigi/apps/ocorrencias/forms.py | 4 +-- sigi/apps/ocorrencias/models.py | 2 +- .../templates/ocorrencias/painel.html | 2 +- sigi/apps/parlamentares/admin.py | 4 +-- sigi/apps/servicos/admin.py | 4 +-- sigi/apps/servicos/models.py | 2 +- .../servicos/templates/servicos/mapa.html | 2 +- sigi/apps/servidores/admin.py | 2 +- sigi/apps/servidores/models.py | 6 ++--- sigi/settings/base.py | 4 +-- templates/index.html | 4 +-- 26 files changed, 78 insertions(+), 78 deletions(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 547f372f..1a437764 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,5 +1,5 @@ -r test-requirements.txt -django-debug-toolbar==1.2.2 -ipdb==0.8 -ipython==2.3.1 -pygraphviz==1.2 +django-debug-toolbar==1.4 +ipdb==0.10.0 +ipython==4.2.0 +pygraphviz==1.3.1 diff --git a/requirements/requirements.txt b/requirements/requirements.txt index abfd1d45..570c578c 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,23 +1,23 @@ -e git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=geraldo -django-bootstrap3==6.2.2 -django-admin-bootstrapped==2.4.0 -django-auth-ldap==1.2.7 +django-bootstrap3==7.0.1 +django-admin-bootstrapped==2.5.7 +django-auth-ldap==1.2.8 django-autoslug==1.9.3 -django-extensions==1.5.7 -django-image-cropping==1.0.2 -django-localflavor==1.1 -Django==1.7.10 -easy-thumbnails==2.2 +django-extensions==1.6.7 +django-image-cropping==1.0.3 +django-localflavor==1.3 +Django==1.9.6 +easy-thumbnails==2.3 eav-django==1.4.7 -gunicorn==19.3.0 +gunicorn==19.6.0 html5lib==0.9999999 -Pillow==2.9.0 +Pillow==3.2.0 pisa==3.0.33 psycopg2==2.6.1 -python-memcached==1.53 +python-memcached==1.58 PyYAML==3.11 -reportlab==2.7 -requests==2.8.1 +reportlab==3.3.0 +requests==2.10.0 six==1.10.0 djangorestframework==2.4.8 django-ipware==1.1.6 diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index 6a2cb2fa..e3bbda13 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,10 +1,10 @@ -r requirements.txt -coverage==3.7.1 -django-dynamic-fixture==1.8.1 -django-webtest==1.7.7 +coverage==4.1 +django-dynamic-fixture==1.9.0 +django-webtest==1.7.9 pyPdf==1.13 -pyquery==1.2.9 -pytest-cov==1.8.1 -pytest-django==2.8.0 -pytest==2.6.4 -WebTest==2.0.17 +pyquery==1.2.13 +pytest-cov==2.2.1 +pytest-django==2.9.1 +pytest==2.9.2 +WebTest==2.0.21 diff --git a/sigi/apps/casas/admin.py b/sigi/apps/casas/admin.py index 392d752b..8f6b0b0c 100644 --- a/sigi/apps/casas/admin.py +++ b/sigi/apps/casas/admin.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- from django.core.urlresolvers import reverse from django.contrib import admin -from django.contrib.contenttypes import generic +from django.contrib.contenttypes.admin import GenericTabularInline from django.http import HttpResponseRedirect from django.utils.translation import ugettext as _ from image_cropping import ImageCroppingMixin @@ -24,7 +24,7 @@ from sigi.apps.utils.base_admin import BaseModelAdmin -class TelefonesInline(generic.GenericTabularInline): +class TelefonesInline(GenericTabularInline): model = Telefone readonly_fields = ('ult_alteracao',) extra = 1 diff --git a/sigi/apps/casas/models.py b/sigi/apps/casas/models.py index b1995798..deb59551 100644 --- a/sigi/apps/casas/models.py +++ b/sigi/apps/casas/models.py @@ -4,7 +4,7 @@ from unicodedata import normalize from datetime import datetime -from django.contrib.contenttypes import generic +from django.contrib.contenttypes import fields from django.db import models from image_cropping import ImageRatioField @@ -85,7 +85,7 @@ class CasaLegislativa(models.Model): pesquisador = models.ForeignKey(Servidor, verbose_name=u"Pesquisador", null=True, blank=True) obs_pesquisa = models.TextField(u"Observações do pesquisador", blank=True) ult_alt_endereco = models.DateTimeField(u'Última alteração do endereço', null=True, blank=True, editable=True) - telefones = generic.GenericRelation('contatos.Telefone') + telefones = fields.GenericRelation('contatos.Telefone') foto = models.ImageField( upload_to='imagens/casas', @@ -293,8 +293,8 @@ class Funcionario(models.Model): sexo = models.CharField(max_length=1, choices=SEXO_CHOICES, default="M") nota = models.CharField(max_length=70, null=True, blank=True) email = models.CharField('e-mail', max_length=75, blank=True) - telefones = generic.GenericRelation('contatos.Telefone') - endereco = generic.GenericRelation('contatos.Endereco') + telefones = fields.GenericRelation('contatos.Telefone') + endereco = fields.GenericRelation('contatos.Endereco') cargo = models.CharField(max_length=100, null=True, blank=True) funcao = models.CharField(u'função', max_length=100, null=True, blank=True) setor = models.CharField(max_length=100, choices=SETOR_CHOICES, default="outros") diff --git a/sigi/apps/contatos/models.py b/sigi/apps/contatos/models.py index 9b3becf3..04cd2ae4 100644 --- a/sigi/apps/contatos/models.py +++ b/sigi/apps/contatos/models.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -from django.contrib.contenttypes import generic +from django.contrib.contenttypes import fields from django.contrib.contenttypes.models import ContentType from django.core.validators import MaxValueValidator, MinValueValidator from django.db import models @@ -176,7 +176,7 @@ class Telefone(models.Model): content_type = models.ForeignKey(ContentType) # identificador do registro na classe vinculado a esse registro object_id = models.PositiveIntegerField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = fields.GenericForeignKey('content_type', 'object_id') class Meta: ordering = ('numero',) @@ -196,7 +196,7 @@ class Contato(models.Model): nota = models.CharField(max_length=70, blank=True) email = models.EmailField(_(u'e-mail'), blank=True) - telefones = generic.GenericRelation(Telefone) + telefones = fields.GenericRelation(Telefone) municipio = models.ForeignKey( Municipio, @@ -209,7 +209,7 @@ class Contato(models.Model): content_type = models.ForeignKey(ContentType) # identificador do registro na classe vinculado a esse registro object_id = models.PositiveIntegerField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = fields.GenericForeignKey('content_type', 'object_id') class Meta: ordering = ('nome',) @@ -301,7 +301,7 @@ class Endereco(models.Model): content_type = models.ForeignKey(ContentType) # identificador do registro na classe vinculado a esse registro object_id = models.PositiveIntegerField() - content_object = generic.GenericForeignKey('content_type', 'object_id') + content_object = fields.GenericForeignKey('content_type', 'object_id') class Meta: ordering = ('logradouro', 'numero') diff --git a/sigi/apps/convenios/models.py b/sigi/apps/convenios/models.py index 07ddcd3e..7bf0f926 100644 --- a/sigi/apps/convenios/models.py +++ b/sigi/apps/convenios/models.py @@ -148,7 +148,7 @@ class Anexo(models.Model): convenio = models.ForeignKey(Convenio, verbose_name=_(u'convênio')) # caminho no sistema para o documento anexo arquivo = models.FileField(upload_to='apps/convenios/anexo/arquivo', max_length=500) - descricao = models.CharField(_(u'descrição'), max_length='70') + descricao = models.CharField(_(u'descrição'), max_length=70) data_pub = models.DateTimeField( _(u'data da publicação do anexo'), default=datetime.now @@ -167,8 +167,8 @@ class UnidadeAdministrativa(models.Model): que pode ser um servivo do próprio Interlegis, assim como uma unidade do Senado Federal """ - sigla = models.CharField(max_length='10') - nome = models.CharField(max_length='100') + sigla = models.CharField(max_length=10) + nome = models.CharField(max_length=100) def __unicode__(self): return unicode(self.sigla) @@ -184,7 +184,7 @@ class Tramitacao(models.Model): data = models.DateField() observacao = models.CharField( _(u'observação'), - max_length='512', + max_length=512, null=True, blank=True, ) diff --git a/sigi/apps/diagnosticos/forms.py b/sigi/apps/diagnosticos/forms.py index a271a1f5..e381cccb 100644 --- a/sigi/apps/diagnosticos/forms.py +++ b/sigi/apps/diagnosticos/forms.py @@ -2,7 +2,7 @@ from copy import deepcopy from django import forms -from django.contrib.contenttypes.generic import generic_inlineformset_factory +from django.contrib.contenttypes.forms import generic_inlineformset_factory from django.forms import (BooleanField, CharField, DateField, FloatField, ModelChoiceField, Textarea, ModelMultipleChoiceField) diff --git a/sigi/apps/diagnosticos/models.py b/sigi/apps/diagnosticos/models.py index 1b71459c..45030e20 100644 --- a/sigi/apps/diagnosticos/models.py +++ b/sigi/apps/diagnosticos/models.py @@ -198,7 +198,7 @@ class Escolha(BaseChoice): """ schema = models.ForeignKey(Pergunta, related_name='choices', verbose_name=_(u'pergunta')) - schema_to_open = models.ForeignKey(Pergunta, related_name='', + schema_to_open = models.ForeignKey(Pergunta, related_name='schema_to_open_related', verbose_name=_(u'pergunta para abrir'), blank=True, null=True) ordem = models.PositiveIntegerField(blank=True, null=True) @@ -242,7 +242,7 @@ class Anexo(models.Model): """ diagnostico = models.ForeignKey(Diagnostico, verbose_name=u'diagnóstico') arquivo = models.FileField(upload_to='apps/diagnostico/anexo/arquivo', max_length=500) - descricao = models.CharField(_(u'descrição'), max_length='70') + descricao = models.CharField(_(u'descrição'), max_length=70) data_pub = models.DateTimeField(_(u'data da publicação do anexo'), default=datetime.now) diff --git a/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html b/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html index 072201c9..16fe77f2 100644 --- a/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html +++ b/sigi/apps/diagnosticos/templates/diagnosticos/mapa.html @@ -6,7 +6,7 @@ {{ block.super }} {% load static from staticfiles %} - + - + diff --git a/sigi/apps/metas/views.py b/sigi/apps/metas/views.py index b72b3cb8..a1f086d9 100644 --- a/sigi/apps/metas/views.py +++ b/sigi/apps/metas/views.py @@ -12,7 +12,7 @@ from django.http import HttpResponse from django.shortcuts import render, render_to_response from django.template import RequestContext -from django.utils.datastructures import SortedDict +from collections import OrderedDict from django.utils.translation import ugettext as _ from django.views.decorators.cache import cache_page from easy_thumbnails.templatetags.thumbnail import thumbnail_url @@ -36,8 +36,8 @@ def dashboard(request): raise PermissionDenied desembolsos_max = 0 - matriz = SortedDict() - dados = SortedDict() + matriz = OrderedDict() + dados = OrderedDict() projetos = Projeto.objects.all() meses = Desembolso.objects.dates('data', 'month', 'DESC')[:6] colors = ['ffff00', 'cc7900', 'ff0000', '92d050', '006600', '0097cc', '002776', 'ae78d6', 'ff00ff', '430080', @@ -137,9 +137,9 @@ def map_sum(request): casas = filtrar_casas(**param) # Montar registros de totalização - tot_servicos = SortedDict() - tot_projetos = SortedDict() - tot_diagnosticos = SortedDict() + tot_servicos = OrderedDict() + tot_projetos = OrderedDict() + tot_diagnosticos = OrderedDict() for ts in TipoServico.objects.all(): tot_servicos[ts.sigla] = 0 diff --git a/sigi/apps/ocorrencias/forms.py b/sigi/apps/ocorrencias/forms.py index bc37feab..45e01d92 100644 --- a/sigi/apps/ocorrencias/forms.py +++ b/sigi/apps/ocorrencias/forms.py @@ -68,7 +68,7 @@ class Meta: widgets = {'ocorrencia': HiddenInput()} class ComentarioForm(ModelForm): - encaminhar_setor = ModelChoiceField(queryset=Servico.objects.all(), cache_choices=True) + encaminhar_setor = ModelChoiceField(queryset=Servico.objects.all()) class Meta: model = Comentario @@ -80,4 +80,4 @@ class Meta: model = Ocorrencia fields = ['casa_legislativa', 'categoria', 'tipo_contato', 'assunto', 'prioridade', 'ticket', 'descricao', 'setor_responsavel',] - widgets = {'casa_legislativa': AjaxSelect(url=reverse_lazy('painel-buscacasa'), attrs={'size':100}), } \ No newline at end of file + widgets = {'casa_legislativa': AjaxSelect(url=reverse_lazy('painel-buscacasa'), attrs={'size':100}), } diff --git a/sigi/apps/ocorrencias/models.py b/sigi/apps/ocorrencias/models.py index 2bfe120c..125bd1ce 100644 --- a/sigi/apps/ocorrencias/models.py +++ b/sigi/apps/ocorrencias/models.py @@ -105,7 +105,7 @@ def save(self, *args, **kwargs): class Anexo(models.Model): ocorrencia = models.ForeignKey(Ocorrencia, verbose_name=_(u'ocorrência')) arquivo = models.FileField(_(u'Arquivo anexado'), upload_to='apps/ocorrencia/anexo/arquivo', max_length=500) - descricao = models.CharField(_(u'descrição do anexo'), max_length='70') + descricao = models.CharField(_(u'descrição do anexo'), max_length=70) data_pub = models.DateTimeField(_(u'data da publicação do anexo'), null=True, blank=True, auto_now_add=True) class Meta: diff --git a/sigi/apps/ocorrencias/templates/ocorrencias/painel.html b/sigi/apps/ocorrencias/templates/ocorrencias/painel.html index 4e964bfb..79391709 100644 --- a/sigi/apps/ocorrencias/templates/ocorrencias/painel.html +++ b/sigi/apps/ocorrencias/templates/ocorrencias/painel.html @@ -11,7 +11,7 @@ {% block extrahead %} {{ block.super }} - + {% endblock %} diff --git a/sigi/apps/parlamentares/admin.py b/sigi/apps/parlamentares/admin.py index 80c8ebcd..e42e8c33 100644 --- a/sigi/apps/parlamentares/admin.py +++ b/sigi/apps/parlamentares/admin.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- from django.contrib import admin -from django.contrib.contenttypes import generic +from django.contrib.contenttypes.admin import GenericTabularInline from django.http import HttpResponseRedirect, HttpResponse from django.utils.html import escape, escapejs from django.utils.translation import ugettext as _ @@ -20,7 +20,7 @@ class MandatosInline(admin.TabularInline): raw_id_fields = ('legislatura', 'partido') -class TelefonesInline(generic.GenericTabularInline): +class TelefonesInline(GenericTabularInline): model = Telefone extra = 2 diff --git a/sigi/apps/servicos/admin.py b/sigi/apps/servicos/admin.py index cecc0a8c..7e7da331 100644 --- a/sigi/apps/servicos/admin.py +++ b/sigi/apps/servicos/admin.py @@ -109,11 +109,11 @@ def calcular_data_uso(self, request, queryset): calcular_data_uso.short_description = _(u"Atualizar a data do último uso do(s) serviço(s)") def get_actions(self, request): - from django.utils.datastructures import SortedDict + from collections import OrderedDict actions = [self.get_action(action) for action in self.actions] actions = filter(None, actions) actions.sort(lambda a, b: cmp(a[2].lower(), b[2].lower())) - actions = SortedDict([(name, (func, name, desc)) for func, name, desc in actions]) + actions = OrderedDict([(name, (func, name, desc)) for func, name, desc in actions]) return actions def lookup_allowed(self, lookup, value): diff --git a/sigi/apps/servicos/models.py b/sigi/apps/servicos/models.py index 6a9cde73..107bf1ba 100644 --- a/sigi/apps/servicos/models.py +++ b/sigi/apps/servicos/models.py @@ -15,7 +15,7 @@ class TipoServico(models.Model): {url} para incluir a URL do serviço,
{senha} para incluir a senha inicial do serviço''' nome = models.CharField(_(u'Nome'), max_length=60) - sigla = models.CharField(_(u'Sigla'), max_length='12') + sigla = models.CharField(_(u'Sigla'), max_length=12) modo = models.CharField(_(u'Modo de prestação do serviço'), max_length=1, choices=MODO_CHOICES) string_pesquisa = models.CharField(_(u'String de pesquisa'), blank=True, max_length=200, help_text=_(u'Sufixo para pesquisa RSS para averiguar a data da última atualização do serviço')) diff --git a/sigi/apps/servicos/templates/servicos/mapa.html b/sigi/apps/servicos/templates/servicos/mapa.html index 94508675..15025631 100644 --- a/sigi/apps/servicos/templates/servicos/mapa.html +++ b/sigi/apps/servicos/templates/servicos/mapa.html @@ -7,7 +7,7 @@ {{ block.super }} {% load static from staticfiles %} - + - + @@ -33,4 +33,4 @@

{% trans 'Dashboard' %}

{% include "snippets/modules/charts-convenios.html" %}
-{% endblock %} \ No newline at end of file +{% endblock %} From d0c4948f5df28836de2292c6bfd287a2019a2c50 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Wed, 15 Jun 2016 14:25:17 -0300 Subject: [PATCH 02/63] =?UTF-8?q?ajusta=20concatena=C3=A7=C3=A3o=20de=20tu?= =?UTF-8?q?plas=20com=20tuplas=20(e=20n=C3=A3o=20listas)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/settings/base.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sigi/settings/base.py b/sigi/settings/base.py index bbc1fdfb..dd011415 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -30,9 +30,9 @@ SITE_ID = 1 -TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + [ +TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + ( 'django.core.context_processors.request', -] +) # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', From 93659fd7a15aca3ecc84fd32bf05c786bc5050a0 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Tue, 21 Jun 2016 11:49:25 -0300 Subject: [PATCH 03/63] Tentativa de portar ATENDIMENTO pra Python 2.7, e dentro do SIGI --- .gitignore | 8 + .../migrations/0002_auto_20160616_1602.py | 38 ++ sigi/apps/crispy_layout_mixin.py | 175 +++++++ sigi/apps/crud/__init__.py | 0 sigi/apps/crud/base.py | 224 +++++++++ sigi/apps/crud/urls.py | 6 + sigi/apps/crud/utils.py | 65 +++ .../migrations/0002_auto_20160616_1602.py | 34 ++ .../migrations/0003_auto_20160616_1602.py | 20 + .../migrations/0003_auto_20160616_1602.py | 20 + sigi/apps/solicitacoes/__init__.py | 0 sigi/apps/solicitacoes/admin.py | 3 + sigi/apps/solicitacoes/apps.py | 10 + sigi/apps/solicitacoes/forms.py | 43 ++ sigi/apps/solicitacoes/layouts.yaml | 33 ++ .../solicitacoes/migrations/0001_initial.py | 53 +++ .../migrations/0002_auto_20160616_1602.py | 20 + sigi/apps/solicitacoes/migrations/__init__.py | 0 sigi/apps/solicitacoes/models.py | 54 +++ sigi/apps/solicitacoes/tests.py | 3 + sigi/apps/solicitacoes/urls.py | 13 + sigi/apps/solicitacoes/views.py | 56 +++ sigi/apps/templates/index.html | 12 + sigi/apps/usuarios/__init__.py | 0 sigi/apps/usuarios/admin.py | 3 + sigi/apps/usuarios/apps.py | 10 + sigi/apps/usuarios/forms.py | 450 ++++++++++++++++++ sigi/apps/usuarios/layouts.yaml | 46 ++ sigi/apps/usuarios/migrations/0001_initial.py | 93 ++++ .../migrations/0002_auto_20160616_1400.py | 35 ++ .../migrations/0003_auto_20160616_1602.py | 26 + sigi/apps/usuarios/migrations/__init__.py | 0 sigi/apps/usuarios/models.py | 148 ++++++ sigi/apps/usuarios/tests.py | 3 + sigi/apps/usuarios/urls.py | 61 +++ sigi/apps/usuarios/utils.py | 65 +++ sigi/apps/usuarios/views.py | 183 +++++++ sigi/settings/base.py | 51 +- sigi/urls.py | 5 + templates/base.html | 155 ++++++ templates/crud/confirm_delete.html | 18 + templates/crud/detail.html | 38 ++ templates/crud/form.html | 15 + templates/crud/list.html | 51 ++ templates/menus/subnav.html | 23 + templates/paginacao.html | 37 ++ templates/templatetags/__init__.py | 0 templates/templatetags/common_tags.py | 38 ++ templates/templatetags/menus.py | 51 ++ templates/usuarios/confirma_email.html | 7 + templates/usuarios/habilitar_detail.html | 41 ++ templates/usuarios/login.html | 34 ++ .../usuarios/recuperacao_senha_completo.html | 10 + .../usuarios/recuperacao_senha_form.html | 13 + templates/usuarios/recuperar_senha.html | 5 + templates/usuarios/recuperar_senha_email.html | 14 + .../usuarios/recuperar_senha_enviado.html | 9 + templates/usuarios/usuario_detail.html | 31 ++ templates/usuarios/usuario_list.html | 38 ++ 59 files changed, 2695 insertions(+), 2 deletions(-) create mode 100644 sigi/apps/convenios/migrations/0002_auto_20160616_1602.py create mode 100644 sigi/apps/crispy_layout_mixin.py create mode 100644 sigi/apps/crud/__init__.py create mode 100644 sigi/apps/crud/base.py create mode 100644 sigi/apps/crud/urls.py create mode 100644 sigi/apps/crud/utils.py create mode 100644 sigi/apps/diagnosticos/migrations/0002_auto_20160616_1602.py create mode 100644 sigi/apps/ocorrencias/migrations/0003_auto_20160616_1602.py create mode 100644 sigi/apps/servicos/migrations/0003_auto_20160616_1602.py create mode 100644 sigi/apps/solicitacoes/__init__.py create mode 100644 sigi/apps/solicitacoes/admin.py create mode 100644 sigi/apps/solicitacoes/apps.py create mode 100644 sigi/apps/solicitacoes/forms.py create mode 100644 sigi/apps/solicitacoes/layouts.yaml create mode 100644 sigi/apps/solicitacoes/migrations/0001_initial.py create mode 100644 sigi/apps/solicitacoes/migrations/0002_auto_20160616_1602.py create mode 100644 sigi/apps/solicitacoes/migrations/__init__.py create mode 100644 sigi/apps/solicitacoes/models.py create mode 100644 sigi/apps/solicitacoes/tests.py create mode 100644 sigi/apps/solicitacoes/urls.py create mode 100644 sigi/apps/solicitacoes/views.py create mode 100644 sigi/apps/templates/index.html create mode 100644 sigi/apps/usuarios/__init__.py create mode 100644 sigi/apps/usuarios/admin.py create mode 100644 sigi/apps/usuarios/apps.py create mode 100644 sigi/apps/usuarios/forms.py create mode 100644 sigi/apps/usuarios/layouts.yaml create mode 100644 sigi/apps/usuarios/migrations/0001_initial.py create mode 100644 sigi/apps/usuarios/migrations/0002_auto_20160616_1400.py create mode 100644 sigi/apps/usuarios/migrations/0003_auto_20160616_1602.py create mode 100644 sigi/apps/usuarios/migrations/__init__.py create mode 100644 sigi/apps/usuarios/models.py create mode 100644 sigi/apps/usuarios/tests.py create mode 100644 sigi/apps/usuarios/urls.py create mode 100644 sigi/apps/usuarios/utils.py create mode 100644 sigi/apps/usuarios/views.py create mode 100644 templates/base.html create mode 100644 templates/crud/confirm_delete.html create mode 100644 templates/crud/detail.html create mode 100644 templates/crud/form.html create mode 100644 templates/crud/list.html create mode 100644 templates/menus/subnav.html create mode 100644 templates/paginacao.html create mode 100644 templates/templatetags/__init__.py create mode 100644 templates/templatetags/common_tags.py create mode 100644 templates/templatetags/menus.py create mode 100644 templates/usuarios/confirma_email.html create mode 100644 templates/usuarios/habilitar_detail.html create mode 100644 templates/usuarios/login.html create mode 100644 templates/usuarios/recuperacao_senha_completo.html create mode 100644 templates/usuarios/recuperacao_senha_form.html create mode 100644 templates/usuarios/recuperar_senha.html create mode 100644 templates/usuarios/recuperar_senha_email.html create mode 100644 templates/usuarios/recuperar_senha_enviado.html create mode 100644 templates/usuarios/usuario_detail.html create mode 100644 templates/usuarios/usuario_list.html diff --git a/.gitignore b/.gitignore index 45262ed7..79b884be 100644 --- a/.gitignore +++ b/.gitignore @@ -47,3 +47,11 @@ db.* .vagrant sigi/settings/prod.py +bower/ +collected_static/ +eav/ +geraldo/ + +*.bak +*~ + diff --git a/sigi/apps/convenios/migrations/0002_auto_20160616_1602.py b/sigi/apps/convenios/migrations/0002_auto_20160616_1602.py new file mode 100644 index 00000000..94c9ae39 --- /dev/null +++ b/sigi/apps/convenios/migrations/0002_auto_20160616_1602.py @@ -0,0 +1,38 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('convenios', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='anexo', + name='descricao', + field=models.CharField(max_length=70, verbose_name='descri\xe7\xe3o'), + preserve_default=True, + ), + migrations.AlterField( + model_name='tramitacao', + name='observacao', + field=models.CharField(max_length=512, null=True, verbose_name='observa\xe7\xe3o', blank=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='unidadeadministrativa', + name='nome', + field=models.CharField(max_length=100), + preserve_default=True, + ), + migrations.AlterField( + model_name='unidadeadministrativa', + name='sigla', + field=models.CharField(max_length=10), + preserve_default=True, + ), + ] diff --git a/sigi/apps/crispy_layout_mixin.py b/sigi/apps/crispy_layout_mixin.py new file mode 100644 index 00000000..5f6e57b5 --- /dev/null +++ b/sigi/apps/crispy_layout_mixin.py @@ -0,0 +1,175 @@ +# -*- coding: utf-8 -*- + +from math import ceil +from os.path import dirname, join + +import rtyaml +from crispy_forms.bootstrap import FormActions +from crispy_forms.helper import FormHelper +from crispy_forms.layout import HTML, Div, Fieldset, Layout, Submit +from django.utils import formats +from django.utils.translation import ugettext as _ + + +def heads_and_tails(list_of_lists): + for alist in list_of_lists: + yield alist[0], alist[1:] + + +def to_column(name_span): + fieldname, span = name_span + return Div(fieldname, css_class='col-md-%d' % span) + + +def to_row(names_spans): + return Div(*map(to_column, names_spans), css_class='row-fluid') + + +def to_fieldsets(fields): + for field in fields: + if isinstance(field, list): + legend, row_specs = field[0], field[1:] + rows = [to_row(name_span_list) for name_span_list in row_specs] + yield Fieldset(legend, *rows) + else: + yield field + + +def form_actions(more=[], save_label=_('Salvar')): + return FormActions( + Submit('salvar', save_label, css_class='pull-right'), *more) + + +class FormLayout(Layout): + + def __init__(self, label_cancel=_("Cancelar"), *fields): + buttons = form_actions(more=[ + HTML('%s' % label_cancel)]) + _fields = list(to_fieldsets(fields)) + [to_row([(buttons, 12)])] + super(FormLayout, self).__init__(*_fields) + + +def get_field_display(obj, fieldname): + field = obj._meta.get_field(fieldname) + verbose_name = str(field.verbose_name) + if field.choices: + value = getattr(obj, 'get_%s_display' % fieldname)() + else: + value = getattr(obj, fieldname) + + if value is None: + display = '' + elif 'date' in str(type(value)): + display = formats.date_format(value, "SHORT_DATE_FORMAT") + elif 'bool' in str(type(value)): + display = _('Sim') if value else _('Não') + elif 'ImageFieldFile' in str(type(value)): + if value: + display = ''.format(value.url) + else: + display = '' + elif 'FieldFile' in str(type(value)): + if value: + display = '{}'.format( + value.url, + value.name.split('/')[-1:][0]) + else: + display = '' + else: + display = str(value) + return verbose_name, display + + +class CrispyLayoutFormMixin(object): + + @property + def layout_key(self): + if hasattr(super(CrispyLayoutFormMixin, self), 'layout_key'): + return super(CrispyLayoutFormMixin, self).layout_key + else: + return self.model.__name__ + + def get_layout(self): + filename = join( + dirname(self.model._meta.app_config.models_module.__file__), + 'layouts.yaml') + return read_layout_from_yaml(filename, self.layout_key) + + @property + def fields(self): + if hasattr(self, 'form_class') and self.form_class: + return None + else: + '''Returns all fields in the layout''' + return [fieldname for legend_rows in self.get_layout() + for row in legend_rows[1:] + for fieldname, span in row] + + def get_form(self, form_class=None): + try: + form = super(CrispyLayoutFormMixin, self).get_form(form_class) + except AttributeError: + # simply return None if there is no get_form on super + pass + else: + form.helper = FormHelper() + form.helper.layout = FormLayout(*self.get_layout()) + return form + + @property + def list_field_names(self): + '''The list of field names to display on table + + This base implementation returns the field names + in the first fieldset of the layout. + ''' + rows = self.get_layout()[0][1:] + return [fieldname for row in rows for fieldname, __ in row] + + def get_column(self, fieldname, span): + obj = self.get_object() + verbose_name, text = get_field_display(obj, fieldname) + return { + 'id': fieldname, + 'span': span, + 'verbose_name': verbose_name, + 'text': text, + } + + @property + def layout_display(self): + + return [ + {'legend': legend, + 'rows': [[self.get_column(fieldname, span) + for fieldname, span in row] + for row in rows] + } for legend, rows in heads_and_tails(self.get_layout())] + + +def read_yaml_from_file(filename): + # TODO cache this at application level + with open(filename, 'r') as yamlfile: + return rtyaml.load(yamlfile) + + +def read_layout_from_yaml(filename, key): + # TODO cache this at application level + yaml = read_yaml_from_file(filename) + base = yaml[key] + + def line_to_namespans(line): + split = [cell.split(':') for cell in line.split()] + namespans = [[s[0], int(s[1]) if len(s) > 1 else 0] for s in split] + remaining = 12 - sum(s for n, s in namespans) + nondefined = [ns for ns in namespans if not ns[1]] + while nondefined: + span = ceil(remaining / len(nondefined)) + namespan = nondefined.pop(0) + namespan[1] = span + remaining = remaining - span + return list(map(tuple, namespans)) + + return [[legend] + [line_to_namespans(l) for l in lines] + for legend, lines in base.items()] diff --git a/sigi/apps/crud/__init__.py b/sigi/apps/crud/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/sigi/apps/crud/base.py b/sigi/apps/crud/base.py new file mode 100644 index 00000000..1d5f22c7 --- /dev/null +++ b/sigi/apps/crud/base.py @@ -0,0 +1,224 @@ +# -*- coding: utf-8 -*- + +from __future__ import absolute_import +from braces.views import FormMessagesMixin +from django.conf.urls import url +from django.core.urlresolvers import reverse +from django.utils.decorators import classonlymethod +from django.utils.translation import ugettext_lazy as _ +from django.views.generic import (CreateView, DeleteView, DetailView, ListView, + UpdateView) + +from .utils import make_pagination +from sigi.apps.crispy_layout_mixin import CrispyLayoutFormMixin, get_field_display + +LIST, CREATE, DETAIL, UPDATE, DELETE = \ + u'list', u'create', u'detail', u'update', u'delete' + + +def _form_invalid_message(msg): + return u'%s %s' % (_(u'Formulário inválido.'), msg) + +FORM_MESSAGES = {CREATE: (_(u'Registro criado com sucesso!'), + _(u'O registro não foi criado.')), + UPDATE: (_(u'Registro alterado com sucesso!'), + _(u'Suas alterações não foram salvas.')), + DELETE: (_(u'Registro excluído com sucesso!'), + _(u'O registro não foi excluído.'))} +FORM_MESSAGES = dict((k, (a, _form_invalid_message(b))) + for k, (a, b) in FORM_MESSAGES.items()) + + +class CrudBaseMixin(CrispyLayoutFormMixin): + + @classmethod + def url_name(cls, suffix): + return u'%s_%s' % (cls.model._meta.model_name, suffix) + + def resolve_url(self, suffix, args=None): + namespace = self.model._meta.app_label + return reverse(u'%s:%s' % (namespace, self.url_name(suffix)), + args=args) + + @property + def list_url(self): + return self.resolve_url(LIST) + + @property + def create_url(self): + return self.resolve_url(CREATE) + + @property + def detail_url(self): + return self.resolve_url(DETAIL, args=(self.object.id,)) + + @property + def update_url(self): + return self.resolve_url(UPDATE, args=(self.object.id,)) + + @property + def delete_url(self): + return self.resolve_url(DELETE, args=(self.object.id,)) + + def get_template_names(self): + names = super(CrudBaseMixin, self).get_template_names() + names.append(u"crud/%s.html" % + self.template_name_suffix.lstrip(u'_')) + return names + + @property + def verbose_name(self): + return self.model._meta.verbose_name + + @property + def verbose_name_plural(self): + return self.model._meta.verbose_name_plural + + +class CrudListView(ListView): + + @classmethod + def get_url_regex(cls): + return ur'^$' + + paginate_by = 10 + no_entries_msg = _(u'Nenhum registro encontrado.') + + def get_rows(self, object_list): + return [self._as_row(obj) for obj in object_list] + + def get_headers(self): + return [self.model._meta.get_field(fieldname).verbose_name + for fieldname in self.list_field_names] + + def _as_row(self, obj): + return [ + (get_field_display(obj, name)[1], + self.resolve_url(DETAIL, args=(obj.id,)) if i == 0 else None) + for i, name in enumerate(self.list_field_names)] + + def get_context_data(self, **kwargs): + context = super(CrudListView, self).get_context_data(**kwargs) + context.setdefault(u'title', self.verbose_name_plural) + + # pagination + if self.paginate_by: + page_obj = context[u'page_obj'] + paginator = context[u'paginator'] + context[u'page_range'] = make_pagination( + page_obj.number, paginator.num_pages) + + # rows + object_list = context[u'object_list'] + context[u'headers'] = self.get_headers() + context[u'rows'] = self.get_rows(object_list) + + context[u'NO_ENTRIES_MSG'] = self.no_entries_msg + + return context + + +class CrudCreateView(FormMessagesMixin, CreateView): + + @classmethod + def get_url_regex(cls): + return ur'^create$' + + form_valid_message, form_invalid_message = FORM_MESSAGES[CREATE] + + @property + def cancel_url(self): + return self.list_url + + def get_success_url(self): + return self.detail_url + + def get_context_data(self, **kwargs): + kwargs.setdefault(u'title', _(u'Adicionar %(verbose_name)s') % { + u'verbose_name': self.verbose_name}) + return super(CrudCreateView, self).get_context_data(**kwargs) + + +class CrudDetailView(DetailView): + + @classmethod + def get_url_regex(cls): + return ur'^(?P\d+)$' + + +class CrudUpdateView(FormMessagesMixin, UpdateView): + + @classmethod + def get_url_regex(cls): + return ur'^(?P\d+)/edit$' + + form_valid_message, form_invalid_message = FORM_MESSAGES[UPDATE] + + @property + def cancel_url(self): + return self.detail_url + + def get_success_url(self): + return self.detail_url + + +class CrudDeleteView(FormMessagesMixin, DeleteView): + + @classmethod + def get_url_regex(cls): + return ur'^(?P\d+)/delete$' + + form_valid_message, form_invalid_message = FORM_MESSAGES[DELETE] + + @property + def cancel_url(self): + return self.detail_url + + def get_success_url(self): + return self.list_url + + +class Crud(object): + BaseMixin = CrudBaseMixin + ListView = CrudListView + CreateView = CrudCreateView + DetailView = CrudDetailView + UpdateView = CrudUpdateView + DeleteView = CrudDeleteView + help_path = u'' + + @classonlymethod + def get_urls(cls): + + def _add_base(view): + class CrudViewWithBase(cls.BaseMixin, view): + model = cls.model + help_path = cls.help_path + crud = cls + CrudViewWithBase.__name__ = view.__name__ + return CrudViewWithBase + + CrudListView = _add_base(cls.ListView) + CrudCreateView = _add_base(cls.CreateView) + CrudDetailView = _add_base(cls.DetailView) + CrudUpdateView = _add_base(cls.UpdateView) + CrudDeleteView = _add_base(cls.DeleteView) + + return [url(regex, view.as_view(), name=view.url_name(suffix)) + for regex, view, suffix in [ + (CrudListView.get_url_regex(), CrudListView, LIST), + (CrudCreateView.get_url_regex(), CrudCreateView, CREATE), + (CrudDetailView.get_url_regex(), CrudDetailView, DETAIL), + (CrudUpdateView.get_url_regex(), CrudUpdateView, UPDATE), + (CrudDeleteView.get_url_regex(), CrudDeleteView, DELETE), + ]] + + @classonlymethod + def build(cls, _model, _help_path): + + class ModelCrud(cls): + model = _model + help_path = _help_path + + ModelCrud.__name__ = u'%sCrud' % _model.__name__ + return ModelCrud diff --git a/sigi/apps/crud/urls.py b/sigi/apps/crud/urls.py new file mode 100644 index 00000000..b17b6df8 --- /dev/null +++ b/sigi/apps/crud/urls.py @@ -0,0 +1,6 @@ +from __future__ import absolute_import +from django.conf.urls import include, url + +urlpatterns = [ + url(ur'', include(u'stub_app.urls')), +] diff --git a/sigi/apps/crud/utils.py b/sigi/apps/crud/utils.py new file mode 100644 index 00000000..53bf2b2d --- /dev/null +++ b/sigi/apps/crud/utils.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import +from django.utils.translation import ugettext_lazy as _ + +UF = [ + (u'AC', u'Acre'), + (u'AL', u'Alagoas'), + (u'AP', u'Amapá'), + (u'AM', u'Amazonas'), + (u'BA', u'Bahia'), + (u'CE', u'Ceará'), + (u'DF', u'Distrito Federal'), + (u'ES', u'Espírito Santo'), + (u'GO', u'Goiás'), + (u'MA', u'Maranhão'), + (u'MT', u'Mato Grosso'), + (u'MS', u'Mato Grosso do Sul'), + (u'MG', u'Minas Gerais'), + (u'PR', u'Paraná'), + (u'PB', u'Paraíba'), + (u'PA', u'Pará'), + (u'PE', u'Pernambuco'), + (u'PI', u'Piauí'), + (u'RJ', u'Rio de Janeiro'), + (u'RN', u'Rio Grande do Norte'), + (u'RS', u'Rio Grande do Sul'), + (u'RO', u'Rondônia'), + (u'RR', u'Roraima'), + (u'SC', u'Santa Catarina'), + (u'SE', u'Sergipe'), + (u'SP', u'São Paulo'), + (u'TO', u'Tocantins'), + (u'EX', u'Exterior'), +] + +YES_NO_CHOICES = [(None, _(u'----')), (False, _(u'Não')), (True, _(u'Sim'))] + + +def str2bool(v): + return v in (u'Sim', u'True') + + +SEXO_CHOICES = [(u'M', _(u'Masculino')), (u'F', _(u'Feminino'))] + + +def from_to(start, end): + return range(start, end + 1) + + +def make_pagination(index, num_pages): + PAGINATION_LENGTH = 10 + if num_pages <= PAGINATION_LENGTH: + return from_to(1, num_pages) + else: + if index - 1 <= 5: + tail = [num_pages - 1, num_pages] + head = from_to(1, PAGINATION_LENGTH - 3) + else: + if index + 1 >= num_pages - 3: + tail = from_to(index - 1, num_pages) + else: + tail = [index - 1, index, index + 1, + None, num_pages - 1, num_pages] + head = from_to(1, PAGINATION_LENGTH - len(tail) - 1) + return head + [None] + tail diff --git a/sigi/apps/diagnosticos/migrations/0002_auto_20160616_1602.py b/sigi/apps/diagnosticos/migrations/0002_auto_20160616_1602.py new file mode 100644 index 00000000..b83a708a --- /dev/null +++ b/sigi/apps/diagnosticos/migrations/0002_auto_20160616_1602.py @@ -0,0 +1,34 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations +import autoslug.fields +import eav.models + + +class Migration(migrations.Migration): + + dependencies = [ + ('diagnosticos', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='anexo', + name='descricao', + field=models.CharField(max_length=70, verbose_name='descri\xe7\xe3o'), + preserve_default=True, + ), + migrations.AlterField( + model_name='escolha', + name='schema_to_open', + field=models.ForeignKey(related_name='schema_to_open_related', verbose_name='pergunta para abrir', blank=True, to='diagnosticos.Pergunta', null=True), + preserve_default=True, + ), + migrations.AlterField( + model_name='pergunta', + name='name', + field=autoslug.fields.AutoSlugField(populate_from=b'title', editable=True, max_length=250, blank=True, verbose_name='name', slugify=eav.models.slugify_attr_name), + preserve_default=True, + ), + ] diff --git a/sigi/apps/ocorrencias/migrations/0003_auto_20160616_1602.py b/sigi/apps/ocorrencias/migrations/0003_auto_20160616_1602.py new file mode 100644 index 00000000..77a9884f --- /dev/null +++ b/sigi/apps/ocorrencias/migrations/0003_auto_20160616_1602.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('ocorrencias', '0002_auto_20160308_0828'), + ] + + operations = [ + migrations.AlterField( + model_name='anexo', + name='descricao', + field=models.CharField(max_length=70, verbose_name='descri\xe7\xe3o do anexo'), + preserve_default=True, + ), + ] diff --git a/sigi/apps/servicos/migrations/0003_auto_20160616_1602.py b/sigi/apps/servicos/migrations/0003_auto_20160616_1602.py new file mode 100644 index 00000000..ef24d8ad --- /dev/null +++ b/sigi/apps/servicos/migrations/0003_auto_20160616_1602.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('servicos', '0002_tiposervico_modo'), + ] + + operations = [ + migrations.AlterField( + model_name='tiposervico', + name='sigla', + field=models.CharField(max_length=12, verbose_name='Sigla'), + preserve_default=True, + ), + ] diff --git a/sigi/apps/solicitacoes/__init__.py b/sigi/apps/solicitacoes/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/sigi/apps/solicitacoes/admin.py b/sigi/apps/solicitacoes/admin.py new file mode 100644 index 00000000..4185d360 --- /dev/null +++ b/sigi/apps/solicitacoes/admin.py @@ -0,0 +1,3 @@ +# from django.contrib import admin + +# Register your models here. diff --git a/sigi/apps/solicitacoes/apps.py b/sigi/apps/solicitacoes/apps.py new file mode 100644 index 00000000..9567689e --- /dev/null +++ b/sigi/apps/solicitacoes/apps.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- + +from __future__ import absolute_import +from django import apps +from django.utils.translation import ugettext_lazy as _ + + +class AppConfig(apps.AppConfig): + name = u'solicitacoes' + verbose_name = _(u'Solicitações') diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py new file mode 100644 index 00000000..5db2086c --- /dev/null +++ b/sigi/apps/solicitacoes/forms.py @@ -0,0 +1,43 @@ +from __future__ import absolute_import +from django import forms +from django.forms import ModelForm + +from .models import Sistema, Solicitacao + + +class SolicitacaoForm(ModelForm): + + resumo = forms.CharField( + label=u'Resumo', + max_length=500, + widget=forms.Textarea) + + class Meta(object): + model = Solicitacao + fields = [u'codigo', u'usuario', u'sistema', + u'email_contato', u'telefone_contato', + u'casa_legislativa', u'titulo', u'resumo'] + widgets = {u'codigo': forms.HiddenInput(), + u'usuario': forms.HiddenInput()} + + +class SolicitacaoEditForm(ModelForm): + + resumo = forms.CharField( + label=u'Resumo', + max_length=500, + widget=forms.Textarea) + + class Meta(object): + model = Solicitacao + fields = [u'codigo', u'usuario', u'sistema', + u'casa_legislativa', u'titulo', u'resumo'] + widgets = {u'codigo': forms.TextInput(attrs={u'readonly': u'readonly'}), + u'usuario': forms.HiddenInput()} + + +class SistemaForm(ModelForm): + + class Meta(object): + model = Sistema + fields = [u'sigla', u'nome'] diff --git a/sigi/apps/solicitacoes/layouts.yaml b/sigi/apps/solicitacoes/layouts.yaml new file mode 100644 index 00000000..2e9804a4 --- /dev/null +++ b/sigi/apps/solicitacoes/layouts.yaml @@ -0,0 +1,33 @@ + +Sistema: + Sistema: + - sigla + - nome + +Solicitacao: + Solicitação: + - codigo + - usuario + - sistema + - casa_legislativa + - email_contato telefone_contato + - titulo + - resumo + +SolicitacaoEdit: + Solicitação: + - codigo + - usuario + - sistema + - titulo + - resumo + +SolicitacaoList: + Solicitação: + - codigo + - usuario + - sistema + - casa_legislativa + - email_contato telefone_contato + - titulo + - data_criacao diff --git a/sigi/apps/solicitacoes/migrations/0001_initial.py b/sigi/apps/solicitacoes/migrations/0001_initial.py new file mode 100644 index 00000000..b1947164 --- /dev/null +++ b/sigi/apps/solicitacoes/migrations/0001_initial.py @@ -0,0 +1,53 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-06-16 16:34 +from __future__ import absolute_import +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + (u'usuarios', u'__first__'), + ] + + operations = [ + migrations.CreateModel( + name=u'Sistema', + fields=[ + (u'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=u'ID')), + (u'sigla', models.CharField(max_length=10, verbose_name=u'Sigla')), + (u'nome', models.CharField(max_length=100, verbose_name=u'Nome Sistema')), + (u'descricao', models.TextField(blank=True, null=True, verbose_name=u'Descrição')), + ], + options={ + u'verbose_name_plural': u'Sistemas', + u'verbose_name': u'Sistema', + }, + ), + migrations.CreateModel( + name=u'Solicitacao', + fields=[ + (u'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=u'ID')), + (u'codigo', models.PositiveIntegerField(unique=True)), + (u'titulo', models.CharField(max_length=100, verbose_name=u'Título')), + (u'resumo', models.CharField(max_length=50, verbose_name=u'Resumo')), + (u'casa_legislativa', models.CharField(max_length=200, verbose_name=u'Casa Legislativa')), + (u'email_contato', models.EmailField(blank=True, max_length=254, null=True, verbose_name=u'Email de contato')), + (u'telefone_contato', models.CharField(blank=True, max_length=15, null=True, verbose_name=u'Telefone de contato')), + (u'data_criacao', models.DateTimeField(auto_now_add=True, verbose_name=u'Data de criação')), + (u'descricao', models.TextField(blank=True, null=True, verbose_name=u'Descrição')), + (u'sistema', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=u'solicitacoes.Sistema')), + (u'usuario', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=u'usuarios.Usuario')), + ], + options={ + u'ordering': [u'data_criacao'], + u'verbose_name_plural': u'Solicitações de Novos Serviços', + u'verbose_name': u'Solicitação de Novo Serviço', + }, + ), + ] diff --git a/sigi/apps/solicitacoes/migrations/0002_auto_20160616_1602.py b/sigi/apps/solicitacoes/migrations/0002_auto_20160616_1602.py new file mode 100644 index 00000000..8712b333 --- /dev/null +++ b/sigi/apps/solicitacoes/migrations/0002_auto_20160616_1602.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('solicitacoes', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='solicitacao', + name='email_contato', + field=models.EmailField(max_length=75, null=True, verbose_name='Email de contato', blank=True), + preserve_default=True, + ), + ] diff --git a/sigi/apps/solicitacoes/migrations/__init__.py b/sigi/apps/solicitacoes/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/sigi/apps/solicitacoes/models.py b/sigi/apps/solicitacoes/models.py new file mode 100644 index 00000000..f6d025f7 --- /dev/null +++ b/sigi/apps/solicitacoes/models.py @@ -0,0 +1,54 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import +from django.db import models +from django.utils.translation import ugettext_lazy as _ + +from sigi.apps.usuarios.models import Usuario + + +class Sistema(models.Model): + sigla = models.CharField(verbose_name=_(u'Sigla'), max_length=10) + nome = models.CharField(verbose_name=_(u'Nome Sistema'), + max_length=100) + descricao = models.TextField(null=True, + blank=True, + verbose_name=_(u'Descrição')) + + class Meta(object): + verbose_name = _(u'Sistema') + verbose_name_plural = _(u'Sistemas') + + def __str__(self): + return u"%s - %s" % (self.sigla, self.nome) + + +class Solicitacao(models.Model): + codigo = models.PositiveIntegerField(unique=True) + usuario = models.ForeignKey(Usuario) + sistema = models.ForeignKey(Sistema) + titulo = models.CharField(verbose_name=_(u'Título'), max_length=100) + resumo = models.CharField(verbose_name=_(u'Resumo'), max_length=50) + casa_legislativa = models.CharField(verbose_name=_(u'Casa Legislativa'), + max_length=200) + email_contato = models.EmailField(blank=True, + null=True, + verbose_name=_(u'Email de contato')) + # Substituir por usuarios.models.Telefone? + telefone_contato = models.CharField(max_length=15, + null=True, + blank=True, + verbose_name=_(u'Telefone de contato')) + + data_criacao = models.DateTimeField(auto_now_add=True, + verbose_name=_(u'Data de criação')) + descricao = models.TextField(blank=True, + null=True, + verbose_name=_(u'Descrição')) + + class Meta(object): + verbose_name = _(u'Solicitação de Novo Serviço') + verbose_name_plural = _(u'Solicitações de Novos Serviços') + ordering = [u'data_criacao'] + + def __str__(self): + return u"%s - %s" % (self.codigo, self.resumo) diff --git a/sigi/apps/solicitacoes/tests.py b/sigi/apps/solicitacoes/tests.py new file mode 100644 index 00000000..a79ca8be --- /dev/null +++ b/sigi/apps/solicitacoes/tests.py @@ -0,0 +1,3 @@ +# from django.test import TestCase + +# Create your tests here. diff --git a/sigi/apps/solicitacoes/urls.py b/sigi/apps/solicitacoes/urls.py new file mode 100644 index 00000000..83f13dde --- /dev/null +++ b/sigi/apps/solicitacoes/urls.py @@ -0,0 +1,13 @@ +from __future__ import absolute_import +from django.conf.urls import include, url + +from sigi.apps.solicitacoes.views import SistemaCrud, SolicitacaoCrud + +from .apps import AppConfig + +app_name = AppConfig.name + +urlpatterns = [ + url(ur'sistema/', include(SistemaCrud.get_urls())), + url(ur'solicitacao/', include(SolicitacaoCrud.get_urls())), +] diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py new file mode 100644 index 00000000..6c8198d1 --- /dev/null +++ b/sigi/apps/solicitacoes/views.py @@ -0,0 +1,56 @@ +from __future__ import absolute_import +import random + +from django.contrib.auth.mixins import LoginRequiredMixin + +import sigi.apps.crud.base +from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView +from sigi.apps.usuarios.models import Usuario + +from .forms import SistemaForm, SolicitacaoEditForm, SolicitacaoForm +from .models import Sistema, Solicitacao + + +class SolicitacaoCrud(LoginRequiredMixin, Crud): + model = Solicitacao + help_path = u'' + + class CreateView(LoginRequiredMixin, CrudCreateView): + form_class = SolicitacaoForm + + def get_initial(self): + try: + usuario = Usuario.objects.get(user=self.request.user) + self.initial[u'usuario'] = usuario + self.initial[u'codigo'] = random.randint(0, 65500) + self.initial[u'email_contato'] = usuario.email + self.initial[u'telefone_contato'] = usuario.primeiro_telefone + except Usuario.DoesNotExist: + pass + return self.initial.copy() # TODO: por que? + + class UpdateView(LoginRequiredMixin, CrudUpdateView): + form_class = SolicitacaoEditForm + + @property + def layout_key(self): + return u'SolicitacaoEdit' + + class ListView(LoginRequiredMixin, CrudListView): + @property + def layout_key(self): + return u'SolicitacaoList' + + +class SistemaCrud(Crud): + model = Sistema + help_path = u'' + + class CreateView(LoginRequiredMixin, CrudCreateView): + form_class = SistemaForm + + class UpdateView(LoginRequiredMixin, CrudUpdateView): + form_class = SistemaForm + + class ListView(LoginRequiredMixin, CrudListView): + pass diff --git a/sigi/apps/templates/index.html b/sigi/apps/templates/index.html new file mode 100644 index 00000000..fb3a5487 --- /dev/null +++ b/sigi/apps/templates/index.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block title %} +

Bem-vindo ao Centro de Suporte

+{% endblock %} + +{% block base_content %} + Através deste sistema, você poderá solicitar novos serviços a serem + hospedados em nosso Data Center e acompanhar as solicitações já em aberto. + Cadastre-se para continuar. +{% endblock %} diff --git a/sigi/apps/usuarios/__init__.py b/sigi/apps/usuarios/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/sigi/apps/usuarios/admin.py b/sigi/apps/usuarios/admin.py new file mode 100644 index 00000000..4185d360 --- /dev/null +++ b/sigi/apps/usuarios/admin.py @@ -0,0 +1,3 @@ +# from django.contrib import admin + +# Register your models here. diff --git a/sigi/apps/usuarios/apps.py b/sigi/apps/usuarios/apps.py new file mode 100644 index 00000000..d1851f69 --- /dev/null +++ b/sigi/apps/usuarios/apps.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- + +from __future__ import absolute_import +from django import apps +from django.utils.translation import ugettext_lazy as _ + + +class AppConfig(apps.AppConfig): + name = u'usuarios' + verbose_name = _(u'Usuários') diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py new file mode 100644 index 00000000..44ecba2e --- /dev/null +++ b/sigi/apps/usuarios/forms.py @@ -0,0 +1,450 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import +from datetime import datetime + +from captcha.fields import CaptchaField +from crispy_forms.helper import FormHelper +from crispy_forms.layout import Fieldset, Layout, Submit +from django import forms +from django.conf import settings +from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm, + SetPasswordForm) +from django.contrib.auth.models import User +from django.contrib.auth.password_validation import validate_password +from django.contrib.auth.tokens import default_token_generator +from django.core.exceptions import ValidationError +from django.core.mail import send_mail +from django.core.urlresolvers import reverse +from django.db import transaction +from django.forms import ModelForm +from django.utils.encoding import force_bytes +from django.utils.http import urlsafe_base64_encode +from django.utils.translation import ugettext_lazy as _ + + +import sigi.apps.crispy_layout_mixin +from sigi.apps.crud.utils import YES_NO_CHOICES +from sigi.apps.crispy_layout_mixin import form_actions + +from .models import Telefone, Usuario, ConfirmaEmail + + +class LoginForm(AuthenticationForm): + username = forms.CharField( + label=u"Username", max_length=30, + widget=forms.TextInput( + attrs={u'class': u'form-control', u'name': u'username'})) + + password = forms.CharField( + label=u"Password", max_length=30, + widget=forms.PasswordInput( + attrs={u'class': u'form-control', u'name': u'password'})) + + +class UsuarioForm(ModelForm): + # Telefone + TIPO_TELEFONE = [(u'FIXO', u'FIXO'), (u'CELULAR', u'CELULAR')] + + # Primeiro Telefone + primeiro_tipo = forms.ChoiceField( + widget=forms.Select(), + choices=TIPO_TELEFONE, + label=_(u'Tipo Telefone')) + primeiro_ddd = forms.CharField(max_length=2, label=_(u'DDD')) + primeiro_numero = forms.CharField(max_length=10, label=_(u'Número')) + primeiro_principal = forms.TypedChoiceField( + widget=forms.Select(), + label=_(u'Telefone Principal?'), + choices=YES_NO_CHOICES) + + # Primeiro Telefone + segundo_tipo = forms.ChoiceField( + required=False, + widget=forms.Select(), + choices=TIPO_TELEFONE, + label=_(u'Tipo Telefone')) + segundo_ddd = forms.CharField(required=False, max_length=2, label=_(u'DDD')) + segundo_numero = forms.CharField( + required=False, max_length=10, label=_(u'Número')) + segundo_principal = forms.ChoiceField( + required=False, + widget=forms.Select(), + label=_(u'Telefone Principal?'), + choices=YES_NO_CHOICES) + + # Usuário + password = forms.CharField( + max_length=20, + label=_(u'Senha'), + widget=forms.PasswordInput()) + + password_confirm = forms.CharField( + max_length=20, + label=_(u'Confirmar Senha'), + widget=forms.PasswordInput()) + + email_confirm = forms.EmailField( + required=True, + widget=forms.TextInput(attrs={u'style': u'text-transform:lowercase;'}), + label=_(u'Confirmar Email')) + + captcha = CaptchaField() + + class Meta(object): + model = Usuario + fields = [u'username', u'email', u'nome_completo', u'password', u'vinculo', + u'password_confirm', u'email_confirm', u'captcha', u'cpf', u'rg', + u'cargo', u'casa_legislativa'] + + widgets = {u'email': forms.TextInput( + attrs={u'style': u'text-transform:lowercase;'}),} + + def __init__(self, *args, **kwargs): + super(UsuarioForm, self).__init__(*args, **kwargs) + self.fields[u'rg'].widget.attrs[u'class'] = u'rg' + self.fields[u'cpf'].widget.attrs[u'class'] = u'cpf' + self.fields[u'primeiro_numero'].widget.attrs[u'class'] = u'telefone' + self.fields[u'primeiro_ddd'].widget.attrs[u'class'] = u'ddd' + self.fields[u'segundo_numero'].widget.attrs[u'class'] = u'telefone' + self.fields[u'segundo_ddd'].widget.attrs[u'class'] = u'ddd' + + def valida_igualdade(self, texto1, texto2, msg): + if texto1 != texto2: + raise ValidationError(msg) + return True + + def clean_primeiro_numero(self): + cleaned_data = self.cleaned_data + + telefone = Telefone() + telefone.tipo = self.data[u'primeiro_tipo'] + telefone.ddd = self.data[u'primeiro_ddd'] + telefone.numero = self.data[u'primeiro_numero'] + telefone.principal = self.data[u'primeiro_principal'] + + cleaned_data[u'primeiro_telefone'] = telefone + return cleaned_data + + def clean_segundo_numero(self): + cleaned_data = self.cleaned_data + + telefone = Telefone() + telefone.tipo = self.data[u'segundo_tipo'] + telefone.ddd = self.data[u'segundo_ddd'] + telefone.numero = self.data[u'segundo_numero'] + telefone.principal = self.data[u'segundo_principal'] + + cleaned_data[u'segundo_telefone'] = telefone + return cleaned_data + + def valida_email_existente(self): + return Usuario.objects.filter( + email=self.cleaned_data[u'email']).exists() + + def clean(self): + + if (u'password' not in self.cleaned_data or + u'password_confirm' not in self.cleaned_data): + raise ValidationError(_(u'Favor informar senhas atuais ou novas')) + + msg = _(u'As senhas não conferem.') + self.valida_igualdade( + self.cleaned_data[u'password'], + self.cleaned_data[u'password_confirm'], + msg) + + if (u'email' not in self.cleaned_data or + u'email_confirm' not in self.cleaned_data): + raise ValidationError(_(u'Favor informar endereços de email')) + + msg = _(u'Os emails não conferem.') + self.valida_igualdade( + self.cleaned_data[u'email'], + self.cleaned_data[u'email_confirm'], + msg) + + email_existente = self.valida_email_existente() + + if email_existente: + msg = _(u'Esse email já foi cadastrado.') + raise ValidationError(msg) + + try: + validate_password(self.cleaned_data[u'password']) + except ValidationError, error: + raise ValidationError(error) + + return self.cleaned_data + + @transaction.atomic + def save(self, commit=False): + usuario = super(UsuarioForm, self).save(commit) + + # Cria telefones + tel = Telefone.objects.create( + tipo=self.data[u'primeiro_tipo'], + ddd=self.data[u'primeiro_ddd'], + numero=self.data[u'primeiro_numero'], + principal=self.data[u'primeiro_principal'] + ) + usuario.primeiro_telefone = tel + + tel = self.cleaned_data[u'segundo_telefone'] + if (tel.tipo and tel.ddd and tel.numero and tel.principal): + tel = Telefone.objects.create( + tipo=self.data[u'segundo_tipo'], + ddd=self.data[u'segundo_ddd'], + numero=self.data[u'segundo_numero'], + principal=self.data[u'segundo_principal'] + ) + usuario.segundo_telefone = tel + + # Cria User + u = User.objects.create(username=usuario.username, email=usuario.email) + u.set_password(self.cleaned_data[u'password']) + u.is_active = False + + u.save() + usuario.user = u + usuario.save() + + +class UsuarioEditForm(UsuarioForm): + + class Meta(object): + model = Usuario + fields = [u'username', u'email', u'nome_completo', u'vinculo', + u'email_confirm', u'captcha', u'cpf', u'rg', + u'cargo', u'casa_legislativa'] + widgets = {u'username': forms.TextInput(attrs={u'readonly': u'readonly'}), + u'email': forms.TextInput( + attrs={u'style': u'text-transform:lowercase;'}), + } + + def __init__(self, *args, **kwargs): + super(UsuarioEditForm, self).__init__(*args, **kwargs) + self.fields[u'email_confirm'].initial = self.instance.email + self.fields.pop(u'password') + self.fields.pop(u'password_confirm') + + def valida_email_existente(self): + u'''Não permite atualizar emails para + emails existentes de outro usuário + ''' + return Usuario.objects.filter( + email=self.cleaned_data[u'email']).exclude( + user__username=self.cleaned_data[u'username']).exists() + + def clean(self): + + if (u'email' not in self.cleaned_data or + u'email_confirm' not in self.cleaned_data): + raise ValidationError(_(u'Favor informar endereços de email')) + + msg = _(u'Os emails não conferem.') + self.valida_igualdade( + self.cleaned_data[u'email'], + self.cleaned_data[u'email_confirm'], + msg) + + email_existente = self.valida_email_existente() + + if email_existente: + msg = _(u'Esse email já foi cadastrado.') + raise ValidationError(msg) + + return self.cleaned_data + + @transaction.atomic + def save(self, commit=False): + + usuario = super(UsuarioForm, self).save(commit) + + # Primeiro telefone + tel = usuario.primeiro_telefone + + tel.tipo = self.data[u'primeiro_tipo'] + tel.ddd = self.data[u'primeiro_ddd'] + tel.numero = self.data[u'primeiro_numero'] + tel.principal = self.data[u'primeiro_principal'] + tel.save() + + usuario.primeiro_telefone = tel + + # Segundo telefone + tel = usuario.segundo_telefone + + if tel: + tel.tipo = self.data[u'segundo_tipo'] + tel.ddd = self.data[u'segundo_ddd'] + tel.numero = self.data[u'segundo_numero'] + tel.principal = self.data[u'segundo_principal'] + tel.save() + usuario.segundo_telefone = tel + + tel = self.cleaned_data[u'segundo_telefone'] + if (tel.tipo and tel.ddd and tel.numero and tel.principal): + tel = Telefone.objects.create( + tipo=self.data[u'segundo_tipo'], + ddd=self.data[u'segundo_ddd'], + numero=self.data[u'segundo_numero'], + principal=self.data[u'segundo_principal'] + ) + usuario.segundo_telefone = tel + + # User + u = usuario.user + u.email = usuario.email + u.save() + + usuario.data_ultima_atualizacao = datetime.now() + usuario.save() + return usuario + + +class HabilitarEditForm(ModelForm): + habilitado = forms.ChoiceField( + widget=forms.Select(), + required=True, + choices=YES_NO_CHOICES) + + class Meta(object): + model = Usuario + fields = [u'cpf', u'nome_completo', u'email', u'habilitado'] + widgets = { + u'cpf': forms.TextInput(attrs={u'readonly': u'readonly'}), + u'nome_completo': forms.TextInput(attrs={u'readonly': u'readonly'}), + u'email': forms.TextInput(attrs={u'readonly': u'readonly'}) + } + + def __init__(self, *args, **kwargs): + super(HabilitarEditForm, self).__init__(*args, **kwargs) + row1 = crispy_layout_mixin.to_row( + [(u'nome_completo', 4), + (u'cpf', 4), + (u'email', 4)]) + row2 = crispy_layout_mixin.to_row([(u'habilitado', 12)]) + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset( + _(u'Editar usuário'), row1, row2, form_actions( + more=[ + Submit( + u'Cancelar', + u'Cancelar', + style=u'background-color:black; color:white;')]) + ) + ) + + +class MudarSenhaForm(ModelForm): + + password = forms.CharField( + max_length=20, + label=_(u'Nova Senha'), + widget=forms.PasswordInput()) + + password_confirm = forms.CharField( + max_length=20, + label=_(u'Confirmar Nova Senha'), + widget=forms.PasswordInput()) + + captcha = CaptchaField() + + def valida_igualdade(self, texto1, texto2, msg): + if texto1 != texto2: + raise ValidationError(msg) + return True + + def clean(self): + if (u'password' not in self.cleaned_data or + u'password_confirm' not in self.cleaned_data): + raise ValidationError(_(u'Favor informar senhas atuais \ + ou novas')) + + msg = _(u'As senhas não conferem.') + self.valida_igualdade( + self.cleaned_data[u'password'], + self.cleaned_data[u'password_confirm'], + msg) + + try: + validate_password(self.cleaned_data[u'password']) + except ValidationError, error: + raise ValidationError(error) + + class Meta(object): + model = Usuario + fields = [u'password', u'password_confirm', u'captcha'] + + def __init__(self, *args, **kwargs): + super(MudarSenhaForm, self).__init__(*args, **kwargs) + row1 = crispy_layout_mixin.to_row( + [(u'password', 6), + (u'password_confirm', 6)]) + row2 = crispy_layout_mixin.to_row([(u'captcha', 12)]) + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset( + _(u'Mudar Senha'), row1, row2, + form_actions( + more=[ + Submit( + u'Cancelar', + u'Cancelar', + style=u'background-color:black; color:white;')]) + ) + ) + + +class RecuperarSenhaEmailForm(PasswordResetForm): + + def __init__(self, *args, **kwargs): + super(RecuperarSenhaEmailForm, self).__init__(*args, **kwargs) + row1 = crispy_layout_mixin.to_row( + [(u'email', 6)]) + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset(_(u'Recuperar Senha'), + row1, + form_actions( + more=[ + Submit( + u'Cancelar', + u'Cancelar', + style=u'background-color:black; color:white;')]) + ) + ) + + def clean(self): + email_existente_usuario = Usuario.objects.filter( + email=self.cleaned_data[u'email']) + email_existente_user = User.objects.filter( + email=self.cleaned_data[u'email']) + + if not email_existente_usuario and not email_existente_user: + msg = _(u'Não existe nenhum usuário cadastrado com este e-mail.') + raise ValidationError(msg) + + return self.cleaned_data + + +class RecuperacaoMudarSenhaForm(SetPasswordForm): + def __init__(self, *args, **kwargs): + super(RecuperacaoMudarSenhaForm, self).__init__(*args, **kwargs) + self.fields[u'new_password1'].help_text = u'' + row1 = crispy_layout_mixin.to_row( + [(u'new_password1', 6), + (u'new_password2', 6)]) + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset(_(u''), + row1, + form_actions( + more=[ + Submit( + u'Cancelar', + u'Cancelar', + style=u'background-color:black; color:white;')]) + ) + ) diff --git a/sigi/apps/usuarios/layouts.yaml b/sigi/apps/usuarios/layouts.yaml new file mode 100644 index 00000000..7cd74757 --- /dev/null +++ b/sigi/apps/usuarios/layouts.yaml @@ -0,0 +1,46 @@ + +CasaLegislativa: + Casa Legislativa: + - sigla:4 nome + - endereco:8 cep + - municipio:8 uf + - email + - telefone + - endereco_web + +Subsecretaria: + Subsecretaria: + - nome:8 sigla + +Usuario: + Usuário: + - username nome_completo:9 + - password password_confirm + - email email_confirm + - cpf rg casa_legislativa + - cargo vinculo + Primeiro Telefone: + - primeiro_tipo primeiro_ddd:2 primeiro_numero:6 primeiro_principal + Segundo Telefone: + - segundo_tipo segundo_ddd:2 segundo_numero:6 segundo_principal + Prove que você é um humano: + - captcha + +UsuarioEdit: + Usuário: + - username nome_completo:9 + - email email_confirm + - cpf rg casa_legislativa + - cargo vinculo + Primeiro Telefone: + - primeiro_tipo primeiro_ddd:2 primeiro_numero:6 primeiro_principal + Segundo Telefone: + - segundo_tipo segundo_ddd:2 segundo_numero:6 segundo_principal + Prove que você é um humano: + - captcha + +UsuarioDetail: + Perfil: + - nome_completo email + - cargo vinculo + - cpf rg casa_legislativa diff --git a/sigi/apps/usuarios/migrations/0001_initial.py b/sigi/apps/usuarios/migrations/0001_initial.py new file mode 100644 index 00000000..bad7bb64 --- /dev/null +++ b/sigi/apps/usuarios/migrations/0001_initial.py @@ -0,0 +1,93 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-06-16 16:34 +from __future__ import absolute_import +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ] + + operations = [ + migrations.CreateModel( + name=u'CasaLegislativa', + fields=[ + (u'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=u'ID')), + (u'nome', models.CharField(max_length=100, verbose_name=u'Nome')), + (u'sigla', models.CharField(max_length=100, verbose_name=u'Sigla')), + (u'endereco', models.CharField(max_length=100, verbose_name=u'Endereço')), + (u'cep', models.CharField(max_length=100, verbose_name=u'CEP')), + (u'municipio', models.CharField(max_length=100, verbose_name=u'Município')), + (u'uf', models.CharField(choices=[(u'AC', u'Acre'), (u'AL', u'Alagoas'), (u'AP', u'Amapá'), (u'AM', u'Amazonas'), (u'BA', u'Bahia'), (u'CE', u'Ceará'), (u'DF', u'Distrito Federal'), (u'ES', u'Espírito Santo'), (u'GO', u'Goiás'), (u'MA', u'Maranhão'), (u'MT', u'Mato Grosso'), (u'MS', u'Mato Grosso do Sul'), (u'MG', u'Minas Gerais'), (u'PR', u'Paraná'), (u'PB', u'Paraíba'), (u'PA', u'Pará'), (u'PE', u'Pernambuco'), (u'PI', u'Piauí'), (u'RJ', u'Rio de Janeiro'), (u'RN', u'Rio Grande do Norte'), (u'RS', u'Rio Grande do Sul'), (u'RO', u'Rondônia'), (u'RR', u'Roraima'), (u'SC', u'Santa Catarina'), (u'SE', u'Sergipe'), (u'SP', u'São Paulo'), (u'TO', u'Tocantins'), (u'EX', u'Exterior')], max_length=100, verbose_name=u'UF')), + (u'telefone', models.CharField(blank=True, max_length=100, verbose_name=u'Telefone')), + (u'endereco_web', models.URLField(blank=True, max_length=100, verbose_name=u'HomePage')), + (u'email', models.EmailField(blank=True, max_length=100, verbose_name=u'E-mail')), + ], + options={ + u'verbose_name': u'Casa Legislativa', + u'verbose_name_plural': u'Casas Legislativas', + }, + ), + migrations.CreateModel( + name=u'Subsecretaria', + fields=[ + (u'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=u'ID')), + (u'nome', models.CharField(max_length=100, null=True, verbose_name=u'Nome')), + (u'sigla', models.CharField(max_length=10, null=True, verbose_name=u'Sigla')), + ], + options={ + u'verbose_name': u'Subsecretaria', + u'ordering': (u'nome', u'sigla'), + u'verbose_name_plural': u'Subsecretarias', + }, + ), + migrations.CreateModel( + name=u'Telefone', + fields=[ + (u'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=u'ID')), + (u'tipo', models.CharField(choices=[(u'FIXO', u'FIXO'), (u'CELULAR', u'CELULAR')], max_length=7, verbose_name=u'Tipo Telefone')), + (u'ddd', models.CharField(max_length=2, verbose_name=u'DDD')), + (u'numero', models.CharField(max_length=10, verbose_name=u'Número')), + (u'principal', models.CharField(choices=[(None, u'----'), (False, u'Não'), (True, u'Sim')], max_length=10, verbose_name=u'Telefone Principal?')), + ], + options={ + u'verbose_name': u'Telefone', + u'verbose_name_plural': u'Telefones', + }, + ), + migrations.CreateModel( + name=u'Usuario', + fields=[ + (u'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=u'ID')), + (u'username', models.CharField(max_length=50, unique=True, verbose_name=u'Nome de Usuário')), + (u'nome_completo', models.CharField(max_length=128, verbose_name=u'Nome Completo')), + (u'data_criacao', models.DateTimeField(default=django.utils.timezone.now, verbose_name=u'Data Criação')), + (u'data_ultima_atualizacao', models.DateTimeField(default=django.utils.timezone.now, verbose_name=u'Última atualização')), + (u'email', models.EmailField(max_length=254, unique=True, verbose_name=u'Email')), + (u'habilitado', models.BooleanField(default=False, verbose_name=u'Habilitado?')), + (u'conveniado', models.BooleanField(default=False)), + (u'responsavel', models.BooleanField(default=False)), + (u'rg', models.CharField(max_length=9, null=True, verbose_name=u'RG')), + (u'cpf', models.CharField(default=u'00000000000', max_length=11, verbose_name=u'CPF')), + (u'cargo', models.CharField(default=u'--------', max_length=30, verbose_name=u'Cargo')), + (u'vinculo', models.CharField(choices=[(u'Tercerizado', u'Tercerizado'), (u'Efetivo', u'Efetivo'), (u'Contratado', u'Contratado')], default=u'--------', max_length=30, verbose_name=u'Vinculo')), + (u'casa_legislativa', models.CharField(default=u'--------', max_length=30, verbose_name=u'Casa Legislativa')), + (u'primeiro_telefone', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name=u'primeiro_telefone', to=u'usuarios.Telefone')), + (u'segundo_telefone', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name=u'segundo_telefone', to=u'usuarios.Telefone')), + (u'user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + u'verbose_name': u'Usuário', + u'verbose_name_plural': u'Usuários', + }, + ), + ] diff --git a/sigi/apps/usuarios/migrations/0002_auto_20160616_1400.py b/sigi/apps/usuarios/migrations/0002_auto_20160616_1400.py new file mode 100644 index 00000000..7b3f83a5 --- /dev/null +++ b/sigi/apps/usuarios/migrations/0002_auto_20160616_1400.py @@ -0,0 +1,35 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.5 on 2016-06-16 17:00 +from __future__ import absolute_import +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + (u'usuarios', u'0001_initial'), + ] + + operations = [ + migrations.CreateModel( + name=u'ConfirmaEmail', + fields=[ + (u'id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name=u'ID')), + (u'email', models.EmailField(max_length=254, unique=True, verbose_name=u'Email')), + (u'confirmado', models.BooleanField(default=False)), + (u'token', models.CharField(max_length=50, verbose_name=u'Hash do Email')), + (u'user_id', models.TextField(blank=True, verbose_name=u'ID do Usuário')), + ], + options={ + u'verbose_name': u'Email', + u'verbose_name_plural': u'Emails', + }, + ), + migrations.AddField( + model_name=u'usuario', + name=u'email_confirmado', + field=models.BooleanField(default=False, verbose_name=u'Email confirmado?'), + ), + ] diff --git a/sigi/apps/usuarios/migrations/0003_auto_20160616_1602.py b/sigi/apps/usuarios/migrations/0003_auto_20160616_1602.py new file mode 100644 index 00000000..c45f0e6b --- /dev/null +++ b/sigi/apps/usuarios/migrations/0003_auto_20160616_1602.py @@ -0,0 +1,26 @@ +# -*- coding: utf-8 -*- +from __future__ import unicode_literals + +from django.db import models, migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0002_auto_20160616_1400'), + ] + + operations = [ + migrations.AlterField( + model_name='confirmaemail', + name='email', + field=models.EmailField(unique=True, max_length=75, verbose_name='Email'), + preserve_default=True, + ), + migrations.AlterField( + model_name='usuario', + name='email', + field=models.EmailField(unique=True, max_length=75, verbose_name='Email'), + preserve_default=True, + ), + ] diff --git a/sigi/apps/usuarios/migrations/__init__.py b/sigi/apps/usuarios/migrations/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/sigi/apps/usuarios/models.py b/sigi/apps/usuarios/models.py new file mode 100644 index 00000000..fc31e816 --- /dev/null +++ b/sigi/apps/usuarios/models.py @@ -0,0 +1,148 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import +import base64 +from django.contrib.auth.models import User +from django.db import models +from django.utils import timezone +from django.utils.translation import ugettext_lazy as _ + +from sigi.apps.crud.utils import UF, YES_NO_CHOICES + + +class CasaLegislativa(models.Model): + nome = models.CharField(max_length=100, verbose_name=_(u'Nome')) + sigla = models.CharField(max_length=100, verbose_name=_(u'Sigla')) + endereco = models.CharField(max_length=100, verbose_name=_(u'Endereço')) + cep = models.CharField(max_length=100, verbose_name=_(u'CEP')) + municipio = models.CharField(max_length=100, verbose_name=_(u'Município')) + uf = models.CharField(max_length=100, + choices=UF, + verbose_name=_(u'UF')) + telefone = models.CharField( + max_length=100, blank=True, verbose_name=_(u'Telefone')) + endereco_web = models.URLField( + max_length=100, blank=True, verbose_name=_(u'HomePage')) + email = models.EmailField( + max_length=100, blank=True, verbose_name=_(u'E-mail')) + + class Meta(object): + verbose_name = _(u'Casa Legislativa') + verbose_name_plural = _(u'Casas Legislativas') + + def __str__(self): + return u'[%s] %s' % (self.sigla, self.nome) + + +class Subsecretaria(models.Model): + + nome = models.CharField(verbose_name=_(u'Nome'), max_length=100, null=True) + sigla = models.CharField(verbose_name=_(u'Sigla'), max_length=10, null=True) + + class Meta(object): + ordering = (u'nome', u'sigla') + verbose_name = _(u'Subsecretaria') + verbose_name_plural = _(u'Subsecretarias') + + def __str__(self): + return u'[%s] %s' % (self.sigla, self.nome) + + +class Telefone(models.Model): + TIPO_TELEFONE = [(u'FIXO', u'FIXO'), (u'CELULAR', u'CELULAR')] + + tipo = models.CharField( + max_length=7, + choices=TIPO_TELEFONE, + verbose_name=_(u'Tipo Telefone'),) + ddd = models.CharField(max_length=2, verbose_name=_(u'DDD')) + numero = models.CharField(max_length=10, verbose_name=_(u'Número')) + principal = models.CharField( + max_length=10, + verbose_name=_(u'Telefone Principal?'), + choices=YES_NO_CHOICES) + + class Meta(object): + verbose_name = _(u'Telefone') + verbose_name_plural = _(u'Telefones') + + def __str__(self): + return u'(%s) %s' % (self.ddd, self.numero) + + +class ConfirmaEmail(models.Model): + u""" + Classe de email + """ + email = models.EmailField(unique=True, verbose_name=_(u'Email')) + confirmado = models.BooleanField(default=False) + token = models.CharField( + max_length=50, verbose_name=_(u'Hash do Email')) + user_id = models.TextField(blank=True, verbose_name=_(u'ID do Usuário')) + + class Meta(object): + verbose_name = _(u'Email') + verbose_name_plural = _(u'Emails') + + +class Usuario(models.Model): + u''' + Usuário cadastrado via web + ''' + + TIPO_VINCULO = [(u'Tercerizado', u'Tercerizado'), + (u'Efetivo', u'Efetivo'), + (u'Contratado', u'Contratado')] + + user = models.ForeignKey(User) + username = models.CharField( + verbose_name=_(u'Nome de Usuário'), + unique=True, + max_length=50) + nome_completo = models.CharField( + verbose_name=_(u'Nome Completo'), + max_length=128) + data_criacao = models.DateTimeField( + _(u'Data Criação'), + default=timezone.now) + data_ultima_atualizacao = models.DateTimeField( + default=timezone.now, verbose_name=_(u'Última atualização')) + email = email = models.EmailField(unique=True, verbose_name=_(u'Email')) + email_confirmado = models.BooleanField( + default=False, verbose_name=_(u'Email confirmado?')) + habilitado = models.BooleanField( + default=False, + verbose_name=_(u'Habilitado?')) + conveniado = models.BooleanField(default=False) + responsavel = models.BooleanField(default=False) + rg = models.CharField( + max_length=9, + null=True, + verbose_name=_(u'RG')) + cpf = models.CharField( + max_length=11, + verbose_name=_(u'CPF'), + default=u'00000000000') + cargo = models.CharField( + max_length=30, + verbose_name=_(u'Cargo'), + default=u'--------') + vinculo = models.CharField( + max_length=30, + verbose_name=_(u'Vinculo'), + choices=TIPO_VINCULO, + default=u'--------') + casa_legislativa = models.CharField( + max_length=30, + verbose_name=_(u'Casa Legislativa'), + default=u'--------') + primeiro_telefone = models.ForeignKey( + Telefone, null=True, related_name=u'primeiro_telefone') + segundo_telefone = models.ForeignKey( + Telefone, null=True, related_name=u'segundo_telefone') + + class Meta(object): + verbose_name = _(u'Usuário') + verbose_name_plural = _(u'Usuários') + + def __str__(self): + return self.username diff --git a/sigi/apps/usuarios/tests.py b/sigi/apps/usuarios/tests.py new file mode 100644 index 00000000..a79ca8be --- /dev/null +++ b/sigi/apps/usuarios/tests.py @@ -0,0 +1,3 @@ +# from django.test import TestCase + +# Create your tests here. diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py new file mode 100644 index 00000000..fdcd9a23 --- /dev/null +++ b/sigi/apps/usuarios/urls.py @@ -0,0 +1,61 @@ +from __future__ import absolute_import +from django.conf.urls import include, url +from django.contrib.auth.views import (login, logout, password_reset, + password_reset_done, + password_reset_confirm, + password_reset_complete) +#from atendimento.settings import EMAIL_SEND_USER +from sigi.apps.usuarios.forms import (LoginForm, RecuperarSenhaEmailForm, + RecuperacaoMudarSenhaForm) +from sigi.apps.usuarios.views import (HabilitarDetailView, HabilitarEditView, + MudarSenhaView, UsuarioCrud, ConfirmarEmailView) + +from .apps import AppConfig + +app_name = AppConfig.name + +EMAIL_SEND_USER='atendimento@interlegis.leg.br' + +recuperar_email = [ + url(ur'^recuperar/recuperar_senha/$', + password_reset, + {u'template_name': u'usuarios/recuperar_senha.html', + u'password_reset_form': RecuperarSenhaEmailForm, + u'post_reset_redirect': u'usuarios:recuperar_senha_finalizado', + u'email_template_name': u'usuarios/recuperar_senha_email.html', + u'from_email': EMAIL_SEND_USER, + u'html_email_template_name': u'usuarios/recuperar_senha_email.html'}, + name=u'recuperar_senha'), + url(ur'^recuperar/recuperar_recuperar/finalizado/$', + password_reset_done, + {u'template_name': u'usuarios/recuperar_senha_enviado.html'}, + name=u'recuperar_senha_finalizado'), + url(ur'^recuperar/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', + password_reset_confirm, + {u'post_reset_redirect': u'usuarios:recuperar_senha_completo', + u'template_name': u'usuarios/recuperacao_senha_form.html', + u'set_password_form': RecuperacaoMudarSenhaForm}, + name=u'recuperar_senha_confirma'), + url(ur'^recuperar/completo/$', + password_reset_complete, + {u'template_name': u'usuarios/recuperacao_senha_completo.html'}, + name=u'recuperar_senha_completo'), +] + +urlpatterns = recuperar_email + [ + url(ur'^login/$', login, { + u'template_name': u'usuarios/login.html', + u'authentication_form': LoginForm}, + name=u'login'), + url(ur'^logout/$', logout, {u'next_page': u'/login'}, name=u'logout'), + url(ur'^usuario/', include(UsuarioCrud.get_urls())), + + url(ur'^habilitar/(?P\d+)$', + HabilitarDetailView.as_view(), name=u'habilitar_detail'), + url(ur'^habilitar/(?P\d+)/edit$', + HabilitarEditView.as_view(), name=u'habilitar_edit'), + url(ur'^usuario/(?P\d+)/mudar_senha$', + MudarSenhaView.as_view(), name=u'mudar_senha'), + url(ur'^usuario/confirmar/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', + ConfirmarEmailView.as_view(), name=u'confirmar_email'), +] diff --git a/sigi/apps/usuarios/utils.py b/sigi/apps/usuarios/utils.py new file mode 100644 index 00000000..53bf2b2d --- /dev/null +++ b/sigi/apps/usuarios/utils.py @@ -0,0 +1,65 @@ +# -*- coding: utf-8 -*- +from __future__ import absolute_import +from django.utils.translation import ugettext_lazy as _ + +UF = [ + (u'AC', u'Acre'), + (u'AL', u'Alagoas'), + (u'AP', u'Amapá'), + (u'AM', u'Amazonas'), + (u'BA', u'Bahia'), + (u'CE', u'Ceará'), + (u'DF', u'Distrito Federal'), + (u'ES', u'Espírito Santo'), + (u'GO', u'Goiás'), + (u'MA', u'Maranhão'), + (u'MT', u'Mato Grosso'), + (u'MS', u'Mato Grosso do Sul'), + (u'MG', u'Minas Gerais'), + (u'PR', u'Paraná'), + (u'PB', u'Paraíba'), + (u'PA', u'Pará'), + (u'PE', u'Pernambuco'), + (u'PI', u'Piauí'), + (u'RJ', u'Rio de Janeiro'), + (u'RN', u'Rio Grande do Norte'), + (u'RS', u'Rio Grande do Sul'), + (u'RO', u'Rondônia'), + (u'RR', u'Roraima'), + (u'SC', u'Santa Catarina'), + (u'SE', u'Sergipe'), + (u'SP', u'São Paulo'), + (u'TO', u'Tocantins'), + (u'EX', u'Exterior'), +] + +YES_NO_CHOICES = [(None, _(u'----')), (False, _(u'Não')), (True, _(u'Sim'))] + + +def str2bool(v): + return v in (u'Sim', u'True') + + +SEXO_CHOICES = [(u'M', _(u'Masculino')), (u'F', _(u'Feminino'))] + + +def from_to(start, end): + return range(start, end + 1) + + +def make_pagination(index, num_pages): + PAGINATION_LENGTH = 10 + if num_pages <= PAGINATION_LENGTH: + return from_to(1, num_pages) + else: + if index - 1 <= 5: + tail = [num_pages - 1, num_pages] + head = from_to(1, PAGINATION_LENGTH - 3) + else: + if index + 1 >= num_pages - 3: + tail = from_to(index - 1, num_pages) + else: + tail = [index - 1, index, index + 1, + None, num_pages - 1, num_pages] + head = from_to(1, PAGINATION_LENGTH - len(tail) - 1) + return head + [None] + tail diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py new file mode 100644 index 00000000..bfbbe039 --- /dev/null +++ b/sigi/apps/usuarios/views.py @@ -0,0 +1,183 @@ +# -*- coding: utf-8 -*- + +from __future__ import absolute_import +from braces.views import FormValidMessageMixin +from django.conf import settings +from django.contrib.auth.mixins import LoginRequiredMixin +from django.core.urlresolvers import reverse +from django.utils import timezone +from django.views.generic import DetailView, FormView, TemplateView +import sigi.apps.crud.base +from django.core.mail import send_mail +from sigi.apps.crud.utils import str2bool +from django.contrib.auth.tokens import default_token_generator +from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode +from django.utils.encoding import force_bytes +from sigi.apps.crud.base import Crud, CrudBaseMixin, CrudCreateView, CrudListView, CrudUpdateView, CrudDetailView + +from .forms import (HabilitarEditForm, MudarSenhaForm, UsuarioEditForm, + UsuarioForm) +from .models import Usuario, ConfirmaEmail, User + + +class UsuarioCrud(Crud): + model = Usuario + help_path = u'' + + class CreateView(CrudCreateView): + form_class = UsuarioForm + form_valid_message = u'Cadastro realizado com sucesso. Aguarde a \ + validação do seu perfil.' + + def get_success_url(self): + kwargs = {} + user = User.objects.get(email=self.request.POST.get(u'email')) + confirmar_email = ConfirmaEmail( + email=user.email, + token=default_token_generator.make_token(user), + user_id=urlsafe_base64_encode(force_bytes(user.pk))) + confirmar_email.save() + + kwargs[u'token'] = confirmar_email.token + kwargs[u'uidb64'] = confirmar_email.user_id + assunto = u"Cadastro no Sistema de Atendimento ao Usuário" + full_url = self.request.get_raw_uri(), + url_base = full_url[0][:full_url[0].find(u'usuario') - 1], + mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + + u"Sistema de Atendimento ao Usuário do Interlegis.\n" + + u"Caso você não tenha feito este cadastro, por favor " + + u"ignore esta mensagem.\n" + url_base[0] + + reverse(u'usuarios:confirmar_email', kwargs=kwargs)) + remetente = settings.EMAIL_HOST_USER + destinatario = [confirmar_email.email, + settings.EMAIL_HOST_USER] + send_mail(assunto, mensagem, remetente, destinatario, + fail_silently=False) + return reverse(u'home') + + class ListView(LoginRequiredMixin, CrudListView): + pass + + class UpdateView(LoginRequiredMixin, CrudUpdateView): + form_class = UsuarioEditForm + + def get_initial(self): + if self.get_object(): + + tel1 = self.get_object().primeiro_telefone + self.initial[u'primeiro_tipo'] = tel1.tipo + self.initial[u'primeiro_ddd'] = tel1.ddd + self.initial[u'primeiro_numero'] = tel1.numero + self.initial[u'primeiro_principal'] = tel1.principal + + tel2 = self.get_object().segundo_telefone + if tel2: + self.initial[u'segundo_tipo'] = tel2.tipo + self.initial[u'segundo_ddd'] = tel2.ddd + self.initial[u'segundo_numero'] = tel2.numero + self.initial[u'segundo_principal'] = tel2.principal + + return self.initial.copy() + + @property + def layout_key(self): + return u'UsuarioEdit' + + class DetailView(LoginRequiredMixin, CrudDetailView): + + def get_context_data(self, **kwargs): + context = super(DetailView, self).get_context_data(**kwargs) + + tel1 = context[u'object'].primeiro_telefone + tel1 = [(u'Primeiro Telefone'), + (u'[%s] - %s' % (tel1.ddd, tel1.numero))] + + tel2 = context[u'object'].segundo_telefone or u'' + if tel2: + tel2 = [(u'Segundo Telefone'), + (u'[%s] - %s' % (tel2.ddd, tel2.numero))] + + context[u'telefones'] = [tel1, tel2] + return context + + @property + def layout_key(self): + return u'UsuarioDetail' + + class BaseMixin(CrudBaseMixin): + list_field_names = [u'username', u'nome_completo', + u'data_criacao', u'habilitado', + u'data_ultima_atualizacao'] + + +class HabilitarDetailView(CrudDetailView): + template_name = u"usuarios/habilitar_detail.html" + + def get(self, request, *args, **kwargs): + context = {} + context[u'pk'] = self.kwargs[u'pk'] + context[u'usuario'] = Usuario.objects.get(pk=self.kwargs[u'pk']) + return self.render_to_response(context) + + +class HabilitarEditView(FormView): + template_name = u"crud/form.html" + + def get(self, request, *args, **kwargs): + context = {} + + usuario = Usuario.objects.get(pk=self.kwargs[u'pk']) + form = HabilitarEditForm(instance=usuario) + + context[u'pk'] = self.kwargs[u'pk'] + context[u'form'] = form + return self.render_to_response(context) + + def post(self, request, *args, **kwargs): + form = HabilitarEditForm(request.POST) + usuario = Usuario.objects.get(pk=self.kwargs[u'pk']) + usuario.habilitado = str2bool(form.data[u'habilitado']) + usuario.data_ultima_atualizacao = timezone.now() + + usuario.save() + return self.form_valid(form) + + def get_success_url(self): + return reverse(u'usuarios:usuario_list') + + +class MudarSenhaView(FormValidMessageMixin, FormView): + template_name = u"crud/form.html" + form_class = MudarSenhaForm + form_valid_message = u'Senha alterada com sucesso. É necessário fazer \ + login novamente.' + + def get(self, request, *args, **kwargs): + context = {} + usuario = Usuario.objects.get(pk=self.kwargs[u'pk']) + form = MudarSenhaForm(instance=usuario) + context[u'pk'] = self.kwargs[u'pk'] + context[u'form'] = self.get_form() + return self.render_to_response(context) + + def form_valid(self, form): + usuario = Usuario.objects.get(pk=self.kwargs[u'pk']) + u = usuario.user + u.set_password(form.cleaned_data[u'password']) + u.save() + return super(MudarSenhaView, self).form_valid(form) + + def get_success_url(self): + return reverse(u'home') + + +class ConfirmarEmailView(TemplateView): + template_name = u"usuarios/confirma_email.html" + + def get(self, request, *args, **kwargs): + uid = urlsafe_base64_decode(self.kwargs[u'uidb64']) + user = User.objects.get(id=uid) + user.is_active = True + user.save() + context = self.get_context_data(**kwargs) + return self.render_to_response(context) diff --git a/sigi/settings/base.py b/sigi/settings/base.py index dd011415..245efff6 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -30,9 +30,10 @@ SITE_ID = 1 -TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + ( +TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + [ 'django.core.context_processors.request', -) +] + # List of callables that know how to import templates from various sources. TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader', 'django.template.loaders.app_directories.Loader', @@ -70,6 +71,10 @@ 'sigi.apps.eventos', 'sigi.apps.whois', + 'sigi.apps.crud', + 'sigi.apps.usuarios', + 'sigi.apps.solicitacoes', + # Integração com Saberes (moodle) 'sigi.apps.mdl', 'sigi.apps.saberes', @@ -82,13 +87,21 @@ 'image_cropping', 'rest_framework', + 'captcha', + 'crispy_forms', + 'djangobower', + 'floppyforms', + 'sass_processor', + ) MIDDLEWARE_CLASSES = ( + 'django.middleware.security.SecurityMiddleware', 'django.contrib.sessions.middleware.SessionMiddleware', 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', + 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) @@ -181,6 +194,40 @@ }, } +STATIC_URL = '/static/' +STATIC_ROOT = os.path.join(BASE_DIR, "collected_static") +STATICFILES_DIRS = (os.path.join(BASE_DIR, ("static")),) +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'djangobower.finders.BowerFinder', + 'sass_processor.finders.CssFinder', +) + + +CRISPY_TEMPLATE_PACK = 'bootstrap3' +CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' +CRISPY_FAIL_SILENTLY = False + +BOWER_COMPONENTS_ROOT = os.path.join(BASE_DIR, 'bower') +BOWER_INSTALLED_APPS = ( + 'bootstrap-sass#3.3.6', + 'components-font-awesome#4.5.0', + 'tinymce#4.3.3', + 'jquery-ui#1.11.4', + 'jquery-runner#2.3.3', + 'jQuery-Mask-Plugin#1.13.4', + 'jsdiff#2.2.1', +) + +# Additional search paths for SASS files when using the @import statement +SASS_PROCESSOR_INCLUDE_DIRS = ( + os.path.join(BOWER_COMPONENTS_ROOT, 'bower_components'), + os.path.join(BOWER_COMPONENTS_ROOT, 'bootstrap-sass'), + os.path.join(BOWER_COMPONENTS_ROOT, 'assets'), + os.path.join(BOWER_COMPONENTS_ROOT, 'stylesheets'), +) + SABERES_REST_PATH = 'webservice/rest/server.php' OSTICKET_URL = 'https://suporte.interlegis.leg.br/scp/tickets.php?a=search&query=%s' diff --git a/sigi/urls.py b/sigi/urls.py index 7eae6fca..6e6392c4 100644 --- a/sigi/urls.py +++ b/sigi/urls.py @@ -26,6 +26,11 @@ url(r'^eventos/', include('sigi.apps.eventos.urls')), url(r'^whois/', include('sigi.apps.whois.urls')), url(r'^pentaho/(?P(plugin|api)/.*)$', pentaho_proxy), + + url(r'', include('sigi.apps.usuarios.urls')), + url(r'', include('sigi.apps.solicitacoes.urls')), + url(r'^captcha/', include('captcha.urls')), + url(r'^', include('sigi.apps.home.urls')), url(r'^', include(admin.site.urls)), diff --git a/templates/base.html b/templates/base.html new file mode 100644 index 00000000..ac7b5209 --- /dev/null +++ b/templates/base.html @@ -0,0 +1,155 @@ + +{% load staticfiles i18n sass_tags%} + + + + + Sistema de Atendimento + {% block head_content %} + + + + + + + {% endblock head_content %} + + + {% block navigation %} +
+
+
+ + +
+ + +
+
+
+
+ {% endblock navigation %} + + + {% block body_block %} + {# Header #} + {% block main_header %} +
+
+
+
+ + Logo + +

Interlegis

Sistema de Solicitação de Serviços

 + + +
+
+
+
+ {% endblock main_header %} + + {# Main content #} + {% block content_container %} +
+
+ {# Feedback messages #} + {% for message in messages %} + + {% endfor %} + + {# Content header #} + {% block base_header %} +
+
+ {% block title %} +

+ {% if title %} + {{ title|safe|linebreaksbr }} + {% elif object %} + {{ object|safe|linebreaksbr }} + {% endif %} +

+ {% endblock %} +
+
+ {% endblock base_header %} + + {# Content per se #} + {% block base_content %}{% endblock %} +
+
+ {% endblock content_container %} + {% endblock %} + {% block foot_js %} + + + + + + + {% block extra_js %}{% endblock extra_js %} + {% endblock foot_js %} + + + {% block footer %} +
+ + {% endblock footer %} + diff --git a/templates/crud/confirm_delete.html b/templates/crud/confirm_delete.html new file mode 100644 index 00000000..685c0d4a --- /dev/null +++ b/templates/crud/confirm_delete.html @@ -0,0 +1,18 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block base_content %} +
{% csrf_token %} +
+
+ {% blocktrans %} + Confirma exclusão de "{{ object }}"? + {% endblocktrans %} +
+
+ {% trans 'Cancelar' %} + +
+
+
+{% endblock %} diff --git a/templates/crud/detail.html b/templates/crud/detail.html new file mode 100644 index 00000000..5ce33ced --- /dev/null +++ b/templates/crud/detail.html @@ -0,0 +1,38 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block base_content %} +
+ {% block actions %} +
+ {% trans 'Editar' %} + {% trans 'Excluir' %} +
+ {% endblock actions %} +
+ + {% block msg %} {% endblock msg %} + + {% block detail_content %} + {% for fieldset in view.layout_display %} +

{{ fieldset.legend }}

+ {% for row in fieldset.rows %} +
+ {% for column in row %} +
+
+

{{ column.verbose_name }}

+
+

{{ column.text|safe }}

+
+
+
+ {% endfor %} +
+ {% endfor %} + {% endfor %} + {% endblock detail_content %} + + {% block extrablock %}{% endblock %} + +{% endblock base_content %} diff --git a/templates/crud/form.html b/templates/crud/form.html new file mode 100644 index 00000000..9e357324 --- /dev/null +++ b/templates/crud/form.html @@ -0,0 +1,15 @@ +{% extends "base.html" %} +{% load i18n crispy_forms_tags %} +{% block base_content %} + {% crispy form %} +{% endblock %} + +{% block extra_js %} + +{% endblock %} diff --git a/templates/crud/list.html b/templates/crud/list.html new file mode 100644 index 00000000..20e9e916 --- /dev/null +++ b/templates/crud/list.html @@ -0,0 +1,51 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block base_content %} + + {% block buttons %} +
+ + {% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %} + + {% block more_buttons %}{% endblock more_buttons %} +
+ {% endblock buttons %} + + + {% block content %} + + {% block extra_content %} {% endblock extra_content %} + + {% if not rows %} +

{{ NO_ENTRIES_MSG }}

+ {% else %} + + + + {% for name in headers %} + + {% endfor %} + + + + {% for value_list in rows %} + + {% for value, href in value_list %} + + {% endfor %} + + {% endfor %} + +
{{ name }}
+ {% if href %} + {{ value }} + {% else %} + {{ value|safe }} + {% endif %} +
+ {% endif %} + + {% include "paginacao.html" %} + {% endblock content %} +{% endblock %} diff --git a/templates/menus/subnav.html b/templates/menus/subnav.html new file mode 100644 index 00000000..85fdecb8 --- /dev/null +++ b/templates/menus/subnav.html @@ -0,0 +1,23 @@ +{% load i18n %} + +{% if menu %} + +{% endif %} diff --git a/templates/paginacao.html b/templates/paginacao.html new file mode 100644 index 00000000..c2e871f7 --- /dev/null +++ b/templates/paginacao.html @@ -0,0 +1,37 @@ +{% if is_paginated %} + +{% endif %} diff --git a/templates/templatetags/__init__.py b/templates/templatetags/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/templates/templatetags/common_tags.py b/templates/templatetags/common_tags.py new file mode 100644 index 00000000..dc38f101 --- /dev/null +++ b/templates/templatetags/common_tags.py @@ -0,0 +1,38 @@ +from compressor.utils import get_class +from django import template + +register = template.Library() + + +@register.simple_tag +def field_verbose_name(instance, field_name): + return instance._meta.get_field(field_name).verbose_name + + +@register.simple_tag +def fieldclass_verbose_name(class_name, field_name): + cls = get_class(class_name) + return cls._meta.get_field(field_name).verbose_name + + +@register.simple_tag +def model_verbose_name(class_name): + model = get_class(class_name) + return model._meta.verbose_name + + +@register.simple_tag +def model_verbose_name_plural(class_name): + model = get_class(class_name) + return model._meta.verbose_name_plural + + +@register.filter +def lookup(d, key): + return d[key] if key in d else [] + + +@register.filter +def isinst(value, class_str): + classe = value.__class__.__name__ + return classe == class_str diff --git a/templates/templatetags/menus.py b/templates/templatetags/menus.py new file mode 100644 index 00000000..6591823b --- /dev/null +++ b/templates/templatetags/menus.py @@ -0,0 +1,51 @@ +import os + +import yaml +from django import template +from django.core.urlresolvers import reverse + +from sapl.settings import BASE_DIR + +register = template.Library() +TEMPLATES_DIR = BASE_DIR.child("templates") + + +@register.inclusion_tag('menus/subnav.html', takes_context=True) +def subnav(context, path=None): + """Renders a subnavigation for views of a certain object. + + If not provided, path defaults to /subnav.yaml + """ + # TODO: 118n !!!!!!!!!!!!!! + # How to internationalize yaml files???? + menu = None + root_pk = context.get('root_pk', None) + if not root_pk: + obj = context.get('object', None) + if obj: + root_pk = obj.pk + if root_pk: + request = context['request'] + app = request.resolver_match.app_name + # Esse IF elimina o bug do subnav em Tabelas Auxiliares + # e também em proposições + if request.path.find(app) == -1: + return + default_path = '%s/subnav.yaml' % app + path = os.path.join(TEMPLATES_DIR, path or default_path) + if os.path.exists(path): + menu = yaml.load(open(path, 'r')) + resolve_urls_inplace(menu, root_pk, app) + return {'menu': menu} + + +def resolve_urls_inplace(menu, pk, app): + if isinstance(menu, list): + for item in menu: + resolve_urls_inplace(item, pk, app) + else: + if 'url' in menu: + menu['url'] = reverse('%s:%s' % (app, menu['url']), + kwargs={'pk': pk}) + if 'children' in menu: + resolve_urls_inplace(menu['children'], pk, app) diff --git a/templates/usuarios/confirma_email.html b/templates/usuarios/confirma_email.html new file mode 100644 index 00000000..fefbd27b --- /dev/null +++ b/templates/usuarios/confirma_email.html @@ -0,0 +1,7 @@ +{% extends "crud/detail.html" %} +{% load i18n %} + +{% block detail_content %} +Sua conta foi confirmada via e-mail. Clique aqui para fazer seu login. + +{% endblock %} \ No newline at end of file diff --git a/templates/usuarios/habilitar_detail.html b/templates/usuarios/habilitar_detail.html new file mode 100644 index 00000000..04667b2a --- /dev/null +++ b/templates/usuarios/habilitar_detail.html @@ -0,0 +1,41 @@ +{% extends "crud/detail.html" %} +{% load i18n %} + +{% block actions %} +
+ {% trans 'Editar' %} +
+{% endblock actions %} + +{% block msg %} + {% if not usuario.habilitado %} +

Esse perfil ainda não está habilitado para uso das funcionalidades.

+ {% else %} +

Esse perfil já está habilitado para uso das funcionalidades.

+ {% endif %} +{% endblock msg %} + +{% block title %} +

Habilitar

+{% endblock %} + +{% block detail_content %} +
+
+
Nome completo:
+
      - {{ usuario.nome_completo }}
+
Email:
+
      - {{ usuario.email }}
+
CPF:
+
      - {{ usuario.cpf }}
+
Cargo:
+
      - {{ usuario.cargo }}
+
Vinculo:
+
      - {{ usuario.vinculo }}
+
Casa Legislativa:
+
      - {{ usuario.casa_legislativa }}
+
Telefones:
+
      - [{{ usuario.primeiro_telefone.ddd }}] - {{usuario.primeiro_telefone.numero}}
+
      - [{{ usuario.segundo_telefone.ddd }}] - {{usuario.segundo_telefone.numero}}
+
+{% endblock detail_content %} diff --git a/templates/usuarios/login.html b/templates/usuarios/login.html new file mode 100644 index 00000000..f6fd241e --- /dev/null +++ b/templates/usuarios/login.html @@ -0,0 +1,34 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block base_content %} +
+

Login

+
+
+ {% csrf_token %} +

+ + {% if form.errors %} +

Usuário e/ou Senha inválidos.

+ {% endif %} + + + + + + + + + +
Usuário{{ form.username }}
Senha{{ form.password }}
+

+

+ +

+
Esqueceu sua senha?
+ +
+
+
+{% endblock %} diff --git a/templates/usuarios/recuperacao_senha_completo.html b/templates/usuarios/recuperacao_senha_completo.html new file mode 100644 index 00000000..150a4ef2 --- /dev/null +++ b/templates/usuarios/recuperacao_senha_completo.html @@ -0,0 +1,10 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block base_content %} + +

{% trans "Sua senha foi alterada corretamente. Agora você pode fazer o login." %}

+ +

{% trans 'Entrar' %}

+ +{% endblock %} \ No newline at end of file diff --git a/templates/usuarios/recuperacao_senha_form.html b/templates/usuarios/recuperacao_senha_form.html new file mode 100644 index 00000000..30664fb7 --- /dev/null +++ b/templates/usuarios/recuperacao_senha_form.html @@ -0,0 +1,13 @@ +{% extends "crud/form.html" %} +{% load i18n crispy_forms_tags %} + +{% block base_content %} + {% if validlink %} +

{% trans "Por favor, insira duas vezes para verificarmos se está correta." %}

+ {% crispy form %} + {% else %} +

{% trans 'A recuperação de senha não obteve sucesso' %}

+

{% trans "O link é inválido, possivelmente este link já foi utilizado. Por favor, refaça o pedido de recuperação de senha." %}

+ {% endif %} + +{% endblock %} \ No newline at end of file diff --git a/templates/usuarios/recuperar_senha.html b/templates/usuarios/recuperar_senha.html new file mode 100644 index 00000000..477f74bd --- /dev/null +++ b/templates/usuarios/recuperar_senha.html @@ -0,0 +1,5 @@ +{% extends "crud/form.html" %} +{% load i18n crispy_forms_tags %} +{% block base_content %} + {% crispy form %} +{% endblock %} diff --git a/templates/usuarios/recuperar_senha_email.html b/templates/usuarios/recuperar_senha_email.html new file mode 100644 index 00000000..f061bd6f --- /dev/null +++ b/templates/usuarios/recuperar_senha_email.html @@ -0,0 +1,14 @@ +{% load i18n %}{% autoescape off %} +{% blocktrans %}Você está recebendo este e-mail porque fez a solicitação de recuperação de senha no seguinte website {{ site_name }}.
{% endblocktrans %} + +{% trans "Clique no link abaixo para redefinir sua senha:" %}
+{% block reset_link %} + Clique aqui
+{% endblock %} +{% trans "Seu nome de usuário, caso você tenha esquecido:" %} {{ user.get_username }}
+ +{% trans "Obrigado por acessar nosso site!" %}
+ +{% blocktrans %}Atenciosamente, equipe Atendimento {% endblocktrans %}
+ +{% endautoescape %} \ No newline at end of file diff --git a/templates/usuarios/recuperar_senha_enviado.html b/templates/usuarios/recuperar_senha_enviado.html new file mode 100644 index 00000000..bbb7ca71 --- /dev/null +++ b/templates/usuarios/recuperar_senha_enviado.html @@ -0,0 +1,9 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block base_content %} + +

{% trans "Foi enviado um e-mail com as instruções para recuperação de senha. Você deve recebê-lo em breve." %}

+

{% trans "Caso você não receba, verifique se você inseriu o e-mail em que você está cadastrado e verifique, também, sua caixa de SPAM." %}

+ +{% endblock %} \ No newline at end of file diff --git a/templates/usuarios/usuario_detail.html b/templates/usuarios/usuario_detail.html new file mode 100644 index 00000000..3e01626b --- /dev/null +++ b/templates/usuarios/usuario_detail.html @@ -0,0 +1,31 @@ +{% extends "crud/detail.html" %} +{% load i18n %} + +{% block actions %} +
+ {% trans 'Editar Perfil' %} +
+{% endblock actions %} + +{% block msg %} + {% if not usuario.habilitado %} +

Esse perfil ainda não está habilitado para uso das funcionalidades.

+ {% else %} +

Esse perfil já está habilitado para uso das funcionalidades.

+ {% endif %} +{% endblock msg %} + +{% block extrablock %} + + {% for tel in telefones %} +
+
+

{{tel|first}}

+
+

{{ tel|last }}

+
+
+
+ {% endfor %} + +{% endblock %} diff --git a/templates/usuarios/usuario_list.html b/templates/usuarios/usuario_list.html new file mode 100644 index 00000000..416ed511 --- /dev/null +++ b/templates/usuarios/usuario_list.html @@ -0,0 +1,38 @@ +{% extends "crud/list.html" %} +{% load i18n %} + +{% block buttons %}{% endblock buttons %} + +{% block content %} + + {% if not rows %} +

{{ NO_ENTRIES_MSG }}

+ {% else %} + + + + {% for name in headers %} + + {% endfor %} + + + + {% for value_list in rows %} + + {% for value, href in value_list %} + + {% endfor %} + + {% endfor %} + +
{{ name }}
+ {% if href %} + {{ value }} + {% else %} + {{ value|safe }} + {% endif %} +
+ {% endif %} + + {% include "paginacao.html" %} +{% endblock content %} From 7617d1de7448624e52c19dc8f95e4349f6604995 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 21 Jun 2016 14:48:34 -0300 Subject: [PATCH 04/63] Corrige alguns erros de import e requirements Signed-off-by: Luciano Almeida --- requirements/requirements.txt | 21 +++++++++++++++++++-- sigi/apps/usuarios/forms.py | 20 +++++++------------- sigi/apps/usuarios/views.py | 5 ++--- sigi/settings/base.py | 17 ++++++----------- 4 files changed, 34 insertions(+), 29 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 570c578c..694f67bd 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,12 +1,25 @@ -e git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=geraldo -django-bootstrap3==7.0.1 django-admin-bootstrapped==2.5.7 django-auth-ldap==1.2.8 django-autoslug==1.9.3 +django-bootstrap3==7.0.1 +django-bower==5.1.0 +django-braces==1.8.1 +django-compressor==2.0 +django-crispy-forms==1.6.0 +dj-database-url==0.4.1 +django-dotenv==1.4.1 django-extensions==1.6.7 +django-extra-views==0.7.1 +django-filter==0.13.0 +django-floppyforms==1.6.1 django-image-cropping==1.0.3 django-localflavor==1.3 +django-model-utils==2.4 +django-sass-processor==0.3.4 +django-simple-captcha==0.5.1 Django==1.9.6 +libsass==0.11.0 easy-thumbnails==2.3 eav-django==1.4.7 gunicorn==19.6.0 @@ -14,10 +27,14 @@ html5lib==0.9999999 Pillow==3.2.0 pisa==3.0.33 psycopg2==2.6.1 +python-decouple==3.0 python-memcached==1.58 +pytz==2016.3 PyYAML==3.11 -reportlab==3.3.0 +reportlab==2.7 requests==2.10.0 +rtyaml==0.0.2 +unipath==1.1 six==1.10.0 djangorestframework==2.4.8 django-ipware==1.1.6 diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index 44ecba2e..fa97dbe4 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -6,19 +6,13 @@ from crispy_forms.helper import FormHelper from crispy_forms.layout import Fieldset, Layout, Submit from django import forms -from django.conf import settings from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm, SetPasswordForm) from django.contrib.auth.models import User from django.contrib.auth.password_validation import validate_password -from django.contrib.auth.tokens import default_token_generator from django.core.exceptions import ValidationError -from django.core.mail import send_mail -from django.core.urlresolvers import reverse from django.db import transaction from django.forms import ModelForm -from django.utils.encoding import force_bytes -from django.utils.http import urlsafe_base64_encode from django.utils.translation import ugettext_lazy as _ @@ -26,7 +20,7 @@ from sigi.apps.crud.utils import YES_NO_CHOICES from sigi.apps.crispy_layout_mixin import form_actions -from .models import Telefone, Usuario, ConfirmaEmail +from .models import Telefone, Usuario class LoginForm(AuthenticationForm): @@ -319,11 +313,11 @@ class Meta(object): def __init__(self, *args, **kwargs): super(HabilitarEditForm, self).__init__(*args, **kwargs) - row1 = crispy_layout_mixin.to_row( + row1 = sigi.apps.crispy_layout_mixin.to_row( [(u'nome_completo', 4), (u'cpf', 4), (u'email', 4)]) - row2 = crispy_layout_mixin.to_row([(u'habilitado', 12)]) + row2 = sigi.apps.crispy_layout_mixin.to_row([(u'habilitado', 12)]) self.helper = FormHelper() self.helper.layout = Layout( Fieldset( @@ -379,10 +373,10 @@ class Meta(object): def __init__(self, *args, **kwargs): super(MudarSenhaForm, self).__init__(*args, **kwargs) - row1 = crispy_layout_mixin.to_row( + row1 = sigi.apps.crispy_layout_mixin.to_row( [(u'password', 6), (u'password_confirm', 6)]) - row2 = crispy_layout_mixin.to_row([(u'captcha', 12)]) + row2 = sigi.apps.crispy_layout_mixin.to_row([(u'captcha', 12)]) self.helper = FormHelper() self.helper.layout = Layout( Fieldset( @@ -401,7 +395,7 @@ class RecuperarSenhaEmailForm(PasswordResetForm): def __init__(self, *args, **kwargs): super(RecuperarSenhaEmailForm, self).__init__(*args, **kwargs) - row1 = crispy_layout_mixin.to_row( + row1 = sigi.apps.crispy_layout_mixin.to_row( [(u'email', 6)]) self.helper = FormHelper() self.helper.layout = Layout( @@ -433,7 +427,7 @@ class RecuperacaoMudarSenhaForm(SetPasswordForm): def __init__(self, *args, **kwargs): super(RecuperacaoMudarSenhaForm, self).__init__(*args, **kwargs) self.fields[u'new_password1'].help_text = u'' - row1 = crispy_layout_mixin.to_row( + row1 = sigi.apps.crispy_layout_mixin.to_row( [(u'new_password1', 6), (u'new_password2', 6)]) self.helper = FormHelper() diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index bfbbe039..6b900252 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -7,7 +7,6 @@ from django.core.urlresolvers import reverse from django.utils import timezone from django.views.generic import DetailView, FormView, TemplateView -import sigi.apps.crud.base from django.core.mail import send_mail from sigi.apps.crud.utils import str2bool from django.contrib.auth.tokens import default_token_generator @@ -45,8 +44,8 @@ def get_success_url(self): url_base = full_url[0][:full_url[0].find(u'usuario') - 1], mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + u"Sistema de Atendimento ao Usuário do Interlegis.\n" + - u"Caso você não tenha feito este cadastro, por favor " + - u"ignore esta mensagem.\n" + url_base[0] + + u"Caso você não tenha feito este cadastro, por favor" + + u" ignore esta mensagem.\n" + url_base[0] + reverse(u'usuarios:confirmar_email', kwargs=kwargs)) remetente = settings.EMAIL_HOST_USER destinatario = [confirmar_email.email, diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 245efff6..0759d58f 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -129,6 +129,12 @@ STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'sigiStatic'), ) +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'djangobower.finders.BowerFinder', + 'sass_processor.finders.CssFinder', +) SERVER_EMAIL = 'sigi@interlegis.leg.br' DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br' @@ -194,17 +200,6 @@ }, } -STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, "collected_static") -STATICFILES_DIRS = (os.path.join(BASE_DIR, ("static")),) -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'djangobower.finders.BowerFinder', - 'sass_processor.finders.CssFinder', -) - - CRISPY_TEMPLATE_PACK = 'bootstrap3' CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_FAIL_SILENTLY = False From b260176457a3364fcc12c8ba55612d5a5862f4dc Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 21 Jun 2016 16:56:40 -0300 Subject: [PATCH 05/63] =?UTF-8?q?mudan=C3=A7as=20css=20e=20base?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/settings/base.py | 17 ++-- sigiStatic/img/img_atendimento/favicon.ico | Bin 0 -> 975 bytes .../glyphicons-halflings-white.png | Bin 0 -> 8777 bytes .../img_atendimento/glyphicons-halflings.png | Bin 0 -> 12799 bytes sigiStatic/img/img_atendimento/logo.png | Bin 0 -> 3868 bytes sigiStatic/img/img_atendimento/logo_cc.jpg | Bin 0 -> 2602 bytes .../img/img_atendimento/logo_interlegis.jpg | Bin 0 -> 2063 bytes templates/base.html | 82 ++++++++---------- 8 files changed, 49 insertions(+), 50 deletions(-) create mode 100644 sigiStatic/img/img_atendimento/favicon.ico create mode 100644 sigiStatic/img/img_atendimento/glyphicons-halflings-white.png create mode 100644 sigiStatic/img/img_atendimento/glyphicons-halflings.png create mode 100644 sigiStatic/img/img_atendimento/logo.png create mode 100644 sigiStatic/img/img_atendimento/logo_cc.jpg create mode 100644 sigiStatic/img/img_atendimento/logo_interlegis.jpg diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 0759d58f..74d3a699 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -129,12 +129,6 @@ STATICFILES_DIRS = ( os.path.join(BASE_DIR, 'sigiStatic'), ) -STATICFILES_FINDERS = ( - 'django.contrib.staticfiles.finders.FileSystemFinder', - 'django.contrib.staticfiles.finders.AppDirectoriesFinder', - 'djangobower.finders.BowerFinder', - 'sass_processor.finders.CssFinder', -) SERVER_EMAIL = 'sigi@interlegis.leg.br' DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br' @@ -200,6 +194,17 @@ }, } +STATIC_URL = '/static/' +STATIC_ROOT = os.path.join(BASE_DIR, "collected_static") +STATICFILES_DIRS = (os.path.join(BASE_DIR, ("static")),) + +STATICFILES_FINDERS = ( + 'django.contrib.staticfiles.finders.FileSystemFinder', + 'django.contrib.staticfiles.finders.AppDirectoriesFinder', + 'djangobower.finders.BowerFinder', + 'sass_processor.finders.CssFinder', +) + CRISPY_TEMPLATE_PACK = 'bootstrap3' CRISPY_ALLOWED_TEMPLATE_PACKS = 'bootstrap3' CRISPY_FAIL_SILENTLY = False diff --git a/sigiStatic/img/img_atendimento/favicon.ico b/sigiStatic/img/img_atendimento/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..b81629808c3b0ef399c3cbb7008d6405543b2575 GIT binary patch literal 975 zcmV;=12FuFP)1v3X4hmB{Gs(HDz=28P!x?AtB4mWMG&pU3!!2`@uFU6MGA^w zX%MR=5yby11ut4CsEBxJ5Ha}2YP_+68bL`m#9Fj9>$>h{&)19mtUGfi$)5Ftg_)i2 zyzg_~**RxcR27$+{?(o(pjVv+11PPjWb>MsvjBw}@T#1Li{t=2_wiEg4i6%lt_T2A z8GtIi6#*DXR04ojnn1<3K+*ukAK^Li^VPLGfHlB)L~q6O-hS5g{%sd9)u>dQKx|Mh zm#DoY%Iac+EXc=necz>;g^6!7onZwp0d9|Q|8RK)1GgZ5x%T@K^I}bjdvYXV3KQMk zL5+3{0RSr_8=Qw=)9F89*ffzbKG{J6hP#WrDyZt!HmVbX95e#bytz2J;_54Mgd@K0FAP} zVK#sh*e_HkYzDfUm{`mDs zf`CE!F_mmSG#bt@z~phQAf2}6%%rXfnTg$za~9-+`piisn@@~3D6#!Lmu>Tx0A~?C zvq9IqoYpnA`-?jNeWDA|hobUOjh;{4ZD}9TF;M>l;jRu(1${d%0000YdQ@0+Q*UN; xcVTj6004N}D=#nC%goCzPEIUH)ypqR2LLwM23QbN%3J^d002ovPDHLkV1keM!8rf` literal 0 HcmV?d00001 diff --git a/sigiStatic/img/img_atendimento/glyphicons-halflings-white.png b/sigiStatic/img/img_atendimento/glyphicons-halflings-white.png new file mode 100644 index 0000000000000000000000000000000000000000..3bf6484a29d8da269f9bc874b25493a45fae3bae GIT binary patch literal 8777 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 B7G?kd literal 0 HcmV?d00001 diff --git a/sigiStatic/img/img_atendimento/glyphicons-halflings.png b/sigiStatic/img/img_atendimento/glyphicons-halflings.png new file mode 100644 index 0000000000000000000000000000000000000000..a9969993201f9cee63cf9f49217646347297b643 GIT binary patch literal 12799 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 literal 0 HcmV?d00001 diff --git a/sigiStatic/img/img_atendimento/logo.png b/sigiStatic/img/img_atendimento/logo.png new file mode 100644 index 0000000000000000000000000000000000000000..bc94190650a910dc07eed4f4e8f29230a147e987 GIT binary patch literal 3868 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 SIzzQf1GVRixtY4~^*;dzQG0v< literal 0 HcmV?d00001 diff --git a/sigiStatic/img/img_atendimento/logo_interlegis.jpg b/sigiStatic/img/img_atendimento/logo_interlegis.jpg new file mode 100644 index 0000000000000000000000000000000000000000..06c178f74f5be7866eab495c8770cf6ae1307c91 GIT binary patch literal 2063 zcmb78dpy$%AO6jl88%}vV>!s3A&z8@`=z<9+zxh9h*G)bvPk9@QJKSBBUyyBy$#K+ zt6M@URBmgf+Jq#sbX@l8ec#X9`Q!cPeZJqnp6~NK-$ytud;`e1I1!ux5J&`2-yT3X z1=s_kVDOI>1&fM_ii$yC;*f1fOTeHogtUwdLK*=_%Arw6Sp``*Vu$h$1w}FF(a|N9_LEFtQb1@?>9^t4&$LE!QtnQmp5Gk;{g4PQA+&8H_#SS?}=pXOlP z{F*|IhRQ+-c_Y&jq+T7~emkPiNsv|)u;)<-koUiQ$|lVD`ICCTc+j%K0xa0ori^ci z$09tm5!0F4tDESrM$komlKOk?D{NwCM*HjY-(gye!o|0}@$q2X*wF2cg3_X;DO`V| zO@1aqHeveR{nSgROW#(xoU%F}*16GG_|A8#%OPZ^i-r|FFWf-&AnGmFvlf1hpY=5M zE^-+~Bx!LT@zE5r)aMQJDxUGB>n(H1XO%}uLmzY{i|yK_vu3K3D;x97i=V;RmJK|= z>4hZlEv=x`J~IBfimJnE)7fd=6^Q$r&$=A<+9BiFHvzVBw>9wvycILn417RcDNz3O zHS&2A3S{zJ2PuHY7JT90cCWbZLLfW5p-c1k)~R4>g|gG28z*Uuyq_#FB&Wn(tscqP z98GNxZ~6!1d)8|)cRf=t{kr~0Q(q*GY{F#N>g?l?A_-vhqG=mt^sMm+`jx+e9*cOa zv;NE2`l+4%1`VwQk3oN|i`Vk^V9&SZcN3C?K%JZEUfPAW&sEbSo%WmgF=sYaxuwS_ zW5yJT4X|M*xAS_H5WrdI-Z9i3wMq#|BfxnBSEQMBVNU$bN)0#j^?iBkX-%v#ks7V~ zaVjc5K{dN8iZeVr-!}_$rM*0GRIj|WnR_<{-*DuWhTvH{DBP0<8_TbirT@v&V(x8-Tw!c7DqGI1 zMH^fVs|yl%HD_FG8FKm{2)}q^v4>569}V;M_N_H9I(JFXYpt8hj72zKCc#`0ol_Q5 ztY8F9EZ~iRO)|g-&#TBsDH36x?Q%c7ZZ&~j3bvBw>RTk|mQf#A^ znChABW4Aw1yz)}HAy;0mB2n_pLbz)L^hAnxWj{d&eo5&@#XhN27*^JCkNJi_IN4AG@p={v<|QHvFbDmZS{BO; z-zcxTqWW=>!fsDP5IMI_-uM)|#n69j1J{_Tm7%A@r@2skstBv4EXoi!*AdD)L3rgO zNIX~nYu;E`k*J*>2zo)SIqqueEoNxmbJEUWIo8BET3o?>+_>NPlt*AtnT1*qs{b4| z3zH}ByT4d5LVK;4UaMnM*p##Y^xeM0aCp(h45(!|cD3>Q3pL{yZIQwdzi&wL;gLO%a(<(>I_Rqn4;?V(LvcE+S z3xV#Otq^pazs>QHjz1LD6GC^h|4?bF$)~U$cv$Z6KSJW{Y3m#vDpA=b7Qob>o#}l% zY)*=hbfK-J>XjVzc)WzA5FQOCe@-wliyI<`&*^{KHKZc2s1*Y9s6*12Lh^NIAJgYj z2EPklEKfA#`3yKVYRBArf)@hqHkH}Av`JZu`ryMk{$^bd%V&*M3J&9Y7S=of+|Rr&Xiy!~MYjV%YJ;@Gyc&S~BD_cYIc7iiH7KOKIUik~?~ ztqM-kv3dz#D_7@_U&$rj&VT@)bLduQb7pJS{eB9h(BPlWp8})9sA;zt=%jp4H_X16O;dP%P0# ID#D3>0;Xk}o&W#< literal 0 HcmV?d00001 diff --git a/templates/base.html b/templates/base.html index ac7b5209..edabff44 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,54 +6,48 @@ Sistema de Atendimento {% block head_content %} - + - + - + {% endblock head_content %} {% block navigation %} -
-
-
- - -
- - -
-
+
+
+
+
+ + +
+
+
-
- {% endblock navigation %} + {% endblock navigation %} + {% block body_block %} @@ -64,7 +58,7 @@
- Logo + Logo

Interlegis

Sistema de Solicitação de Serviços

 @@ -117,7 +111,7 @@

- + {% block extra_js %}{% endblock extra_js %} {% endblock foot_js %} @@ -130,7 +124,7 @@

@@ -140,7 +134,7 @@

From 17d5ae8d5f500b021ea28fb3d24bad25d43645a7 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 22 Jun 2016 15:05:51 -0300 Subject: [PATCH 06/63] Adiciona arquivo css separado para atendimento --- sigi/settings/base.py | 4 ---- sigiStatic/css/atendimento.css | 3 +++ templates/base.html | 3 ++- 3 files changed, 5 insertions(+), 5 deletions(-) create mode 100644 sigiStatic/css/atendimento.css diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 74d3a699..2ff1126f 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -194,10 +194,6 @@ }, } -STATIC_URL = '/static/' -STATIC_ROOT = os.path.join(BASE_DIR, "collected_static") -STATICFILES_DIRS = (os.path.join(BASE_DIR, ("static")),) - STATICFILES_FINDERS = ( 'django.contrib.staticfiles.finders.FileSystemFinder', 'django.contrib.staticfiles.finders.AppDirectoriesFinder', diff --git a/sigiStatic/css/atendimento.css b/sigiStatic/css/atendimento.css new file mode 100644 index 00000000..b4513da5 --- /dev/null +++ b/sigiStatic/css/atendimento.css @@ -0,0 +1,3 @@ +input { + height: 30px !important; +} diff --git a/templates/base.html b/templates/base.html index edabff44..14ccbb60 100644 --- a/templates/base.html +++ b/templates/base.html @@ -7,6 +7,8 @@ Sistema de Atendimento {% block head_content %} + + @@ -14,7 +16,6 @@ {% endblock head_content %} - {% block navigation %}

From b106208bef3faa4ff149df53c8d8a210862beb8b Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 22 Jun 2016 15:55:16 -0300 Subject: [PATCH 07/63] Adiciona dados dos arquvios faltando para um unico arquivo css e js --- sigiStatic/css/atendimento.css | 1120 ++++++++++++++++++++++++++++++++ sigiStatic/js/atendimento.js | 11 + templates/base.html | 4 +- 3 files changed, 1132 insertions(+), 3 deletions(-) create mode 100644 sigiStatic/js/atendimento.js diff --git a/sigiStatic/css/atendimento.css b/sigiStatic/css/atendimento.css index b4513da5..27fcb3e7 100644 --- a/sigiStatic/css/atendimento.css +++ b/sigiStatic/css/atendimento.css @@ -1,3 +1,1123 @@ input { height: 30px !important; } + +/** Bootstrap Fluid Adj **/ +body { +padding-top: 60px; +padding-bottom: 40px; +} + +.sidebar-nav { +padding: 9px 0; +} + +@media (max-width: 980px) { + /* Enable use of floated navbar text */ + .navbar-text.pull-right { + float: none; + padding-left: 5px; + padding-right: 5px; + } +} + +/** Bootstrap Responsive v2.3.2 **/ +.clearfix { + *zoom: 1; +} + +.clearfix:before, +.clearfix:after { + display: table; + line-height: 0; + content: ""; +} + +.clearfix:after { + clear: both; +} + +.hide-text { + font: 0/0 a; + color: transparent; + text-shadow: none; + background-color: transparent; + border: 0; +} + +.input-block-level { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; +} + +@-ms-viewport { + width: device-width; +} + +.hidden { + display: none; + visibility: hidden; +} + +.visible-phone { + display: none !important; +} + +.visible-tablet { + display: none !important; +} + +.hidden-desktop { + display: none !important; +} + +.visible-desktop { + display: inherit !important; +} + +@media (min-width: 768px) and (max-width: 979px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important ; + } + .visible-tablet { + display: inherit !important; + } + .hidden-tablet { + display: none !important; + } +} + +@media (max-width: 767px) { + .hidden-desktop { + display: inherit !important; + } + .visible-desktop { + display: none !important; + } + .visible-phone { + display: inherit !important; + } + .hidden-phone { + display: none !important; + } +} + +.visible-print { + display: none !important; +} + +@media print { + .visible-print { + display: inherit !important; + } + .hidden-print { + display: none !important; + } +} + +@media (min-width: 1200px) { + .row { + margin-left: -30px; + *zoom: 1; + } + .row:before, + .row:after { + display: table; + line-height: 0; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + min-height: 1px; + margin-left: 30px; + } + .container, + .navbar-static-top .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 1170px; + } + .span12 { + width: 1170px; + } + .span11 { + width: 1070px; + } + .span10 { + width: 970px; + } + .span9 { + width: 870px; + } + .span8 { + width: 770px; + } + .span7 { + width: 670px; + } + .span6 { + width: 570px; + } + .span5 { + width: 470px; + } + .span4 { + width: 370px; + } + .span3 { + width: 270px; + } + .span2 { + width: 170px; + } + .span1 { + width: 70px; + } + .offset12 { + margin-left: 1230px; + } + .offset11 { + margin-left: 1130px; + } + .offset10 { + margin-left: 1030px; + } + .offset9 { + margin-left: 930px; + } + .offset8 { + margin-left: 830px; + } + .offset7 { + margin-left: 730px; + } + .offset6 { + margin-left: 630px; + } + .offset5 { + margin-left: 530px; + } + .offset4 { + margin-left: 430px; + } + .offset3 { + margin-left: 330px; + } + .offset2 { + margin-left: 230px; + } + .offset1 { + margin-left: 130px; + } + .row-fluid { + width: 100%; + *zoom: 1; + } + .row-fluid:before, + .row-fluid:after { + display: table; + line-height: 0; + content: ""; + } + .row-fluid:after { + clear: both; + } + .row-fluid [class*="span"] { + display: block; + float: left; + width: 100%; + min-height: 30px; + margin-left: 2.564102564102564%; + *margin-left: 2.5109110747408616%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .row-fluid [class*="span"]:first-child { + margin-left: 0; + } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.564102564102564%; + } + .row-fluid .span12 { + width: 100%; + *width: 99.94680851063829%; + } + .row-fluid .span11 { + width: 91.45299145299145%; + *width: 91.39979996362975%; + } + .row-fluid .span10 { + width: 82.90598290598291%; + *width: 82.8527914166212%; + } + .row-fluid .span9 { + width: 74.35897435897436%; + *width: 74.30578286961266%; + } + .row-fluid .span8 { + width: 65.81196581196582%; + *width: 65.75877432260411%; + } + .row-fluid .span7 { + width: 57.26495726495726%; + *width: 57.21176577559556%; + } + .row-fluid .span6 { + width: 48.717948717948715%; + *width: 48.664757228587014%; + } + .row-fluid .span5 { + width: 40.17094017094017%; + *width: 40.11774868157847%; + } + .row-fluid .span4 { + width: 31.623931623931625%; + *width: 31.570740134569924%; + } + .row-fluid .span3 { + width: 23.076923076923077%; + *width: 23.023731587561375%; + } + .row-fluid .span2 { + width: 14.52991452991453%; + *width: 14.476723040552828%; + } + .row-fluid .span1 { + width: 5.982905982905983%; + *width: 5.929714493544281%; + } + .row-fluid .offset12 { + margin-left: 105.12820512820512%; + *margin-left: 105.02182214948171%; + } + .row-fluid .offset12:first-child { + margin-left: 102.56410256410257%; + *margin-left: 102.45771958537915%; + } + .row-fluid .offset11 { + margin-left: 96.58119658119658%; + *margin-left: 96.47481360247316%; + } + .row-fluid .offset11:first-child { + margin-left: 94.01709401709402%; + *margin-left: 93.91071103837061%; + } + .row-fluid .offset10 { + margin-left: 88.03418803418803%; + *margin-left: 87.92780505546462%; + } + .row-fluid .offset10:first-child { + margin-left: 85.47008547008548%; + *margin-left: 85.36370249136206%; + } + .row-fluid .offset9 { + margin-left: 79.48717948717949%; + *margin-left: 79.38079650845607%; + } + .row-fluid .offset9:first-child { + margin-left: 76.92307692307693%; + *margin-left: 76.81669394435352%; + } + .row-fluid .offset8 { + margin-left: 70.94017094017094%; + *margin-left: 70.83378796144753%; + } + .row-fluid .offset8:first-child { + margin-left: 68.37606837606839%; + *margin-left: 68.26968539734497%; + } + .row-fluid .offset7 { + margin-left: 62.393162393162385%; + *margin-left: 62.28677941443899%; + } + .row-fluid .offset7:first-child { + margin-left: 59.82905982905982%; + *margin-left: 59.72267685033642%; + } + .row-fluid .offset6 { + margin-left: 53.84615384615384%; + *margin-left: 53.739770867430444%; + } + .row-fluid .offset6:first-child { + margin-left: 51.28205128205128%; + *margin-left: 51.175668303327875%; + } + .row-fluid .offset5 { + margin-left: 45.299145299145295%; + *margin-left: 45.1927623204219%; + } + .row-fluid .offset5:first-child { + margin-left: 42.73504273504273%; + *margin-left: 42.62865975631933%; + } + .row-fluid .offset4 { + margin-left: 36.75213675213675%; + *margin-left: 36.645753773413354%; + } + .row-fluid .offset4:first-child { + margin-left: 34.18803418803419%; + *margin-left: 34.081651209310785%; + } + .row-fluid .offset3 { + margin-left: 28.205128205128204%; + *margin-left: 28.0987452264048%; + } + .row-fluid .offset3:first-child { + margin-left: 25.641025641025642%; + *margin-left: 25.53464266230224%; + } + .row-fluid .offset2 { + margin-left: 19.65811965811966%; + *margin-left: 19.551736679396257%; + } + .row-fluid .offset2:first-child { + margin-left: 17.094017094017094%; + *margin-left: 16.98763411529369%; + } + .row-fluid .offset1 { + margin-left: 11.11111111111111%; + *margin-left: 11.004728132387708%; + } + .row-fluid .offset1:first-child { + margin-left: 8.547008547008547%; + *margin-left: 8.440625568285142%; + } + input, + textarea, + .uneditable-input { + margin-left: 0; + } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 30px; + } + input.span12, + textarea.span12, + .uneditable-input.span12 { + width: 1156px; + } + input.span11, + textarea.span11, + .uneditable-input.span11 { + width: 1056px; + } + input.span10, + textarea.span10, + .uneditable-input.span10 { + width: 956px; + } + input.span9, + textarea.span9, + .uneditable-input.span9 { + width: 856px; + } + input.span8, + textarea.span8, + .uneditable-input.span8 { + width: 756px; + } + input.span7, + textarea.span7, + .uneditable-input.span7 { + width: 656px; + } + input.span6, + textarea.span6, + .uneditable-input.span6 { + width: 556px; + } + input.span5, + textarea.span5, + .uneditable-input.span5 { + width: 456px; + } + input.span4, + textarea.span4, + .uneditable-input.span4 { + width: 356px; + } + input.span3, + textarea.span3, + .uneditable-input.span3 { + width: 256px; + } + input.span2, + textarea.span2, + .uneditable-input.span2 { + width: 156px; + } + input.span1, + textarea.span1, + .uneditable-input.span1 { + width: 56px; + } + .thumbnails { + margin-left: -30px; + } + .thumbnails > li { + margin-left: 30px; + } + .row-fluid .thumbnails { + margin-left: 0; + } +} + +@media (min-width: 768px) and (max-width: 979px) { + .row { + margin-left: -20px; + *zoom: 1; + } + .row:before, + .row:after { + display: table; + line-height: 0; + content: ""; + } + .row:after { + clear: both; + } + [class*="span"] { + float: left; + min-height: 1px; + margin-left: 20px; + } + .container, + .navbar-static-top .container, + .navbar-fixed-top .container, + .navbar-fixed-bottom .container { + width: 724px; + } + .span12 { + width: 724px; + } + .span11 { + width: 662px; + } + .span10 { + width: 600px; + } + .span9 { + width: 538px; + } + .span8 { + width: 476px; + } + .span7 { + width: 414px; + } + .span6 { + width: 352px; + } + .span5 { + width: 290px; + } + .span4 { + width: 228px; + } + .span3 { + width: 166px; + } + .span2 { + width: 104px; + } + .span1 { + width: 42px; + } + .offset12 { + margin-left: 764px; + } + .offset11 { + margin-left: 702px; + } + .offset10 { + margin-left: 640px; + } + .offset9 { + margin-left: 578px; + } + .offset8 { + margin-left: 516px; + } + .offset7 { + margin-left: 454px; + } + .offset6 { + margin-left: 392px; + } + .offset5 { + margin-left: 330px; + } + .offset4 { + margin-left: 268px; + } + .offset3 { + margin-left: 206px; + } + .offset2 { + margin-left: 144px; + } + .offset1 { + margin-left: 82px; + } + .row-fluid { + width: 100%; + *zoom: 1; + } + .row-fluid:before, + .row-fluid:after { + display: table; + line-height: 0; + content: ""; + } + .row-fluid:after { + clear: both; + } + .row-fluid [class*="span"] { + display: block; + float: left; + width: 100%; + min-height: 30px; + margin-left: 2.7624309392265194%; + *margin-left: 2.709239449864817%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .row-fluid [class*="span"]:first-child { + margin-left: 0; + } + .row-fluid .controls-row [class*="span"] + [class*="span"] { + margin-left: 2.7624309392265194%; + } + .row-fluid .span12 { + width: 100%; + *width: 99.94680851063829%; + } + .row-fluid .span11 { + width: 91.43646408839778%; + *width: 91.38327259903608%; + } + .row-fluid .span10 { + width: 82.87292817679558%; + *width: 82.81973668743387%; + } + .row-fluid .span9 { + width: 74.30939226519337%; + *width: 74.25620077583166%; + } + .row-fluid .span8 { + width: 65.74585635359117%; + *width: 65.69266486422946%; + } + .row-fluid .span7 { + width: 57.18232044198895%; + *width: 57.12912895262725%; + } + .row-fluid .span6 { + width: 48.61878453038674%; + *width: 48.56559304102504%; + } + .row-fluid .span5 { + width: 40.05524861878453%; + *width: 40.00205712942283%; + } + .row-fluid .span4 { + width: 31.491712707182323%; + *width: 31.43852121782062%; + } + .row-fluid .span3 { + width: 22.92817679558011%; + *width: 22.87498530621841%; + } + .row-fluid .span2 { + width: 14.3646408839779%; + *width: 14.311449394616199%; + } + .row-fluid .span1 { + width: 5.801104972375691%; + *width: 5.747913483013988%; + } + .row-fluid .offset12 { + margin-left: 105.52486187845304%; + *margin-left: 105.41847889972962%; + } + .row-fluid .offset12:first-child { + margin-left: 102.76243093922652%; + *margin-left: 102.6560479605031%; + } + .row-fluid .offset11 { + margin-left: 96.96132596685082%; + *margin-left: 96.8549429881274%; + } + .row-fluid .offset11:first-child { + margin-left: 94.1988950276243%; + *margin-left: 94.09251204890089%; + } + .row-fluid .offset10 { + margin-left: 88.39779005524862%; + *margin-left: 88.2914070765252%; + } + .row-fluid .offset10:first-child { + margin-left: 85.6353591160221%; + *margin-left: 85.52897613729868%; + } + .row-fluid .offset9 { + margin-left: 79.8342541436464%; + *margin-left: 79.72787116492299%; + } + .row-fluid .offset9:first-child { + margin-left: 77.07182320441989%; + *margin-left: 76.96544022569647%; + } + .row-fluid .offset8 { + margin-left: 71.2707182320442%; + *margin-left: 71.16433525332079%; + } + .row-fluid .offset8:first-child { + margin-left: 68.50828729281768%; + *margin-left: 68.40190431409427%; + } + .row-fluid .offset7 { + margin-left: 62.70718232044199%; + *margin-left: 62.600799341718584%; + } + .row-fluid .offset7:first-child { + margin-left: 59.94475138121547%; + *margin-left: 59.838368402492065%; + } + .row-fluid .offset6 { + margin-left: 54.14364640883978%; + *margin-left: 54.037263430116376%; + } + .row-fluid .offset6:first-child { + margin-left: 51.38121546961326%; + *margin-left: 51.27483249088986%; + } + .row-fluid .offset5 { + margin-left: 45.58011049723757%; + *margin-left: 45.47372751851417%; + } + .row-fluid .offset5:first-child { + margin-left: 42.81767955801105%; + *margin-left: 42.71129657928765%; + } + .row-fluid .offset4 { + margin-left: 37.01657458563536%; + *margin-left: 36.91019160691196%; + } + .row-fluid .offset4:first-child { + margin-left: 34.25414364640884%; + *margin-left: 34.14776066768544%; + } + .row-fluid .offset3 { + margin-left: 28.45303867403315%; + *margin-left: 28.346655695309746%; + } + .row-fluid .offset3:first-child { + margin-left: 25.69060773480663%; + *margin-left: 25.584224756083227%; + } + .row-fluid .offset2 { + margin-left: 19.88950276243094%; + *margin-left: 19.783119783707537%; + } + .row-fluid .offset2:first-child { + margin-left: 17.12707182320442%; + *margin-left: 17.02068884448102%; + } + .row-fluid .offset1 { + margin-left: 11.32596685082873%; + *margin-left: 11.219583872105325%; + } + .row-fluid .offset1:first-child { + margin-left: 8.56353591160221%; + *margin-left: 8.457152932878806%; + } + input, + textarea, + .uneditable-input { + margin-left: 0; + } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 20px; + } + input.span12, + textarea.span12, + .uneditable-input.span12 { + width: 710px; + } + input.span11, + textarea.span11, + .uneditable-input.span11 { + width: 648px; + } + input.span10, + textarea.span10, + .uneditable-input.span10 { + width: 586px; + } + input.span9, + textarea.span9, + .uneditable-input.span9 { + width: 524px; + } + input.span8, + textarea.span8, + .uneditable-input.span8 { + width: 462px; + } + input.span7, + textarea.span7, + .uneditable-input.span7 { + width: 400px; + } + input.span6, + textarea.span6, + .uneditable-input.span6 { + width: 338px; + } + input.span5, + textarea.span5, + .uneditable-input.span5 { + width: 276px; + } + input.span4, + textarea.span4, + .uneditable-input.span4 { + width: 214px; + } + input.span3, + textarea.span3, + .uneditable-input.span3 { + width: 152px; + } + input.span2, + textarea.span2, + .uneditable-input.span2 { + width: 90px; + } + input.span1, + textarea.span1, + .uneditable-input.span1 { + width: 28px; + } +} + +@media (max-width: 767px) { + body { + padding-right: 20px; + padding-left: 20px; + } + .navbar-fixed-top, + .navbar-fixed-bottom, + .navbar-static-top { + margin-right: -20px; + margin-left: -20px; + } + .container-fluid { + padding: 0; + } + .dl-horizontal dt { + float: none; + width: auto; + clear: none; + text-align: left; + } + .dl-horizontal dd { + margin-left: 0; + } + .container { + width: auto; + } + .row-fluid { + width: 100%; + } + .row, + .thumbnails { + margin-left: 0; + } + .thumbnails > li { + float: none; + margin-left: 0; + } + [class*="span"], + .uneditable-input[class*="span"], + .row-fluid [class*="span"] { + display: block; + float: none; + width: 100%; + margin-left: 0; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .span12, + .row-fluid .span12 { + width: 100%; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .row-fluid [class*="offset"]:first-child { + margin-left: 0; + } + .input-large, + .input-xlarge, + .input-xxlarge, + input[class*="span"], + select[class*="span"], + textarea[class*="span"], + .uneditable-input { + display: block; + width: 100%; + min-height: 30px; + -webkit-box-sizing: border-box; + -moz-box-sizing: border-box; + box-sizing: border-box; + } + .input-prepend input, + .input-append input, + .input-prepend input[class*="span"], + .input-append input[class*="span"] { + display: inline-block; + width: auto; + } + .controls-row [class*="span"] + [class*="span"] { + margin-left: 0; + } + .modal { + position: fixed; + top: 20px; + right: 20px; + left: 20px; + width: auto; + margin: 0; + } + .modal.fade { + top: -100px; + } + .modal.fade.in { + top: 20px; + } +} + +@media (max-width: 480px) { + .nav-collapse { + -webkit-transform: translate3d(0, 0, 0); + } + .page-header h1 small { + display: block; + line-height: 20px; + } + input[type="checkbox"], + input[type="radio"] { + border: 1px solid #ccc; + } + .form-horizontal .control-label { + float: none; + width: auto; + padding-top: 0; + text-align: left; + } + .form-horizontal .controls { + margin-left: 0; + } + .form-horizontal .control-list { + padding-top: 0; + } + .form-horizontal .form-actions { + padding-right: 10px; + padding-left: 10px; + } + .media .pull-left, + .media .pull-right { + display: block; + float: none; + margin-bottom: 10px; + } + .media-object { + margin-right: 0; + margin-left: 0; + } + .modal { + top: 10px; + right: 10px; + left: 10px; + } + .modal-header .close { + padding: 10px; + margin: -10px; + } + .carousel-caption { + position: static; + } +} + +@media (max-width: 979px) { + body { + padding-top: 0; + } + .navbar-fixed-top, + .navbar-fixed-bottom { + position: static; + } + .navbar-fixed-top { + margin-bottom: 20px; + } + .navbar-fixed-bottom { + margin-top: 20px; + } + .navbar-fixed-top .navbar-inner, + .navbar-fixed-bottom .navbar-inner { + padding: 5px; + } + .navbar .container { + width: auto; + padding: 0; + } + .navbar .brand { + padding-right: 10px; + padding-left: 10px; + margin: 0 0 0 -5px; + } + .nav-collapse { + clear: both; + } + .nav-collapse .nav { + float: none; + margin: 0 0 10px; + } + .nav-collapse .nav > li { + float: none; + } + .nav-collapse .nav > li > a { + margin-bottom: 2px; + } + .nav-collapse .nav > .divider-vertical { + display: none; + } + .nav-collapse .nav .nav-header { + color: #777777; + text-shadow: none; + } + .nav-collapse .nav > li > a, + .nav-collapse .dropdown-menu a { + padding: 9px 15px; + font-weight: bold; + color: #777777; + -webkit-border-radius: 3px; + -moz-border-radius: 3px; + border-radius: 3px; + } + .nav-collapse .btn { + padding: 4px 10px 4px; + font-weight: normal; + -webkit-border-radius: 4px; + -moz-border-radius: 4px; + border-radius: 4px; + } + .nav-collapse .dropdown-menu li + li a { + margin-bottom: 2px; + } + .nav-collapse .nav > li > a:hover, + .nav-collapse .nav > li > a:focus, + .nav-collapse .dropdown-menu a:hover, + .nav-collapse .dropdown-menu a:focus { + background-color: #f2f2f2; + } + .navbar-inverse .nav-collapse .nav > li > a, + .navbar-inverse .nav-collapse .dropdown-menu a { + color: #999999; + } + .navbar-inverse .nav-collapse .nav > li > a:hover, + .navbar-inverse .nav-collapse .nav > li > a:focus, + .navbar-inverse .nav-collapse .dropdown-menu a:hover, + .navbar-inverse .nav-collapse .dropdown-menu a:focus { + background-color: #111111; + } + .nav-collapse.in .btn-group { + padding: 0; + margin-top: 5px; + } + .nav-collapse .dropdown-menu { + position: static; + top: auto; + left: auto; + display: none; + float: none; + max-width: none; + padding: 0; + margin: 0 15px; + background-color: transparent; + border: none; + -webkit-border-radius: 0; + -moz-border-radius: 0; + border-radius: 0; + -webkit-box-shadow: none; + -moz-box-shadow: none; + box-shadow: none; + } + .nav-collapse .open > .dropdown-menu { + display: block; + } + .nav-collapse .dropdown-menu:before, + .nav-collapse .dropdown-menu:after { + display: none; + } + .nav-collapse .dropdown-menu .divider { + display: none; + } + .nav-collapse .nav > li > .dropdown-menu:before, + .nav-collapse .nav > li > .dropdown-menu:after { + display: none; + } + .nav-collapse .navbar-form, + .nav-collapse .navbar-search { + float: none; + padding: 10px 15px; + margin: 10px 0; + border-top: 1px solid #f2f2f2; + border-bottom: 1px solid #f2f2f2; + -webkit-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + -moz-box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.1), 0 1px 0 rgba(255, 255, 255, 0.1); + } + .navbar-inverse .nav-collapse .navbar-form, + .navbar-inverse .nav-collapse .navbar-search { + border-top-color: #111111; + border-bottom-color: #111111; + } + .navbar .nav-collapse .nav.pull-right { + float: none; + margin-left: 0; + } + .nav-collapse, + .nav-collapse.collapse { + height: 0; + overflow: hidden; + } + .navbar .btn-navbar { + display: block; + } + .navbar-static .navbar-inner { + padding-right: 10px; + padding-left: 10px; + } +} + +@media (min-width: 980px) { + .nav-collapse.collapse { + height: auto !important; + overflow: visible !important; + } +} diff --git a/sigiStatic/js/atendimento.js b/sigiStatic/js/atendimento.js new file mode 100644 index 00000000..33f98c76 --- /dev/null +++ b/sigiStatic/js/atendimento.js @@ -0,0 +1,11 @@ +function refreshMask () { + $('.telefone').mask("00000000", {placeholder:"____-____"}); + $('.ddd').mask("00", {placeholder:"__"}); + $('.cpf').mask("00000000000", {placeholder:"___.___.___-__"}); + $('.cep').mask("00000-000", {placeholder:"_____-___"}); + $('.rg').mask("0.000.000", {placeholder:"_.___.___"}); +} + +$(document).ready(function (){ + refreshMask(); +}); diff --git a/templates/base.html b/templates/base.html index 14ccbb60..99c5e2bd 100644 --- a/templates/base.html +++ b/templates/base.html @@ -10,9 +10,7 @@ - - {% endblock head_content %} @@ -113,7 +111,7 @@

- + {% block extra_js %}{% endblock extra_js %} {% endblock foot_js %} From 5fef5233510e4bbdcd52dfb9bdde8253bd983a50 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 22 Jun 2016 16:46:08 -0300 Subject: [PATCH 08/63] Arruma bug no layout --- sigi/apps/crispy_layout_mixin.py | 5 +++-- sigi/apps/usuarios/forms.py | 26 ++++++++++++++++---------- sigi/apps/usuarios/layouts.yaml | 9 ++++----- sigi/apps/usuarios/views.py | 3 ++- 4 files changed, 25 insertions(+), 18 deletions(-) diff --git a/sigi/apps/crispy_layout_mixin.py b/sigi/apps/crispy_layout_mixin.py index 5f6e57b5..1ea1e042 100644 --- a/sigi/apps/crispy_layout_mixin.py +++ b/sigi/apps/crispy_layout_mixin.py @@ -42,10 +42,11 @@ def form_actions(more=[], save_label=_('Salvar')): class FormLayout(Layout): - def __init__(self, label_cancel=_("Cancelar"), *fields): + def __init__(self, *fields): buttons = form_actions(more=[ HTML('%s' % label_cancel)]) + ' class="btn btn-primary" style="background-color:black;">' + ' Cancelar')]) _fields = list(to_fieldsets(fields)) + [to_row([(buttons, 12)])] super(FormLayout, self).__init__(*_fields) diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index fa97dbe4..d34e7391 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -57,7 +57,10 @@ class UsuarioForm(ModelForm): widget=forms.Select(), choices=TIPO_TELEFONE, label=_(u'Tipo Telefone')) - segundo_ddd = forms.CharField(required=False, max_length=2, label=_(u'DDD')) + segundo_ddd = forms.CharField( + required=False, + max_length=2, + label=_(u'DDD')) segundo_numero = forms.CharField( required=False, max_length=10, label=_(u'Número')) segundo_principal = forms.ChoiceField( @@ -86,12 +89,12 @@ class UsuarioForm(ModelForm): class Meta(object): model = Usuario - fields = [u'username', u'email', u'nome_completo', u'password', u'vinculo', - u'password_confirm', u'email_confirm', u'captcha', u'cpf', u'rg', - u'cargo', u'casa_legislativa'] + fields = [u'username', u'email', u'nome_completo', u'password', + u'vinculo', u'password_confirm', u'email_confirm', + u'captcha', u'cpf', u'rg', u'cargo', u'casa_legislativa'] widgets = {u'email': forms.TextInput( - attrs={u'style': u'text-transform:lowercase;'}),} + attrs={u'style': u'text-transform:lowercase;'}), } def __init__(self, *args, **kwargs): super(UsuarioForm, self).__init__(*args, **kwargs) @@ -210,10 +213,12 @@ class Meta(object): fields = [u'username', u'email', u'nome_completo', u'vinculo', u'email_confirm', u'captcha', u'cpf', u'rg', u'cargo', u'casa_legislativa'] - widgets = {u'username': forms.TextInput(attrs={u'readonly': u'readonly'}), - u'email': forms.TextInput( - attrs={u'style': u'text-transform:lowercase;'}), - } + widgets = {u'username': forms.TextInput( + attrs={u'readonly': u'readonly'}), + u'email': forms.TextInput( + attrs={u'style': u'text-transform:lowercase;'} + ), + } def __init__(self, *args, **kwargs): super(UsuarioEditForm, self).__init__(*args, **kwargs) @@ -307,7 +312,8 @@ class Meta(object): fields = [u'cpf', u'nome_completo', u'email', u'habilitado'] widgets = { u'cpf': forms.TextInput(attrs={u'readonly': u'readonly'}), - u'nome_completo': forms.TextInput(attrs={u'readonly': u'readonly'}), + u'nome_completo': forms.TextInput(attrs={u'readonly': u'readonly'} + ), u'email': forms.TextInput(attrs={u'readonly': u'readonly'}) } diff --git a/sigi/apps/usuarios/layouts.yaml b/sigi/apps/usuarios/layouts.yaml index 7cd74757..92b8e7d6 100644 --- a/sigi/apps/usuarios/layouts.yaml +++ b/sigi/apps/usuarios/layouts.yaml @@ -1,4 +1,3 @@ - CasaLegislativa: Casa Legislativa: - sigla:4 nome @@ -13,18 +12,18 @@ Subsecretaria: - nome:8 sigla Usuario: - Usuário: + Dados do Usuário: - username nome_completo:9 - password password_confirm - email email_confirm - cpf rg casa_legislativa - cargo vinculo Primeiro Telefone: - - primeiro_tipo primeiro_ddd:2 primeiro_numero:6 primeiro_principal + - primeiro_tipo primeiro_ddd:2 primeiro_numero:6 primeiro_principal Segundo Telefone: - - segundo_tipo segundo_ddd:2 segundo_numero:6 segundo_principal + - segundo_tipo segundo_ddd:2 segundo_numero:6 segundo_principal Prove que você é um humano: - - captcha + - captcha UsuarioEdit: Usuário: diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 6b900252..2ceca77f 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -12,7 +12,8 @@ from django.contrib.auth.tokens import default_token_generator from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode from django.utils.encoding import force_bytes -from sigi.apps.crud.base import Crud, CrudBaseMixin, CrudCreateView, CrudListView, CrudUpdateView, CrudDetailView +from sigi.apps.crud.base import (Crud, CrudBaseMixin, CrudCreateView, + CrudListView, CrudUpdateView, CrudDetailView) from .forms import (HabilitarEditForm, MudarSenhaForm, UsuarioEditForm, UsuarioForm) From 8a51e8d2845f6a185d5c46aacc9ceabab4152a55 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 22 Jun 2016 17:44:47 -0300 Subject: [PATCH 09/63] Teste redirect login --- sigi/apps/crispy_layout_mixin.py | 2 +- sigi/apps/usuarios/views.py | 5 +++-- sigi/settings/base.py | 2 +- sigi/urls.py | 2 +- templates/base.html | 4 ++-- templates/index_atendimento.html | 12 ++++++++++++ 6 files changed, 20 insertions(+), 7 deletions(-) create mode 100644 templates/index_atendimento.html diff --git a/sigi/apps/crispy_layout_mixin.py b/sigi/apps/crispy_layout_mixin.py index 1ea1e042..317b0e43 100644 --- a/sigi/apps/crispy_layout_mixin.py +++ b/sigi/apps/crispy_layout_mixin.py @@ -64,7 +64,7 @@ def get_field_display(obj, fieldname): elif 'date' in str(type(value)): display = formats.date_format(value, "SHORT_DATE_FORMAT") elif 'bool' in str(type(value)): - display = _('Sim') if value else _('Não') + display = _(u'Sim') if value else _(u'Não') elif 'ImageFieldFile' in str(type(value)): if value: display = ''.format(value.url) diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 2ceca77f..8ea64e14 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -18,6 +18,8 @@ from .forms import (HabilitarEditForm, MudarSenhaForm, UsuarioEditForm, UsuarioForm) from .models import Usuario, ConfirmaEmail, User +from django.contrib.auth.decorators import login_required +from django.shortcuts import redirect class UsuarioCrud(Crud): @@ -53,7 +55,7 @@ def get_success_url(self): settings.EMAIL_HOST_USER] send_mail(assunto, mensagem, remetente, destinatario, fail_silently=False) - return reverse(u'home') + return reverse(u'home_atendimento') class ListView(LoginRequiredMixin, CrudListView): pass @@ -87,7 +89,6 @@ class DetailView(LoginRequiredMixin, CrudDetailView): def get_context_data(self, **kwargs): context = super(DetailView, self).get_context_data(**kwargs) - tel1 = context[u'object'].primeiro_telefone tel1 = [(u'Primeiro Telefone'), (u'[%s] - %s' % (tel1.ddd, tel1.numero))] diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 2ff1126f..7ff265ff 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -142,7 +142,7 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = True -LOGIN_REDIRECT_URL = '/' +LOGIN_REDIRECT_URL = '' LOGIN_URL = '/login/' # Using pytest directly (without a test runner) diff --git a/sigi/urls.py b/sigi/urls.py index 6e6392c4..b743cf06 100644 --- a/sigi/urls.py +++ b/sigi/urls.py @@ -1,4 +1,5 @@ #-*- coding:utf-8 -*- + from django.conf import settings from django.conf.urls import patterns, include, url from django.conf.urls.static import static @@ -7,7 +8,6 @@ from sigi.apps.saberes.views import pentaho_proxy - admin.site.index_template = 'index.html' admin.autodiscover() diff --git a/templates/base.html b/templates/base.html index 99c5e2bd..7947e02e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -36,8 +36,8 @@ diff --git a/templates/index_atendimento.html b/templates/index_atendimento.html new file mode 100644 index 00000000..fb3a5487 --- /dev/null +++ b/templates/index_atendimento.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} +{% load i18n %} + +{% block title %} +

Bem-vindo ao Centro de Suporte

+{% endblock %} + +{% block base_content %} + Através deste sistema, você poderá solicitar novos serviços a serem + hospedados em nosso Data Center e acompanhar as solicitações já em aberto. + Cadastre-se para continuar. +{% endblock %} From 605582ca1825759012ffec146e3b26a119188fc7 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 23 Jun 2016 14:23:16 -0300 Subject: [PATCH 10/63] concerta urls do app usuarios Signed-off-by: Luciano Almeida --- .../migrations/0003_auto_20160623_0829.py | 20 +++++++++++++ sigi/apps/home/urls.py | 20 +++++++++---- .../migrations/0002_auto_20160623_0829.py | 20 +++++++++++++ .../migrations/0002_auto_20160623_0829.py | 20 +++++++++++++ .../migrations/0004_auto_20160623_0829.py | 20 +++++++++++++ .../migrations/0002_auto_20160623_0829.py | 20 +++++++++++++ .../migrations/0003_auto_20160623_0829.py | 20 +++++++++++++ sigi/apps/solicitacoes/urls.py | 5 ++-- .../migrations/0004_auto_20160623_0829.py | 25 +++++++++++++++++ sigi/apps/usuarios/urls.py | 28 ++++++++++--------- sigi/apps/usuarios/views.py | 4 +-- sigi/settings/base.py | 16 +++++++++-- 12 files changed, 193 insertions(+), 25 deletions(-) create mode 100644 sigi/apps/contatos/migrations/0003_auto_20160623_0829.py create mode 100644 sigi/apps/inventario/migrations/0002_auto_20160623_0829.py create mode 100644 sigi/apps/parlamentares/migrations/0002_auto_20160623_0829.py create mode 100644 sigi/apps/servicos/migrations/0004_auto_20160623_0829.py create mode 100644 sigi/apps/servidores/migrations/0002_auto_20160623_0829.py create mode 100644 sigi/apps/solicitacoes/migrations/0003_auto_20160623_0829.py create mode 100644 sigi/apps/usuarios/migrations/0004_auto_20160623_0829.py diff --git a/sigi/apps/contatos/migrations/0003_auto_20160623_0829.py b/sigi/apps/contatos/migrations/0003_auto_20160623_0829.py new file mode 100644 index 00000000..8508c790 --- /dev/null +++ b/sigi/apps/contatos/migrations/0003_auto_20160623_0829.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 08:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('contatos', '0002_auto_20151104_0810'), + ] + + operations = [ + migrations.AlterField( + model_name='contato', + name='email', + field=models.EmailField(blank=True, max_length=254, verbose_name='e-mail'), + ), + ] diff --git a/sigi/apps/home/urls.py b/sigi/apps/home/urls.py index 33e1e5b2..2d6b091f 100644 --- a/sigi/apps/home/urls.py +++ b/sigi/apps/home/urls.py @@ -1,15 +1,23 @@ # coding: utf-8 from django.conf.urls import patterns, url +from django.views.generic.base import TemplateView -urlpatterns = patterns('sigi.apps.home.views', +urlpatterns = patterns( + 'sigi.apps.home.views', + url(r'^home/atendimento', TemplateView.as_view( + template_name='index_atendimento.html'), + name='index_atendimento'), url(r'^$', 'index', name='sigi_index'), - url(r'^home/resumoconvenios/$', 'resumo_convenios', name="home_resumoconvenios"), + url(r'^home/resumoconvenios/$', 'resumo_convenios', + name="home_resumoconvenios"), url(r'^home/resumoseit/$', 'resumo_seit', name="home_resumoseit"), url(r'^home/chartseit/$', 'chart_seit', name="home_chartseit"), - url(r'^home/chartconvenios/$', 'chart_convenios', name="home_chartconvenios"), + url(r'^home/chartconvenios/$', 'chart_convenios', + name="home_chartconvenios"), url(r'^home/chartcarteira/$', 'chart_carteira', name="home_chartcarteira"), - url(r'^home/chartperformance/$', 'chart_performance', name="home_chartperformance"), - url(r'^home/report/semconvenio/$', 'report_sem_convenio', name="home_reportsemconvenio"), - + url(r'^home/chartperformance/$', 'chart_performance', + name="home_chartperformance"), + url(r'^home/report/semconvenio/$', 'report_sem_convenio', + name="home_reportsemconvenio"), ) diff --git a/sigi/apps/inventario/migrations/0002_auto_20160623_0829.py b/sigi/apps/inventario/migrations/0002_auto_20160623_0829.py new file mode 100644 index 00000000..057c1b32 --- /dev/null +++ b/sigi/apps/inventario/migrations/0002_auto_20160623_0829.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 08:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('inventario', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='fornecedor', + name='email', + field=models.EmailField(blank=True, max_length=254, verbose_name='e-mail'), + ), + ] diff --git a/sigi/apps/parlamentares/migrations/0002_auto_20160623_0829.py b/sigi/apps/parlamentares/migrations/0002_auto_20160623_0829.py new file mode 100644 index 00000000..56699c4a --- /dev/null +++ b/sigi/apps/parlamentares/migrations/0002_auto_20160623_0829.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 08:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='parlamentar', + name='email', + field=models.EmailField(blank=True, max_length=254, verbose_name='e-mail'), + ), + ] diff --git a/sigi/apps/servicos/migrations/0004_auto_20160623_0829.py b/sigi/apps/servicos/migrations/0004_auto_20160623_0829.py new file mode 100644 index 00000000..7d78bcc9 --- /dev/null +++ b/sigi/apps/servicos/migrations/0004_auto_20160623_0829.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 08:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('servicos', '0003_auto_20160616_1602'), + ] + + operations = [ + migrations.AlterField( + model_name='casamanifesta', + name='email', + field=models.EmailField(blank=True, max_length=254, verbose_name='E-mail de contato'), + ), + ] diff --git a/sigi/apps/servidores/migrations/0002_auto_20160623_0829.py b/sigi/apps/servidores/migrations/0002_auto_20160623_0829.py new file mode 100644 index 00000000..cbe7986d --- /dev/null +++ b/sigi/apps/servidores/migrations/0002_auto_20160623_0829.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 08:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('servidores', '0001_initial'), + ] + + operations = [ + migrations.AlterField( + model_name='servidor', + name='email_pessoal', + field=models.EmailField(blank=True, max_length=254, null=True, verbose_name=b'email pessoal'), + ), + ] diff --git a/sigi/apps/solicitacoes/migrations/0003_auto_20160623_0829.py b/sigi/apps/solicitacoes/migrations/0003_auto_20160623_0829.py new file mode 100644 index 00000000..65261cdc --- /dev/null +++ b/sigi/apps/solicitacoes/migrations/0003_auto_20160623_0829.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 08:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('solicitacoes', '0002_auto_20160616_1602'), + ] + + operations = [ + migrations.AlterField( + model_name='solicitacao', + name='email_contato', + field=models.EmailField(blank=True, max_length=254, null=True, verbose_name='Email de contato'), + ), + ] diff --git a/sigi/apps/solicitacoes/urls.py b/sigi/apps/solicitacoes/urls.py index 83f13dde..37c6f6f3 100644 --- a/sigi/apps/solicitacoes/urls.py +++ b/sigi/apps/solicitacoes/urls.py @@ -8,6 +8,7 @@ app_name = AppConfig.name urlpatterns = [ - url(ur'sistema/', include(SistemaCrud.get_urls())), - url(ur'solicitacao/', include(SolicitacaoCrud.get_urls())), + url(ur'home/atendimento/sistema/', include(SistemaCrud.get_urls())), + url(ur'home/atendimento/solicitacao/', + include(SolicitacaoCrud.get_urls())), ] diff --git a/sigi/apps/usuarios/migrations/0004_auto_20160623_0829.py b/sigi/apps/usuarios/migrations/0004_auto_20160623_0829.py new file mode 100644 index 00000000..9c019907 --- /dev/null +++ b/sigi/apps/usuarios/migrations/0004_auto_20160623_0829.py @@ -0,0 +1,25 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 08:29 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0003_auto_20160616_1602'), + ] + + operations = [ + migrations.AlterField( + model_name='confirmaemail', + name='email', + field=models.EmailField(max_length=254, unique=True, verbose_name='Email'), + ), + migrations.AlterField( + model_name='usuario', + name='email', + field=models.EmailField(max_length=254, unique=True, verbose_name='Email'), + ), + ] diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index fdcd9a23..2bb88144 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -4,11 +4,12 @@ password_reset_done, password_reset_confirm, password_reset_complete) -#from atendimento.settings import EMAIL_SEND_USER from sigi.apps.usuarios.forms import (LoginForm, RecuperarSenhaEmailForm, - RecuperacaoMudarSenhaForm) + RecuperacaoMudarSenhaForm) from sigi.apps.usuarios.views import (HabilitarDetailView, HabilitarEditView, - MudarSenhaView, UsuarioCrud, ConfirmarEmailView) + MudarSenhaView, UsuarioCrud, + ConfirmarEmailView) +from django.views.generic.base import TemplateView from .apps import AppConfig @@ -17,7 +18,7 @@ EMAIL_SEND_USER='atendimento@interlegis.leg.br' recuperar_email = [ - url(ur'^recuperar/recuperar_senha/$', + url(ur'^home/atendimento/recuperar/recuperar_senha/$', password_reset, {u'template_name': u'usuarios/recuperar_senha.html', u'password_reset_form': RecuperarSenhaEmailForm, @@ -26,35 +27,36 @@ u'from_email': EMAIL_SEND_USER, u'html_email_template_name': u'usuarios/recuperar_senha_email.html'}, name=u'recuperar_senha'), - url(ur'^recuperar/recuperar_recuperar/finalizado/$', + url(ur'^home/atendimento/recuperar/recuperar_recuperar/finalizado/$', password_reset_done, {u'template_name': u'usuarios/recuperar_senha_enviado.html'}, name=u'recuperar_senha_finalizado'), - url(ur'^recuperar/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', + url(ur'^home/atendimento/recuperar/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', password_reset_confirm, {u'post_reset_redirect': u'usuarios:recuperar_senha_completo', u'template_name': u'usuarios/recuperacao_senha_form.html', u'set_password_form': RecuperacaoMudarSenhaForm}, name=u'recuperar_senha_confirma'), - url(ur'^recuperar/completo/$', + url(ur'^home/atendimento/recuperar/completo/$', password_reset_complete, {u'template_name': u'usuarios/recuperacao_senha_completo.html'}, name=u'recuperar_senha_completo'), ] urlpatterns = recuperar_email + [ - url(ur'^login/$', login, { + url(ur'^home/atendimento/login/$', login, { u'template_name': u'usuarios/login.html', u'authentication_form': LoginForm}, name=u'login'), - url(ur'^logout/$', logout, {u'next_page': u'/login'}, name=u'logout'), - url(ur'^usuario/', include(UsuarioCrud.get_urls())), + url(ur'^home/atendimento/logout/$', logout, {u'next_page': u'/login'}, + name=u'logout'), + url(ur'^home/atendimento/usuario/', include(UsuarioCrud.get_urls())), - url(ur'^habilitar/(?P\d+)$', + url(ur'^home/atendimento/habilitar/(?P\d+)$', HabilitarDetailView.as_view(), name=u'habilitar_detail'), - url(ur'^habilitar/(?P\d+)/edit$', + url(ur'^home/atendimento/habilitar/(?P\d+)/edit$', HabilitarEditView.as_view(), name=u'habilitar_edit'), - url(ur'^usuario/(?P\d+)/mudar_senha$', + url(ur'^home/atendimento/usuario/(?P\d+)/mudar_senha$', MudarSenhaView.as_view(), name=u'mudar_senha'), url(ur'^usuario/confirmar/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', ConfirmarEmailView.as_view(), name=u'confirmar_email'), diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 8ea64e14..ee3c8699 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -55,7 +55,7 @@ def get_success_url(self): settings.EMAIL_HOST_USER] send_mail(assunto, mensagem, remetente, destinatario, fail_silently=False) - return reverse(u'home_atendimento') + return reverse(u'index_atendimento') class ListView(LoginRequiredMixin, CrudListView): pass @@ -169,7 +169,7 @@ def form_valid(self, form): return super(MudarSenhaView, self).form_valid(form) def get_success_url(self): - return reverse(u'home') + return reverse(u'index_atendimento') class ConfirmarEmailView(TemplateView): diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 7ff265ff..2a29ab11 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -134,6 +134,16 @@ DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br' EMAIL_SUBJECT_PREFIX = u'[SIGI]' + +EMAIL_USE_TLS = True +EMAIL_PORT = 587 +EMAIL_HOST = 'smtp.interlegis.leg.br' +EMAIL_HOST_USER = 'sapl-test' +EMAIL_HOST_PASSWORD = '2BhCwbGHcZ' +EMAIL_SEND_USER = 'atendimento@interlegis.leg.br' +EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' + + TEMPLATE_DIRS = ( os.path.join(BASE_DIR, 'templates'), ) @@ -142,8 +152,10 @@ SESSION_EXPIRE_AT_BROWSER_CLOSE = True -LOGIN_REDIRECT_URL = '' -LOGIN_URL = '/login/' +# LOGIN_REDIRECT_URL = '' +# LOGIN_URL = '/login/' +LOGIN_REDIRECT_URL = '/' +LOGIN_URL = '/login/?next=' # Using pytest directly (without a test runner) TEST_RUNNER = None From 8ce7fa2c691dfe49b346be7efac98d042f92004c Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 23 Jun 2016 14:35:46 -0300 Subject: [PATCH 11/63] =?UTF-8?q?Passa=20PK=20usu=C3=A1rio=20ap=C3=B3s=20l?= =?UTF-8?q?ogar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/context_processors.py | 22 ++++++++++++++++++++++ sigi/settings/base.py | 1 + 2 files changed, 23 insertions(+) create mode 100644 sigi/context_processors.py diff --git a/sigi/context_processors.py b/sigi/context_processors.py new file mode 100644 index 00000000..34bd01b4 --- /dev/null +++ b/sigi/context_processors.py @@ -0,0 +1,22 @@ +from django.core.exceptions import ObjectDoesNotExist + +from sigi.apps.usuarios.models import Usuario + + +def recupera_usuario(request): + + pk = request.user.pk + if pk: + try: + usuario = Usuario.objects.get(user_id=pk) + except ObjectDoesNotExist: + return 0 + else: + return usuario.pk + else: + return 0 + + +def usuario_context(request): + context = {'usuario_pk': recupera_usuario(request)} + return context diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 2a29ab11..12556c6c 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -32,6 +32,7 @@ TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + [ 'django.core.context_processors.request', + 'sigi.context_processors.usuario_context' ] # List of callables that know how to import templates from various sources. From 3250f0692b13e8eace74fcde3a0a3d1e1ec5c7ff Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 23 Jun 2016 14:42:53 -0300 Subject: [PATCH 12/63] =?UTF-8?q?Redireciona=20para=20tela=20principal=20d?= =?UTF-8?q?o=20atendimento=20ap=C3=B3s=20logar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/usuarios/login.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/usuarios/login.html b/templates/usuarios/login.html index f6fd241e..61b1e0c5 100644 --- a/templates/usuarios/login.html +++ b/templates/usuarios/login.html @@ -27,7 +27,7 @@

Login

Esqueceu sua senha?
- +

From 05eb3997e83a781c812318858bd31ab589e01250 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 23 Jun 2016 14:44:08 -0300 Subject: [PATCH 13/63] =?UTF-8?q?Redireciona=20para=20tela=20principal=20d?= =?UTF-8?q?o=20atendimento=20ap=C3=B3s=20deslogar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/usuarios/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index 2bb88144..ecdca958 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -48,7 +48,7 @@ u'template_name': u'usuarios/login.html', u'authentication_form': LoginForm}, name=u'login'), - url(ur'^home/atendimento/logout/$', logout, {u'next_page': u'/login'}, + url(ur'^home/atendimento/logout/$', logout, {u'next_page': u'/home/atendimento'}, name=u'logout'), url(ur'^home/atendimento/usuario/', include(UsuarioCrud.get_urls())), From 02e661906a17513a531d1f0d76e8e20c879729fd Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 23 Jun 2016 15:54:27 -0300 Subject: [PATCH 14/63] =?UTF-8?q?Implementa=20cria=C3=A7=C3=A3o=20de=20tic?= =?UTF-8?q?ket=20no=20osticket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precisa configurar o prod.py --- docker-compose.yml | 14 ++++++++ sigi/apps/solicitacoes/forms.py | 35 ++++++++++++++++++- .../migrations/0004_solicitacao_osticket.py | 20 +++++++++++ sigi/apps/solicitacoes/models.py | 5 +++ sigi/settings/base.py | 10 ------ 5 files changed, 73 insertions(+), 11 deletions(-) create mode 100644 docker-compose.yml create mode 100644 sigi/apps/solicitacoes/migrations/0004_solicitacao_osticket.py diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..bd041929 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +osticket: + image: campbellsoftwaresolutions/osticket + ports: + - "80:80" + links: + - mysql + +mysql: + image: mysql + environment: + - MYSQL_ROOT_PASSWORD=secret + - MYSQL_DATABASE=osticket + - MYSQL_USER=osticket + - MYSQL_PASSWORD=secret diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index 5db2086c..6153e688 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -1,8 +1,33 @@ from __future__ import absolute_import +from django.db import transaction from django import forms from django.forms import ModelForm - +from sigi.settings.prod import OSTICKET_API_KEY, OSTICKET_URL from .models import Sistema, Solicitacao +import json +import requests + + +def open_osticket(solicitacao): + headers = {'X-API-KEY': OSTICKET_API_KEY, + 'Content-Type': 'application/json'} + + usuario = solicitacao.usuario + data = {"alert": True, + "autorespond": True, + "source": "API", + "name": usuario.username, + "email": usuario.email, + "phone": '-'.join((usuario.primeiro_telefone.ddd, + usuario.primeiro_telefone.numero)), + "subject": solicitacao.titulo, + "ip": "", + "message": solicitacao.resumo} + response = requests.post(OSTICKET_URL, headers=headers, json=data) + if response.status_code == requests.codes.ok: + return response.text + else: + response.raise_for_status() class SolicitacaoForm(ModelForm): @@ -20,6 +45,14 @@ class Meta(object): widgets = {u'codigo': forms.HiddenInput(), u'usuario': forms.HiddenInput()} + @transaction.atomic + def save(self, commit=False): + solicitacao = super(SolicitacaoForm, self).save(commit) + os_ticket = open_osticket(solicitacao) + solicitacao.osticket = os_ticket + solicitacao.save() + return solicitacao + class SolicitacaoEditForm(ModelForm): diff --git a/sigi/apps/solicitacoes/migrations/0004_solicitacao_osticket.py b/sigi/apps/solicitacoes/migrations/0004_solicitacao_osticket.py new file mode 100644 index 00000000..6e4a52ea --- /dev/null +++ b/sigi/apps/solicitacoes/migrations/0004_solicitacao_osticket.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-23 13:22 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('solicitacoes', '0003_auto_20160623_0829'), + ] + + operations = [ + migrations.AddField( + model_name='solicitacao', + name='osticket', + field=models.CharField(blank=True, max_length=256, null=True, verbose_name='C\xf3digo Ticket'), + ), + ] diff --git a/sigi/apps/solicitacoes/models.py b/sigi/apps/solicitacoes/models.py index f6d025f7..cacff142 100644 --- a/sigi/apps/solicitacoes/models.py +++ b/sigi/apps/solicitacoes/models.py @@ -45,6 +45,11 @@ class Solicitacao(models.Model): null=True, verbose_name=_(u'Descrição')) + osticket = models.CharField(blank=True, + null=True, + max_length=256, + verbose_name=_(u'Código Ticket')) + class Meta(object): verbose_name = _(u'Solicitação de Novo Serviço') verbose_name_plural = _(u'Solicitações de Novos Serviços') diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 12556c6c..fea53bcc 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -135,16 +135,6 @@ DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br' EMAIL_SUBJECT_PREFIX = u'[SIGI]' - -EMAIL_USE_TLS = True -EMAIL_PORT = 587 -EMAIL_HOST = 'smtp.interlegis.leg.br' -EMAIL_HOST_USER = 'sapl-test' -EMAIL_HOST_PASSWORD = '2BhCwbGHcZ' -EMAIL_SEND_USER = 'atendimento@interlegis.leg.br' -EMAIL_BACKEND = 'django.core.mail.backends.console.EmailBackend' - - TEMPLATE_DIRS = ( os.path.join(BASE_DIR, 'templates'), ) From 08c4eee1b6013b1a3041d1982e421c92c5096a30 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 23 Jun 2016 15:59:34 -0300 Subject: [PATCH 15/63] =?UTF-8?q?Muda=20url=20de=20habilitar=20usu=C3=A1ri?= =?UTF-8?q?o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/usuarios/urls.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index ecdca958..77838828 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -52,7 +52,7 @@ name=u'logout'), url(ur'^home/atendimento/usuario/', include(UsuarioCrud.get_urls())), - url(ur'^home/atendimento/habilitar/(?P\d+)$', + url(ur'^habilitar/home/atendimento/(?P\d+)$', HabilitarDetailView.as_view(), name=u'habilitar_detail'), url(ur'^home/atendimento/habilitar/(?P\d+)/edit$', HabilitarEditView.as_view(), name=u'habilitar_edit'), From 390661f20cfd170d42c4a6a0c6bd00e397881787 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 23 Jun 2016 16:07:05 -0300 Subject: [PATCH 16/63] =?UTF-8?q?Ajeita=20layout=20habilitar=5Fdetail,=20t?= =?UTF-8?q?roca=20url=20da=20logo=20e=20muda=20campos=20da=20listagem=20de?= =?UTF-8?q?=20solicita=C3=A7=C3=B5es?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/solicitacoes/views.py | 5 ++++- templates/base.html | 2 +- templates/usuarios/habilitar_detail.html | 6 ++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index 6c8198d1..3ca4f3bb 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -4,7 +4,7 @@ from django.contrib.auth.mixins import LoginRequiredMixin import sigi.apps.crud.base -from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView +from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView, CrudBaseMixin from sigi.apps.usuarios.models import Usuario from .forms import SistemaForm, SolicitacaoEditForm, SolicitacaoForm @@ -41,6 +41,9 @@ class ListView(LoginRequiredMixin, CrudListView): def layout_key(self): return u'SolicitacaoList' + class BaseMixin(CrudBaseMixin): + list_field_names = [u'codigo', u'sistema', u'titulo', u'data_criacao'] + class SistemaCrud(Crud): model = Sistema diff --git a/templates/base.html b/templates/base.html index 7947e02e..adb5dcf3 100644 --- a/templates/base.html +++ b/templates/base.html @@ -56,7 +56,7 @@
- + Logo

Interlegis

Sistema de Solicitação de Serviços

 diff --git a/templates/usuarios/habilitar_detail.html b/templates/usuarios/habilitar_detail.html index 04667b2a..96cff33d 100644 --- a/templates/usuarios/habilitar_detail.html +++ b/templates/usuarios/habilitar_detail.html @@ -34,8 +34,10 @@

Habilitar

      - {{ usuario.vinculo }}
Casa Legislativa:
      - {{ usuario.casa_legislativa }}
-
Telefones:
+
Telefone(s):
      - [{{ usuario.primeiro_telefone.ddd }}] - {{usuario.primeiro_telefone.numero}}
-
      - [{{ usuario.segundo_telefone.ddd }}] - {{usuario.segundo_telefone.numero}}
+ {% if usuario.segundo_telefone.ddd and usuario.segundo_telefone.numero %} +
      - [{{ usuario.segundo_telefone.ddd }}] - {{usuario.segundo_telefone.numero}}
+ {% endif %} {% endblock detail_content %} From b675cdc529838a4228198d8b03a2a5d38d41d003 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 23 Jun 2016 16:20:44 -0300 Subject: [PATCH 17/63] =?UTF-8?q?Ajeita=20c=C3=B3digo=20retornado=20do=20o?= =?UTF-8?q?sticket?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- prod.py | 1 + sigi/apps/solicitacoes/forms.py | 2 +- sigi/apps/solicitacoes/views.py | 9 +++++++-- 3 files changed, 9 insertions(+), 3 deletions(-) create mode 120000 prod.py diff --git a/prod.py b/prod.py new file mode 120000 index 00000000..01f8fd64 --- /dev/null +++ b/prod.py @@ -0,0 +1 @@ +dev.py \ No newline at end of file diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index 6153e688..b2f1d0c3 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -24,7 +24,7 @@ def open_osticket(solicitacao): "ip": "", "message": solicitacao.resumo} response = requests.post(OSTICKET_URL, headers=headers, json=data) - if response.status_code == requests.codes.ok: + if response.status_code == requests.codes.created: return response.text else: response.raise_for_status() diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index 3ca4f3bb..5999cc2d 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -2,6 +2,7 @@ import random from django.contrib.auth.mixins import LoginRequiredMixin +from django.core.urlresolvers import reverse import sigi.apps.crud.base from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView, CrudBaseMixin @@ -27,7 +28,10 @@ def get_initial(self): self.initial[u'telefone_contato'] = usuario.primeiro_telefone except Usuario.DoesNotExist: pass - return self.initial.copy() # TODO: por que? + return self.initial.copy() + + def get_success_url(self): + return reverse(u'solicitacoes:solicitacao_list') class UpdateView(LoginRequiredMixin, CrudUpdateView): form_class = SolicitacaoEditForm @@ -42,7 +46,8 @@ def layout_key(self): return u'SolicitacaoList' class BaseMixin(CrudBaseMixin): - list_field_names = [u'codigo', u'sistema', u'titulo', u'data_criacao'] + list_field_names = [u'osticket', u'sistema', + u'titulo', u'data_criacao'] class SistemaCrud(Crud): From 94e4e079a7e880b4668b47e7a84278849d59064b Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Fri, 24 Jun 2016 10:42:15 -0300 Subject: [PATCH 18/63] Padroniza url de habilitar --- sigi/apps/usuarios/urls.py | 2 +- templates/usuarios/usuario_list.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index 77838828..ecdca958 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -52,7 +52,7 @@ name=u'logout'), url(ur'^home/atendimento/usuario/', include(UsuarioCrud.get_urls())), - url(ur'^habilitar/home/atendimento/(?P\d+)$', + url(ur'^home/atendimento/habilitar/(?P\d+)$', HabilitarDetailView.as_view(), name=u'habilitar_detail'), url(ur'^home/atendimento/habilitar/(?P\d+)/edit$', HabilitarEditView.as_view(), name=u'habilitar_edit'), diff --git a/templates/usuarios/usuario_list.html b/templates/usuarios/usuario_list.html index 416ed511..3618be2b 100644 --- a/templates/usuarios/usuario_list.html +++ b/templates/usuarios/usuario_list.html @@ -22,7 +22,7 @@ {% for value, href in value_list %} {% if href %} - {{ value }} + {{ value }} {% else %} {{ value|safe }} {% endif %} From 43c3c197cec22749e4dd375129fc6e08be5ae2a7 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Fri, 24 Jun 2016 13:22:17 -0300 Subject: [PATCH 19/63] =?UTF-8?q?Transforma=20casa=20legislativa=20de=20us?= =?UTF-8?q?u=C3=A1rio=20em=20uma=20chave=20estrageira?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/dev-requirements.txt | 1 + sigi/apps/templates/index.html | 12 ------ .../migrations/0005_auto_20160624_0853.py | 31 ++++++++++++++ sigi/apps/usuarios/models.py | 40 +++++-------------- 4 files changed, 42 insertions(+), 42 deletions(-) delete mode 100644 sigi/apps/templates/index.html create mode 100644 sigi/apps/usuarios/migrations/0005_auto_20160624_0853.py diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 1a437764..43771218 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -2,4 +2,5 @@ django-debug-toolbar==1.4 ipdb==0.10.0 ipython==4.2.0 +model_mommy==1.2.6 pygraphviz==1.3.1 diff --git a/sigi/apps/templates/index.html b/sigi/apps/templates/index.html deleted file mode 100644 index fb3a5487..00000000 --- a/sigi/apps/templates/index.html +++ /dev/null @@ -1,12 +0,0 @@ -{% extends "base.html" %} -{% load i18n %} - -{% block title %} -

Bem-vindo ao Centro de Suporte

-{% endblock %} - -{% block base_content %} - Através deste sistema, você poderá solicitar novos serviços a serem - hospedados em nosso Data Center e acompanhar as solicitações já em aberto. - Cadastre-se para continuar. -{% endblock %} diff --git a/sigi/apps/usuarios/migrations/0005_auto_20160624_0853.py b/sigi/apps/usuarios/migrations/0005_auto_20160624_0853.py new file mode 100644 index 00000000..8d6569c8 --- /dev/null +++ b/sigi/apps/usuarios/migrations/0005_auto_20160624_0853.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-24 08:53 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion +import sigi.apps.utils + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0004_auto_20160623_0829'), + ] + + operations = [ + migrations.DeleteModel( + name='CasaLegislativa', + ), + migrations.AddField( + model_name='usuario', + name='search_text', + field=sigi.apps.utils.SearchField(default='casa', editable=False, field_names=[b'casa_legislativa']), + preserve_default=False, + ), + migrations.AlterField( + model_name='usuario', + name='casa_legislativa', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='casas.CasaLegislativa', verbose_name='Casa Legislativa'), + ), + ] diff --git a/sigi/apps/usuarios/models.py b/sigi/apps/usuarios/models.py index fc31e816..b7efa7ca 100644 --- a/sigi/apps/usuarios/models.py +++ b/sigi/apps/usuarios/models.py @@ -5,38 +5,15 @@ from django.db import models from django.utils import timezone from django.utils.translation import ugettext_lazy as _ - +from sigi.apps.utils import SearchField from sigi.apps.crud.utils import UF, YES_NO_CHOICES -class CasaLegislativa(models.Model): - nome = models.CharField(max_length=100, verbose_name=_(u'Nome')) - sigla = models.CharField(max_length=100, verbose_name=_(u'Sigla')) - endereco = models.CharField(max_length=100, verbose_name=_(u'Endereço')) - cep = models.CharField(max_length=100, verbose_name=_(u'CEP')) - municipio = models.CharField(max_length=100, verbose_name=_(u'Município')) - uf = models.CharField(max_length=100, - choices=UF, - verbose_name=_(u'UF')) - telefone = models.CharField( - max_length=100, blank=True, verbose_name=_(u'Telefone')) - endereco_web = models.URLField( - max_length=100, blank=True, verbose_name=_(u'HomePage')) - email = models.EmailField( - max_length=100, blank=True, verbose_name=_(u'E-mail')) - - class Meta(object): - verbose_name = _(u'Casa Legislativa') - verbose_name_plural = _(u'Casas Legislativas') - - def __str__(self): - return u'[%s] %s' % (self.sigla, self.nome) - - class Subsecretaria(models.Model): nome = models.CharField(verbose_name=_(u'Nome'), max_length=100, null=True) - sigla = models.CharField(verbose_name=_(u'Sigla'), max_length=10, null=True) + sigla = models.CharField(verbose_name=_(u'Sigla'), + max_length=10, null=True) class Meta(object): ordering = (u'nome', u'sigla') @@ -131,15 +108,18 @@ class Usuario(models.Model): verbose_name=_(u'Vinculo'), choices=TIPO_VINCULO, default=u'--------') - casa_legislativa = models.CharField( - max_length=30, - verbose_name=_(u'Casa Legislativa'), - default=u'--------') primeiro_telefone = models.ForeignKey( Telefone, null=True, related_name=u'primeiro_telefone') segundo_telefone = models.ForeignKey( Telefone, null=True, related_name=u'segundo_telefone') + casa_legislativa = models.ForeignKey( + 'casas.CasaLegislativa', + verbose_name=_(u'Casa Legislativa') + ) + # campo de busca em caixa baixa e sem acentos + search_text = SearchField(field_names=['casa_legislativa']) + class Meta(object): verbose_name = _(u'Usuário') verbose_name_plural = _(u'Usuários') From c8eb8e2e1df6a61a108ae1c63e6487d55d14b905 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Mon, 27 Jun 2016 15:50:43 -0300 Subject: [PATCH 20/63] =?UTF-8?q?Substitui=20model=20servi=C3=A7o=20pelo?= =?UTF-8?q?=20TipoServi=C3=A7o=20j=C3=A1=20existente=20no=20sigi?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/solicitacoes/forms.py | 9 +------ .../migrations/0005_auto_20160627_1349.py | 24 +++++++++++++++++++ sigi/apps/solicitacoes/models.py | 19 ++------------- sigi/apps/solicitacoes/urls.py | 3 +-- sigi/apps/solicitacoes/views.py | 18 ++------------ templates/base.html | 1 - 6 files changed, 30 insertions(+), 44 deletions(-) create mode 100644 sigi/apps/solicitacoes/migrations/0005_auto_20160627_1349.py diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index b2f1d0c3..0511c475 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -3,7 +3,7 @@ from django import forms from django.forms import ModelForm from sigi.settings.prod import OSTICKET_API_KEY, OSTICKET_URL -from .models import Sistema, Solicitacao +from .models import Solicitacao import json import requests @@ -67,10 +67,3 @@ class Meta(object): u'casa_legislativa', u'titulo', u'resumo'] widgets = {u'codigo': forms.TextInput(attrs={u'readonly': u'readonly'}), u'usuario': forms.HiddenInput()} - - -class SistemaForm(ModelForm): - - class Meta(object): - model = Sistema - fields = [u'sigla', u'nome'] diff --git a/sigi/apps/solicitacoes/migrations/0005_auto_20160627_1349.py b/sigi/apps/solicitacoes/migrations/0005_auto_20160627_1349.py new file mode 100644 index 00000000..dc09b9f3 --- /dev/null +++ b/sigi/apps/solicitacoes/migrations/0005_auto_20160627_1349.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-27 13:49 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('solicitacoes', '0004_solicitacao_osticket'), + ] + + operations = [ + migrations.AlterField( + model_name='solicitacao', + name='sistema', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='servicos.TipoServico'), + ), + migrations.DeleteModel( + name='Sistema', + ), + ] diff --git a/sigi/apps/solicitacoes/models.py b/sigi/apps/solicitacoes/models.py index cacff142..534e618e 100644 --- a/sigi/apps/solicitacoes/models.py +++ b/sigi/apps/solicitacoes/models.py @@ -4,28 +4,13 @@ from django.utils.translation import ugettext_lazy as _ from sigi.apps.usuarios.models import Usuario - - -class Sistema(models.Model): - sigla = models.CharField(verbose_name=_(u'Sigla'), max_length=10) - nome = models.CharField(verbose_name=_(u'Nome Sistema'), - max_length=100) - descricao = models.TextField(null=True, - blank=True, - verbose_name=_(u'Descrição')) - - class Meta(object): - verbose_name = _(u'Sistema') - verbose_name_plural = _(u'Sistemas') - - def __str__(self): - return u"%s - %s" % (self.sigla, self.nome) +from sigi.apps.servicos.models import TipoServico class Solicitacao(models.Model): codigo = models.PositiveIntegerField(unique=True) usuario = models.ForeignKey(Usuario) - sistema = models.ForeignKey(Sistema) + sistema = models.ForeignKey(TipoServico) titulo = models.CharField(verbose_name=_(u'Título'), max_length=100) resumo = models.CharField(verbose_name=_(u'Resumo'), max_length=50) casa_legislativa = models.CharField(verbose_name=_(u'Casa Legislativa'), diff --git a/sigi/apps/solicitacoes/urls.py b/sigi/apps/solicitacoes/urls.py index 37c6f6f3..910d3972 100644 --- a/sigi/apps/solicitacoes/urls.py +++ b/sigi/apps/solicitacoes/urls.py @@ -1,14 +1,13 @@ from __future__ import absolute_import from django.conf.urls import include, url -from sigi.apps.solicitacoes.views import SistemaCrud, SolicitacaoCrud +from sigi.apps.solicitacoes.views import SolicitacaoCrud from .apps import AppConfig app_name = AppConfig.name urlpatterns = [ - url(ur'home/atendimento/sistema/', include(SistemaCrud.get_urls())), url(ur'home/atendimento/solicitacao/', include(SolicitacaoCrud.get_urls())), ] diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index 5999cc2d..59a95e4b 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -8,8 +8,8 @@ from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView, CrudBaseMixin from sigi.apps.usuarios.models import Usuario -from .forms import SistemaForm, SolicitacaoEditForm, SolicitacaoForm -from .models import Sistema, Solicitacao +from .forms import SolicitacaoEditForm, SolicitacaoForm +from .models import Solicitacao class SolicitacaoCrud(LoginRequiredMixin, Crud): @@ -48,17 +48,3 @@ def layout_key(self): class BaseMixin(CrudBaseMixin): list_field_names = [u'osticket', u'sistema', u'titulo', u'data_criacao'] - - -class SistemaCrud(Crud): - model = Sistema - help_path = u'' - - class CreateView(LoginRequiredMixin, CrudCreateView): - form_class = SistemaForm - - class UpdateView(LoginRequiredMixin, CrudUpdateView): - form_class = SistemaForm - - class ListView(LoginRequiredMixin, CrudListView): - pass diff --git a/templates/base.html b/templates/base.html index adb5dcf3..a78a3dfc 100644 --- a/templates/base.html +++ b/templates/base.html @@ -37,7 +37,6 @@ From 4b9b4739ebf539332f745f406de6856770f32f1a Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Mon, 27 Jun 2016 15:55:31 -0300 Subject: [PATCH 21/63] =?UTF-8?q?Pr=C3=A9-preenche=20campo=20casa=20do=20u?= =?UTF-8?q?su=C3=A1rio=20e=20torna=20readonly?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/solicitacoes/forms.py | 9 +++++++-- sigi/apps/solicitacoes/views.py | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index 0511c475..a9fe3051 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -42,8 +42,13 @@ class Meta(object): fields = [u'codigo', u'usuario', u'sistema', u'email_contato', u'telefone_contato', u'casa_legislativa', u'titulo', u'resumo'] - widgets = {u'codigo': forms.HiddenInput(), - u'usuario': forms.HiddenInput()} + widgets = { + u'codigo': forms.HiddenInput(), + u'usuario': forms.HiddenInput(), + u'casa_legislativa': forms.TextInput(attrs={'readonly':'readonly'}), + u'email_contato': forms.TextInput(attrs={'readonly':'readonly'}), + u'telefone_contato': forms.TextInput(attrs={'readonly':'readonly'}) + } @transaction.atomic def save(self, commit=False): diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index 59a95e4b..ba8729a1 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -26,6 +26,7 @@ def get_initial(self): self.initial[u'codigo'] = random.randint(0, 65500) self.initial[u'email_contato'] = usuario.email self.initial[u'telefone_contato'] = usuario.primeiro_telefone + self.initial[u'casa_legislativa'] = usuario.casa_legislativa except Usuario.DoesNotExist: pass return self.initial.copy() From 9b8effabbdf22d66cb4fbdd6448bdf35d71c75f5 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Mon, 27 Jun 2016 16:08:04 -0300 Subject: [PATCH 22/63] Teste com auto-complete --- requirements/requirements.txt | 1 + sigi/apps/usuarios/forms.py | 8 +++++++- sigi/settings/base.py | 1 + 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 694f67bd..e7d0bed4 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -17,6 +17,7 @@ django-image-cropping==1.0.3 django-localflavor==1.3 django-model-utils==2.4 django-sass-processor==0.3.4 +django-easy-select2==1.3.2 django-simple-captcha==0.5.1 Django==1.9.6 libsass==0.11.0 diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index d34e7391..0cde1640 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -14,7 +14,8 @@ from django.db import transaction from django.forms import ModelForm from django.utils.translation import ugettext_lazy as _ - +from sigi.apps.casas.models import CasaLegislativa +from easy_select2 import Select2 import sigi.apps.crispy_layout_mixin from sigi.apps.crud.utils import YES_NO_CHOICES @@ -87,6 +88,11 @@ class UsuarioForm(ModelForm): captcha = CaptchaField() + casa_legislativa = forms.ModelChoiceField( + queryset=CasaLegislativa.objects.all(), + widget=Select2() + ) + class Meta(object): model = Usuario fields = [u'username', u'email', u'nome_completo', u'password', diff --git a/sigi/settings/base.py b/sigi/settings/base.py index fea53bcc..91c41d97 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -93,6 +93,7 @@ 'djangobower', 'floppyforms', 'sass_processor', + 'easy_select2', ) From ce918e72450afaa9198d19d67583645bc2ae2371 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 27 Jun 2016 15:58:27 -0300 Subject: [PATCH 23/63] =?UTF-8?q?Desabilitar=20confirma=C3=A7=C3=A3o=20de?= =?UTF-8?q?=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/usuarios/forms.py | 2 +- sigi/apps/usuarios/views.py | 47 +++++++++++++++++++------------------ 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index 0cde1640..85ffb91b 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -205,7 +205,7 @@ def save(self, commit=False): # Cria User u = User.objects.create(username=usuario.username, email=usuario.email) u.set_password(self.cleaned_data[u'password']) - u.is_active = False + u.is_active = True # TODO: change back to False u.save() usuario.user = u diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index ee3c8699..bf63014e 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -32,29 +32,30 @@ class CreateView(CrudCreateView): validação do seu perfil.' def get_success_url(self): - kwargs = {} - user = User.objects.get(email=self.request.POST.get(u'email')) - confirmar_email = ConfirmaEmail( - email=user.email, - token=default_token_generator.make_token(user), - user_id=urlsafe_base64_encode(force_bytes(user.pk))) - confirmar_email.save() - - kwargs[u'token'] = confirmar_email.token - kwargs[u'uidb64'] = confirmar_email.user_id - assunto = u"Cadastro no Sistema de Atendimento ao Usuário" - full_url = self.request.get_raw_uri(), - url_base = full_url[0][:full_url[0].find(u'usuario') - 1], - mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + - u"Sistema de Atendimento ao Usuário do Interlegis.\n" + - u"Caso você não tenha feito este cadastro, por favor" + - u" ignore esta mensagem.\n" + url_base[0] + - reverse(u'usuarios:confirmar_email', kwargs=kwargs)) - remetente = settings.EMAIL_HOST_USER - destinatario = [confirmar_email.email, - settings.EMAIL_HOST_USER] - send_mail(assunto, mensagem, remetente, destinatario, - fail_silently=False) + # TODO: colocar isso aqui em get_success_url parece esquisito + # kwargs = {} + # user = User.objects.get(email=self.request.POST.get(u'email')) + # confirmar_email = ConfirmaEmail( + # email=user.email, + # token=default_token_generator.make_token(user), + # user_id=urlsafe_base64_encode(force_bytes(user.pk))) + # confirmar_email.save() + # + # kwargs[u'token'] = confirmar_email.token + # kwargs[u'uidb64'] = confirmar_email.user_id + # assunto = u"Cadastro no Sistema de Atendimento ao Usuário" + # full_url = self.request.get_raw_uri(), + # url_base = full_url[0][:full_url[0].find(u'usuario') - 1], + # mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + + # u"Sistema de Atendimento ao Usuário do Interlegis.\n" + + # u"Caso você não tenha feito este cadastro, por favor" + + # u" ignore esta mensagem.\n" + url_base[0] + + # reverse(u'usuarios:confirmar_email', kwargs=kwargs)) + # remetente = settings.EMAIL_HOST_USER + # destinatario = [confirmar_email.email, + # settings.EMAIL_HOST_USER] + # send_mail(assunto, mensagem, remetente, destinatario, + # fail_silently=False) return reverse(u'index_atendimento') class ListView(LoginRequiredMixin, CrudListView): From eb26ed3a0ee204e9bf22dbe540bdb03fca574651 Mon Sep 17 00:00:00 2001 From: Edward Ribeiro Date: Mon, 27 Jun 2016 16:13:01 -0300 Subject: [PATCH 24/63] =?UTF-8?q?Revert=20"Desabilitar=20confirma=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20email"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit fc99bf9b980a007ac3b731fb71dcf3bfcf02ff2e. --- sigi/apps/usuarios/forms.py | 2 +- sigi/apps/usuarios/views.py | 47 ++++++++++++++++++------------------- 2 files changed, 24 insertions(+), 25 deletions(-) diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index 85ffb91b..0cde1640 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -205,7 +205,7 @@ def save(self, commit=False): # Cria User u = User.objects.create(username=usuario.username, email=usuario.email) u.set_password(self.cleaned_data[u'password']) - u.is_active = True # TODO: change back to False + u.is_active = False u.save() usuario.user = u diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index bf63014e..ee3c8699 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -32,30 +32,29 @@ class CreateView(CrudCreateView): validação do seu perfil.' def get_success_url(self): - # TODO: colocar isso aqui em get_success_url parece esquisito - # kwargs = {} - # user = User.objects.get(email=self.request.POST.get(u'email')) - # confirmar_email = ConfirmaEmail( - # email=user.email, - # token=default_token_generator.make_token(user), - # user_id=urlsafe_base64_encode(force_bytes(user.pk))) - # confirmar_email.save() - # - # kwargs[u'token'] = confirmar_email.token - # kwargs[u'uidb64'] = confirmar_email.user_id - # assunto = u"Cadastro no Sistema de Atendimento ao Usuário" - # full_url = self.request.get_raw_uri(), - # url_base = full_url[0][:full_url[0].find(u'usuario') - 1], - # mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + - # u"Sistema de Atendimento ao Usuário do Interlegis.\n" + - # u"Caso você não tenha feito este cadastro, por favor" + - # u" ignore esta mensagem.\n" + url_base[0] + - # reverse(u'usuarios:confirmar_email', kwargs=kwargs)) - # remetente = settings.EMAIL_HOST_USER - # destinatario = [confirmar_email.email, - # settings.EMAIL_HOST_USER] - # send_mail(assunto, mensagem, remetente, destinatario, - # fail_silently=False) + kwargs = {} + user = User.objects.get(email=self.request.POST.get(u'email')) + confirmar_email = ConfirmaEmail( + email=user.email, + token=default_token_generator.make_token(user), + user_id=urlsafe_base64_encode(force_bytes(user.pk))) + confirmar_email.save() + + kwargs[u'token'] = confirmar_email.token + kwargs[u'uidb64'] = confirmar_email.user_id + assunto = u"Cadastro no Sistema de Atendimento ao Usuário" + full_url = self.request.get_raw_uri(), + url_base = full_url[0][:full_url[0].find(u'usuario') - 1], + mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + + u"Sistema de Atendimento ao Usuário do Interlegis.\n" + + u"Caso você não tenha feito este cadastro, por favor" + + u" ignore esta mensagem.\n" + url_base[0] + + reverse(u'usuarios:confirmar_email', kwargs=kwargs)) + remetente = settings.EMAIL_HOST_USER + destinatario = [confirmar_email.email, + settings.EMAIL_HOST_USER] + send_mail(assunto, mensagem, remetente, destinatario, + fail_silently=False) return reverse(u'index_atendimento') class ListView(LoginRequiredMixin, CrudListView): From 72f023a07587384c8d18f26c2b4d3cfb026a0f1e Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Mon, 27 Jun 2016 17:37:21 -0300 Subject: [PATCH 25/63] =?UTF-8?q?Remove=20c=C3=B3digo=20n=C3=A3o=20usado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/solicitacoes/forms.py | 36 ++++++++++------------------- sigi/apps/solicitacoes/layouts.yaml | 18 --------------- sigi/apps/solicitacoes/views.py | 14 +---------- 3 files changed, 13 insertions(+), 55 deletions(-) diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index a9fe3051..781db4e6 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -12,14 +12,14 @@ def open_osticket(solicitacao): headers = {'X-API-KEY': OSTICKET_API_KEY, 'Content-Type': 'application/json'} - usuario = solicitacao.usuario data = {"alert": True, "autorespond": True, "source": "API", - "name": usuario.username, - "email": usuario.email, - "phone": '-'.join((usuario.primeiro_telefone.ddd, - usuario.primeiro_telefone.numero)), + "name": solicitacao.usuario.username, + "email": solicitacao.usuario.email, + "phone": ' - '.join( + (solicitacao.usuario.primeiro_telefone.ddd, + solicitacao.usuario.primeiro_telefone.numero)), "subject": solicitacao.titulo, "ip": "", "message": solicitacao.resumo} @@ -37,7 +37,7 @@ class SolicitacaoForm(ModelForm): max_length=500, widget=forms.Textarea) - class Meta(object): + class Meta: model = Solicitacao fields = [u'codigo', u'usuario', u'sistema', u'email_contato', u'telefone_contato', @@ -45,9 +45,12 @@ class Meta(object): widgets = { u'codigo': forms.HiddenInput(), u'usuario': forms.HiddenInput(), - u'casa_legislativa': forms.TextInput(attrs={'readonly':'readonly'}), - u'email_contato': forms.TextInput(attrs={'readonly':'readonly'}), - u'telefone_contato': forms.TextInput(attrs={'readonly':'readonly'}) + u'casa_legislativa': forms.TextInput( + attrs={'readonly': 'readonly'}), + u'email_contato': forms.TextInput( + attrs={'readonly': 'readonly'}), + u'telefone_contato': forms.TextInput( + attrs={'readonly': 'readonly'}) } @transaction.atomic @@ -57,18 +60,3 @@ def save(self, commit=False): solicitacao.osticket = os_ticket solicitacao.save() return solicitacao - - -class SolicitacaoEditForm(ModelForm): - - resumo = forms.CharField( - label=u'Resumo', - max_length=500, - widget=forms.Textarea) - - class Meta(object): - model = Solicitacao - fields = [u'codigo', u'usuario', u'sistema', - u'casa_legislativa', u'titulo', u'resumo'] - widgets = {u'codigo': forms.TextInput(attrs={u'readonly': u'readonly'}), - u'usuario': forms.HiddenInput()} diff --git a/sigi/apps/solicitacoes/layouts.yaml b/sigi/apps/solicitacoes/layouts.yaml index 2e9804a4..cfbf36f6 100644 --- a/sigi/apps/solicitacoes/layouts.yaml +++ b/sigi/apps/solicitacoes/layouts.yaml @@ -13,21 +13,3 @@ Solicitacao: - email_contato telefone_contato - titulo - resumo - -SolicitacaoEdit: - Solicitação: - - codigo - - usuario - - sistema - - titulo - - resumo - -SolicitacaoList: - Solicitação: - - codigo - - usuario - - sistema - - casa_legislativa - - email_contato telefone_contato - - titulo - - data_criacao diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index ba8729a1..95e65dc3 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -8,7 +8,7 @@ from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView, CrudBaseMixin from sigi.apps.usuarios.models import Usuario -from .forms import SolicitacaoEditForm, SolicitacaoForm +from .forms import SolicitacaoForm from .models import Solicitacao @@ -34,18 +34,6 @@ def get_initial(self): def get_success_url(self): return reverse(u'solicitacoes:solicitacao_list') - class UpdateView(LoginRequiredMixin, CrudUpdateView): - form_class = SolicitacaoEditForm - - @property - def layout_key(self): - return u'SolicitacaoEdit' - - class ListView(LoginRequiredMixin, CrudListView): - @property - def layout_key(self): - return u'SolicitacaoList' - class BaseMixin(CrudBaseMixin): list_field_names = [u'osticket', u'sistema', u'titulo', u'data_criacao'] From c240955dc13994f80f14d8f26195cee6b832583a Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Mon, 27 Jun 2016 17:48:45 -0300 Subject: [PATCH 26/63] Isort --- check_qa.sh | 17 ++ conftest.py | 1 - etc/migracao/migra.py | 10 +- fix_qa.sh | 11 + scripts/casas_com_PM_e_SAPL.py | 1 - scripts/casas_que_usam_LEGBR_ou_PM.py | 5 +- ...contatos_de_casas_que_usam_portalmodelo.py | 4 +- scripts/csv_writer.py | 2 +- scripts/importa_pesquisa.py | 2 +- scripts/servicos_seit_ate_2013_2014.py | 1 + scripts/setgerentes/dados_gerentes.py | 1 - scripts/user_from_session.py | 2 +- .../verificacao_arquivos_faltando_media.py | 4 +- setup.py | 1 - sigi/apps/casas/admin.py | 11 +- .../management/commands/importa_gerentes.py | 7 +- sigi/apps/casas/models.py | 2 +- sigi/apps/casas/reports.py | 4 +- sigi/apps/casas/urls.py | 1 - sigi/apps/casas/views.py | 30 ++- sigi/apps/contatos/admin.py | 5 +- .../management/commands/importa_mesomicro.py | 8 +- sigi/apps/convenios/admin.py | 3 +- sigi/apps/convenios/models.py | 1 + sigi/apps/convenios/reports.py | 3 +- sigi/apps/convenios/urls.py | 1 - sigi/apps/convenios/views.py | 13 +- sigi/apps/crud/base.py | 5 +- sigi/apps/crud/urls.py | 1 + sigi/apps/crud/utils.py | 1 + sigi/apps/diagnosticos/admin.py | 4 +- sigi/apps/diagnosticos/decorators.py | 3 +- sigi/apps/diagnosticos/forms.py | 8 +- sigi/apps/diagnosticos/models.py | 3 +- .../diagnosticos/templatetags/smart_if.py | 1 - .../templatetags/test_smart_if.py | 2 +- sigi/apps/diagnosticos/urls.py | 1 - sigi/apps/diagnosticos/views.py | 9 +- sigi/apps/diagnosticos/widgets.py | 8 +- sigi/apps/eventos/admin.py | 9 +- sigi/apps/eventos/models.py | 8 +- sigi/apps/eventos/urls.py | 1 - sigi/apps/eventos/views.py | 12 +- sigi/apps/home/templatetags/menus.py | 1 - sigi/apps/home/urls.py | 1 - sigi/apps/home/views.py | 21 +- sigi/apps/inventario/admin.py | 6 +- sigi/apps/mdl/models.py | 1 + sigi/apps/metas/models.py | 3 +- sigi/apps/metas/templatetags/mapa_tags.py | 1 - sigi/apps/metas/urls.py | 1 - sigi/apps/metas/views.py | 3 +- sigi/apps/ocorrencias/admin.py | 3 +- sigi/apps/ocorrencias/forms.py | 12 +- sigi/apps/ocorrencias/models.py | 4 +- sigi/apps/ocorrencias/urls.py | 1 - sigi/apps/ocorrencias/views.py | 28 ++- sigi/apps/parlamentares/admin.py | 12 +- sigi/apps/parlamentares/reports.py | 4 +- sigi/apps/parlamentares/test_parlamentares.py | 1 - sigi/apps/parlamentares/views.py | 14 +- sigi/apps/relatorios/reports.py | 3 +- sigi/apps/saberes/admin.py | 3 +- .../management/commands/get_moodle_stats.py | 7 +- sigi/apps/saberes/models.py | 7 +- sigi/apps/saberes/urls.py | 4 +- sigi/apps/saberes/views.py | 4 +- sigi/apps/servicos/admin.py | 3 +- sigi/apps/servicos/models.py | 5 +- sigi/apps/servicos/urls.py | 1 - sigi/apps/servicos/views.py | 5 +- sigi/apps/servidores/admin.py | 5 +- sigi/apps/servidores/forms.py | 2 +- .../servidores/management/commands/migra.py | 4 +- .../management/commands/sync_ldap.py | 226 +++++++++--------- .../management/commands/test_sync_ldap.py | 1 - sigi/apps/servidores/test_servidores_forms.py | 8 +- sigi/apps/servidores/urls.py | 1 - sigi/apps/servidores/views.py | 8 +- sigi/apps/solicitacoes/apps.py | 1 + sigi/apps/solicitacoes/forms.py | 10 +- sigi/apps/solicitacoes/models.py | 3 +- sigi/apps/solicitacoes/urls.py | 1 + sigi/apps/solicitacoes/views.py | 4 +- sigi/apps/usuarios/apps.py | 1 + sigi/apps/usuarios/forms.py | 5 +- sigi/apps/usuarios/models.py | 5 +- sigi/apps/usuarios/urls.py | 16 +- sigi/apps/usuarios/utils.py | 1 + sigi/apps/usuarios/views.py | 20 +- sigi/apps/utils/decorators.py | 8 +- sigi/apps/utils/filters.py | 1 + sigi/apps/utils/moodle_ws_api.py | 4 +- sigi/settings/base.py | 2 +- sigi/settings/test.py | 1 - sigi/test_cart.py | 5 +- sigi/test_testutils.py | 1 - sigi/testutils.py | 3 +- sigi/urls.py | 2 +- sigi/wsgi.py | 4 +- 100 files changed, 424 insertions(+), 315 deletions(-) create mode 100755 check_qa.sh create mode 100755 fix_qa.sh diff --git a/check_qa.sh b/check_qa.sh new file mode 100755 index 00000000..607bb52b --- /dev/null +++ b/check_qa.sh @@ -0,0 +1,17 @@ +#!/bin/bash + +# Check if there's some debug breakpoint in codebase +me=`basename "$0"` +stmts=`grep --exclude=$me -r -l "ipdb.set_trace()" * | wc -l` +if [ $stmts != '0' ] +then + echo "==================================================================" + echo "ERROR: ipdb.set_trace() call in codebase! Remove, please." + grep --exclude=$me -r -n "ipdb.set_trace()" * + echo "==================================================================" +fi + +# QA checks: run this before every commit +./manage.py check +flake8 --exclude='ipython_log.py*,migrations,templates' . +isort --recursive --check-only --skip='migrations' --skip='templates' --skip='ipython_log.py' . diff --git a/conftest.py b/conftest.py index b9ff21fc..a59c9995 100644 --- a/conftest.py +++ b/conftest.py @@ -2,7 +2,6 @@ import pytest from django_webtest import DjangoTestApp, WebTestMixin - DEFAULT_MARK = object() diff --git a/etc/migracao/migra.py b/etc/migracao/migra.py index 47216db4..693fa256 100755 --- a/etc/migracao/migra.py +++ b/etc/migracao/migra.py @@ -19,19 +19,21 @@ banco de dados em produção. """ +import csv +from datetime import datetime + from django.core.management import setup_environ from sigi import settings -setup_environ(settings) - -import csv -from datetime import datetime from sigi.apps.casas.models import * from sigi.apps.contatos.models import * from sigi.apps.convenios.models import * from sigi.apps.inventario.models import * from sigi.apps.parlamentares.models import * +setup_environ(settings) + + ERROR_MSG_0 = (' %s[%s]: erro desconhecido! Possível erro de integridade ' 'do banco de dados. Favor verificar e inserir manualmente caso ' 'necessário.') diff --git a/fix_qa.sh b/fix_qa.sh new file mode 100755 index 00000000..a3ac9d84 --- /dev/null +++ b/fix_qa.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# QA fix: Use ese script para corrigir automaticamente vários +# problemas de estilo e boas práticas no código. +# +# Sempre guarde suas mudanças de alguma forma antes de aplicar esse script, +# de modo que possa revisar cada alteração que ele fez. +# Uma forma simples de fazer isso é adicionando antes suas mudanças à +# "staging area" do git, com `git add .` e após usar o script `git diff`. + +isort --recursive --skip='migrations' --skip='templates' --skip='ipython_log.py' . diff --git a/scripts/casas_com_PM_e_SAPL.py b/scripts/casas_com_PM_e_SAPL.py index b382da34..8c915c00 100644 --- a/scripts/casas_com_PM_e_SAPL.py +++ b/scripts/casas_com_PM_e_SAPL.py @@ -1,7 +1,6 @@ from csv_writer import CsvWriter from sigi.apps.servicos.models import Servico - ARQUIVO_CSV = '/tmp/casas_que_usam_PM_e_SAPL.csv' diff --git a/scripts/casas_que_usam_LEGBR_ou_PM.py b/scripts/casas_que_usam_LEGBR_ou_PM.py index 2dc8aeba..8d1de620 100644 --- a/scripts/casas_que_usam_LEGBR_ou_PM.py +++ b/scripts/casas_que_usam_LEGBR_ou_PM.py @@ -1,9 +1,8 @@ -import cStringIO import codecs +import cStringIO import csv -from sigi.apps.servicos.models import TipoServico, Servico - +from sigi.apps.servicos.models import Servico, TipoServico # cria um CSV com contatos das casas legislativas que possuem portal modelo ativo # rodar em um shell: diff --git a/scripts/contatos_de_casas_que_usam_portalmodelo.py b/scripts/contatos_de_casas_que_usam_portalmodelo.py index 32dc761a..4736e40f 100644 --- a/scripts/contatos_de_casas_que_usam_portalmodelo.py +++ b/scripts/contatos_de_casas_que_usam_portalmodelo.py @@ -1,10 +1,10 @@ -import cStringIO import codecs +import cStringIO import csv from sigi.apps.casas.models import Funcionario from sigi.apps.contatos.models import Telefone -from sigi.apps.servicos.models import TipoServico, Servico +from sigi.apps.servicos.models import Servico, TipoServico # cria um CSV com contatos das casas legislativas que possuem portal modelo ativo # rodar em um shell: diff --git a/scripts/csv_writer.py b/scripts/csv_writer.py index acf485dd..a825e5cc 100644 --- a/scripts/csv_writer.py +++ b/scripts/csv_writer.py @@ -1,5 +1,5 @@ -import cStringIO import codecs +import cStringIO import csv diff --git a/scripts/importa_pesquisa.py b/scripts/importa_pesquisa.py index cac1c324..b0f79554 100644 --- a/scripts/importa_pesquisa.py +++ b/scripts/importa_pesquisa.py @@ -29,6 +29,7 @@ from sigi.apps.casas.models import CasaLegislativa from sigi.apps.servidores.models import Servidor + def importa(file_list): ''' Este script importa dados de um arquivo CSV e dá carga no model casas.CasaLegislativa @@ -128,4 +129,3 @@ def importa(file_list): casa.save() print 'O arquivo '+filename+'.out foi criado com os registros que nao puderam ser importados' - diff --git a/scripts/servicos_seit_ate_2013_2014.py b/scripts/servicos_seit_ate_2013_2014.py index 24b4f7fd..c2d2e188 100644 --- a/scripts/servicos_seit_ate_2013_2014.py +++ b/scripts/servicos_seit_ate_2013_2014.py @@ -1,4 +1,5 @@ from datetime import date + from django.db.models import Q from sigi.apps.servicos.models import TipoServico diff --git a/scripts/setgerentes/dados_gerentes.py b/scripts/setgerentes/dados_gerentes.py index 20009146..6616f24b 100644 --- a/scripts/setgerentes/dados_gerentes.py +++ b/scripts/setgerentes/dados_gerentes.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from sigi.apps.servidores.models import Servidor - gerentes = {k: Servidor.objects.get(nome_completo=n) for k, n in ( ('ADAL', u'Adalberto Alves de Oliveira'), ('janarycn', u'Janary Carvão Nunes'), diff --git a/scripts/user_from_session.py b/scripts/user_from_session.py index 853aeb7e..7c9b7895 100644 --- a/scripts/user_from_session.py +++ b/scripts/user_from_session.py @@ -1,5 +1,5 @@ -from django.contrib.sessions.models import Session from django.contrib.auth.models import User +from django.contrib.sessions.models import Session def user_from_session(session_key): diff --git a/scripts/verificacao_arquivos_faltando_media.py b/scripts/verificacao_arquivos_faltando_media.py index 90cc79f4..6a686c60 100644 --- a/scripts/verificacao_arquivos_faltando_media.py +++ b/scripts/verificacao_arquivos_faltando_media.py @@ -1,13 +1,12 @@ # -*- coding: utf-8 -*- +from datetime import datetime # Dependência: # pip install terminaltables from os.path import isfile -from datetime import datetime from django.contrib.contenttypes.models import ContentType from django.core.urlresolvers import reverse -from terminaltables import AsciiTable from sigi.apps.casas.models import CasaLegislativa from sigi.apps.convenios.models import Anexo as AnexoConvenios @@ -15,6 +14,7 @@ from sigi.apps.ocorrencias.models import Anexo as AnexoOcorrencias from sigi.apps.parlamentares.models import Parlamentar from sigi.apps.servidores.models import Servidor +from terminaltables import AsciiTable def print_table(msg, relacao): diff --git a/setup.py b/setup.py index 2ca58d5a..c23c2bbe 100644 --- a/setup.py +++ b/setup.py @@ -4,5 +4,4 @@ # from distutils.core import setup - setup(name='sigi', version='2.x') diff --git a/sigi/apps/casas/admin.py b/sigi/apps/casas/admin.py index 8f6b0b0c..5099368b 100644 --- a/sigi/apps/casas/admin.py +++ b/sigi/apps/casas/admin.py @@ -1,16 +1,17 @@ # -*- coding: utf-8 -*- -from django.core.urlresolvers import reverse from django.contrib import admin from django.contrib.contenttypes.admin import GenericTabularInline +from django.core.urlresolvers import reverse from django.http import HttpResponseRedirect from django.utils.translation import ugettext as _ from image_cropping import ImageCroppingMixin from sigi.apps.casas.forms import CasaLegislativaForm -from sigi.apps.casas.models import CasaLegislativa, Presidente, Funcionario, TipoCasaLegislativa -from sigi.apps.casas.views import report_complete, labels_report, export_csv, \ - labels_report_sem_presidente, report, \ - adicionar_casas_carrinho +from sigi.apps.casas.models import (CasaLegislativa, Funcionario, Presidente, + TipoCasaLegislativa) +from sigi.apps.casas.views import (adicionar_casas_carrinho, export_csv, + labels_report, labels_report_sem_presidente, + report, report_complete) from sigi.apps.contatos.models import Telefone from sigi.apps.convenios.models import Convenio from sigi.apps.diagnosticos.models import Diagnostico diff --git a/sigi/apps/casas/management/commands/importa_gerentes.py b/sigi/apps/casas/management/commands/importa_gerentes.py index f43744cd..2016d98c 100644 --- a/sigi/apps/casas/management/commands/importa_gerentes.py +++ b/sigi/apps/casas/management/commands/importa_gerentes.py @@ -24,10 +24,13 @@ import csv import os + from django.core.management.base import BaseCommand, CommandError + from sigi.apps.casas.models import CasaLegislativa -from sigi.apps.servidores.models import Servidor from sigi.apps.contatos.models import Municipio +from sigi.apps.servidores.models import Servidor + class Command(BaseCommand): args = u"data_file.csv" @@ -81,4 +84,4 @@ def handle(self, *args, **options): casa.gerente_contas = gerente casa.save() - self.stdout.write(u"Importação concluída. %s erros em %s linhas" % (erros, reader.line_num,)) \ No newline at end of file + self.stdout.write(u"Importação concluída. %s erros em %s linhas" % (erros, reader.line_num,)) diff --git a/sigi/apps/casas/models.py b/sigi/apps/casas/models.py index deb59551..6ae4e4a2 100644 --- a/sigi/apps/casas/models.py +++ b/sigi/apps/casas/models.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- import random +from datetime import datetime from string import ascii_uppercase from unicodedata import normalize -from datetime import datetime from django.contrib.contenttypes import fields from django.db import models from image_cropping import ImageRatioField diff --git a/sigi/apps/casas/reports.py b/sigi/apps/casas/reports.py index 2c7a0437..3e5e66fd 100644 --- a/sigi/apps/casas/reports.py +++ b/sigi/apps/casas/reports.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- from django.templatetags.static import static from django.utils.translation import ugettext as _ -from geraldo import Report, DetailBand, Label, ObjectValue, ReportGroup, ReportBand, landscape, SubReport, BAND_WIDTH, SystemField +from geraldo import (BAND_WIDTH, DetailBand, Label, ObjectValue, Report, + ReportBand, ReportGroup, SubReport, SystemField, + landscape) from geraldo.graphics import Image from reportlab.lib.enums import TA_CENTER from reportlab.lib.pagesizes import A4 diff --git a/sigi/apps/casas/urls.py b/sigi/apps/casas/urls.py index 53813647..4ad35193 100644 --- a/sigi/apps/casas/urls.py +++ b/sigi/apps/casas/urls.py @@ -1,7 +1,6 @@ # coding: utf-8 from django.conf.urls import patterns, url - urlpatterns = patterns( 'sigi.apps.casas.views', diff --git a/sigi/apps/casas/views.py b/sigi/apps/casas/views.py index d8cea61a..d218cc3c 100644 --- a/sigi/apps/casas/views.py +++ b/sigi/apps/casas/views.py @@ -2,23 +2,29 @@ import csv from functools import reduce -from django.core.paginator import Paginator, InvalidPage, EmptyPage -from django.http import HttpResponse, HttpResponseRedirect, Http404 -from django.shortcuts import render, get_object_or_404 -from django.utils.translation import ugettext as _, ungettext +from django.contrib.auth.decorators import login_required +from django.core.paginator import EmptyPage, InvalidPage, Paginator +from django.db.models import Count, Q +from django.http import Http404, HttpResponse, HttpResponseRedirect +from django.http.response import JsonResponse +from django.shortcuts import get_object_or_404, render +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext from geraldo.generators import PDFGenerator +from sigi.apps.casas.forms import PortfolioForm from sigi.apps.casas.models import CasaLegislativa -from sigi.apps.casas.reports import CasasLegislativasLabels, CasasLegislativasLabelsSemPresidente, CasasLegislativasReport, CasasSemConvenioReport, InfoCasaLegislativa +from sigi.apps.casas.reports import (CasasLegislativasLabels, + CasasLegislativasLabelsSemPresidente, + CasasLegislativasReport, + CasasSemConvenioReport, + InfoCasaLegislativa) +from sigi.apps.contatos.models import (Mesorregiao, Microrregiao, + UnidadeFederativa) +from sigi.apps.ocorrencias.models import Ocorrencia from sigi.apps.parlamentares.reports import ParlamentaresLabels -from sigi.apps.contatos.models import UnidadeFederativa, Mesorregiao, Microrregiao -from sigi.apps.casas.forms import PortfolioForm -from django.contrib.auth.decorators import login_required from sigi.apps.servicos.models import TipoServico from sigi.apps.servidores.models import Servidor -from sigi.apps.ocorrencias.models import Ocorrencia -from django.db.models import Count, Q -from django.http.response import JsonResponse # @param qs: queryset @@ -678,4 +684,4 @@ def painel_relacionamento(request): if snippet == 'resumo': return render(request, 'casas/resumo_carteira_snippet.html', context) - return render(request, 'casas/painel.html', context) \ No newline at end of file + return render(request, 'casas/painel.html', context) diff --git a/sigi/apps/contatos/admin.py b/sigi/apps/contatos/admin.py index 768956fa..7506f42e 100644 --- a/sigi/apps/contatos/admin.py +++ b/sigi/apps/contatos/admin.py @@ -3,11 +3,12 @@ from django.utils.translation import ugettext as _ from sigi.apps.contatos.filters import PopulationFilter -from sigi.apps.contatos.models import (UnidadeFederativa, Mesorregiao, Microrregiao, - Municipio, Telefone, Contato) +from sigi.apps.contatos.models import (Contato, Mesorregiao, Microrregiao, + Municipio, Telefone, UnidadeFederativa) from sigi.apps.utils import queryset_ascii from sigi.apps.utils.base_admin import BaseModelAdmin + class MesorregiaoInline(admin.TabularInline): model = Mesorregiao diff --git a/sigi/apps/contatos/management/commands/importa_mesomicro.py b/sigi/apps/contatos/management/commands/importa_mesomicro.py index d4bc2b90..ffea4193 100644 --- a/sigi/apps/contatos/management/commands/importa_mesomicro.py +++ b/sigi/apps/contatos/management/commands/importa_mesomicro.py @@ -23,8 +23,12 @@ # import csv import os + from django.core.management.base import BaseCommand, CommandError -from sigi.apps.contatos.models import Municipio, UnidadeFederativa, Mesorregiao, Microrregiao + +from sigi.apps.contatos.models import (Mesorregiao, Microrregiao, Municipio, + UnidadeFederativa) + class Command(BaseCommand): args = u"data_file.csv" @@ -97,4 +101,4 @@ def handle(self, *args, **options): municipio.microrregiao = micro municipio.save() - self.stdout.write(u"Importação concluída. %s erros em %s linhas" % (erros, reader.line_num,)) \ No newline at end of file + self.stdout.write(u"Importação concluída. %s erros em %s linhas" % (erros, reader.line_num,)) diff --git a/sigi/apps/convenios/admin.py b/sigi/apps/convenios/admin.py index 6eeac0bd..77dd8ee8 100644 --- a/sigi/apps/convenios/admin.py +++ b/sigi/apps/convenios/admin.py @@ -4,7 +4,8 @@ from django.utils.translation import ugettext as _ from geraldo.generators import PDFGenerator -from sigi.apps.convenios.models import Projeto, Convenio, EquipamentoPrevisto, Anexo, Tramitacao +from sigi.apps.convenios.models import (Anexo, Convenio, EquipamentoPrevisto, + Projeto, Tramitacao) from sigi.apps.convenios.reports import ConvenioReport from sigi.apps.convenios.views import adicionar_convenios_carrinho from sigi.apps.utils import queryset_ascii diff --git a/sigi/apps/convenios/models.py b/sigi/apps/convenios/models.py index 7bf0f926..ad490c9c 100644 --- a/sigi/apps/convenios/models.py +++ b/sigi/apps/convenios/models.py @@ -1,5 +1,6 @@ # style="list-style-type: noneo -*- coding: utf-8 -*- from datetime import datetime + from django.db import models from django.utils.translation import ugettext as _ diff --git a/sigi/apps/convenios/reports.py b/sigi/apps/convenios/reports.py index 15f68a81..a4dce186 100644 --- a/sigi/apps/convenios/reports.py +++ b/sigi/apps/convenios/reports.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from django.utils.translation import ugettext as _ -from geraldo import ReportBand, ObjectValue, Label, ReportGroup, FIELD_ACTION_SUM +from geraldo import (FIELD_ACTION_SUM, Label, ObjectValue, ReportBand, + ReportGroup) from reportlab.lib.units import cm from sigi.apps.relatorios.reports import ReportDefault diff --git a/sigi/apps/convenios/urls.py b/sigi/apps/convenios/urls.py index d3b753a9..a8917efe 100644 --- a/sigi/apps/convenios/urls.py +++ b/sigi/apps/convenios/urls.py @@ -1,7 +1,6 @@ # coding: utf-8 from django.conf.urls import patterns, url - urlpatterns = patterns( 'sigi.apps.convenios.views', diff --git a/sigi/apps/convenios/views.py b/sigi/apps/convenios/views.py index 733dc189..af501265 100644 --- a/sigi/apps/convenios/views.py +++ b/sigi/apps/convenios/views.py @@ -1,12 +1,13 @@ #-*- coding:utf-8 -*- import csv - import datetime + import ho.pisa as pisa from django.conf import settings -from django.core.paginator import Paginator, InvalidPage, EmptyPage +from django.contrib.auth.decorators import login_required +from django.core.paginator import EmptyPage, InvalidPage, Paginator from django.http import HttpResponse, HttpResponseRedirect -from django.shortcuts import render, get_list_or_404 +from django.shortcuts import get_list_or_404, render from django.template import Context, loader from django.utils.translation import ugettext as _ from geraldo.generators import PDFGenerator @@ -14,8 +15,10 @@ from sigi.apps.casas.models import CasaLegislativa from sigi.apps.contatos.models import UnidadeFederativa from sigi.apps.convenios.models import Convenio, Projeto -from sigi.apps.convenios.reports import ConvenioPorCMReport, ConvenioPorALReport, ConvenioReportSemAceiteAL, ConvenioReportSemAceiteCM -from django.contrib.auth.decorators import login_required +from sigi.apps.convenios.reports import (ConvenioPorALReport, + ConvenioPorCMReport, + ConvenioReportSemAceiteAL, + ConvenioReportSemAceiteCM) def query_ordena(qs, o, ot): diff --git a/sigi/apps/crud/base.py b/sigi/apps/crud/base.py index 1d5f22c7..b1a9ad39 100644 --- a/sigi/apps/crud/base.py +++ b/sigi/apps/crud/base.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from braces.views import FormMessagesMixin from django.conf.urls import url from django.core.urlresolvers import reverse @@ -9,8 +10,10 @@ from django.views.generic import (CreateView, DeleteView, DetailView, ListView, UpdateView) +from sigi.apps.crispy_layout_mixin import (CrispyLayoutFormMixin, + get_field_display) + from .utils import make_pagination -from sigi.apps.crispy_layout_mixin import CrispyLayoutFormMixin, get_field_display LIST, CREATE, DETAIL, UPDATE, DELETE = \ u'list', u'create', u'detail', u'update', u'delete' diff --git a/sigi/apps/crud/urls.py b/sigi/apps/crud/urls.py index b17b6df8..51fdfd6a 100644 --- a/sigi/apps/crud/urls.py +++ b/sigi/apps/crud/urls.py @@ -1,4 +1,5 @@ from __future__ import absolute_import + from django.conf.urls import include, url urlpatterns = [ diff --git a/sigi/apps/crud/utils.py b/sigi/apps/crud/utils.py index 53bf2b2d..bf7723eb 100644 --- a/sigi/apps/crud/utils.py +++ b/sigi/apps/crud/utils.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from django.utils.translation import ugettext_lazy as _ UF = [ diff --git a/sigi/apps/diagnosticos/admin.py b/sigi/apps/diagnosticos/admin.py index 402e7da4..4ffb1a35 100644 --- a/sigi/apps/diagnosticos/admin.py +++ b/sigi/apps/diagnosticos/admin.py @@ -1,12 +1,14 @@ # -*- coding: utf-8 -*- from datetime import datetime + from django.contrib import admin from django.db.utils import OperationalError, ProgrammingError from django.utils.translation import ugettext as _ from eav.admin import BaseEntityAdmin, BaseSchemaAdmin from sigi.apps.diagnosticos.forms import DiagnosticoForm -from sigi.apps.diagnosticos.models import Diagnostico, Pergunta, Escolha, Equipe, Anexo, Categoria +from sigi.apps.diagnosticos.models import (Anexo, Categoria, Diagnostico, + Equipe, Escolha, Pergunta) from sigi.apps.utils.base_admin import BaseModelAdmin diff --git a/sigi/apps/diagnosticos/decorators.py b/sigi/apps/diagnosticos/decorators.py index 253f403a..417e67ca 100644 --- a/sigi/apps/diagnosticos/decorators.py +++ b/sigi/apps/diagnosticos/decorators.py @@ -1,7 +1,8 @@ # -*- coding: utf-8 -*- -from django.template import RequestContext from django.shortcuts import render_to_response +from django.template import RequestContext + from sigi.apps.diagnosticos.models import Diagnostico diff --git a/sigi/apps/diagnosticos/forms.py b/sigi/apps/diagnosticos/forms.py index e381cccb..d426bd92 100644 --- a/sigi/apps/diagnosticos/forms.py +++ b/sigi/apps/diagnosticos/forms.py @@ -3,9 +3,8 @@ from django import forms from django.contrib.contenttypes.forms import generic_inlineformset_factory -from django.forms import (BooleanField, CharField, DateField, - FloatField, ModelChoiceField, Textarea, - ModelMultipleChoiceField) +from django.forms import (BooleanField, CharField, DateField, FloatField, + ModelChoiceField, ModelMultipleChoiceField, Textarea) from django.forms.forms import BoundField from django.utils.translation import ugettext as _ from eav.fields import RangeField @@ -14,7 +13,8 @@ from sigi.apps.casas.models import CasaLegislativa, Funcionario from sigi.apps.contatos.models import Telefone from sigi.apps.diagnosticos.models import Diagnostico -from sigi.apps.diagnosticos.widgets import EavCheckboxSelectMultiple, EavRadioSelect +from sigi.apps.diagnosticos.widgets import (EavCheckboxSelectMultiple, + EavRadioSelect) class DiagnosticoForm(BaseDynamicEntityForm): diff --git a/sigi/apps/diagnosticos/models.py b/sigi/apps/diagnosticos/models.py index 45030e20..7f554682 100644 --- a/sigi/apps/diagnosticos/models.py +++ b/sigi/apps/diagnosticos/models.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- from datetime import datetime + from django.db import models from django.utils.translation import ugettext as _ -from eav.models import BaseChoice, BaseEntity, BaseSchema, BaseAttribute +from eav.models import BaseAttribute, BaseChoice, BaseEntity, BaseSchema from sigi.apps.utils import SearchField from sigi.apps.utils.email import enviar_email diff --git a/sigi/apps/diagnosticos/templatetags/smart_if.py b/sigi/apps/diagnosticos/templatetags/smart_if.py index 5a09cd30..4de3c60a 100644 --- a/sigi/apps/diagnosticos/templatetags/smart_if.py +++ b/sigi/apps/diagnosticos/templatetags/smart_if.py @@ -9,7 +9,6 @@ """ from django import template - register = template.Library() diff --git a/sigi/apps/diagnosticos/templatetags/test_smart_if.py b/sigi/apps/diagnosticos/templatetags/test_smart_if.py index 9101bf91..29b34119 100644 --- a/sigi/apps/diagnosticos/templatetags/test_smart_if.py +++ b/sigi/apps/diagnosticos/templatetags/test_smart_if.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- import pytest -from smart_if import Or, And, Equals, Greater, GreaterOrEqual, In, IfParser +from smart_if import And, Equals, Greater, GreaterOrEqual, IfParser, In, Or class TestVar(object): diff --git a/sigi/apps/diagnosticos/urls.py b/sigi/apps/diagnosticos/urls.py index 3e170d3c..1b4d5510 100644 --- a/sigi/apps/diagnosticos/urls.py +++ b/sigi/apps/diagnosticos/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import patterns, url from django.views.generic import TemplateView - LOGIN_REDIRECT_URL = '/diagnosticos/mobile/login' urlpatterns = patterns( diff --git a/sigi/apps/diagnosticos/views.py b/sigi/apps/diagnosticos/views.py index 2807abe7..3768c571 100644 --- a/sigi/apps/diagnosticos/views.py +++ b/sigi/apps/diagnosticos/views.py @@ -3,7 +3,7 @@ from itertools import cycle from django.http import HttpResponse -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import get_object_or_404, render_to_response from django.template import RequestContext from django.utils.translation import ugettext as _ from django.views.decorators.cache import never_cache @@ -11,9 +11,10 @@ from sigi.apps.casas.models import Funcionario from sigi.apps.contatos.models import Telefone from sigi.apps.diagnosticos.decorators import validate_diagnostico -from sigi.apps.diagnosticos.forms import (DiagnosticoMobileForm, - CasaLegislativaMobileForm, FuncionariosMobileForm) -from sigi.apps.diagnosticos.models import Diagnostico, Categoria, Pergunta +from sigi.apps.diagnosticos.forms import (CasaLegislativaMobileForm, + DiagnosticoMobileForm, + FuncionariosMobileForm) +from sigi.apps.diagnosticos.models import Categoria, Diagnostico, Pergunta from sigi.apps.diagnosticos.urls import LOGIN_REDIRECT_URL from sigi.apps.utils.decorators import login_required from sigi.shortcuts import render_to_pdf diff --git a/sigi/apps/diagnosticos/widgets.py b/sigi/apps/diagnosticos/widgets.py index 5dc7a442..f0c8d320 100644 --- a/sigi/apps/diagnosticos/widgets.py +++ b/sigi/apps/diagnosticos/widgets.py @@ -1,8 +1,12 @@ from itertools import chain -from django.forms.widgets import CheckboxInput, CheckboxSelectMultiple, RadioSelect, RadioFieldRenderer, RadioChoiceInput -from django.utils.html import conditional_escape + +from django.forms.widgets import (CheckboxInput, CheckboxSelectMultiple, + RadioChoiceInput, RadioFieldRenderer, + RadioSelect) from django.utils.encoding import force_unicode +from django.utils.html import conditional_escape from django.utils.safestring import mark_safe + from sigi.apps.diagnosticos.models import Escolha diff --git a/sigi/apps/eventos/admin.py b/sigi/apps/eventos/admin.py index fb1c4153..6723ff19 100644 --- a/sigi/apps/eventos/admin.py +++ b/sigi/apps/eventos/admin.py @@ -18,10 +18,13 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -from django.contrib import admin from django import forms +from django.contrib import admin from django.utils.translation import ugettext as _ -from sigi.apps.eventos.models import TipoEvento, Funcao, Evento, Equipe, Convite + +from sigi.apps.eventos.models import (Convite, Equipe, Evento, Funcao, + TipoEvento) + class EventoAdminForm(forms.ModelForm): class Meta: @@ -67,5 +70,3 @@ class EventoAdmin(admin.ModelAdmin): search_fields = ('nome', 'tipo_evento__nome', 'casa_anfitria__search_text', 'municipio__search_text', 'solicitante') inlines = (EquipeInline, ConviteInline) - - diff --git a/sigi/apps/eventos/models.py b/sigi/apps/eventos/models.py index 0374d264..9a6eea46 100644 --- a/sigi/apps/eventos/models.py +++ b/sigi/apps/eventos/models.py @@ -18,15 +18,17 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +from django.core.exceptions import ValidationError from django.db import models from django.utils.functional import lazy from django.utils.translation import ugettext as _ + from sigi.apps.casas.models import CasaLegislativa from sigi.apps.contatos.models import Municipio +from sigi.apps.mdl.models import Course from sigi.apps.servidores.models import Servidor from sigi.apps.utils.moodle_ws_api import get_courses -from django.core.exceptions import ValidationError -from sigi.apps.mdl.models import Course + class TipoEvento(models.Model): nome = models.CharField(_(u"Nome"), max_length=100) @@ -138,4 +140,4 @@ class Convite(models.Model): class Meta: ordering = ('evento', 'casa', '-data_convite') unique_together = ('evento', 'casa') - verbose_name, verbose_name_plural = _(u"Casa convidada"), _(u"Casas convidadas") \ No newline at end of file + verbose_name, verbose_name_plural = _(u"Casa convidada"), _(u"Casas convidadas") diff --git a/sigi/apps/eventos/urls.py b/sigi/apps/eventos/urls.py index a648c7c2..9967641b 100644 --- a/sigi/apps/eventos/urls.py +++ b/sigi/apps/eventos/urls.py @@ -1,7 +1,6 @@ # coding: utf-8 from django.conf.urls import patterns, url - urlpatterns = patterns( 'sigi.apps.eventos.views', # Painel de ocorrencias diff --git a/sigi/apps/eventos/views.py b/sigi/apps/eventos/views.py index e6ab84ba..9f414df9 100644 --- a/sigi/apps/eventos/views.py +++ b/sigi/apps/eventos/views.py @@ -19,17 +19,21 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. import calendar +import csv import datetime import locale + from django.contrib.auth.decorators import login_required +from django.http.response import HttpResponse, JsonResponse from django.shortcuts import render from django.utils import translation -from django.utils.translation import ungettext, ugettext as _ +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext + from sigi.apps.eventos.models import Evento from sigi.apps.servidores.models import Servidor from sigi.shortcuts import render_to_pdf -import csv -from django.http.response import JsonResponse, HttpResponse + @login_required def calendario(request): @@ -188,4 +192,4 @@ def alocacao_equipe(request): } for d in dados]} return JsonResponse(result) - return render(request, 'eventos/alocacao_equipe.html', data) \ No newline at end of file + return render(request, 'eventos/alocacao_equipe.html', data) diff --git a/sigi/apps/home/templatetags/menus.py b/sigi/apps/home/templatetags/menus.py index f8819fd3..5bf6094d 100644 --- a/sigi/apps/home/templatetags/menus.py +++ b/sigi/apps/home/templatetags/menus.py @@ -3,7 +3,6 @@ import yaml from django import template - register = template.Library() menus = yaml.load(open(dirname(__file__) + '/menu_conf.yaml', 'r')) diff --git a/sigi/apps/home/urls.py b/sigi/apps/home/urls.py index 2d6b091f..94bc18f0 100644 --- a/sigi/apps/home/urls.py +++ b/sigi/apps/home/urls.py @@ -2,7 +2,6 @@ from django.conf.urls import patterns, url from django.views.generic.base import TemplateView - urlpatterns = patterns( 'sigi.apps.home.views', url(r'^home/atendimento', TemplateView.as_view( diff --git a/sigi/apps/home/views.py b/sigi/apps/home/views.py index bef5f520..ca477948 100644 --- a/sigi/apps/home/views.py +++ b/sigi/apps/home/views.py @@ -22,24 +22,27 @@ # 02110-1301, USA. # -import datetime import calendar -from django.shortcuts import render, get_object_or_404 -from django.utils.translation import ugettext as _ +import csv +import datetime from itertools import cycle + +from django.contrib.auth.decorators import login_required +from django.core.urlresolvers import reverse +from django.db.models import Count, Q +from django.http.response import HttpResponse, JsonResponse +from django.shortcuts import get_object_or_404, render +from django.utils.translation import ugettext as _ +from django.views.decorators.cache import never_cache + from sigi.apps.casas.models import CasaLegislativa from sigi.apps.convenios.models import Convenio, Projeto from sigi.apps.diagnosticos.models import Diagnostico from sigi.apps.metas.models import Meta from sigi.apps.servicos.models import TipoServico from sigi.apps.servidores.models import Servidor -from django.views.decorators.cache import never_cache -from django.contrib.auth.decorators import login_required -from django.http.response import JsonResponse, HttpResponse -from django.core.urlresolvers import reverse -from django.db.models import Q, Count from sigi.shortcuts import render_to_pdf -import csv + @never_cache @login_required diff --git a/sigi/apps/inventario/admin.py b/sigi/apps/inventario/admin.py index 5a5b00ae..e8faed0c 100644 --- a/sigi/apps/inventario/admin.py +++ b/sigi/apps/inventario/admin.py @@ -3,9 +3,9 @@ from django.contrib.contenttypes.admin import GenericTabularInline from sigi.apps.contatos.models import Contato, Telefone -from sigi.apps.inventario.models import (Fornecedor, Fabricante, Equipamento, - TipoEquipamento, ModeloEquipamento, - Bem) +from sigi.apps.inventario.models import (Bem, Equipamento, Fabricante, + Fornecedor, ModeloEquipamento, + TipoEquipamento) from sigi.apps.utils.base_admin import BaseModelAdmin diff --git a/sigi/apps/mdl/models.py b/sigi/apps/mdl/models.py index 0466b45c..0e229362 100644 --- a/sigi/apps/mdl/models.py +++ b/sigi/apps/mdl/models.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals + from django.db import models diff --git a/sigi/apps/metas/models.py b/sigi/apps/metas/models.py index 3ca3c36d..5b1a58de 100644 --- a/sigi/apps/metas/models.py +++ b/sigi/apps/metas/models.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- from datetime import date + from django.db import models from django.utils.translation import ugettext as _ from sigi.apps.casas.models import CasaLegislativa -from sigi.apps.convenios.models import Projeto, Convenio +from sigi.apps.convenios.models import Convenio, Projeto from sigi.apps.diagnosticos.models import Diagnostico from sigi.apps.financeiro.models import Desembolso diff --git a/sigi/apps/metas/templatetags/mapa_tags.py b/sigi/apps/metas/templatetags/mapa_tags.py index 79039a6d..0e885a17 100644 --- a/sigi/apps/metas/templatetags/mapa_tags.py +++ b/sigi/apps/metas/templatetags/mapa_tags.py @@ -5,7 +5,6 @@ from sigi.apps.casas.models import CasaLegislativa from sigi.apps.metas.views import parliament_summary - register = template.Library() diff --git a/sigi/apps/metas/urls.py b/sigi/apps/metas/urls.py index 3d89a57d..7c7dad40 100644 --- a/sigi/apps/metas/urls.py +++ b/sigi/apps/metas/urls.py @@ -1,7 +1,6 @@ # coding: utf-8 from django.conf.urls import patterns, url - urlpatterns = patterns( 'sigi.apps.metas.views', diff --git a/sigi/apps/metas/views.py b/sigi/apps/metas/views.py index a1f086d9..de8971a2 100644 --- a/sigi/apps/metas/views.py +++ b/sigi/apps/metas/views.py @@ -3,6 +3,7 @@ import json as simplejson # XXX trocar isso por simplesmente import json e refatorar o codigo import os import time +from collections import OrderedDict from functools import reduce from django.contrib.auth.decorators import login_required @@ -12,7 +13,6 @@ from django.http import HttpResponse from django.shortcuts import render, render_to_response from django.template import RequestContext -from collections import OrderedDict from django.utils.translation import ugettext as _ from django.views.decorators.cache import cache_page from easy_thumbnails.templatetags.thumbnail import thumbnail_url @@ -26,7 +26,6 @@ from sigi.settings import MEDIA_ROOT, STATIC_URL from sigi.shortcuts import render_to_pdf - JSON_FILE_NAME = os.path.join(MEDIA_ROOT, 'apps/metas/map_data.json') diff --git a/sigi/apps/ocorrencias/admin.py b/sigi/apps/ocorrencias/admin.py index 4cf1dd65..ccf8d884 100644 --- a/sigi/apps/ocorrencias/admin.py +++ b/sigi/apps/ocorrencias/admin.py @@ -4,7 +4,8 @@ from django.utils.translation import ugettext as _ from filters import OcorrenciaListFilter -from sigi.apps.ocorrencias.models import Ocorrencia, Comentario, Anexo, Categoria, TipoContato +from sigi.apps.ocorrencias.models import (Anexo, Categoria, Comentario, + Ocorrencia, TipoContato) from sigi.apps.servidores.models import Servidor from sigi.apps.utils.base_admin import BaseModelAdmin diff --git a/sigi/apps/ocorrencias/forms.py b/sigi/apps/ocorrencias/forms.py index 45e01d92..746a2a7f 100644 --- a/sigi/apps/ocorrencias/forms.py +++ b/sigi/apps/ocorrencias/forms.py @@ -21,15 +21,17 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. # -from django.forms import ModelForm, ModelChoiceField, HiddenInput, TextInput -from sigi.apps.ocorrencias.models import Ocorrencia, Comentario, Anexo -from sigi.apps.servidores.models import Servico +from django.core.urlresolvers import reverse_lazy +from django.forms import HiddenInput, ModelChoiceField, ModelForm, TextInput +from django.forms.utils import flatatt from django.utils.encoding import force_text from django.utils.html import format_html -from django.forms.utils import flatatt -from django.core.urlresolvers import reverse_lazy from django.utils.safestring import mark_safe +from sigi.apps.ocorrencias.models import Anexo, Comentario, Ocorrencia +from sigi.apps.servidores.models import Servico + + class AjaxSelect(TextInput): url = "" def __init__(self, url, attrs=None): diff --git a/sigi/apps/ocorrencias/models.py b/sigi/apps/ocorrencias/models.py index 125bd1ce..d9932bb3 100644 --- a/sigi/apps/ocorrencias/models.py +++ b/sigi/apps/ocorrencias/models.py @@ -1,9 +1,9 @@ # -*- coding: utf-8 -*- -from django.db import models from django.conf import settings -from django.utils.translation import ugettext as _ from django.core.exceptions import ValidationError +from django.db import models from django.utils.safestring import mark_safe +from django.utils.translation import ugettext as _ class Categoria(models.Model): diff --git a/sigi/apps/ocorrencias/urls.py b/sigi/apps/ocorrencias/urls.py index f98cb087..c6c82579 100644 --- a/sigi/apps/ocorrencias/urls.py +++ b/sigi/apps/ocorrencias/urls.py @@ -1,7 +1,6 @@ # coding: utf-8 from django.conf.urls import patterns, url - urlpatterns = patterns( 'sigi.apps.ocorrencias.views', # Painel de ocorrencias diff --git a/sigi/apps/ocorrencias/views.py b/sigi/apps/ocorrencias/views.py index bc9f1687..7b4bce21 100644 --- a/sigi/apps/ocorrencias/views.py +++ b/sigi/apps/ocorrencias/views.py @@ -1,19 +1,23 @@ # -*- coding: utf-8 -*- -from django.http import JsonResponse, Http404 -from django.db.models import Q, Count -from django.utils.translation import ungettext, ugettext as _ -from django.shortcuts import get_object_or_404, render, HttpResponse from django.contrib.auth.decorators import login_required -from django.views.decorators.http import require_POST -from django.template.loader import render_to_string +from django.db.models import Count, Q +from django.http import Http404, JsonResponse +from django.shortcuts import HttpResponse, get_object_or_404, render from django.template import RequestContext -from sigi.apps.utils import to_ascii +from django.template.loader import render_to_string +from django.utils.html import escape +from django.utils.translation import ugettext as _ +from django.utils.translation import ungettext +from django.views.decorators.http import require_POST + from sigi.apps.casas.models import CasaLegislativa from sigi.apps.contatos.models import UnidadeFederativa -from sigi.apps.servidores.models import Servidor, Servico -from sigi.apps.ocorrencias.models import Ocorrencia, Anexo -from sigi.apps.ocorrencias.forms import AnexoForm, ComentarioForm, OcorrenciaForm -from django.utils.html import escape +from sigi.apps.ocorrencias.forms import (AnexoForm, ComentarioForm, + OcorrenciaForm) +from sigi.apps.ocorrencias.models import Anexo, Ocorrencia +from sigi.apps.servidores.models import Servico, Servidor +from sigi.apps.utils import to_ascii + @login_required def painel_ocorrencias(request): @@ -212,4 +216,4 @@ def inclui_ocorrencia(request): {'ocorrencia_form': form}, context_instance=RequestContext(request)) - return JsonResponse(data) \ No newline at end of file + return JsonResponse(data) diff --git a/sigi/apps/parlamentares/admin.py b/sigi/apps/parlamentares/admin.py index e42e8c33..9f974481 100644 --- a/sigi/apps/parlamentares/admin.py +++ b/sigi/apps/parlamentares/admin.py @@ -1,14 +1,16 @@ # -*- coding: utf-8 -*- from django.contrib import admin -from django.contrib.contenttypes.admin import GenericTabularInline -from django.http import HttpResponseRedirect, HttpResponse +from django.contrib.contenttypes.admin import GenericTabularInline +from django.http import HttpResponse, HttpResponseRedirect from django.utils.html import escape, escapejs from django.utils.translation import ugettext as _ from sigi.apps.contatos.models import Telefone -from sigi.apps.parlamentares.models import ( - Partido, Parlamentar, Mandato, Legislatura, Coligacao, ComposicaoColigacao, - SessaoLegislativa, MesaDiretora, Cargo, MembroMesaDiretora) +from sigi.apps.parlamentares.models import (Cargo, Coligacao, + ComposicaoColigacao, Legislatura, + Mandato, MembroMesaDiretora, + MesaDiretora, Parlamentar, Partido, + SessaoLegislativa) from sigi.apps.parlamentares.views import adicionar_parlamentar_carrinho from sigi.apps.utils.base_admin import BaseModelAdmin from sigi.apps.utils.filters import AlphabeticFilter diff --git a/sigi/apps/parlamentares/reports.py b/sigi/apps/parlamentares/reports.py index adbe0216..1d43eb40 100644 --- a/sigi/apps/parlamentares/reports.py +++ b/sigi/apps/parlamentares/reports.py @@ -1,7 +1,9 @@ # -*- coding: utf-8 -*- from django.templatetags.static import static from django.utils.translation import ugettext as _ -from geraldo import Report, DetailBand, Label, ObjectValue, ReportGroup, ReportBand, landscape, SubReport, BAND_WIDTH, SystemField +from geraldo import (BAND_WIDTH, DetailBand, Label, ObjectValue, Report, + ReportBand, ReportGroup, SubReport, SystemField, + landscape) from geraldo.graphics import Image from reportlab.lib.enums import TA_CENTER from reportlab.lib.pagesizes import A4 diff --git a/sigi/apps/parlamentares/test_parlamentares.py b/sigi/apps/parlamentares/test_parlamentares.py index 271820d7..3c9cff47 100644 --- a/sigi/apps/parlamentares/test_parlamentares.py +++ b/sigi/apps/parlamentares/test_parlamentares.py @@ -4,7 +4,6 @@ from sigi.apps.parlamentares.models import Parlamentar - pytestmark = pytest.mark.django_db diff --git a/sigi/apps/parlamentares/views.py b/sigi/apps/parlamentares/views.py index 33d66e45..063d01b5 100644 --- a/sigi/apps/parlamentares/views.py +++ b/sigi/apps/parlamentares/views.py @@ -1,22 +1,20 @@ # coding: utf-8 -import datetime import csv +import datetime -from django.template import Context, loader -from django.core.paginator import Paginator, InvalidPage, EmptyPage from django.conf import settings -from django.shortcuts import render, get_list_or_404 +from django.contrib.auth.decorators import login_required +from django.core.paginator import EmptyPage, InvalidPage, Paginator from django.http import HttpResponse, HttpResponseRedirect +from django.shortcuts import get_list_or_404, render +from django.template import Context, RequestContext, loader from django.views.decorators.csrf import csrf_protect -from django.template import RequestContext +from geraldo.generators import PDFGenerator from sigi.apps.casas.models import CasaLegislativa from sigi.apps.parlamentares.models import Parlamentar from sigi.apps.parlamentares.reports import ParlamentaresLabels -from geraldo.generators import PDFGenerator -from django.contrib.auth.decorators import login_required - def adicionar_parlamentar_carrinho(request, queryset=None, id=None): if request.method == 'POST': diff --git a/sigi/apps/relatorios/reports.py b/sigi/apps/relatorios/reports.py index 9bf82de6..30bb1e0e 100644 --- a/sigi/apps/relatorios/reports.py +++ b/sigi/apps/relatorios/reports.py @@ -3,7 +3,8 @@ from django.templatetags.static import static from django.utils.translation import ugettext as _ -from geraldo import Report, ReportBand, ObjectValue, DetailBand, Label, SystemField, BAND_WIDTH, FIELD_ACTION_COUNT, Line +from geraldo import (BAND_WIDTH, FIELD_ACTION_COUNT, DetailBand, Label, Line, + ObjectValue, Report, ReportBand, SystemField) from geraldo.graphics import Image from reportlab.lib.colors import navy from reportlab.lib.enums import TA_CENTER, TA_RIGHT diff --git a/sigi/apps/saberes/admin.py b/sigi/apps/saberes/admin.py index e9749de6..9798544c 100644 --- a/sigi/apps/saberes/admin.py +++ b/sigi/apps/saberes/admin.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- -from django.utils.translation import ugettext as _ from django.contrib import admin +from django.utils.translation import ugettext as _ + from sigi.apps.saberes.models import CategoriasInteresse diff --git a/sigi/apps/saberes/management/commands/get_moodle_stats.py b/sigi/apps/saberes/management/commands/get_moodle_stats.py index 29dcfb22..6984b8be 100644 --- a/sigi/apps/saberes/management/commands/get_moodle_stats.py +++ b/sigi/apps/saberes/management/commands/get_moodle_stats.py @@ -21,12 +21,13 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA # 02110-1301, USA. # -from django.utils.translation import ugettext as _ from django.core.management.base import BaseCommand -from django.db.models import Sum, Avg +from django.db.models import Avg, Sum +from django.utils.translation import ugettext as _ + +from sigi.apps.mdl.models import CourseStats, User from sigi.apps.metas.views import gera_map_data_file from sigi.apps.saberes.models import CategoriasInteresse, PainelItem -from sigi.apps.mdl.models import User, CourseStats class Command(BaseCommand): diff --git a/sigi/apps/saberes/models.py b/sigi/apps/saberes/models.py index a200aeb0..30b11ef3 100644 --- a/sigi/apps/saberes/models.py +++ b/sigi/apps/saberes/models.py @@ -1,10 +1,13 @@ # -*- coding: utf-8 -*- from __future__ import unicode_literals -from django.utils.translation import ugettext as _ + from django.db import models from django.db.models import Q -from sigi.apps.mdl.models import Course, CourseCategories, CourseCompletions, UserEnrolments +from django.utils.translation import ugettext as _ + +from sigi.apps.mdl.models import (Course, CourseCategories, CourseCompletions, + UserEnrolments) class CategoriasInteresse(models.Model): diff --git a/sigi/apps/saberes/urls.py b/sigi/apps/saberes/urls.py index 05254fc3..7a6d1bc0 100644 --- a/sigi/apps/saberes/urls.py +++ b/sigi/apps/saberes/urls.py @@ -1,8 +1,8 @@ # coding: utf-8 from django.conf.urls import patterns, url -from .views import cursos_sem_tutoria, cursos_com_tutoria, dashboard, pentaho_proxy - +from .views import (cursos_com_tutoria, cursos_sem_tutoria, dashboard, + pentaho_proxy) urlpatterns = patterns( 'sigi.apps.saberes.views', diff --git a/sigi/apps/saberes/views.py b/sigi/apps/saberes/views.py index 28951f70..b7798b63 100644 --- a/sigi/apps/saberes/views.py +++ b/sigi/apps/saberes/views.py @@ -5,8 +5,8 @@ from django.views.decorators.csrf import csrf_exempt from requests.auth import HTTPBasicAuth -from sigi.settings import PENTAHO_SERVER, PENTAHO_DASHBOARDS, PENTAHO_USERNAME_PASSWORD - +from sigi.settings import (PENTAHO_DASHBOARDS, PENTAHO_SERVER, + PENTAHO_USERNAME_PASSWORD) PENTAHO_CDF_URL = 'http://%s/pentaho/plugin/pentaho-cdf-dd/api/renderer/' % PENTAHO_SERVER diff --git a/sigi/apps/servicos/admin.py b/sigi/apps/servicos/admin.py index 7e7da331..5badf837 100644 --- a/sigi/apps/servicos/admin.py +++ b/sigi/apps/servicos/admin.py @@ -8,7 +8,8 @@ from sigi.apps.casas.admin import FuncionariosInline from sigi.apps.casas.models import CasaLegislativa -from sigi.apps.servicos.models import Servico, LogServico, CasaAtendida, TipoServico +from sigi.apps.servicos.models import (CasaAtendida, LogServico, Servico, + TipoServico) from sigi.apps.utils.base_admin import BaseModelAdmin diff --git a/sigi/apps/servicos/models.py b/sigi/apps/servicos/models.py index 107bf1ba..8eeee003 100644 --- a/sigi/apps/servicos/models.py +++ b/sigi/apps/servicos/models.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- from datetime import date + from django.db import models -from sigi.apps.casas.models import CasaLegislativa, Funcionario from django.utils.translation import ugettext as _ +from sigi.apps.casas.models import CasaLegislativa, Funcionario + class TipoServico(models.Model): MODO_CHOICES = ( @@ -219,4 +221,3 @@ class RegistroServico(models.Model): class Meta: verbose_name_plural = _(u'Registro de serviços') - diff --git a/sigi/apps/servicos/urls.py b/sigi/apps/servicos/urls.py index 8c918075..22f9e9f7 100644 --- a/sigi/apps/servicos/urls.py +++ b/sigi/apps/servicos/urls.py @@ -4,7 +4,6 @@ from .views import MapaView - urlpatterns = patterns( 'sigi.apps.servicos.views', diff --git a/sigi/apps/servicos/views.py b/sigi/apps/servicos/views.py index ab7a47c3..7196a76b 100644 --- a/sigi/apps/servicos/views.py +++ b/sigi/apps/servicos/views.py @@ -5,14 +5,15 @@ from django.db.models import Q from django.forms.forms import BoundField from django.http import HttpResponse -from django.shortcuts import render_to_response, get_object_or_404 +from django.shortcuts import get_object_or_404, render_to_response from django.template.context import RequestContext from django.utils.translation import ugettext as _ from django.views.generic.base import TemplateView from sigi.apps.casas.models import CasaLegislativa from sigi.apps.contatos.models import UnidadeFederativa -from sigi.apps.servicos.models import TipoServico, CasaAtendida, CasaManifesta, ServicoManifesto +from sigi.apps.servicos.models import (CasaAtendida, CasaManifesta, + ServicoManifesto, TipoServico) class MapaView(TemplateView): diff --git a/sigi/apps/servidores/admin.py b/sigi/apps/servidores/admin.py index 033b14b5..033ea244 100644 --- a/sigi/apps/servidores/admin.py +++ b/sigi/apps/servidores/admin.py @@ -4,8 +4,9 @@ from django.utils.translation import ugettext as _ from sigi.apps.contatos.models import Endereco, Telefone -from sigi.apps.servidores.forms import FeriasForm, LicencaForm, FuncaoForm -from sigi.apps.servidores.models import Servidor, Funcao, Licenca, Ferias, Servico, Subsecretaria +from sigi.apps.servidores.forms import FeriasForm, FuncaoForm, LicencaForm +from sigi.apps.servidores.models import (Ferias, Funcao, Licenca, Servico, + Servidor, Subsecretaria) from sigi.apps.utils.admin_widgets import AdminImageWidget from sigi.apps.utils.base_admin import BaseModelAdmin from sigi.apps.utils.filters import AlphabeticFilter diff --git a/sigi/apps/servidores/forms.py b/sigi/apps/servidores/forms.py index 3f01a957..307ff0fa 100644 --- a/sigi/apps/servidores/forms.py +++ b/sigi/apps/servidores/forms.py @@ -4,7 +4,7 @@ from django import forms from django.utils.translation import ugettext as _ -from sigi.apps.servidores.models import Ferias, Licenca, Funcao, Servidor +from sigi.apps.servidores.models import Ferias, Funcao, Licenca, Servidor def valida_data_inicial_menor_que_final(data, chave_ini, chave_fim): diff --git a/sigi/apps/servidores/management/commands/migra.py b/sigi/apps/servidores/management/commands/migra.py index c6187cac..c6603f03 100644 --- a/sigi/apps/servidores/management/commands/migra.py +++ b/sigi/apps/servidores/management/commands/migra.py @@ -1,14 +1,14 @@ # coding= utf-8 import csv import re - from datetime import datetime + from django.contrib.auth.models import User from django.core.management.base import BaseCommand from django.utils.translation import ugettext as _ from sigi.apps.contatos.models import Municipio -from sigi.apps.servidores.models import Servidor, Servico, Subsecretaria +from sigi.apps.servidores.models import Servico, Servidor, Subsecretaria # Funcao.objects.all().delete() diff --git a/sigi/apps/servidores/management/commands/sync_ldap.py b/sigi/apps/servidores/management/commands/sync_ldap.py index 6c2c9c32..f15d4eaa 100644 --- a/sigi/apps/servidores/management/commands/sync_ldap.py +++ b/sigi/apps/servidores/management/commands/sync_ldap.py @@ -1,113 +1,113 @@ -# coding: utf-8 -import ldap -from django.contrib.auth.models import User, Group -from django.core.management.base import BaseCommand - -from sigi.apps.servidores.models import Servidor -from sigi.settings import * - - -class Command(BaseCommand): - help = u'Sincroniza Usuários e Servidores com o LDAP' - - def handle(self, *args, **options): - self.sync_groups() - self.sync_users() - - def get_ldap_groups(self): - filter = "(&(objectclass=Group))" - values = ['cn', ] - l = ldap.initialize(AUTH_LDAP_SERVER_URI) - l.protocol_version = ldap.VERSION3 - l.simple_bind_s(AUTH_LDAP_BIND_DN.encode('utf-8'), AUTH_LDAP_BIND_PASSWORD) - result_id = l.search(AUTH_LDAP_GROUP, ldap.SCOPE_SUBTREE, filter, values) - result_type, result_data = l.result(result_id, 1) - l.unbind() - return result_data - - def get_ldap_users(self): - filter = "(&(objectclass=user))" - values = ['sAMAccountName', 'userPrincipalName', 'givenName', 'sn', 'cn'] - l = ldap.initialize(AUTH_LDAP_SERVER_URI) - l.protocol_version = ldap.VERSION3 - l.simple_bind_s(AUTH_LDAP_BIND_DN.encode('utf-8'), AUTH_LDAP_BIND_PASSWORD) - result_id = l.search(AUTH_LDAP_USER.encode('utf-8'), ldap.SCOPE_SUBTREE, filter, values) - result_type, result_data = l.result(result_id, 1) - l.unbind() - return result_data - - def sync_groups(self): - ldap_groups = self.get_ldap_groups() - for ldap_group in ldap_groups: - try: - group_name = ldap_group[1]['cn'][0] - except: - pass - else: - try: - group = Group.objects.get(name=group_name) - except Group.DoesNotExist: - group = Group(name=group_name) - group.save() - print "Group '%s' created." % group_name - print "Groups are synchronized." - - def sync_users(self): - ldap_users = self.get_ldap_users() - - def get_ldap_property(ldap_user, property_name, default_value=None): - value = ldap_user[1].get(property_name, None) - return value[0].decode('utf8') if value else default_value - - for ldap_user in ldap_users: - username = get_ldap_property(ldap_user, 'sAMAccountName') - if username: - email = get_ldap_property(ldap_user, 'userPrincipalName', '') - first_name = get_ldap_property(ldap_user, 'givenName', username) - last_name = get_ldap_property(ldap_user, 'sn', '')[:30] - try: - user = User.objects.get(username=username) - except User.DoesNotExist: - try: - user = User.objects.get(email=email) - old_username = user.username - user.username = username - print "User with email '%s' had his/her username updated from [%s] to [%s]." % ( - email, old_username, username) - except User.DoesNotExist: - user = User.objects.create_user( - username=username, - first_name=first_name, - last_name=last_name, - email=email, - ) - print "User '%s' created." % username - - if not user.first_name == first_name: - user.first_name = first_name - print "User '%s' first name updated." % username - if not user.last_name == last_name: - user.last_name = last_name - print "User '%s' last name updated." % username - if not user.email == email: - user.email = email - print "User '%s' email updated." % username - - nome_completo = get_ldap_property(ldap_user, 'cn', '') - try: - servidor = user.servidor - except Servidor.DoesNotExist: - try: - servidor = Servidor.objects.get(nome_completo=nome_completo) - except Servidor.DoesNotExist: - servidor = user.servidor_set.create(nome_completo=nome_completo) - print "Servidor '%s' created." % nome_completo - else: - if not servidor.nome_completo == nome_completo: - servidor.nome_completo = nome_completo - print "Full name of Servidor '%s' updated." % nome_completo - - servidor.user = user - servidor.save() - user.save() - print "Users are synchronized." +# coding: utf-8 +import ldap +from django.contrib.auth.models import Group, User +from django.core.management.base import BaseCommand + +from sigi.apps.servidores.models import Servidor +from sigi.settings import * + + +class Command(BaseCommand): + help = u'Sincroniza Usuários e Servidores com o LDAP' + + def handle(self, *args, **options): + self.sync_groups() + self.sync_users() + + def get_ldap_groups(self): + filter = "(&(objectclass=Group))" + values = ['cn', ] + l = ldap.initialize(AUTH_LDAP_SERVER_URI) + l.protocol_version = ldap.VERSION3 + l.simple_bind_s(AUTH_LDAP_BIND_DN.encode('utf-8'), AUTH_LDAP_BIND_PASSWORD) + result_id = l.search(AUTH_LDAP_GROUP, ldap.SCOPE_SUBTREE, filter, values) + result_type, result_data = l.result(result_id, 1) + l.unbind() + return result_data + + def get_ldap_users(self): + filter = "(&(objectclass=user))" + values = ['sAMAccountName', 'userPrincipalName', 'givenName', 'sn', 'cn'] + l = ldap.initialize(AUTH_LDAP_SERVER_URI) + l.protocol_version = ldap.VERSION3 + l.simple_bind_s(AUTH_LDAP_BIND_DN.encode('utf-8'), AUTH_LDAP_BIND_PASSWORD) + result_id = l.search(AUTH_LDAP_USER.encode('utf-8'), ldap.SCOPE_SUBTREE, filter, values) + result_type, result_data = l.result(result_id, 1) + l.unbind() + return result_data + + def sync_groups(self): + ldap_groups = self.get_ldap_groups() + for ldap_group in ldap_groups: + try: + group_name = ldap_group[1]['cn'][0] + except: + pass + else: + try: + group = Group.objects.get(name=group_name) + except Group.DoesNotExist: + group = Group(name=group_name) + group.save() + print "Group '%s' created." % group_name + print "Groups are synchronized." + + def sync_users(self): + ldap_users = self.get_ldap_users() + + def get_ldap_property(ldap_user, property_name, default_value=None): + value = ldap_user[1].get(property_name, None) + return value[0].decode('utf8') if value else default_value + + for ldap_user in ldap_users: + username = get_ldap_property(ldap_user, 'sAMAccountName') + if username: + email = get_ldap_property(ldap_user, 'userPrincipalName', '') + first_name = get_ldap_property(ldap_user, 'givenName', username) + last_name = get_ldap_property(ldap_user, 'sn', '')[:30] + try: + user = User.objects.get(username=username) + except User.DoesNotExist: + try: + user = User.objects.get(email=email) + old_username = user.username + user.username = username + print "User with email '%s' had his/her username updated from [%s] to [%s]." % ( + email, old_username, username) + except User.DoesNotExist: + user = User.objects.create_user( + username=username, + first_name=first_name, + last_name=last_name, + email=email, + ) + print "User '%s' created." % username + + if not user.first_name == first_name: + user.first_name = first_name + print "User '%s' first name updated." % username + if not user.last_name == last_name: + user.last_name = last_name + print "User '%s' last name updated." % username + if not user.email == email: + user.email = email + print "User '%s' email updated." % username + + nome_completo = get_ldap_property(ldap_user, 'cn', '') + try: + servidor = user.servidor + except Servidor.DoesNotExist: + try: + servidor = Servidor.objects.get(nome_completo=nome_completo) + except Servidor.DoesNotExist: + servidor = user.servidor_set.create(nome_completo=nome_completo) + print "Servidor '%s' created." % nome_completo + else: + if not servidor.nome_completo == nome_completo: + servidor.nome_completo = nome_completo + print "Full name of Servidor '%s' updated." % nome_completo + + servidor.user = user + servidor.save() + user.save() + print "Users are synchronized." diff --git a/sigi/apps/servidores/management/commands/test_sync_ldap.py b/sigi/apps/servidores/management/commands/test_sync_ldap.py index d01d64d1..4cac0241 100644 --- a/sigi/apps/servidores/management/commands/test_sync_ldap.py +++ b/sigi/apps/servidores/management/commands/test_sync_ldap.py @@ -5,7 +5,6 @@ from sigi.apps.servidores.management.commands.sync_ldap import Command - pytestmark = pytest.mark.django_db diff --git a/sigi/apps/servidores/test_servidores_forms.py b/sigi/apps/servidores/test_servidores_forms.py index cbbd8387..975f03f3 100644 --- a/sigi/apps/servidores/test_servidores_forms.py +++ b/sigi/apps/servidores/test_servidores_forms.py @@ -1,9 +1,11 @@ # -*- coding: utf-8 -*- -from django import forms -import pytest from datetime import date -from sigi.apps.servidores.forms import valida_data_inicial_menor_que_final, Periodo, periodos_se_sobrepoe +import pytest +from django import forms + +from sigi.apps.servidores.forms import (Periodo, periodos_se_sobrepoe, + valida_data_inicial_menor_que_final) @pytest.mark.parametrize('data', [ diff --git a/sigi/apps/servidores/urls.py b/sigi/apps/servidores/urls.py index 0a3c33c3..60c122db 100644 --- a/sigi/apps/servidores/urls.py +++ b/sigi/apps/servidores/urls.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from django.conf.urls import patterns, url - urlpatterns = patterns( 'sigi.apps.servidores.views', diff --git a/sigi/apps/servidores/views.py b/sigi/apps/servidores/views.py index f229af48..4870804e 100644 --- a/sigi/apps/servidores/views.py +++ b/sigi/apps/servidores/views.py @@ -1,10 +1,12 @@ # -*- coding: utf-8 -*- import new + +from django.db.models import Avg, Count, Max, Min +from django.shortcuts import get_object_or_404, redirect, render_to_response from django.template import RequestContext -from django.shortcuts import render_to_response, get_object_or_404, redirect -from django.db.models import Avg, Max, Min, Count -from sigi.apps.servidores.models import Servidor, Funcao + +from sigi.apps.servidores.models import Funcao, Servidor from sigi.shortcuts import render_to_pdf diff --git a/sigi/apps/solicitacoes/apps.py b/sigi/apps/solicitacoes/apps.py index 9567689e..c3df515d 100644 --- a/sigi/apps/solicitacoes/apps.py +++ b/sigi/apps/solicitacoes/apps.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from django import apps from django.utils.translation import ugettext_lazy as _ diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index 781db4e6..8c702f5b 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -1,11 +1,15 @@ from __future__ import absolute_import -from django.db import transaction + +import json + +import requests from django import forms +from django.db import transaction from django.forms import ModelForm + from sigi.settings.prod import OSTICKET_API_KEY, OSTICKET_URL + from .models import Solicitacao -import json -import requests def open_osticket(solicitacao): diff --git a/sigi/apps/solicitacoes/models.py b/sigi/apps/solicitacoes/models.py index 534e618e..379317be 100644 --- a/sigi/apps/solicitacoes/models.py +++ b/sigi/apps/solicitacoes/models.py @@ -1,10 +1,11 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from django.db import models from django.utils.translation import ugettext_lazy as _ -from sigi.apps.usuarios.models import Usuario from sigi.apps.servicos.models import TipoServico +from sigi.apps.usuarios.models import Usuario class Solicitacao(models.Model): diff --git a/sigi/apps/solicitacoes/urls.py b/sigi/apps/solicitacoes/urls.py index 910d3972..289bbef5 100644 --- a/sigi/apps/solicitacoes/urls.py +++ b/sigi/apps/solicitacoes/urls.py @@ -1,4 +1,5 @@ from __future__ import absolute_import + from django.conf.urls import include, url from sigi.apps.solicitacoes.views import SolicitacaoCrud diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index 95e65dc3..dffe63bf 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -1,11 +1,13 @@ from __future__ import absolute_import + import random from django.contrib.auth.mixins import LoginRequiredMixin from django.core.urlresolvers import reverse import sigi.apps.crud.base -from sigi.apps.crud.base import Crud, CrudCreateView, CrudListView, CrudCreateView, CrudUpdateView, CrudBaseMixin +from sigi.apps.crud.base import (Crud, CrudBaseMixin, CrudCreateView, + CrudListView, CrudUpdateView) from sigi.apps.usuarios.models import Usuario from .forms import SolicitacaoForm diff --git a/sigi/apps/usuarios/apps.py b/sigi/apps/usuarios/apps.py index d1851f69..212178d0 100644 --- a/sigi/apps/usuarios/apps.py +++ b/sigi/apps/usuarios/apps.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from django import apps from django.utils.translation import ugettext_lazy as _ diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index 0cde1640..0261cb5c 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from datetime import datetime from captcha.fields import CaptchaField @@ -14,12 +15,12 @@ from django.db import transaction from django.forms import ModelForm from django.utils.translation import ugettext_lazy as _ -from sigi.apps.casas.models import CasaLegislativa from easy_select2 import Select2 import sigi.apps.crispy_layout_mixin -from sigi.apps.crud.utils import YES_NO_CHOICES +from sigi.apps.casas.models import CasaLegislativa from sigi.apps.crispy_layout_mixin import form_actions +from sigi.apps.crud.utils import YES_NO_CHOICES from .models import Telefone, Usuario diff --git a/sigi/apps/usuarios/models.py b/sigi/apps/usuarios/models.py index b7efa7ca..639a5deb 100644 --- a/sigi/apps/usuarios/models.py +++ b/sigi/apps/usuarios/models.py @@ -1,12 +1,15 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + import base64 + from django.contrib.auth.models import User from django.db import models from django.utils import timezone from django.utils.translation import ugettext_lazy as _ -from sigi.apps.utils import SearchField + from sigi.apps.crud.utils import UF, YES_NO_CHOICES +from sigi.apps.utils import SearchField class Subsecretaria(models.Model): diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index ecdca958..5e4497ad 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -1,16 +1,18 @@ from __future__ import absolute_import + from django.conf.urls import include, url from django.contrib.auth.views import (login, logout, password_reset, - password_reset_done, + password_reset_complete, password_reset_confirm, - password_reset_complete) -from sigi.apps.usuarios.forms import (LoginForm, RecuperarSenhaEmailForm, - RecuperacaoMudarSenhaForm) -from sigi.apps.usuarios.views import (HabilitarDetailView, HabilitarEditView, - MudarSenhaView, UsuarioCrud, - ConfirmarEmailView) + password_reset_done) from django.views.generic.base import TemplateView +from sigi.apps.usuarios.forms import (LoginForm, RecuperacaoMudarSenhaForm, + RecuperarSenhaEmailForm) +from sigi.apps.usuarios.views import (ConfirmarEmailView, HabilitarDetailView, + HabilitarEditView, MudarSenhaView, + UsuarioCrud) + from .apps import AppConfig app_name = AppConfig.name diff --git a/sigi/apps/usuarios/utils.py b/sigi/apps/usuarios/utils.py index 53bf2b2d..bf7723eb 100644 --- a/sigi/apps/usuarios/utils.py +++ b/sigi/apps/usuarios/utils.py @@ -1,5 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from django.utils.translation import ugettext_lazy as _ UF = [ diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index ee3c8699..49bfde97 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -1,25 +1,27 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import + from braces.views import FormValidMessageMixin from django.conf import settings +from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.tokens import default_token_generator +from django.core.mail import send_mail from django.core.urlresolvers import reverse +from django.shortcuts import redirect from django.utils import timezone -from django.views.generic import DetailView, FormView, TemplateView -from django.core.mail import send_mail -from sigi.apps.crud.utils import str2bool -from django.contrib.auth.tokens import default_token_generator -from django.utils.http import urlsafe_base64_encode, urlsafe_base64_decode from django.utils.encoding import force_bytes +from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode +from django.views.generic import DetailView, FormView, TemplateView + from sigi.apps.crud.base import (Crud, CrudBaseMixin, CrudCreateView, - CrudListView, CrudUpdateView, CrudDetailView) + CrudDetailView, CrudListView, CrudUpdateView) +from sigi.apps.crud.utils import str2bool from .forms import (HabilitarEditForm, MudarSenhaForm, UsuarioEditForm, UsuarioForm) -from .models import Usuario, ConfirmaEmail, User -from django.contrib.auth.decorators import login_required -from django.shortcuts import redirect +from .models import ConfirmaEmail, User, Usuario class UsuarioCrud(Crud): diff --git a/sigi/apps/utils/decorators.py b/sigi/apps/utils/decorators.py index 85d67862..52715ec2 100644 --- a/sigi/apps/utils/decorators.py +++ b/sigi/apps/utils/decorators.py @@ -11,14 +11,16 @@ """ import urlparse + +from django.conf import settings +from django.contrib.auth import REDIRECT_FIELD_NAME +from django.utils.decorators import available_attrs + try: from functools import wraps except ImportError: from django.utils.functional import wraps # Python 2.4 fallback. -from django.conf import settings -from django.contrib.auth import REDIRECT_FIELD_NAME -from django.utils.decorators import available_attrs def user_passes_test(test_func, login_url=None, redirect_field_name=REDIRECT_FIELD_NAME): diff --git a/sigi/apps/utils/filters.py b/sigi/apps/utils/filters.py index 05517769..6c905dc9 100644 --- a/sigi/apps/utils/filters.py +++ b/sigi/apps/utils/filters.py @@ -1,5 +1,6 @@ # coding: utf-8 import string + from django.contrib import admin diff --git a/sigi/apps/utils/moodle_ws_api.py b/sigi/apps/utils/moodle_ws_api.py index 1be0cc02..f1ac319c 100644 --- a/sigi/apps/utils/moodle_ws_api.py +++ b/sigi/apps/utils/moodle_ws_api.py @@ -20,8 +20,10 @@ import json import urllib2 + from django.conf import settings + def get_courses(ids=[], sort_order='', *args, **kwargs): ''' Implements core_courses_get_courses function @param ids: list of course ids to retrieve, blank for all courses @@ -84,4 +86,4 @@ def get_courses(ids=[], sort_order='', *args, **kwargs): else: courses.sort(key=lambda x: x[sort_order]) - return courses \ No newline at end of file + return courses diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 91c41d97..0f212d19 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -14,6 +14,7 @@ from os.path import dirname import django.conf.global_settings as DEFAULT_SETTINGS +from easy_thumbnails.conf import Settings as thumbnail_settings BASE_DIR = dirname(dirname(dirname(__file__))) @@ -152,7 +153,6 @@ # Using pytest directly (without a test runner) TEST_RUNNER = None -from easy_thumbnails.conf import Settings as thumbnail_settings THUMBNAIL_PROCESSORS = ( 'image_cropping.thumbnail_processors.crop_corners', ) + thumbnail_settings.THUMBNAIL_PROCESSORS diff --git a/sigi/settings/test.py b/sigi/settings/test.py index d0371479..094b7102 100644 --- a/sigi/settings/test.py +++ b/sigi/settings/test.py @@ -1,6 +1,5 @@ from base import * - # SECURITY WARNING: keep the secret key used in production secret! SECRET_KEY = '0$ip1fb5xtq%a=)-k_4r^(#jn0t^@+*^kihkxkozg-mip7+w3+' diff --git a/sigi/test_cart.py b/sigi/test_cart.py index d9d7d530..dad85319 100644 --- a/sigi/test_cart.py +++ b/sigi/test_cart.py @@ -1,8 +1,9 @@ # -*- coding: utf-8 -*- import pytest -from sigi.apps.casas.test_casas import some_parliaments, parliaments_from_names -from sigi.apps.parlamentares.test_parlamentares import some_parliamentarians, parliamentarians_from_names +from sigi.apps.casas.test_casas import parliaments_from_names, some_parliaments +from sigi.apps.parlamentares.test_parlamentares import (parliamentarians_from_names, + some_parliamentarians) from sigi.testutils import pdf_text diff --git a/sigi/test_testutils.py b/sigi/test_testutils.py index 7b75ec48..d66c3de7 100644 --- a/sigi/test_testutils.py +++ b/sigi/test_testutils.py @@ -2,7 +2,6 @@ from sigi.testutils import SigiDataFixture - FieldStub = namedtuple('FieldStub', ['max_length']) diff --git a/sigi/testutils.py b/sigi/testutils.py index bae2f149..336ced1f 100644 --- a/sigi/testutils.py +++ b/sigi/testutils.py @@ -3,7 +3,8 @@ from itertools import product import pyPdf -from django_dynamic_fixture.fixture_algorithms.sequential_fixture import SequentialDataFixture +from django_dynamic_fixture.fixture_algorithms.sequential_fixture import \ + SequentialDataFixture def pdf_text(res): diff --git a/sigi/urls.py b/sigi/urls.py index b743cf06..cb29f9d3 100644 --- a/sigi/urls.py +++ b/sigi/urls.py @@ -1,7 +1,7 @@ #-*- coding:utf-8 -*- from django.conf import settings -from django.conf.urls import patterns, include, url +from django.conf.urls import include, patterns, url from django.conf.urls.static import static from django.contrib import admin from django.views.generic.base import TemplateView diff --git a/sigi/wsgi.py b/sigi/wsgi.py index 2bfdfd1e..0a175098 100644 --- a/sigi/wsgi.py +++ b/sigi/wsgi.py @@ -8,7 +8,9 @@ """ import os -os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sigi.settings") from django.core.wsgi import get_wsgi_application + +os.environ.setdefault("DJANGO_SETTINGS_MODULE", "sigi.settings") + application = get_wsgi_application() From 55d391d0b9dd3e9ed4d6bcdca7666e04034ffa5e Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Mon, 27 Jun 2016 17:57:19 -0300 Subject: [PATCH 27/63] =?UTF-8?q?Lista=20somente=20as=20solicita=C3=A7?= =?UTF-8?q?=C3=B5es=20do=20usu=C3=A1rio?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- requirements/dev-requirements.txt | 1 + sigi/apps/solicitacoes/views.py | 8 ++++++++ sigi/apps/usuarios/views.py | 3 --- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index 43771218..bac1a752 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -2,5 +2,6 @@ django-debug-toolbar==1.4 ipdb==0.10.0 ipython==4.2.0 +isort==4.2.5 model_mommy==1.2.6 pygraphviz==1.3.1 diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index dffe63bf..afebd168 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -12,12 +12,20 @@ from .forms import SolicitacaoForm from .models import Solicitacao +from sigi.context_processors import recupera_usuario class SolicitacaoCrud(LoginRequiredMixin, Crud): model = Solicitacao help_path = u'' + class ListView(LoginRequiredMixin, CrudListView): + + def get_rows(self, object_list): + object_list = Solicitacao.objects.filter( + usuario=recupera_usuario(self.request)) + return [self._as_row(obj) for obj in object_list] + class CreateView(LoginRequiredMixin, CrudCreateView): form_class = SolicitacaoForm diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 49bfde97..321627a3 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -59,9 +59,6 @@ def get_success_url(self): fail_silently=False) return reverse(u'index_atendimento') - class ListView(LoginRequiredMixin, CrudListView): - pass - class UpdateView(LoginRequiredMixin, CrudUpdateView): form_class = UsuarioEditForm From 8c287c79ca455a6c42a998b56d4f04f9d5d2f594 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 28 Jun 2016 16:46:15 -0300 Subject: [PATCH 28/63] =?UTF-8?q?#37=20Remove=20codigo=20de=20solicita?= =?UTF-8?q?=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/solicitacoes/forms.py | 3 +-- .../0006_remove_solicitacao_codigo.py | 19 +++++++++++++++++++ sigi/apps/solicitacoes/models.py | 1 - 3 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 sigi/apps/solicitacoes/migrations/0006_remove_solicitacao_codigo.py diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index 8c702f5b..614e3c1a 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -43,11 +43,10 @@ class SolicitacaoForm(ModelForm): class Meta: model = Solicitacao - fields = [u'codigo', u'usuario', u'sistema', + fields = [u'usuario', u'sistema', u'email_contato', u'telefone_contato', u'casa_legislativa', u'titulo', u'resumo'] widgets = { - u'codigo': forms.HiddenInput(), u'usuario': forms.HiddenInput(), u'casa_legislativa': forms.TextInput( attrs={'readonly': 'readonly'}), diff --git a/sigi/apps/solicitacoes/migrations/0006_remove_solicitacao_codigo.py b/sigi/apps/solicitacoes/migrations/0006_remove_solicitacao_codigo.py new file mode 100644 index 00000000..f5d3f1b0 --- /dev/null +++ b/sigi/apps/solicitacoes/migrations/0006_remove_solicitacao_codigo.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-28 14:45 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('solicitacoes', '0005_auto_20160627_1349'), + ] + + operations = [ + migrations.RemoveField( + model_name='solicitacao', + name='codigo', + ), + ] diff --git a/sigi/apps/solicitacoes/models.py b/sigi/apps/solicitacoes/models.py index 379317be..241f520e 100644 --- a/sigi/apps/solicitacoes/models.py +++ b/sigi/apps/solicitacoes/models.py @@ -9,7 +9,6 @@ class Solicitacao(models.Model): - codigo = models.PositiveIntegerField(unique=True) usuario = models.ForeignKey(Usuario) sistema = models.ForeignKey(TipoServico) titulo = models.CharField(verbose_name=_(u'Título'), max_length=100) From 15bb053ac073753a34879480aa814a963d2444dd Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 28 Jun 2016 17:07:05 -0300 Subject: [PATCH 29/63] =?UTF-8?q?#39=20Remove=20captcha=20e=20torna=20camp?= =?UTF-8?q?os=20readonly=20na=20edi=C3=A7=C3=A3o=20do=20perfil?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/usuarios/forms.py | 51 ++++++++++--------- sigi/apps/usuarios/layouts.yaml | 4 +- .../0006_remove_usuario_search_text.py | 19 +++++++ sigi/apps/usuarios/models.py | 2 - 4 files changed, 48 insertions(+), 28 deletions(-) create mode 100644 sigi/apps/usuarios/migrations/0006_remove_usuario_search_text.py diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index 0261cb5c..47d528d1 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -101,7 +101,7 @@ class Meta(object): u'captcha', u'cpf', u'rg', u'cargo', u'casa_legislativa'] widgets = {u'email': forms.TextInput( - attrs={u'style': u'text-transform:lowercase;'}), } + attrs={u'style': u'text-transform:lowercase;'}), } def __init__(self, *args, **kwargs): super(UsuarioForm, self).__init__(*args, **kwargs) @@ -211,21 +211,34 @@ def save(self, commit=False): u.save() usuario.user = u usuario.save() + return usuario class UsuarioEditForm(UsuarioForm): + captcha = CaptchaField(required=False) + + casa_legislativa = forms.ModelChoiceField( + queryset=CasaLegislativa.objects.all(), + widget=Select2(), + required=False + ) class Meta(object): model = Usuario fields = [u'username', u'email', u'nome_completo', u'vinculo', - u'email_confirm', u'captcha', u'cpf', u'rg', - u'cargo', u'casa_legislativa'] + u'email_confirm', u'cpf', u'rg', u'cargo'] + exclude = [u'captcha', u'casa_legislativa'] + widgets = {u'username': forms.TextInput( - attrs={u'readonly': u'readonly'}), + attrs={u'readonly': u'readonly'}), + u'nome_completo': forms.TextInput( + attrs={u'readonly': u'readonly'}), + u'cpf': forms.TextInput( + attrs={u'readonly': u'readonly'}), + u'rg': forms.TextInput( + attrs={u'readonly': u'readonly'}), u'email': forms.TextInput( - attrs={u'style': u'text-transform:lowercase;'} - ), - } + attrs={u'style': u'text-transform:lowercase;'}), } def __init__(self, *args, **kwargs): super(UsuarioEditForm, self).__init__(*args, **kwargs) @@ -242,7 +255,6 @@ def valida_email_existente(self): user__username=self.cleaned_data[u'username']).exists() def clean(self): - if (u'email' not in self.cleaned_data or u'email_confirm' not in self.cleaned_data): raise ValidationError(_(u'Favor informar endereços de email')) @@ -263,7 +275,6 @@ def clean(self): @transaction.atomic def save(self, commit=False): - usuario = super(UsuarioForm, self).save(commit) # Primeiro telefone @@ -415,13 +426,10 @@ def __init__(self, *args, **kwargs): Fieldset(_(u'Recuperar Senha'), row1, form_actions( - more=[ - Submit( - u'Cancelar', - u'Cancelar', - style=u'background-color:black; color:white;')]) - ) - ) + more=[Submit(u'Cancelar', + u'Cancelar', + style=u'background-color:black;' + 'color:white;')]))) def clean(self): email_existente_usuario = Usuario.objects.filter( @@ -448,10 +456,7 @@ def __init__(self, *args, **kwargs): Fieldset(_(u''), row1, form_actions( - more=[ - Submit( - u'Cancelar', - u'Cancelar', - style=u'background-color:black; color:white;')]) - ) - ) + more=[Submit(u'Cancelar', + u'Cancelar', + style=u'background-color:black;' + 'color:white;')]))) diff --git a/sigi/apps/usuarios/layouts.yaml b/sigi/apps/usuarios/layouts.yaml index 92b8e7d6..227859b4 100644 --- a/sigi/apps/usuarios/layouts.yaml +++ b/sigi/apps/usuarios/layouts.yaml @@ -29,14 +29,12 @@ UsuarioEdit: Usuário: - username nome_completo:9 - email email_confirm - - cpf rg casa_legislativa + - cpf rg - cargo vinculo Primeiro Telefone: - primeiro_tipo primeiro_ddd:2 primeiro_numero:6 primeiro_principal Segundo Telefone: - segundo_tipo segundo_ddd:2 segundo_numero:6 segundo_principal - Prove que você é um humano: - - captcha UsuarioDetail: Perfil: diff --git a/sigi/apps/usuarios/migrations/0006_remove_usuario_search_text.py b/sigi/apps/usuarios/migrations/0006_remove_usuario_search_text.py new file mode 100644 index 00000000..611d3d6f --- /dev/null +++ b/sigi/apps/usuarios/migrations/0006_remove_usuario_search_text.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-28 15:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0005_auto_20160624_0853'), + ] + + operations = [ + migrations.RemoveField( + model_name='usuario', + name='search_text', + ), + ] diff --git a/sigi/apps/usuarios/models.py b/sigi/apps/usuarios/models.py index 639a5deb..024324ef 100644 --- a/sigi/apps/usuarios/models.py +++ b/sigi/apps/usuarios/models.py @@ -120,8 +120,6 @@ class Usuario(models.Model): 'casas.CasaLegislativa', verbose_name=_(u'Casa Legislativa') ) - # campo de busca em caixa baixa e sem acentos - search_text = SearchField(field_names=['casa_legislativa']) class Meta(object): verbose_name = _(u'Usuário') From f914f3e53fb69ce7418215d2109c9a589dcaead9 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Tue, 28 Jun 2016 17:13:42 -0300 Subject: [PATCH 30/63] #40 Substitui /home/atendimento por /atendimento --- sigi/apps/home/urls.py | 2 +- sigi/apps/solicitacoes/urls.py | 2 +- sigi/apps/usuarios/urls.py | 20 ++++++++++---------- sigi/urls.py | 4 ++-- templates/base.html | 2 +- templates/usuarios/login.html | 2 +- templates/usuarios/usuario_list.html | 2 +- 7 files changed, 17 insertions(+), 17 deletions(-) diff --git a/sigi/apps/home/urls.py b/sigi/apps/home/urls.py index 94bc18f0..1cf329a2 100644 --- a/sigi/apps/home/urls.py +++ b/sigi/apps/home/urls.py @@ -4,7 +4,7 @@ urlpatterns = patterns( 'sigi.apps.home.views', - url(r'^home/atendimento', TemplateView.as_view( + url(r'^atendimento', TemplateView.as_view( template_name='index_atendimento.html'), name='index_atendimento'), url(r'^$', 'index', name='sigi_index'), diff --git a/sigi/apps/solicitacoes/urls.py b/sigi/apps/solicitacoes/urls.py index 289bbef5..b44fa1fd 100644 --- a/sigi/apps/solicitacoes/urls.py +++ b/sigi/apps/solicitacoes/urls.py @@ -9,6 +9,6 @@ app_name = AppConfig.name urlpatterns = [ - url(ur'home/atendimento/solicitacao/', + url(ur'atendimento/solicitacao/', include(SolicitacaoCrud.get_urls())), ] diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index 5e4497ad..d9be142e 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -20,7 +20,7 @@ EMAIL_SEND_USER='atendimento@interlegis.leg.br' recuperar_email = [ - url(ur'^home/atendimento/recuperar/recuperar_senha/$', + url(ur'^atendimento/recuperar/recuperar_senha/$', password_reset, {u'template_name': u'usuarios/recuperar_senha.html', u'password_reset_form': RecuperarSenhaEmailForm, @@ -29,36 +29,36 @@ u'from_email': EMAIL_SEND_USER, u'html_email_template_name': u'usuarios/recuperar_senha_email.html'}, name=u'recuperar_senha'), - url(ur'^home/atendimento/recuperar/recuperar_recuperar/finalizado/$', + url(ur'^atendimento/recuperar/recuperar_recuperar/finalizado/$', password_reset_done, {u'template_name': u'usuarios/recuperar_senha_enviado.html'}, name=u'recuperar_senha_finalizado'), - url(ur'^home/atendimento/recuperar/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', + url(ur'^atendimento/recuperar/(?P[0-9A-Za-z_\-]+)/(?P.+)/$', password_reset_confirm, {u'post_reset_redirect': u'usuarios:recuperar_senha_completo', u'template_name': u'usuarios/recuperacao_senha_form.html', u'set_password_form': RecuperacaoMudarSenhaForm}, name=u'recuperar_senha_confirma'), - url(ur'^home/atendimento/recuperar/completo/$', + url(ur'^atendimento/recuperar/completo/$', password_reset_complete, {u'template_name': u'usuarios/recuperacao_senha_completo.html'}, name=u'recuperar_senha_completo'), ] urlpatterns = recuperar_email + [ - url(ur'^home/atendimento/login/$', login, { + url(ur'^atendimento/login/$', login, { u'template_name': u'usuarios/login.html', u'authentication_form': LoginForm}, name=u'login'), - url(ur'^home/atendimento/logout/$', logout, {u'next_page': u'/home/atendimento'}, + url(ur'^atendimento/logout/$', logout, {u'next_page': u'/atendimento'}, name=u'logout'), - url(ur'^home/atendimento/usuario/', include(UsuarioCrud.get_urls())), + url(ur'^atendimento/usuario/', include(UsuarioCrud.get_urls())), - url(ur'^home/atendimento/habilitar/(?P\d+)$', + url(ur'^atendimento/habilitar/(?P\d+)$', HabilitarDetailView.as_view(), name=u'habilitar_detail'), - url(ur'^home/atendimento/habilitar/(?P\d+)/edit$', + url(ur'^atendimento/habilitar/(?P\d+)/edit$', HabilitarEditView.as_view(), name=u'habilitar_edit'), - url(ur'^home/atendimento/usuario/(?P\d+)/mudar_senha$', + url(ur'^atendimento/usuario/(?P\d+)/mudar_senha$', MudarSenhaView.as_view(), name=u'mudar_senha'), url(ur'^usuario/confirmar/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', ConfirmarEmailView.as_view(), name=u'confirmar_email'), diff --git a/sigi/urls.py b/sigi/urls.py index cb29f9d3..ea67a57a 100644 --- a/sigi/urls.py +++ b/sigi/urls.py @@ -1,4 +1,4 @@ -#-*- coding:utf-8 -*- +# -*- coding:utf-8 -*- from django.conf import settings from django.conf.urls import include, patterns, url @@ -36,7 +36,7 @@ # to enable language selection # Suspended - #url(r'^i18n/', include('django.conf.urls.i18n')), + # url(r'^i18n/', include('django.conf.urls.i18n')), ) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) diff --git a/templates/base.html b/templates/base.html index a78a3dfc..7c5d5032 100644 --- a/templates/base.html +++ b/templates/base.html @@ -55,7 +55,7 @@
- + Logo

Interlegis

Sistema de Solicitação de Serviços

 diff --git a/templates/usuarios/login.html b/templates/usuarios/login.html index 61b1e0c5..4064ff97 100644 --- a/templates/usuarios/login.html +++ b/templates/usuarios/login.html @@ -27,7 +27,7 @@

Login

Esqueceu sua senha?
- +
diff --git a/templates/usuarios/usuario_list.html b/templates/usuarios/usuario_list.html index 3618be2b..e5961795 100644 --- a/templates/usuarios/usuario_list.html +++ b/templates/usuarios/usuario_list.html @@ -22,7 +22,7 @@ {% for value, href in value_list %} {% if href %} - {{ value }} + {{ value }} {% else %} {{ value|safe }} {% endif %} From 1d464c8d4eed7c057704346a994ae7357daec15c Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 28 Jun 2016 18:09:07 -0300 Subject: [PATCH 31/63] Esconde campo de habilitar detail do Usuario Signed-off-by: Luciano Almeida --- templates/usuarios/habilitar_detail.html | 5 ----- 1 file changed, 5 deletions(-) diff --git a/templates/usuarios/habilitar_detail.html b/templates/usuarios/habilitar_detail.html index 96cff33d..dba5a239 100644 --- a/templates/usuarios/habilitar_detail.html +++ b/templates/usuarios/habilitar_detail.html @@ -34,10 +34,5 @@

Habilitar

      - {{ usuario.vinculo }}
Casa Legislativa:
      - {{ usuario.casa_legislativa }}
-
Telefone(s):
-
      - [{{ usuario.primeiro_telefone.ddd }}] - {{usuario.primeiro_telefone.numero}}
- {% if usuario.segundo_telefone.ddd and usuario.segundo_telefone.numero %} -
      - [{{ usuario.segundo_telefone.ddd }}] - {{usuario.segundo_telefone.numero}}
- {% endif %} {% endblock detail_content %} From f82e4af987fb2c4d30cd886100f2ad0f099bcaf7 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 29 Jun 2016 17:18:28 -0300 Subject: [PATCH 32/63] =?UTF-8?q?#43=20Atestar=20conv=C3=AAnio=20e=20respo?= =?UTF-8?q?ns=C3=A1vel?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/home/templatetags/menu_conf.yaml | 7 ++ sigi/apps/solicitacoes/layouts.yaml | 1 - sigi/apps/usuarios/forms.py | 56 ++++++++- .../migrations/0007_auto_20160628_1609.py | 29 +++++ sigi/apps/usuarios/migrations/0008_atesto.py | 31 +++++ .../0009_usuario_atesto_conveniado.py | 21 ++++ .../migrations/0010_auto_20160629_1448.py | 45 +++++++ sigi/apps/usuarios/models.py | 31 ++++- sigi/apps/usuarios/urls.py | 19 ++- sigi/apps/usuarios/views.py | 113 +++++++++++++++++- templates/usuarios/convenio.html | 24 ++++ templates/usuarios/convenio_list.html | 24 ++++ templates/usuarios/responsavel.html | 33 +++++ templates/usuarios/responsavel_list.html | 26 ++++ 14 files changed, 446 insertions(+), 14 deletions(-) create mode 100644 sigi/apps/usuarios/migrations/0007_auto_20160628_1609.py create mode 100644 sigi/apps/usuarios/migrations/0008_atesto.py create mode 100644 sigi/apps/usuarios/migrations/0009_usuario_atesto_conveniado.py create mode 100644 sigi/apps/usuarios/migrations/0010_auto_20160629_1448.py create mode 100644 templates/usuarios/convenio.html create mode 100644 templates/usuarios/convenio_list.html create mode 100644 templates/usuarios/responsavel.html create mode 100644 templates/usuarios/responsavel_list.html diff --git a/sigi/apps/home/templatetags/menu_conf.yaml b/sigi/apps/home/templatetags/menu_conf.yaml index 161947a3..23ed5e22 100644 --- a/sigi/apps/home/templatetags/menu_conf.yaml +++ b/sigi/apps/home/templatetags/menu_conf.yaml @@ -123,3 +123,10 @@ main_menu: url: saberes/dashboard/cursos-sem-turoria/ - title: Cursos com Tutoria url: saberes/dashboard/cursos-com-turoria/ + - title: Atesto + url: '/' + children: + - title: Convênio + url: convenio + - title: Responsável + url: responsavel diff --git a/sigi/apps/solicitacoes/layouts.yaml b/sigi/apps/solicitacoes/layouts.yaml index cfbf36f6..ef0757c6 100644 --- a/sigi/apps/solicitacoes/layouts.yaml +++ b/sigi/apps/solicitacoes/layouts.yaml @@ -6,7 +6,6 @@ Sistema: Solicitacao: Solicitação: - - codigo - usuario - sistema - casa_legislativa diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index 47d528d1..afe07972 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -5,7 +5,7 @@ from captcha.fields import CaptchaField from crispy_forms.helper import FormHelper -from crispy_forms.layout import Fieldset, Layout, Submit +from crispy_forms.layout import HTML, Fieldset, Layout, Submit from django import forms from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm, SetPasswordForm) @@ -25,6 +25,60 @@ from .models import Telefone, Usuario +class ResponsavelForm(ModelForm): + responsavel = forms.TypedChoiceField( + widget=forms.Select(), + label=_(u'Responsavel?'), + choices=YES_NO_CHOICES) + + class Meta(object): + model = Usuario + fields = ['responsavel'] + + def __init__(self, *args, **kwargs): + super(ResponsavelForm, self).__init__(*args, **kwargs) + row1 = sigi.apps.crispy_layout_mixin.to_row([(u'responsavel', 12)]) + + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset(_(u'Atestar Responsável'), + HTML(u'''

+ Ao atestar a responsabilidade deste convênio você + estará assumindo responsabilidade por qualquer + problema que poderá ocorrer pela existência de dados + incorretos.

'''), + row1, + form_actions( + save_label='Atestar'))) + + +class ConveniadoForm(ModelForm): + conveniado = forms.TypedChoiceField( + widget=forms.Select(), + label=_(u'Conveniado?'), + choices=YES_NO_CHOICES) + + class Meta(object): + model = Usuario + fields = ['conveniado'] + + def __init__(self, *args, **kwargs): + super(ConveniadoForm, self).__init__(*args, **kwargs) + row1 = sigi.apps.crispy_layout_mixin.to_row([(u'conveniado', 12)]) + + self.helper = FormHelper() + self.helper.layout = Layout( + Fieldset(_(u'Atestar Conveniado'), + HTML(u'''

+ Ao atestar o convênio deste usuário você estará + assumindo resonsabilidade por qualquer problema + que poderá ocorrer pela existência de dados + incorretos.

'''), + row1, + form_actions( + save_label='Atestar'))) + + class LoginForm(AuthenticationForm): username = forms.CharField( label=u"Username", max_length=30, diff --git a/sigi/apps/usuarios/migrations/0007_auto_20160628_1609.py b/sigi/apps/usuarios/migrations/0007_auto_20160628_1609.py new file mode 100644 index 00000000..65c2839f --- /dev/null +++ b/sigi/apps/usuarios/migrations/0007_auto_20160628_1609.py @@ -0,0 +1,29 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-28 16:09 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0006_remove_usuario_search_text'), + ] + + operations = [ + migrations.RemoveField( + model_name='usuario', + name='habilitado', + ), + migrations.AlterField( + model_name='usuario', + name='conveniado', + field=models.BooleanField(default=False, verbose_name='Conveniado?'), + ), + migrations.AlterField( + model_name='usuario', + name='responsavel', + field=models.BooleanField(default=False, verbose_name='Rspons\xe1vel?'), + ), + ] diff --git a/sigi/apps/usuarios/migrations/0008_atesto.py b/sigi/apps/usuarios/migrations/0008_atesto.py new file mode 100644 index 00000000..f6abff95 --- /dev/null +++ b/sigi/apps/usuarios/migrations/0008_atesto.py @@ -0,0 +1,31 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-29 13:56 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('usuarios', '0007_auto_20160628_1609'), + ] + + operations = [ + migrations.CreateModel( + name='Atesto', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('data', models.DateTimeField(default=django.utils.timezone.now)), + ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), + ], + options={ + 'verbose_name': 'Atesto', + 'verbose_name_plural': 'Atestos', + }, + ), + ] diff --git a/sigi/apps/usuarios/migrations/0009_usuario_atesto_conveniado.py b/sigi/apps/usuarios/migrations/0009_usuario_atesto_conveniado.py new file mode 100644 index 00000000..433ebcf9 --- /dev/null +++ b/sigi/apps/usuarios/migrations/0009_usuario_atesto_conveniado.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-29 13:57 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0008_atesto'), + ] + + operations = [ + migrations.AddField( + model_name='usuario', + name='atesto_conveniado', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='usuarios.Atesto'), + ), + ] diff --git a/sigi/apps/usuarios/migrations/0010_auto_20160629_1448.py b/sigi/apps/usuarios/migrations/0010_auto_20160629_1448.py new file mode 100644 index 00000000..4955547a --- /dev/null +++ b/sigi/apps/usuarios/migrations/0010_auto_20160629_1448.py @@ -0,0 +1,45 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-29 14:48 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0009_usuario_atesto_conveniado'), + ] + + operations = [ + migrations.CreateModel( + name='AtestoConvenio', + fields=[ + ('atesto_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='usuarios.Atesto')), + ], + bases=('usuarios.atesto',), + ), + migrations.CreateModel( + name='AtestoResponsavel', + fields=[ + ('atesto_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='usuarios.Atesto')), + ], + bases=('usuarios.atesto',), + ), + migrations.AlterField( + model_name='usuario', + name='atesto_conveniado', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='usuarios.AtestoConvenio'), + ), + migrations.AlterField( + model_name='usuario', + name='responsavel', + field=models.BooleanField(default=False, verbose_name='Respons\xe1vel?'), + ), + migrations.AddField( + model_name='usuario', + name='atesto_responsavel', + field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='usuarios.AtestoResponsavel'), + ), + ] diff --git a/sigi/apps/usuarios/models.py b/sigi/apps/usuarios/models.py index 024324ef..95c07231 100644 --- a/sigi/apps/usuarios/models.py +++ b/sigi/apps/usuarios/models.py @@ -64,6 +64,23 @@ class Meta(object): verbose_name_plural = _(u'Emails') +class Atesto(models.Model): + user = models.ForeignKey(User) + data = models.DateTimeField(default=timezone.now) + + class Meta(object): + verbose_name = _(u'Atesto') + verbose_name_plural = _(u'Atestos') + + +class AtestoResponsavel(Atesto): + pass + + +class AtestoConvenio(Atesto): + pass + + class Usuario(models.Model): u''' Usuário cadastrado via web @@ -89,11 +106,6 @@ class Usuario(models.Model): email = email = models.EmailField(unique=True, verbose_name=_(u'Email')) email_confirmado = models.BooleanField( default=False, verbose_name=_(u'Email confirmado?')) - habilitado = models.BooleanField( - default=False, - verbose_name=_(u'Habilitado?')) - conveniado = models.BooleanField(default=False) - responsavel = models.BooleanField(default=False) rg = models.CharField( max_length=9, null=True, @@ -121,6 +133,15 @@ class Usuario(models.Model): verbose_name=_(u'Casa Legislativa') ) + responsavel = models.BooleanField( + default=False, + verbose_name=_(u'Responsável?')) + conveniado = models.BooleanField( + default=False, + verbose_name=_(u'Conveniado?')) + atesto_conveniado = models.ForeignKey(AtestoConvenio, null=True) + atesto_responsavel = models.ForeignKey(AtestoResponsavel, null=True) + class Meta(object): verbose_name = _(u'Usuário') verbose_name_plural = _(u'Usuários') diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index d9be142e..93dfdc29 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -9,15 +9,17 @@ from sigi.apps.usuarios.forms import (LoginForm, RecuperacaoMudarSenhaForm, RecuperarSenhaEmailForm) -from sigi.apps.usuarios.views import (ConfirmarEmailView, HabilitarDetailView, +from sigi.apps.usuarios.views import (ConfirmarEmailView, ConveniadoListView, + ConveniadoView, HabilitarDetailView, HabilitarEditView, MudarSenhaView, + ResponsavelListView, ResponsavelView, UsuarioCrud) from .apps import AppConfig app_name = AppConfig.name -EMAIL_SEND_USER='atendimento@interlegis.leg.br' +EMAIL_SEND_USER = 'atendimento@interlegis.leg.br' recuperar_email = [ url(ur'^atendimento/recuperar/recuperar_senha/$', @@ -60,6 +62,17 @@ HabilitarEditView.as_view(), name=u'habilitar_edit'), url(ur'^atendimento/usuario/(?P\d+)/mudar_senha$', MudarSenhaView.as_view(), name=u'mudar_senha'), - url(ur'^usuario/confirmar/(?P[0-9A-Za-z_\-]+)/(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', + url(ur'^usuario/confirmar/(?P[0-9A-Za-z_\-]+)/' + '(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', ConfirmarEmailView.as_view(), name=u'confirmar_email'), + + url(ur'^responsavel$', ResponsavelListView.as_view(), + name=u'responsavel_list'), + url(ur'^responsavel/(?P\d+)/$', ResponsavelView.as_view(), + name=u'responsavel_update'), + + url(ur'^convenio$', ConveniadoListView.as_view(), + name=u'convenio_list'), + url(ur'^convenio/(?P\d+)/$', ConveniadoView.as_view(), + name=u'convenio_update'), ] diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 321627a3..e795e6a6 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -7,21 +7,126 @@ from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin from django.contrib.auth.tokens import default_token_generator +from django.core.exceptions import ObjectDoesNotExist from django.core.mail import send_mail from django.core.urlresolvers import reverse +from django.http import HttpResponseRedirect from django.shortcuts import redirect from django.utils import timezone from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_decode, urlsafe_base64_encode -from django.views.generic import DetailView, FormView, TemplateView +from django.views.generic import (CreateView, DetailView, FormView, ListView, + TemplateView) +from django.views.generic.edit import FormMixin from sigi.apps.crud.base import (Crud, CrudBaseMixin, CrudCreateView, CrudDetailView, CrudListView, CrudUpdateView) from sigi.apps.crud.utils import str2bool -from .forms import (HabilitarEditForm, MudarSenhaForm, UsuarioEditForm, - UsuarioForm) -from .models import ConfirmaEmail, User, Usuario +from .forms import (ConveniadoForm, HabilitarEditForm, MudarSenhaForm, + ResponsavelForm, UsuarioEditForm, UsuarioForm) +from .models import (AtestoConvenio, AtestoResponsavel, ConfirmaEmail, User, + Usuario) + + +class ResponsavelListView(ListView): + template_name = u'usuarios/responsavel_list.html' + model = Usuario + queryset = Usuario.objects.filter(conveniado=True, responsavel=False) + ordering = [u'nome_completo', u'casa_legislativa'] + + +class ConveniadoListView(ListView): + template_name = u'usuarios/convenio_list.html' + model = Usuario + queryset = Usuario.objects.filter(conveniado=False, responsavel=False) + ordering = [u'casa_legislativa'] + + +class ConveniadoView(CreateView): + template_name = u'usuarios/convenio.html' + form_class = ConveniadoForm + + def post(self, request, *args, **kwargs): + form = ConveniadoForm(request.POST) + usuario = Usuario.objects.get(pk=self.kwargs['pk']) + + if usuario.atesto_conveniado: + atesto = usuario.atesto_conveniado + atesto.data = timezone.now() + atesto.user = request.user + atesto.save() + else: + atesto = AtestoConvenio.objects.create( + data=timezone.now(), user=request.user) + + usuario.atesto_conveniado = atesto + usuario.conveniado = form.data['conveniado'] + + usuario.save() + return HttpResponseRedirect(self.get_success_url()) + + def get_context_data(self, **kwargs): + context = {} + context = super(ConveniadoView, self).get_context_data(**kwargs) + context[u'usuario'] = self.get_object() + context[u'casa'] = self.get_object().casa_legislativa + return context + + def get_object(self, queryset=None): + obj = Usuario.objects.get(pk=self.kwargs['pk']) + return obj + + def get_initial(self): + if self.get_object(): + self.initial[u'conveniado'] = self.get_object().conveniado + return self.initial.copy() + + def get_success_url(self): + return reverse(u'usuarios:convenio_list') + + +class ResponsavelView(CreateView): + template_name = u'usuarios/responsavel.html' + form_class = ResponsavelForm + + def post(self, request, *args, **kwargs): + form = ResponsavelForm(request.POST) + usuario = Usuario.objects.get(pk=self.kwargs['pk']) + + if usuario.atesto_responsavel: + atesto = usuario.atesto_responsavel + atesto.data = timezone.now() + atesto.user = request.user + atesto.save() + else: + atesto = AtestoResponsavel.objects.create( + data=timezone.now(), user=request.user) + + usuario.atesto_responsavel = atesto + usuario.responsavel = form.data['responsavel'] + + usuario.save() + return HttpResponseRedirect(self.get_success_url()) + + def get_context_data(self, **kwargs): + context = {} + context = super(ResponsavelView, self).get_context_data(**kwargs) + context[u'usuario'] = self.get_object() + context[u'casa'] = self.get_object().casa_legislativa + return context + + def get_object(self, queryset=None): + obj = Usuario.objects.get(pk=self.kwargs['pk']) + return obj + + def get_initial(self): + if self.get_object(): + self.initial[u'responsavel'] = self.get_object().responsavel + return self.initial.copy() + + def get_success_url(self): + return reverse(u'usuarios:responsavel_list') class UsuarioCrud(Crud): diff --git a/templates/usuarios/convenio.html b/templates/usuarios/convenio.html new file mode 100644 index 00000000..4c2aded0 --- /dev/null +++ b/templates/usuarios/convenio.html @@ -0,0 +1,24 @@ +{% extends "admin/base_site.html" %} +{% load i18n crispy_forms_tags %} + +{% block content %} + + + + + + + + + +
Dados da Casa Legislativa
+ Casa: {{casa}}
+ CNJ: {{casa.cnpj}}
+ Município: {{casa.municipio}}
+ Email: {{casa.email}}
+ Cep: {{casa.cep}}
+ Página: {{casa.pagina_web}}
+ Telefone: {{casa.telefone}}
+
+ {% crispy form %} +{% endblock %} diff --git a/templates/usuarios/convenio_list.html b/templates/usuarios/convenio_list.html new file mode 100644 index 00000000..28ef331f --- /dev/null +++ b/templates/usuarios/convenio_list.html @@ -0,0 +1,24 @@ +{% extends "admin/base_site.html" %} +{% load i18n crispy_forms_tags %} + +{% block content %} + {% if object_list|length >= 1 %} +
+ Lista para atesto de convênio + + + + + + + {% for object in object_list %} + + + + {% endfor %} +
Casa Legislativa
{{object.casa_legislativa}}
+
+ {% else %} +

Não há nenhum usuário para ser verificado.

+ {% endif %} +{% endblock %} diff --git a/templates/usuarios/responsavel.html b/templates/usuarios/responsavel.html new file mode 100644 index 00000000..0c89ef4d --- /dev/null +++ b/templates/usuarios/responsavel.html @@ -0,0 +1,33 @@ +{% extends "admin/base_site.html" %} +{% load i18n crispy_forms_tags %} + +{% block content %} + + + + + + + + + + + +
Dados informado pelo UsuárioDados da Casa Legislativa
+ Nome completo: {{usuario.nome_completo}}
+ Email: {{usuario.email}}
+ CPF: {{usuario.cpf}}
+ RG: {{usuario.rg}}
+ Cargo: {{usuario.cargo}}
+ Vinculo: {{usuario.vinculo}}
+ 		+ Casa: {{casa}}
+ CNJ: {{casa.cnpj}}
+ Município: {{casa.municipio}}
+ Email: {{casa.email}}
+ Cep: {{casa.cep}}
+ Página: {{casa.pagina_web}}
+ Telefone: {{casa.telefone}}
+
+ {% crispy form %} +{% endblock %} diff --git a/templates/usuarios/responsavel_list.html b/templates/usuarios/responsavel_list.html new file mode 100644 index 00000000..36d1458f --- /dev/null +++ b/templates/usuarios/responsavel_list.html @@ -0,0 +1,26 @@ +{% extends "admin/base_site.html" %} +{% load i18n crispy_forms_tags %} + +{% block content %} + {% if object_list|length >= 1 %} +
+ Lista para atesto de responsável + + + + + + + + {% for object in object_list %} + + + + + {% endfor %} +
Nome UsuárioCasa Legislativa
{{object.nome_completo}}{{object.casa_legislativa}}
+
+ {% else %} +

Não há nenhum usuário para ser verificado.

+ {% endif %} +{% endblock %} From 8a602d8d4b5e7d6181004e100d11403465f4fce2 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Wed, 29 Jun 2016 17:24:52 -0300 Subject: [PATCH 33/63] #38 valida username existente --- sigi/apps/usuarios/forms.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index afe07972..b3a67ede 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -171,6 +171,15 @@ def valida_igualdade(self, texto1, texto2, msg): raise ValidationError(msg) return True + def clean_username(self): + usuario = User.objects.filter( + username=self.cleaned_data[u'username']).exists() + + if usuario: + raise ValidationError(u'Usuário existente.') + + return self.cleaned_data + def clean_primeiro_numero(self): cleaned_data = self.cleaned_data From 11fcec12137425b1e12a06a88f5493c49f141942 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 14:29:22 -0300 Subject: [PATCH 34/63] =?UTF-8?q?#47=20mostra=20conv=C3=AAnios=20da=20casa?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/home/templatetags/menu_conf.yaml | 4 ++-- sigi/apps/usuarios/forms.py | 4 ++-- sigi/apps/usuarios/urls.py | 8 ++++---- sigi/apps/usuarios/views.py | 2 ++ templates/usuarios/convenio.html | 6 ++++++ 5 files changed, 16 insertions(+), 8 deletions(-) diff --git a/sigi/apps/home/templatetags/menu_conf.yaml b/sigi/apps/home/templatetags/menu_conf.yaml index 23ed5e22..f048b905 100644 --- a/sigi/apps/home/templatetags/menu_conf.yaml +++ b/sigi/apps/home/templatetags/menu_conf.yaml @@ -127,6 +127,6 @@ main_menu: url: '/' children: - title: Convênio - url: convenio + url: atesto/convenio - title: Responsável - url: responsavel + url: atesto/responsavel diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index b3a67ede..69046f62 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -43,7 +43,7 @@ def __init__(self, *args, **kwargs): self.helper.layout = Layout( Fieldset(_(u'Atestar Responsável'), HTML(u'''

- Ao atestar a responsabilidade deste convênio você + Ao atestar o vínculo deste usuário com esta casa você estará assumindo responsabilidade por qualquer problema que poderá ocorrer pela existência de dados incorretos.

'''), @@ -70,7 +70,7 @@ def __init__(self, *args, **kwargs): self.helper.layout = Layout( Fieldset(_(u'Atestar Conveniado'), HTML(u'''

- Ao atestar o convênio deste usuário você estará + Ao atestar o convênio desta casa você estará assumindo resonsabilidade por qualquer problema que poderá ocorrer pela existência de dados incorretos.

'''), diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index 93dfdc29..ca235f42 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -66,13 +66,13 @@ '(?P[0-9A-Za-z]{1,13}-[0-9A-Za-z]{1,20})$', ConfirmarEmailView.as_view(), name=u'confirmar_email'), - url(ur'^responsavel$', ResponsavelListView.as_view(), + url(ur'^atesto/responsavel$', ResponsavelListView.as_view(), name=u'responsavel_list'), - url(ur'^responsavel/(?P\d+)/$', ResponsavelView.as_view(), + url(ur'^atesto/responsavel/(?P\d+)/$', ResponsavelView.as_view(), name=u'responsavel_update'), - url(ur'^convenio$', ConveniadoListView.as_view(), + url(ur'^atesto/convenio$', ConveniadoListView.as_view(), name=u'convenio_list'), - url(ur'^convenio/(?P\d+)/$', ConveniadoView.as_view(), + url(ur'^atesto/convenio/(?P\d+)/$', ConveniadoView.as_view(), name=u'convenio_update'), ] diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index e795e6a6..e80391ce 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -71,6 +71,8 @@ def get_context_data(self, **kwargs): context = super(ConveniadoView, self).get_context_data(**kwargs) context[u'usuario'] = self.get_object() context[u'casa'] = self.get_object().casa_legislativa + context[u'convenios'] = self.get_object( + ).casa_legislativa.convenio_set.all() return context def get_object(self, queryset=None): diff --git a/templates/usuarios/convenio.html b/templates/usuarios/convenio.html index 4c2aded0..afa93364 100644 --- a/templates/usuarios/convenio.html +++ b/templates/usuarios/convenio.html @@ -6,6 +6,7 @@ Dados da Casa Legislativa + Convênio(s) da Casa Legislativa @@ -18,6 +19,11 @@ Página: {{casa.pagina_web}}
Telefone: {{casa.telefone}}
+ + {% for c in convenios %} + {{c}}
+ {% endfor %} + {% crispy form %} From 89c70a24e3ad311b691b09d53dacc9fa045b5732 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 30 Jun 2016 14:08:52 -0300 Subject: [PATCH 35/63] =?UTF-8?q?Corrige=20link=20de=20confirma=C3=A7?= =?UTF-8?q?=C3=A3o=20de=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luciano Almeida --- sigi/apps/usuarios/views.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index e80391ce..2ec5e350 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -153,12 +153,14 @@ def get_success_url(self): kwargs[u'uidb64'] = confirmar_email.user_id assunto = u"Cadastro no Sistema de Atendimento ao Usuário" full_url = self.request.get_raw_uri(), - url_base = full_url[0][:full_url[0].find(u'usuario') - 1], + url_base = full_url[0][:full_url[0].find(u'atendimento') - 1], mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + u"Sistema de Atendimento ao Usuário do Interlegis.\n" + - u"Caso você não tenha feito este cadastro, por favor" + - u" ignore esta mensagem.\n" + url_base[0] + - reverse(u'usuarios:confirmar_email', kwargs=kwargs)) + u"Clique no link abaixo para confirmar o cadastro:\n\n" + + url_base[0] + + reverse(u'usuarios:confirmar_email', kwargs=kwargs) + + u"\n\nCaso você não tenha feito este cadastro, " + + u"por favor, ignore esta mensagem.\n") remetente = settings.EMAIL_HOST_USER destinatario = [confirmar_email.email, settings.EMAIL_HOST_USER] From 02fdb00fde0209629595fc596a3b8b71b9216510 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 30 Jun 2016 14:45:59 -0300 Subject: [PATCH 36/63] =?UTF-8?q?Corrige=20cadastro=20de=20usu=C3=A1rio,?= =?UTF-8?q?=20atualiza=C3=A7=C3=A3o=20de=20perfil=20e=20envio=20de=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luciano Almeida --- sigi/apps/usuarios/forms.py | 16 ++++++++++------ sigi/apps/usuarios/views.py | 5 ++--- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index 69046f62..e204d5f7 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -172,13 +172,14 @@ def valida_igualdade(self, texto1, texto2, msg): return True def clean_username(self): + # import ipdb; ipdb.set_trace() usuario = User.objects.filter( username=self.cleaned_data[u'username']).exists() if usuario: raise ValidationError(u'Usuário existente.') - return self.cleaned_data + return self.cleaned_data[u'username'] def clean_primeiro_numero(self): cleaned_data = self.cleaned_data @@ -190,7 +191,7 @@ def clean_primeiro_numero(self): telefone.principal = self.data[u'primeiro_principal'] cleaned_data[u'primeiro_telefone'] = telefone - return cleaned_data + return self.cleaned_data[u'primeiro_numero'] def clean_segundo_numero(self): cleaned_data = self.cleaned_data @@ -202,14 +203,13 @@ def clean_segundo_numero(self): telefone.principal = self.data[u'segundo_principal'] cleaned_data[u'segundo_telefone'] = telefone - return cleaned_data + return self.cleaned_data[u'segundo_numero'] def valida_email_existente(self): return Usuario.objects.filter( email=self.cleaned_data[u'email']).exists() def clean(self): - if (u'password' not in self.cleaned_data or u'password_confirm' not in self.cleaned_data): raise ValidationError(_(u'Favor informar senhas atuais ou novas')) @@ -309,15 +309,20 @@ def __init__(self, *args, **kwargs): self.fields.pop(u'password') self.fields.pop(u'password_confirm') + def clean_username(self): + pass + def valida_email_existente(self): u'''Não permite atualizar emails para emails existentes de outro usuário ''' + return Usuario.objects.filter( email=self.cleaned_data[u'email']).exclude( - user__username=self.cleaned_data[u'username']).exists() + user__username=self.data[u'username']).exists() def clean(self): + self.cleaned_data[u'username'] = self.data[u'username'] if (u'email' not in self.cleaned_data or u'email_confirm' not in self.cleaned_data): raise ValidationError(_(u'Favor informar endereços de email')) @@ -327,7 +332,6 @@ def clean(self): self.cleaned_data[u'email'], self.cleaned_data[u'email_confirm'], msg) - email_existente = self.valida_email_existente() if email_existente: diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 2ec5e350..a0bd74c9 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -161,9 +161,8 @@ def get_success_url(self): reverse(u'usuarios:confirmar_email', kwargs=kwargs) + u"\n\nCaso você não tenha feito este cadastro, " + u"por favor, ignore esta mensagem.\n") - remetente = settings.EMAIL_HOST_USER - destinatario = [confirmar_email.email, - settings.EMAIL_HOST_USER] + remetente = settings.EMAIL_SEND_USER + destinatario = [confirmar_email.email] send_mail(assunto, mensagem, remetente, destinatario, fail_silently=False) return reverse(u'index_atendimento') From 9decb74cd8ba0e9df1c5ab30864a716c5ae26021 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 15:38:28 -0300 Subject: [PATCH 37/63] =?UTF-8?q?Adiciona=20permiss=C3=A3o=20COADFI,=20COP?= =?UTF-8?q?LAF=20e=20Usuario=5FHabilitado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- scripts/atendimento/criar_grupos.py | 15 +++++++++++++ sigi/apps/solicitacoes/views.py | 16 +++++++++++--- .../migrations/0011_delete_subsecretaria.py | 18 ++++++++++++++++ sigi/apps/usuarios/models.py | 15 ------------- sigi/apps/usuarios/views.py | 21 ++++++++++++++----- templates/base.html | 1 - 6 files changed, 62 insertions(+), 24 deletions(-) create mode 100644 scripts/atendimento/criar_grupos.py create mode 100644 sigi/apps/usuarios/migrations/0011_delete_subsecretaria.py diff --git a/scripts/atendimento/criar_grupos.py b/scripts/atendimento/criar_grupos.py new file mode 100644 index 00000000..e870269f --- /dev/null +++ b/scripts/atendimento/criar_grupos.py @@ -0,0 +1,15 @@ +from django.contrib.auth.models import Group + + +def criar_grupos(): + # COPLAF = Atestar usuário + if not Group.objects.filter(name='COPLAF').exists(): + Group.objects.create(name='COPLAF') + + # COADFI = Atestar convênio + if not Group.objects.filter(name='COADFI').exists(): + Group.objects.create(name='COADFI') + + # Já recebeu aprovação dos dois grupos de cima + if not Group.objects.filter(name='Usuario_Habilitado').exists(): + Group.objects.create(name='Usuario_Habilitado') diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index afebd168..6dae6d05 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -2,6 +2,7 @@ import random +from braces.views import GroupRequiredMixin from django.contrib.auth.mixins import LoginRequiredMixin from django.core.urlresolvers import reverse @@ -9,25 +10,34 @@ from sigi.apps.crud.base import (Crud, CrudBaseMixin, CrudCreateView, CrudListView, CrudUpdateView) from sigi.apps.usuarios.models import Usuario +from sigi.context_processors import recupera_usuario from .forms import SolicitacaoForm from .models import Solicitacao -from sigi.context_processors import recupera_usuario class SolicitacaoCrud(LoginRequiredMixin, Crud): model = Solicitacao help_path = u'' - class ListView(LoginRequiredMixin, CrudListView): + class ListView(CrudListView): def get_rows(self, object_list): object_list = Solicitacao.objects.filter( usuario=recupera_usuario(self.request)) return [self._as_row(obj) for obj in object_list] - class CreateView(LoginRequiredMixin, CrudCreateView): + class UpdateView(GroupRequiredMixin, CrudUpdateView): + # TODO: Usado para ngm ter acesso + group_required = u'admin' + + class CrudDeleteView(GroupRequiredMixin, CrudUpdateView): + # TODO: Usado para ngm ter acesso + group_required = u'admin' + + class CreateView(GroupRequiredMixin, CrudCreateView): form_class = SolicitacaoForm + group_required = u'Usuario_Habilitado' def get_initial(self): try: diff --git a/sigi/apps/usuarios/migrations/0011_delete_subsecretaria.py b/sigi/apps/usuarios/migrations/0011_delete_subsecretaria.py new file mode 100644 index 00000000..a2c1bddf --- /dev/null +++ b/sigi/apps/usuarios/migrations/0011_delete_subsecretaria.py @@ -0,0 +1,18 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-30 12:52 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('usuarios', '0010_auto_20160629_1448'), + ] + + operations = [ + migrations.DeleteModel( + name='Subsecretaria', + ), + ] diff --git a/sigi/apps/usuarios/models.py b/sigi/apps/usuarios/models.py index 95c07231..589b4601 100644 --- a/sigi/apps/usuarios/models.py +++ b/sigi/apps/usuarios/models.py @@ -12,21 +12,6 @@ from sigi.apps.utils import SearchField -class Subsecretaria(models.Model): - - nome = models.CharField(verbose_name=_(u'Nome'), max_length=100, null=True) - sigla = models.CharField(verbose_name=_(u'Sigla'), - max_length=10, null=True) - - class Meta(object): - ordering = (u'nome', u'sigla') - verbose_name = _(u'Subsecretaria') - verbose_name_plural = _(u'Subsecretarias') - - def __str__(self): - return u'[%s] %s' % (self.sigla, self.nome) - - class Telefone(models.Model): TIPO_TELEFONE = [(u'FIXO', u'FIXO'), (u'CELULAR', u'CELULAR')] diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index a0bd74c9..2d67804b 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -2,10 +2,11 @@ from __future__ import absolute_import -from braces.views import FormValidMessageMixin +from braces.views import FormValidMessageMixin, GroupRequiredMixin from django.conf import settings from django.contrib.auth.decorators import login_required from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.models import Group from django.contrib.auth.tokens import default_token_generator from django.core.exceptions import ObjectDoesNotExist from django.core.mail import send_mail @@ -29,23 +30,31 @@ Usuario) -class ResponsavelListView(ListView): +def habilitar_usuario(usuario): + grupo = Group.objects.get(name='Usuario_Habilitado') + usuario.user.groups.add(grupo) + + +class ResponsavelListView(GroupRequiredMixin, ListView): template_name = u'usuarios/responsavel_list.html' model = Usuario queryset = Usuario.objects.filter(conveniado=True, responsavel=False) ordering = [u'nome_completo', u'casa_legislativa'] + group_required = u'COPLAF' -class ConveniadoListView(ListView): +class ConveniadoListView(GroupRequiredMixin, ListView): template_name = u'usuarios/convenio_list.html' model = Usuario queryset = Usuario.objects.filter(conveniado=False, responsavel=False) ordering = [u'casa_legislativa'] + group_required = u'COADFI' -class ConveniadoView(CreateView): +class ConveniadoView(GroupRequiredMixin, CreateView): template_name = u'usuarios/convenio.html' form_class = ConveniadoForm + group_required = u'COADFI' def post(self, request, *args, **kwargs): form = ConveniadoForm(request.POST) @@ -88,9 +97,10 @@ def get_success_url(self): return reverse(u'usuarios:convenio_list') -class ResponsavelView(CreateView): +class ResponsavelView(GroupRequiredMixin, CreateView): template_name = u'usuarios/responsavel.html' form_class = ResponsavelForm + group_required = u'COPLAF' def post(self, request, *args, **kwargs): form = ResponsavelForm(request.POST) @@ -107,6 +117,7 @@ def post(self, request, *args, **kwargs): usuario.atesto_responsavel = atesto usuario.responsavel = form.data['responsavel'] + habilitar_usuario(usuario) usuario.save() return HttpResponseRedirect(self.get_success_url()) diff --git a/templates/base.html b/templates/base.html index 7c5d5032..8df5d7eb 100644 --- a/templates/base.html +++ b/templates/base.html @@ -37,7 +37,6 @@
From fb1eaf8e8c0850ec3329dbb99f423f1797029e9d Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 15:56:32 -0300 Subject: [PATCH 38/63] Muda template do detalhe de perfil do usuario --- templates/usuarios/habilitar_detail.html | 38 ---------------------- templates/usuarios/usuario_detail.html | 40 +++++++++++------------- 2 files changed, 19 insertions(+), 59 deletions(-) delete mode 100644 templates/usuarios/habilitar_detail.html diff --git a/templates/usuarios/habilitar_detail.html b/templates/usuarios/habilitar_detail.html deleted file mode 100644 index dba5a239..00000000 --- a/templates/usuarios/habilitar_detail.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "crud/detail.html" %} -{% load i18n %} - -{% block actions %} -
- {% trans 'Editar' %} -
-{% endblock actions %} - -{% block msg %} - {% if not usuario.habilitado %} -

Esse perfil ainda não está habilitado para uso das funcionalidades.

- {% else %} -

Esse perfil já está habilitado para uso das funcionalidades.

- {% endif %} -{% endblock msg %} - -{% block title %} -

Habilitar

-{% endblock %} - -{% block detail_content %} -
-
-
Nome completo:
-
      - {{ usuario.nome_completo }}
-
Email:
-
      - {{ usuario.email }}
-
CPF:
-
      - {{ usuario.cpf }}
-
Cargo:
-
      - {{ usuario.cargo }}
-
Vinculo:
-
      - {{ usuario.vinculo }}
-
Casa Legislativa:
-
      - {{ usuario.casa_legislativa }}
-
-{% endblock detail_content %} diff --git a/templates/usuarios/usuario_detail.html b/templates/usuarios/usuario_detail.html index 3e01626b..441ffa96 100644 --- a/templates/usuarios/usuario_detail.html +++ b/templates/usuarios/usuario_detail.html @@ -7,25 +7,23 @@
{% endblock actions %} -{% block msg %} - {% if not usuario.habilitado %} -

Esse perfil ainda não está habilitado para uso das funcionalidades.

- {% else %} -

Esse perfil já está habilitado para uso das funcionalidades.

- {% endif %} -{% endblock msg %} - -{% block extrablock %} - - {% for tel in telefones %} -
-
-

{{tel|first}}

-
-

{{ tel|last }}

-
-
-
- {% endfor %} - +{% block detail_content %} +
+ + + + + + + + + + + + +
Nome de Usuário: {{object.username}}
Nome completo: {{object.nome_completo}}
Email: {{object.email}}
CPF: {{object.cpf}}
RG: {{object.rg}}
Casa Legislativa: {{object.casa_legislativa}}
Cargo: {{object.cargo}}
Vínculo: {{object.vinculo}}
Telefone(s): + {% for tel in telefones %} + {{tel|last}}
+ {% endfor %} +
{% endblock %} From 96861958990ccd9d5a418747584aa286797156b8 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 30 Jun 2016 15:58:42 -0300 Subject: [PATCH 39/63] =?UTF-8?q?Cria=20instancia=20de=20servidor=20soment?= =?UTF-8?q?e=20se=20User=20n=C3=A3o=20for=20staff?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luciano Almeida --- sigi/apps/servidores/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sigi/apps/servidores/models.py b/sigi/apps/servidores/models.py index 58653cdc..204fb5fb 100644 --- a/sigi/apps/servidores/models.py +++ b/sigi/apps/servidores/models.py @@ -149,6 +149,7 @@ def __unicode__(self): # Soluçao alternativa para extender o usuário do django # Acessa do servidor de um objeto user criando um profile # baseado nos dados do LDAP + User.servidor = property(lambda user: Servidor.objects.get(user=user)) # Sinal para ao criar um usuário criar um servidor @@ -156,7 +157,7 @@ def __unicode__(self): def create_user_profile(sender, instance, created, **kwargs): - if created: + if created and instance.is_staff: Servidor.objects.create( user=instance, nome_completo="%s %s" % (instance.first_name, instance.last_name) From a7f8c54f9751883e1a77469fd71eedb06245d185 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 16:03:33 -0300 Subject: [PATCH 40/63] Muda tamanho da coluna na tabela de perfil --- templates/usuarios/usuario_detail.html | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/templates/usuarios/usuario_detail.html b/templates/usuarios/usuario_detail.html index 441ffa96..1f60fa9c 100644 --- a/templates/usuarios/usuario_detail.html +++ b/templates/usuarios/usuario_detail.html @@ -10,15 +10,15 @@ {% block detail_content %}
- - - - - - - - - + + + + + + + + + + src="{% static srv.hospedagem_interlegis|yesno:'admin/img/icon-yes.svg,admin/img/icon-no.svg' %}"> From 3486863fa2fdaaf14c3370593c02bbab1403b96a Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Mon, 15 Aug 2016 11:53:16 -0300 Subject: [PATCH 55/63] Fix some test that was failing Signed-off-by: Luciano Almeida --- sigi/apps/casas/test_casas.py | 3 ++- .../migrations/0003_auto_20160811_1553.py | 20 +++++++++++++++++++ sigi/apps/parlamentares/models.py | 3 ++- .../management/commands/test_sync_ldap.py | 12 ++++++----- .../migrations/0003_auto_20160811_1553.py | 20 +++++++++++++++++++ sigi/apps/servidores/models.py | 3 ++- sigi/settings/test.py | 8 +++++++- 7 files changed, 60 insertions(+), 9 deletions(-) create mode 100644 sigi/apps/parlamentares/migrations/0003_auto_20160811_1553.py create mode 100644 sigi/apps/servidores/migrations/0003_auto_20160811_1553.py diff --git a/sigi/apps/casas/test_casas.py b/sigi/apps/casas/test_casas.py index 9e113c15..ad95dee8 100644 --- a/sigi/apps/casas/test_casas.py +++ b/sigi/apps/casas/test_casas.py @@ -14,4 +14,5 @@ def some_parliaments(): def parliaments_from_names(names): - return [G(CasaLegislativa, nome=name, foto=None, gerente_contas=None,) for name in names] + return [G(CasaLegislativa, nome=name, foto=None, gerente_contas=None, + pesquisador=None,) for name in names] diff --git a/sigi/apps/parlamentares/migrations/0003_auto_20160811_1553.py b/sigi/apps/parlamentares/migrations/0003_auto_20160811_1553.py new file mode 100644 index 00000000..dbb1aad1 --- /dev/null +++ b/sigi/apps/parlamentares/migrations/0003_auto_20160811_1553.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-08-11 15:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('parlamentares', '0002_auto_20160623_0829'), + ] + + operations = [ + migrations.AlterField( + model_name='parlamentar', + name='foto', + field=models.ImageField(blank=True, height_field=b'foto_altura', null=True, upload_to=b'fotos/parlamentares', width_field=b'foto_largura'), + ), + ] diff --git a/sigi/apps/parlamentares/models.py b/sigi/apps/parlamentares/models.py index 2d80d389..176e2b66 100644 --- a/sigi/apps/parlamentares/models.py +++ b/sigi/apps/parlamentares/models.py @@ -27,7 +27,8 @@ class Parlamentar(models.Model): upload_to='fotos/parlamentares', width_field='foto_largura', height_field='foto_altura', - blank=True + blank=True, + null=True ) foto_largura = models.SmallIntegerField(editable=False, null=True) foto_altura = models.SmallIntegerField(editable=False, null=True) diff --git a/sigi/apps/servidores/management/commands/test_sync_ldap.py b/sigi/apps/servidores/management/commands/test_sync_ldap.py index 4cac0241..d7512d01 100644 --- a/sigi/apps/servidores/management/commands/test_sync_ldap.py +++ b/sigi/apps/servidores/management/commands/test_sync_ldap.py @@ -19,11 +19,11 @@ def get_ldap_users(self): def create_stub_user(username, nome_completo, first_name, last_name, email): - user = G(User, username=username, first_name=first_name, last_name=last_name, email=email) + user = G(User, username=username, first_name=first_name, last_name=last_name, email=email, is_staff=True) user.servidor.nome_completo = nome_completo return user -ALEX_LDAP, BRUNO_LDAP, RITA_LDAP = [ +ALEX_LDAP, BRUNO_LDAP, CLAUDIA_LDAP = [ ('...', {'cn': ['Alex Lima'], 'givenName': ['Alex'], @@ -54,6 +54,7 @@ def create_stub_user(username, nome_completo, first_name, last_name, email): [(u'alexlima', u'Alex Lima', u'Alex', u'Lima', u'alexlima@interlegis.leg.br')], u''' User 'alexlima' created. +Servidor 'Alex Lima' created. Users are synchronized. '''), @@ -67,7 +68,7 @@ def create_stub_user(username, nome_completo, first_name, last_name, email): # unicode encoding from LDAP data works well ([('claudia', u'Cláudia de Cássia', u'Cláudia', u'de Cássia', 'claudia@interlegis.leg.br', )], - [RITA_LDAP], + [CLAUDIA_LDAP], [(u'claudia', u'Cláudia de Cássia', u'Cláudia', u'de Cássia', u'claudia@interlegis.leg.br', )], u''' Users are synchronized. @@ -77,7 +78,7 @@ def create_stub_user(username, nome_completo, first_name, last_name, email): ([('alexlima', '___', '___', '___', '___', ), ('bruno', 'Bruno Almeida Prado', '___', 'Almeida Prado', '___', ), ('claudia', '___', u'Cláudia', '___', 'claudia@interlegis.leg.br', )], - [ALEX_LDAP, BRUNO_LDAP, RITA_LDAP], + [ALEX_LDAP, BRUNO_LDAP, CLAUDIA_LDAP], [(u'alexlima', u'Alex Lima', u'Alex', u'Lima', u'alexlima@interlegis.leg.br', ), (u'bruno', u'Bruno Almeida Prado', u'Bruno', u'Almeida Prado', u'bruno@interlegis.leg.br', ), (u'claudia', u'Cláudia de Cássia', u'Cláudia', u'de Cássia', u'claudia@interlegis.leg.br', )], @@ -108,7 +109,7 @@ def create_stub_user(username, nome_completo, first_name, last_name, email): ([(u'alexlima', u'Alex Lima', u'Alex', u'Lima', u'alexlima@interlegis.leg.br', ), (u'bruno', u'Bruno Almeida Prado', u'Bruno', u'Almeida Prado', u'bruno@interlegis.leg.br', ), (u'claudia', u'Cláudia de Cássia', u'Cláudia', u'de Cássia', u'claudia@interlegis.leg.br', )], - [ALEX_LDAP, RITA_LDAP], + [ALEX_LDAP, CLAUDIA_LDAP], [(u'alexlima', u'Alex Lima', u'Alex', u'Lima', u'alexlima@interlegis.leg.br', ), (u'bruno', u'Bruno Almeida Prado', u'Bruno', u'Almeida Prado', u'bruno@interlegis.leg.br', ), (u'claudia', u'Cláudia de Cássia', u'Cláudia', u'de Cássia', u'claudia@interlegis.leg.br', )], @@ -119,6 +120,7 @@ def create_stub_user(username, nome_completo, first_name, last_name, email): def test_sync_users(before, ldap_users, after, messages, capsys): # setup + User.objects.all().delete() for user_setup in before: if type(user_setup) == tuple: create_stub_user(*user_setup) diff --git a/sigi/apps/servidores/migrations/0003_auto_20160811_1553.py b/sigi/apps/servidores/migrations/0003_auto_20160811_1553.py new file mode 100644 index 00000000..9e0e273c --- /dev/null +++ b/sigi/apps/servidores/migrations/0003_auto_20160811_1553.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-08-11 15:53 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('servidores', '0002_auto_20160623_0829'), + ] + + operations = [ + migrations.AlterField( + model_name='servidor', + name='foto', + field=models.ImageField(blank=True, height_field=b'foto_altura', null=True, upload_to=b'fotos/servidores', width_field=b'foto_largura'), + ), + ] diff --git a/sigi/apps/servidores/models.py b/sigi/apps/servidores/models.py index 204fb5fb..e835815f 100644 --- a/sigi/apps/servidores/models.py +++ b/sigi/apps/servidores/models.py @@ -71,7 +71,8 @@ class Servidor(models.Model): upload_to='fotos/servidores', width_field='foto_largura', height_field='foto_altura', - blank=True + blank=True, + null=True ) foto_largura = models.SmallIntegerField(editable=False, null=True) foto_altura = models.SmallIntegerField(editable=False, null=True) diff --git a/sigi/settings/test.py b/sigi/settings/test.py index 094b7102..93dfe903 100644 --- a/sigi/settings/test.py +++ b/sigi/settings/test.py @@ -10,7 +10,13 @@ 'USER': 'sigi', 'PASSWORD': 'sigi', 'HOST': 'localhost', - 'PORT': '5432', + }, + 'moodle': { + 'ENGINE': 'django.db.backends.postgresql_psycopg2', + 'NAME': 'moodle', # will be actually used as "test_sigi" by pytest-django + 'USER': 'saberes', + 'PASSWORD': 'A8oFvFWnvj', + 'HOST': 'bdsaberes02h.interlegis.leg.br', } } From f308b99176f8529b9dc04a3296263500af0c1677 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 18 Aug 2016 18:23:56 -0300 Subject: [PATCH 56/63] Create Dockerfile Signed-off-by: Luciano Almeida --- Dockerfile | 56 ++++++++++++++++++++++++++++++++++++++++++++++ docker-compose.yml | 18 +++++++++++++++ 2 files changed, 74 insertions(+) create mode 100644 Dockerfile diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 00000000..789a107b --- /dev/null +++ b/Dockerfile @@ -0,0 +1,56 @@ +FROM ubuntu:15.04 + +RUN locale-gen en_US.UTF-8 +ENV LANG en_US.UTF-8 +ENV LANGUAGE en_US:en +ENV LC_ALL en_US.UTF-8 + +RUN mkdir /sigi + +RUN apt-get update && \ + apt-get install -y -f \ + build-essential \ + curl \ + git \ + graphviz-dev \ + graphviz \ + libz-dev \ + libffi-dev \ + libfreetype6-dev \ + libjpeg62 \ + libjpeg-dev \ + libldap2-dev \ + libpq-dev \ + libsasl2-dev \ + libssl-dev \ + libxft-dev \ + libxml2-dev \ + libxslt1-dev \ + nginx \ + pkg-config \ + python-dev \ + python-setuptools \ + software-properties-common \ + npm \ + nodejs + +# install nodejs +RUN DEBIAN_FRONTEND=noninteractive curl -sL https://deb.nodesource.com/setup_5.x | bash - +RUN DEBIAN_FRONTEND=noninteractive apt-get install -y nodejs + +# install bower +RUN npm install -g bower + +# Bower aceitar root +RUN touch /root/.bowerrc +RUN chmod 751 /root/.bowerrc +RUN echo "{ \"allow_root\": true }" >> /root/.bowerrc + +ADD . /sigi + +WORKDIR /sigi + +RUN easy_install pip +RUN pip2 install -r requirements/dev-requirements.txt +RUN pip2 install --upgrade setuptools + diff --git a/docker-compose.yml b/docker-compose.yml index bd041929..8702818a 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,3 +1,21 @@ +localhost: + image: postgres + environment: + POSTGRES_PASSWORD: sigi + POSTGRES_USER: sigi + POSTGRES_DB: sigi + ports: + - "5532:5432" +web: + build: . + command: bash -c "python manage.py bower install && python manage.py migrate && python manage.py runserver 0.0.0.0:8000" + volumes: + - .:/sigi + ports: + - "8000:8000" + links: + - localhost + osticket: image: campbellsoftwaresolutions/osticket ports: From ed38ffc1402d0ff82ce1b5d1decf2bc27cb43c12 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Mon, 12 Sep 2016 13:40:17 -0300 Subject: [PATCH 57/63] Add EAV models.py to script folder Signed-off-by: Luciano Almeida --- scripts/eav_models.py | 398 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 398 insertions(+) create mode 100644 scripts/eav_models.py diff --git a/scripts/eav_models.py b/scripts/eav_models.py new file mode 100644 index 00000000..5ddb08a9 --- /dev/null +++ b/scripts/eav_models.py @@ -0,0 +1,398 @@ +# -*- coding: utf-8 -*- +# +# EAV-Django is a reusable Django application which implements EAV data model +# Copyright © 2009—2010 Andrey Mikhaylenko +# +# This file is part of EAV-Django. +# +# EAV-Django is free software: you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# EAV-Django is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with EAV-Django. If not, see . +""" +Models +~~~~~~ +""" + +# django +from django.contrib.contenttypes.models import ContentType +from django.contrib.contenttypes import fields +from django.db.models import (BooleanField, CharField, DateField, FloatField, + ForeignKey, IntegerField, Model, NullBooleanField, + TextField) +from django.utils.translation import ugettext_lazy as _ + +# 3rd-party +from autoslug.fields import AutoSlugField +from autoslug.settings import slugify +#from view_shortcuts.decorators import cached_property + +# this app +from managers import BaseEntityManager + + +__all__ = ['BaseAttribute', 'BaseChoice', 'BaseEntity', 'BaseSchema'] + + +def slugify_attr_name(name): + return slugify(name.replace('_', '-')).replace('-', '_') + + +def get_entity_lookups(entity): + ctype = ContentType.objects.get_for_model(entity) + return {'entity_type': ctype, 'entity_id': entity.pk} + + +class BaseSchema(Model): + """ + Metadata for an attribute. + """ + TYPE_TEXT = 'text' + TYPE_FLOAT = 'float' + TYPE_DATE = 'date' + TYPE_BOOLEAN = 'bool' + TYPE_ONE = 'one' + TYPE_MANY = 'many' + TYPE_RANGE = 'range' + + DATATYPE_CHOICES = ( + (TYPE_TEXT, _('text')), + (TYPE_FLOAT, _('number')), + (TYPE_DATE, _('date')), + (TYPE_BOOLEAN, _('boolean')), + (TYPE_ONE, _('choice')), + (TYPE_MANY, _('multiple choices')), + (TYPE_RANGE, _('numeric range')), + ) + + title = CharField(_('title'), max_length=250, help_text=_('user-friendly attribute name')) + name = AutoSlugField(_('name'), max_length=250, populate_from='title', + editable=True, blank=True, slugify=slugify_attr_name) + help_text = CharField(_('help text'), max_length=250, blank=True, + help_text=_('short description for administrator')) + datatype = CharField(_('data type'), max_length=5, choices=DATATYPE_CHOICES) + + required = BooleanField(_('required'), default=False) + searched = BooleanField(_('include in search'), default=False) # i.e. full-text search? mb for text only + filtered = BooleanField(_('include in filters'), default=False) + sortable = BooleanField(_('allow sorting'), default=False) + + class Meta: + abstract = True + verbose_name, verbose_name_plural = _('schema'), _('schemata') + ordering = ['title'] + + def __unicode__(self): + return u'%s (%s)%s' % (self.title, self.get_datatype_display(), + u' %s'%_('required') if self.required else '') + + def get_choices(self): + """ + Returns a queryset of choice objects bound to this schema. + """ + return self.choices.all() + + def get_attrs(self, entity): + """ + Returns available attributes for given entity instance. + Handles many-to-one relations transparently. + """ + return self.attrs.filter(**get_entity_lookups(entity)) + + def save_attr(self, entity, value): + """ + Saves given EAV attribute with given value for given entity. + + If schema is not a choice, the value is saved to the corresponding + Attr instance (which is created or updated). + + If schema is an cvhoice (one-to-one or many-to-one), the value is + processed thusly: + + * if value is iterable, all Attr instances for corresponding managed choice + schemata are updated (those with names from the value list are set to + True, others to False). If a list item is not in available choices, + ValueError is raised; + * if the value is None, all corresponding Attr instances are reset to False; + * if the value is neither a list nor None, it is wrapped into a list and + processed as above (i.e. "foo" --> ["foo"]). + """ + + if self.datatype in (self.TYPE_ONE, self.TYPE_MANY): + self._save_choice_attr(entity, value) + else: + self._save_single_attr(entity, value) + + def _save_single_attr(self, entity, value=None, schema=None, + create_nulls=False, extra={}): + """ + Creates or updates an EAV attribute for given entity with given value. + + :param schema: schema for attribute. Default it current schema instance. + :param create_nulls: boolean: if True, even attributes with value=None + are created (by default they are skipped). + :param extra: dict: additional data for Attr instance (e.g. title). + """ + # If schema is not many-to-one, the value is saved to the corresponding + # Attr instance (which is created or updated). + + schema = schema or self + lookups = dict(get_entity_lookups(entity), schema=schema, **extra) + try: + attr = self.attrs.get(**lookups) + except self.attrs.model.DoesNotExist: + attr = self.attrs.model(**lookups) + if create_nulls or value != attr.value: + attr.value = value + for k,v in extra.items(): + setattr(attr, k, v) + attr.save() + + def _save_choice_attr(self, entity, value): + """ + Creates or updates BaseChoice(s) attribute(s) for given entity. + """ + + # value can be None to reset choices from schema + if value == None: + value = [] + + if not hasattr(value, '__iter__'): + value = [value] + + if self.datatype == self.TYPE_ONE and len(value) > 1: + raise TypeError('Cannot assign multiple values "%s" to TYPE_ONE ' + 'must be only one BaseChoice instance.' + % value) + + if not all(isinstance(x, BaseChoice) for x in value): + raise TypeError('Cannot assign "%s": "Attr.choice" ' + 'must be a BaseChoice instance.' + % value) + + # drop all attributes for this entity/schema pair + self.get_attrs(entity).delete() + + # Attr instances for corresponding managed choice schemata are updated + for choice in value: + self._save_single_attr( + entity, + schema = self, + create_nulls = True, + extra = {'choice': choice} + ) + + +class BaseEntity(Model): + """ + Entity, the "E" in EAV. This model is abstract and must be subclassed. + See tests for examples. + """ + + objects = BaseEntityManager() + + class Meta: + abstract = True + + def save(self, force_eav=False, **kwargs): + """ + Saves entity instance and creates/updates related attribute instances. + + :param eav: if True (default), EAV attributes are saved along with entity. + """ + # save entity + super(BaseEntity, self).save(**kwargs) + + # TODO: think about use cases; are we doing it right? + #if not self.check_eav_allowed(): + # import warnings + # warnings.warn('EAV attributes are going to be saved along with entity' + # ' despite %s.check_eav_allowed() returned False.' + # % type(self), RuntimeWarning) + + + # create/update EAV attributes + for schema in self.get_schemata(): + value = getattr(self, schema.name, None) + schema.save_attr(self, value) + + def __getattr__(self, name): + if not name.startswith('_'): + if name in self.get_schema_names(): + schema = self.get_schema(name) + attrs = schema.get_attrs(self) + if schema.datatype == schema.TYPE_MANY: + return [a.value for a in attrs if a.value] + else: + return attrs[0].value if attrs else None + raise AttributeError('%s does not have attribute named "%s".' % + (self._meta.object_name, name)) + + def __iter__(self): + "Iterates over non-empty EAV attributes. Normal fields are not included." + for attr in self.attrs.select_related(): + if getattr(self, attr.schema.name, None): + yield attr + + @classmethod + def get_schemata_for_model(cls): + return NotImplementedError('BaseEntity subclasses must define method ' + '"get_schemata_for_model" which returns a ' + 'QuerySet for a BaseSchema subclass.') + + def get_schemata_for_instance(self, qs): + return qs + + def get_schemata(self): + if hasattr(self, '_schemata_cache') and self._schemata_cache is not None: + return self._schemata_cache + all_schemata = self.get_schemata_for_model().select_related() + self._schemata_cache = self.get_schemata_for_instance(all_schemata) + self._schemata_cache_dict = dict((s.name, s) for s in self._schemata_cache) + return self._schemata_cache + + def get_schema_names(self): + if not hasattr(self, '_schemata_cache_dict'): + self.get_schemata() + return self._schemata_cache_dict.keys() + + def get_schema(self, name): + if not hasattr(self, '_schemata_cache_dict'): + self.get_schemata() + return self._schemata_cache_dict[name] + + def get_schema_by_id(self, schema_id): + for schema in self.get_schemata(): + if schema.pk == schema_id: + return schema + + def check_eav_allowed(self): + """ + Returns True if entity instance allows EAV attributes to be attached. + + Can be useful if some external data is required to determine available + schemata and that data may be missing. In such cases this method should + be overloaded to check whether the data is available. + """ + return True + + def is_valid(self): + "Returns True if attributes and their values conform with schema." + + raise NotImplementedError() + + ''' + schemata = self.rubric.schemata.all() + return all(x.is_valid for x in self.attributes) + # 1. check if all required attributes are present + for schema in schemata: + pass + # 2. check if all attributes have appropriate values + for schema in schemata: + pass + return True + ''' + + +class BaseChoice(Model): + """ Base class for choices. Concrete choice class must overload the + `schema` attribute. + """ + title = CharField(max_length=100) + schema = NotImplemented + + class Meta: + abstract = True + ordering = ('title',) + + def __unicode__(self): + return self.title #u'%s "%s"' % (self.schema.title, self.title) + + +class BaseAttribute(Model): + """ Base class for choices. Concrete choice class must overload the + `schema` and `choice` attributes. + """ + entity_type = ForeignKey(ContentType) + entity_id = IntegerField() + entity = fields.GenericForeignKey(ct_field="entity_type", fk_field='entity_id') + + value_text = TextField(blank=True, null=True) + value_float = FloatField(blank=True, null=True) + value_date = DateField(blank=True, null=True) + value_bool = NullBooleanField(blank=True) # TODO: ensure that form invalidates null booleans (??) + value_range_min = FloatField(blank=True, null=True) + value_range_max = FloatField(blank=True, null=True) + + schema = NotImplemented # must be FK + choice = NotImplemented # must be nullable FK + + class Meta: + abstract = True + verbose_name, verbose_name_plural = _('attribute'), _('attributes') + ordering = ['entity_type', 'entity_id', 'schema'] + unique_together = ('entity_type', 'entity_id', 'schema', 'choice') + + def __unicode__(self): + return u'%s: %s "%s"' % (self.entity, self.schema.title, self.value) + + def _get_value(self): + if self.schema.datatype in (self.schema.TYPE_ONE, self.schema.TYPE_MANY): + return self.choice + if self.schema.datatype == self.schema.TYPE_RANGE: + names = ('value_range_%s' % x for x in ('min', 'max')) + value = tuple(getattr(self, x, None) for x in names) + return None if value == (None, None) else value + return getattr(self, 'value_%s' % self.schema.datatype) + + def _set_value(self, new_value): + if self.schema.datatype == self.schema.TYPE_RANGE: + new_value = new_value or (None, None) + + # validate range value -- expecting a tuple of two numbers + try: + validate_range_value(new_value) + except (TypeError, ValueError): + raise + + for k,v in zip('min max'.split(), new_value): + v = v if v is None else float(v) + setattr(self, 'value_range_%s' % k, v) + else: + setattr(self, 'value_%s' % self.schema.datatype, new_value) + + value = property(_get_value, _set_value) + + +def validate_range_value(value): + """ + Validates given value against `Schema.TYPE_RANGE` data type. Raises + TypeError or ValueError if something is wrong. Returns None if everything + is OK. + """ + if value == (None, None): + return + + if not hasattr(value, '__iter__'): + raise TypeError('Range value must be an iterable, got "%s".' % value) + if not 2 == len(value): + raise ValueError('Range value must consist of two elements, got %d.' % + len(value)) + if not all(isinstance(x, (int,float)) for x in value): + raise TypeError('Range value must consist of two numbers, got "%s" ' + 'and "%s" instead.' % value) + if not value[0] <= value[1]: + raise ValueError('Range must consist of min and max values (min <= ' + 'max) but got "%s" and "%s" instead.' % value) + return + + +# xxx catch signal Attr.post_save() --> update attr.item.attribute_cache (JSONField or such) From 3f96ccb916d14e35b0cb16f94b6a78272f37aaa7 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Mon, 12 Sep 2016 17:05:13 -0300 Subject: [PATCH 58/63] Correct lots of deprecation warnings mainly in url.py files Signed-off-by: Luciano Almeida --- moodlerouter.py | 4 +- sigi/apps/casas/urls.py | 38 ++++++------- sigi/apps/convenios/urls.py | 21 ++++--- sigi/apps/diagnosticos/urls.py | 56 ++++++++++--------- sigi/apps/diagnosticos/views.py | 2 +- sigi/apps/eventos/urls.py | 12 ++-- sigi/apps/home/urls.py | 22 ++++---- sigi/apps/mdl/models.py | 2 +- sigi/apps/metas/urls.py | 20 +++---- sigi/apps/ocorrencias/urls.py | 28 +++++----- sigi/apps/parlamentares/urls.py | 19 +++---- sigi/apps/saberes/urls.py | 19 +++---- .../migrations/0005_auto_20160912_1503.py | 21 +++++++ sigi/apps/servicos/models.py | 2 +- sigi/apps/servicos/urls.py | 14 ++--- .../migrations/0004_auto_20160912_1503.py | 22 ++++++++ sigi/apps/servidores/models.py | 2 +- sigi/apps/servidores/urls.py | 13 ++--- sigi/settings/base.py | 37 +++++++----- sigi/settings/dev.py | 1 - sigi/urls.py | 15 ++--- 21 files changed, 210 insertions(+), 160 deletions(-) create mode 100644 sigi/apps/servicos/migrations/0005_auto_20160912_1503.py create mode 100644 sigi/apps/servidores/migrations/0004_auto_20160912_1503.py diff --git a/moodlerouter.py b/moodlerouter.py index 4ea4aa14..c5ba3465 100644 --- a/moodlerouter.py +++ b/moodlerouter.py @@ -18,7 +18,7 @@ def allow_relation(self, obj1, obj2, **hints): return True return None - def allow_migrate(self, db, model): - if model._meta.app_label == 'mdl': + def allow_migrate(self, db, app_label, model_name=None, **hints): + if app_label == 'mdl': return False return None diff --git a/sigi/apps/casas/urls.py b/sigi/apps/casas/urls.py index 4ad35193..1c403dc7 100644 --- a/sigi/apps/casas/urls.py +++ b/sigi/apps/casas/urls.py @@ -1,37 +1,37 @@ # coding: utf-8 from django.conf.urls import patterns, url +from sigi.apps.casas import views -urlpatterns = patterns( - 'sigi.apps.casas.views', +urlpatterns = [ # Informacoes de uma casa legislativa - url(r'^casalegislativa/report_complete/$', 'report_complete', name='report-complete-all'), - url(r'^casalegislativa/(?P\w+)/report_complete/$', 'report_complete', name='report-complete-id'), + url(r'^casalegislativa/report_complete/$', views.report_complete, name='report-complete-all'), + url(r'^casalegislativa/(?P\w+)/report_complete/$', views.report_complete, name='report-complete-id'), # Reports Labels - url(r'^casalegislativa/labels/$', 'labels_report', name='labels-report-all'), - url(r'^casalegislativa/(?P\w+)/labels/$', 'labels_report', name='labels-report-id'), + url(r'^casalegislativa/labels/$', views.labels_report, name='labels-report-all'), + url(r'^casalegislativa/(?P\w+)/labels/$', views.labels_report, name='labels-report-id'), # Reports Labels Parlamentar - url(r'^casalegislativa/labels_parlamentar/$', 'labels_report_parlamentar', name='lebels-report-parlamentar-all'), - url(r'^casalegislativa/(?P\w+)/labels_parlamentar/$', 'labels_report_parlamentar', name='labels-report-parlamentar-id'), + url(r'^casalegislativa/labels_parlamentar/$', views.labels_report_parlamentar, name='lebels-report-parlamentar-all'), + url(r'^casalegislativa/(?P\w+)/labels_parlamentar/$', views.labels_report_parlamentar, name='labels-report-parlamentar-id'), # Reports labels sem presidente - url(r'^casalegislativa/labels_sem_presidente/$', 'labels_report_sem_presidente', name='labels-report-sem-presidente-all'), - url(r'^casalegislativa/(?P\w+)/labels_sem_presidente/$', 'labels_report_sem_presidente', name='labels-report-sem-presidente-id'), + url(r'^casalegislativa/labels_sem_presidente/$', views.labels_report_sem_presidente, name='labels-report-sem-presidente-all'), + url(r'^casalegislativa/(?P\w+)/labels_sem_presidente/$', views.labels_report_sem_presidente, name='labels-report-sem-presidente-id'), # Reports casas sem convenio - url(r'^casalegislativa/reports/$', 'report', name='casa-report'), - url(r'^casalegislativa/casas_sem_convenio_report/$', 'casas_sem_convenio_report', name='casas-sem-convenio-report'), + url(r'^casalegislativa/reports/$', views.report, name='casa-report'), + url(r'^casalegislativa/casas_sem_convenio_report/$', views.casas_sem_convenio_report, name='casas-sem-convenio-report'), # CSV - url(r'^casalegislativa/csv/$', 'export_csv', name='casa-export-csv'), # Error + url(r'^casalegislativa/csv/$', views.export_csv, name='casa-export-csv'), # Error # Carrinho - url(r'^casalegislativa/carrinho/$', 'visualizar_carrinho', name='visualizar-carrinho'), - url(r'^casalegislativa/carrinho/excluir_carrinho/$', 'excluir_carrinho', name='excluir-carrinho'), # Error - url(r'^casalegislativa/carrinho/deleta_itens_carrinho$', 'deleta_itens_carrinho', name='deleta-itens-carrinho'), # Error - url(r'^portfolio/$', 'portfolio', name='casas-portfolio'), - url(r'^carteira/$', 'painel_relacionamento', name='casas-carteira'), -) + url(r'^casalegislativa/carrinho/$', views.visualizar_carrinho, name='visualizar-carrinho'), + url(r'^casalegislativa/carrinho/excluir_carrinho/$', views.excluir_carrinho, name='excluir-carrinho'), # Error + url(r'^casalegislativa/carrinho/deleta_itens_carrinho$', views.deleta_itens_carrinho, name='deleta-itens-carrinho'), # Error + url(r'^portfolio/$', views.portfolio, name='casas-portfolio'), + url(r'^carteira/$', views.painel_relacionamento, name='casas-carteira'), +] diff --git a/sigi/apps/convenios/urls.py b/sigi/apps/convenios/urls.py index a8917efe..94a88456 100644 --- a/sigi/apps/convenios/urls.py +++ b/sigi/apps/convenios/urls.py @@ -1,13 +1,12 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url +from sigi.apps.convenios import views -urlpatterns = patterns( - 'sigi.apps.convenios.views', - - url(r'^convenio/reports/$', 'report', name='convenios-report'), - url(r'^convenio/carrinho/$', 'visualizar_carrinho', name='visualizar-carrinho'), - url(r'^convenio/carrinho/excluir_carrinho/$', 'excluir_carrinho', name='excluir-carrinho'), # tagerror - url(r'^convenio/carrinho/deleta_itens_carrinho$', 'deleta_itens_carrinho', name='deleta-itens-carrinho'), # tagerror - url(r'^convenio/csv/$', 'export_csv', name='convenios-csv'), - url(r'^reportsRegiao/(?P\w+)/$', 'report_regiao', name='convenios-report_regiao_pdf'), -) +urlpatterns = [ + url(r'^convenio/reports/$', views.report, name='convenios-report'), + url(r'^convenio/carrinho/$', views.visualizar_carrinho, name='visualizar-carrinho'), + url(r'^convenio/carrinho/excluir_carrinho/$', views.excluir_carrinho, name='excluir-carrinho'), # tagerror + url(r'^convenio/carrinho/deleta_itens_carrinho$', views.deleta_itens_carrinho, name='deleta-itens-carrinho'), # tagerror + url(r'^convenio/csv/$', views.export_csv, name='convenios-csv'), + url(r'^reportsRegiao/(?P\w+)/$', views.report_regiao, name='convenios-report_regiao_pdf'), +] diff --git a/sigi/apps/diagnosticos/urls.py b/sigi/apps/diagnosticos/urls.py index 1b4d5510..95957c7a 100644 --- a/sigi/apps/diagnosticos/urls.py +++ b/sigi/apps/diagnosticos/urls.py @@ -1,51 +1,57 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, url +from django.conf.urls import url from django.views.generic import TemplateView +from sigi.apps.diagnosticos import views as diagnosticos_views +from django.contrib.auth import views as auth_views -LOGIN_REDIRECT_URL = '/diagnosticos/mobile/login' - -urlpatterns = patterns( - 'sigi.apps.diagnosticos.views', +urlpatterns = [ # Lista de Diagnósticos - url(r'^mobile/$', 'lista', name='lista_diagnosticos'), + url(r'^mobile/$', diagnosticos_views.lista, name='lista_diagnosticos'), # Lista de Categorias url(r'^mobile/(?P\d+)/categorias/$', - 'categorias', name='lista_categorias'), + diagnosticos_views.categorias, name='lista_categorias'), # Detalhes da Categoria da Casa Legislativa url(r'^mobile/(?P\d+)/categorias/1/$', - 'categoria_casa_legislativa', name='detalhes_categoria_casa_legislativa'), + diagnosticos_views.categoria_casa_legislativa, + name='detalhes_categoria_casa_legislativa'), # Detalhes da Categoria de Contatos url(r'^mobile/(?P\d+)/categorias/2/$', - 'categoria_contatos', name='detalhes_categoria_contatos'), + diagnosticos_views.categoria_contatos, + name='detalhes_categoria_contatos'), # Detalhes de Categorias Dinamicas url(r'^mobile/(?P\d+)/categorias/(?P\d+)/$', - 'categoria_detalhes', name='detalhes_categoria'), + diagnosticos_views.categoria_detalhes, name='detalhes_categoria'), - url(r'^mapa/$', TemplateView.as_view(template_name="diagnosticos/mapa.html"), name='template-mapa'), - url(r'^mundiagjson/$', 'municipios_diagnosticados', name='municipios-diagnosticados'), + url(r'^mapa/$', + TemplateView.as_view(template_name="diagnosticos/mapa.html"), + name='template-mapa'), + url(r'^mundiagjson/$', diagnosticos_views.municipios_diagnosticados, + name='municipios-diagnosticados'), # Reports diagnosticos - url(r'^diagnostico/(?P\w+).pdf$', 'diagnostico_pdf', name='diagnostico-pdf'), + url(r'^diagnostico/(?P\w+).pdf$', + diagnosticos_views.diagnostico_pdf, name='diagnostico-pdf'), # Graficos de perguntas - url(r'^graficos/$', 'graficos', name="diagnosticos-graficos"), # tagerror - url(r'^api/$', 'grafico_api', name="diagnosticos-grafico-api"), # tagerror - -) - -urlpatterns += patterns( - 'django.contrib.auth.views', + url(r'^graficos/$', diagnosticos_views.graficos, + name="diagnosticos-graficos"), # tagerror + url(r'^api/$', diagnosticos_views.grafico_api, + name="diagnosticos-grafico-api"), # tagerror +] +urlpatterns += [ # Login do Diagnóstico - url(r'^mobile/login/$', 'login', {'template_name': - 'diagnosticos/diagnosticos_login.html'}, name='login'), + url(r'^mobile/login/$', + auth_views.login, {'template_name': + 'diagnosticos/diagnosticos_login.html'}, + name='login'), # Logout do Diagnóstico - url(r'^mobile/logout/$', 'logout', - {'next_page': LOGIN_REDIRECT_URL}, name='logout'), -) + url(r'^mobile/logout/$', auth_views.logout, + {'next_page': diagnosticos_views.LOGIN_REDIRECT_URL}, name='logout'), +] diff --git a/sigi/apps/diagnosticos/views.py b/sigi/apps/diagnosticos/views.py index 946300d4..79725bd9 100644 --- a/sigi/apps/diagnosticos/views.py +++ b/sigi/apps/diagnosticos/views.py @@ -15,10 +15,10 @@ DiagnosticoMobileForm, FuncionariosMobileForm) from sigi.apps.diagnosticos.models import Categoria, Diagnostico, Pergunta -from sigi.apps.diagnosticos.urls import LOGIN_REDIRECT_URL from sigi.apps.utils.decorators import login_required from sigi.shortcuts import render_to_pdf +LOGIN_REDIRECT_URL = '/diagnosticos/mobile/login' @never_cache @login_required(login_url=LOGIN_REDIRECT_URL) diff --git a/sigi/apps/eventos/urls.py b/sigi/apps/eventos/urls.py index 9967641b..327eba6c 100644 --- a/sigi/apps/eventos/urls.py +++ b/sigi/apps/eventos/urls.py @@ -1,9 +1,9 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url +from sigi.apps.eventos import views -urlpatterns = patterns( - 'sigi.apps.eventos.views', +urlpatterns = [ # Painel de ocorrencias - url(r'^calendario/$', 'calendario', name='eventos-calendario'), - url(r'^alocacaoequipe/$', 'alocacao_equipe', name='eventos-alocacaoequipe'), -) + url(r'^calendario/$', views.calendario, name='eventos-calendario'), + url(r'^alocacaoequipe/$', views.alocacao_equipe, name='eventos-alocacaoequipe'), +] diff --git a/sigi/apps/home/urls.py b/sigi/apps/home/urls.py index 1cf329a2..3c28ec9d 100644 --- a/sigi/apps/home/urls.py +++ b/sigi/apps/home/urls.py @@ -1,22 +1,22 @@ # coding: utf-8 from django.conf.urls import patterns, url from django.views.generic.base import TemplateView +from sigi.apps.home import views -urlpatterns = patterns( - 'sigi.apps.home.views', +urlpatterns = [ url(r'^atendimento', TemplateView.as_view( template_name='index_atendimento.html'), name='index_atendimento'), - url(r'^$', 'index', name='sigi_index'), - url(r'^home/resumoconvenios/$', 'resumo_convenios', + url(r'^$', views.index, name='sigi_index'), + url(r'^home/resumoconvenios/$', views.resumo_convenios, name="home_resumoconvenios"), - url(r'^home/resumoseit/$', 'resumo_seit', name="home_resumoseit"), - url(r'^home/chartseit/$', 'chart_seit', name="home_chartseit"), - url(r'^home/chartconvenios/$', 'chart_convenios', + url(r'^home/resumoseit/$', views.resumo_seit, name="home_resumoseit"), + url(r'^home/chartseit/$', views.chart_seit, name="home_chartseit"), + url(r'^home/chartconvenios/$', views.chart_convenios, name="home_chartconvenios"), - url(r'^home/chartcarteira/$', 'chart_carteira', name="home_chartcarteira"), - url(r'^home/chartperformance/$', 'chart_performance', + url(r'^home/chartcarteira/$', views.chart_carteira, name="home_chartcarteira"), + url(r'^home/chartperformance/$', views.chart_performance, name="home_chartperformance"), - url(r'^home/report/semconvenio/$', 'report_sem_convenio', + url(r'^home/report/semconvenio/$', views.report_sem_convenio, name="home_reportsemconvenio"), -) +] diff --git a/sigi/apps/mdl/models.py b/sigi/apps/mdl/models.py index 0e229362..6e14c8c4 100644 --- a/sigi/apps/mdl/models.py +++ b/sigi/apps/mdl/models.py @@ -40,7 +40,7 @@ class CourseStats(models.Model): ('A', u'Aprovação'), ('I', u'Indeterminado'),) - category = models.ForeignKey('CourseCategories', db_column='categoryid', primary_key=True) + category = models.ForeignKey('CourseCategories', db_column='categoryid') course = models.ForeignKey('Course', db_column='courseid') completionstatus = models.CharField(max_length=1, choices=COMPLETIONSTATUS_CHOICES) usercount = models.IntegerField() diff --git a/sigi/apps/metas/urls.py b/sigi/apps/metas/urls.py index 7c7dad40..eda366c9 100644 --- a/sigi/apps/metas/urls.py +++ b/sigi/apps/metas/urls.py @@ -1,13 +1,13 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url +from sigi.apps.metas import views -urlpatterns = patterns( - 'sigi.apps.metas.views', - url(r'^$', 'dashboard', name='metas-dashboardsss'), # tagerror - url(r'^mapa/$', 'mapa', name='metas-mapa'), # tagerror - url(r'^mapdata/$', 'map_data', name='metas-map_data'), - url(r'^mapsearch/$', 'map_search', name='metas-map_search'), - url(r'^mapsum/$', 'map_sum', name='metas-map_sum'), - url(r'^maplist/$', 'map_list', name='metas-map_list'), -) +urlpatterns = [ + url(r'^$', views.dashboard, name='metas-dashboardsss'), # tagerror + url(r'^mapa/$', views.mapa, name='metas-mapa'), # tagerror + url(r'^mapdata/$', views.map_data, name='metas-map_data'), + url(r'^mapsearch/$', views.map_search, name='metas-map_search'), + url(r'^mapsum/$', views.map_sum, name='metas-map_sum'), + url(r'^maplist/$', views.map_list, name='metas-map_list'), +] diff --git a/sigi/apps/ocorrencias/urls.py b/sigi/apps/ocorrencias/urls.py index c6c82579..536117b0 100644 --- a/sigi/apps/ocorrencias/urls.py +++ b/sigi/apps/ocorrencias/urls.py @@ -1,18 +1,18 @@ # coding: utf-8 from django.conf.urls import patterns, url +from sigi.apps.ocorrencias import views -urlpatterns = patterns( - 'sigi.apps.ocorrencias.views', +urlpatterns = [ # Painel de ocorrencias - url(r'^painel/$', 'painel_ocorrencias', name='painel-ocorrencias'), - url(r'^painel/buscanominal/$', 'busca_nominal', {"origin": "tudo"}, name='painel-buscanominal'), - url(r'^painel/buscanominal/casa/$', 'busca_nominal', {"origin": "casa"}, name='painel-buscacasa'), - url(r'^painel/buscanominal/servidor/$', 'busca_nominal', {"origin": "servidor"}, name='painel-buscaservidor'), - url(r'^painel/buscanominal/servico/$', 'busca_nominal', {"origin": "servico"}, name='painel-buscaservico'), - url(r'^mudaprioridade/$', 'muda_prioridade', name='ocorrencia-mudaprioridade'), - url(r'^excluianexo/$', 'exclui_anexo', name='ocorrencia-excluianexo'), - url(r'^incluianexo/$', 'inclui_anexo', name='ocorrencia-incluianexo'), - url(r'^anexosnippet/$', 'anexo_snippet', name='ocorrencia-anexosnippet'), - url(r'^incluicomentario/$', 'inclui_comentario', name='ocorrencia-incluicomentario'), - url(r'^incluiocorrencia/$', 'inclui_ocorrencia', name='ocorrencia-incluiocorrencia'), -) + url(r'^painel/$', views.painel_ocorrencias, name='painel-ocorrencias'), + url(r'^painel/buscanominal/$', views.busca_nominal, {"origin": "tudo"}, name='painel-buscanominal'), + url(r'^painel/buscanominal/casa/$', views.busca_nominal, {"origin": "casa"}, name='painel-buscacasa'), + url(r'^painel/buscanominal/servidor/$', views.busca_nominal, {"origin": "servidor"}, name='painel-buscaservidor'), + url(r'^painel/buscanominal/servico/$', views.busca_nominal, {"origin": "servico"}, name='painel-buscaservico'), + url(r'^mudaprioridade/$', views.muda_prioridade, name='ocorrencia-mudaprioridade'), + url(r'^excluianexo/$', views.exclui_anexo, name='ocorrencia-excluianexo'), + url(r'^incluianexo/$', views.inclui_anexo, name='ocorrencia-incluianexo'), + url(r'^anexosnippet/$', views.anexo_snippet, name='ocorrencia-anexosnippet'), + url(r'^incluicomentario/$', views.inclui_comentario, name='ocorrencia-incluicomentario'), + url(r'^incluiocorrencia/$', views.inclui_ocorrencia, name='ocorrencia-incluiocorrencia'), +] diff --git a/sigi/apps/parlamentares/urls.py b/sigi/apps/parlamentares/urls.py index 395ef316..278706b5 100644 --- a/sigi/apps/parlamentares/urls.py +++ b/sigi/apps/parlamentares/urls.py @@ -1,17 +1,16 @@ # coding: utf-8 -from django.conf.urls import patterns, url - -urlpatterns = patterns( - 'sigi.apps.parlamentares.views', +from django.conf.urls import url +from sigi.apps.parlamentares import views +urlpatterns = [ # Reports labels parlamentares - url(r'^parlamentar/labels/$', 'labels_report', name='labels-report-all'), - url(r'^parlamentar/(?P\w+)/labels/$', 'labels_report', name='labels-report-id'), + url(r'^parlamentar/labels/$', views.labels_report, name='labels-report-all'), + url(r'^parlamentar/(?P\w+)/labels/$', views.labels_report, name='labels-report-id'), # Carrinho - url(r'^parlamentar/carrinho/$', 'visualizar_carrinho', name='visualizar-carrinho'), - url(r'^parlamentar/carrinho/deleta_itens_carrinho$', 'deleta_itens_carrinho', name='deleta-itens-carrinho'), + url(r'^parlamentar/carrinho/$', views.visualizar_carrinho, name='visualizar-carrinho'), + url(r'^parlamentar/carrinho/deleta_itens_carrinho$', views.deleta_itens_carrinho, name='deleta-itens-carrinho'), # A view excluir_carrinho n existe ainda. - # url(r'^parlamentar/carrinho/exluir_carrinho$', 'excluir_carrinho', name='excluir-carrinho'), -) + # url(r'^parlamentar/carrinho/exluir_carrinho$', views.excluir_carrinho, name='excluir-carrinho'), +] diff --git a/sigi/apps/saberes/urls.py b/sigi/apps/saberes/urls.py index 7a6d1bc0..53c24b85 100644 --- a/sigi/apps/saberes/urls.py +++ b/sigi/apps/saberes/urls.py @@ -1,14 +1,11 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url +from sigi.apps.saberes import views -from .views import (cursos_com_tutoria, cursos_sem_tutoria, dashboard, - pentaho_proxy) -urlpatterns = patterns( - 'sigi.apps.saberes.views', - - url(r'^dashboard/cursos-sem-turoria/?$', cursos_sem_tutoria, name="saberes-cursos-sem-tutoria"), - url(r'^dashboard/cursos-com-turoria/?$', cursos_com_tutoria, name="saberes-cursos-com-tutoria"), - url(r'^dashboard/?$', dashboard, name="saberes-dashboard-view"), - url(r'^(?P(plugin|api)/.*)$', pentaho_proxy), -) +urlpatterns = [ + url(r'^dashboard/cursos-sem-turoria/?$', views.cursos_sem_tutoria, name="saberes-cursos-sem-tutoria"), + url(r'^dashboard/cursos-com-turoria/?$', views.cursos_com_tutoria, name="saberes-cursos-com-tutoria"), + url(r'^dashboard/?$', views.dashboard, name="saberes-dashboard-view"), + url(r'^(?P(plugin|api)/.*)$', views.pentaho_proxy), +] diff --git a/sigi/apps/servicos/migrations/0005_auto_20160912_1503.py b/sigi/apps/servicos/migrations/0005_auto_20160912_1503.py new file mode 100644 index 00000000..e25f681d --- /dev/null +++ b/sigi/apps/servicos/migrations/0005_auto_20160912_1503.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-09-12 15:03 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('servicos', '0004_auto_20160623_0829'), + ] + + operations = [ + migrations.AlterField( + model_name='casamanifesta', + name='casa_legislativa', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='casas.CasaLegislativa'), + ), + ] diff --git a/sigi/apps/servicos/models.py b/sigi/apps/servicos/models.py index 8eeee003..d7db14c5 100644 --- a/sigi/apps/servicos/models.py +++ b/sigi/apps/servicos/models.py @@ -195,7 +195,7 @@ class Meta: class CasaManifesta(models.Model): - casa_legislativa = models.OneToOneField(CasaLegislativa) + casa_legislativa = models.ForeignKey(CasaLegislativa) data_manifestacao = models.DateTimeField(auto_now_add=True) data_atualizacao = models.DateTimeField(auto_now=True) informante = models.CharField(_(u'Nome do informante'), max_length=100, blank=True) diff --git a/sigi/apps/servicos/urls.py b/sigi/apps/servicos/urls.py index 22f9e9f7..b050297d 100644 --- a/sigi/apps/servicos/urls.py +++ b/sigi/apps/servicos/urls.py @@ -1,14 +1,14 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url from django.views.generic.base import TemplateView from .views import MapaView +from sigi.apps.servicos import views -urlpatterns = patterns( - 'sigi.apps.servicos.views', - url(r'^manifesta/$', 'casa_manifesta_view', name="casa-manifesta-view"), - url(r'^munatenjson/(?P\w+)/$', 'municipios_atendidos', name="municipios-atendidos"), +urlpatterns = [ + url(r'^manifesta/$', views.casa_manifesta_view, name="casa-manifesta-view"), + url(r'^munatenjson/(?P\w+)/$', views.municipios_atendidos, name="municipios-atendidos"), url(r'^mapa/(?P\w+)/$', MapaView.as_view(), name="servicos-mapa"), - # url(r'^listacasas/(?P\w+)', 'casas_usam_servico', name="casas-usam-servico"), -) + # url(r'^listacasas/(?P\w+)', views.casas_usam_servico, name="casas-usam-servico"), +] diff --git a/sigi/apps/servidores/migrations/0004_auto_20160912_1503.py b/sigi/apps/servidores/migrations/0004_auto_20160912_1503.py new file mode 100644 index 00000000..c01ad6af --- /dev/null +++ b/sigi/apps/servidores/migrations/0004_auto_20160912_1503.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-09-12 15:03 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('servidores', '0003_auto_20160811_1553'), + ] + + operations = [ + migrations.AlterField( + model_name='servidor', + name='user', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/sigi/apps/servidores/models.py b/sigi/apps/servidores/models.py index e835815f..6b649401 100644 --- a/sigi/apps/servidores/models.py +++ b/sigi/apps/servidores/models.py @@ -63,7 +63,7 @@ class Servidor(models.Model): ) # usuario responsavel pela autenticação do servidor no sistema - user = models.ForeignKey(User, unique=True) + user = models.OneToOneField(User) nome_completo = models.CharField(max_length=128) apelido = models.CharField(max_length=50, blank=True) # caminho no sistema para arquivo com a imagem diff --git a/sigi/apps/servidores/urls.py b/sigi/apps/servidores/urls.py index 60c122db..93539bfc 100644 --- a/sigi/apps/servidores/urls.py +++ b/sigi/apps/servidores/urls.py @@ -1,10 +1,9 @@ # -*- coding: utf-8 -*- -from django.conf.urls import patterns, url - -urlpatterns = patterns( - 'sigi.apps.servidores.views', +from django.conf.urls import url +from sigi.apps.servidores import views +urlpatterns = [ # Reports servidores - url(r'^servidores_por_funcao.pdf$', 'servidores_por_funcao', name='servidores-funcao-pdf'), - url(r'^servidores_por_cargo.pdf$', 'servidores_por_cargo', name='servidores-cargo-pdf'), -) + url(r'^servidores_por_funcao.pdf$', views.servidores_por_funcao, name='servidores-funcao-pdf'), + url(r'^servidores_por_cargo.pdf$', views.servidores_por_cargo, name='servidores-cargo-pdf'), +] diff --git a/sigi/settings/base.py b/sigi/settings/base.py index 0f212d19..de571843 100644 --- a/sigi/settings/base.py +++ b/sigi/settings/base.py @@ -31,16 +31,6 @@ SITE_ID = 1 -TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + [ - 'django.core.context_processors.request', - 'sigi.context_processors.usuario_context' -] - -# List of callables that know how to import templates from various sources. -TEMPLATE_LOADERS = ('django.template.loaders.filesystem.Loader', - 'django.template.loaders.app_directories.Loader', - ) - # Database routers DATABASE_ROUTERS = ['moodlerouter.MoodleRouter', ] @@ -137,9 +127,30 @@ DEFAULT_FROM_EMAIL = 'spdt@interlegis.leg.br' EMAIL_SUBJECT_PREFIX = u'[SIGI]' -TEMPLATE_DIRS = ( - os.path.join(BASE_DIR, 'templates'), -) +TEMPLATES = [ + { + 'BACKEND': 'django.template.backends.django.DjangoTemplates', + 'DIRS': [os.path.join(BASE_DIR, 'templates')], + 'OPTIONS': { + 'context_processors': [ + 'django.template.context_processors.request', + 'django.contrib.auth.context_processors.auth', + 'django.template.context_processors.debug', + 'django.template.context_processors.i18n', + 'django.template.context_processors.media', + 'django.template.context_processors.static', + 'django.template.context_processors.tz', + 'django.contrib.messages.context_processors.messages', + 'sigi.context_processors.usuario_context' + ], + 'loaders': [ + 'django.template.loaders.filesystem.Loader', + 'django.template.loaders.app_directories.Loader', + ] + }, + }, +] + MEDIA_ROOT = os.path.join(BASE_DIR, 'media') MEDIA_URL = '/media/' diff --git a/sigi/settings/dev.py b/sigi/settings/dev.py index d400545e..6f7e4722 100644 --- a/sigi/settings/dev.py +++ b/sigi/settings/dev.py @@ -19,7 +19,6 @@ # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -TEMPLATE_DEBUG = DEBUG DEBUG_TOOLBAR_CONFIG = { 'SHOW_TEMPLATE_CONTEXT': True, } diff --git a/sigi/urls.py b/sigi/urls.py index ea67a57a..3552057d 100644 --- a/sigi/urls.py +++ b/sigi/urls.py @@ -5,15 +5,14 @@ from django.conf.urls.static import static from django.contrib import admin from django.views.generic.base import TemplateView +from django.views.static import serve from sigi.apps.saberes.views import pentaho_proxy admin.site.index_template = 'index.html' admin.autodiscover() -urlpatterns = patterns( - '', - +urlpatterns = [ url(r'^parlamentares/', include('sigi.apps.parlamentares.urls')), url(r'^casas/', include('sigi.apps.casas.urls')), url(r'^convenios/', include('sigi.apps.convenios.urls')), @@ -38,15 +37,13 @@ # Suspended # url(r'^i18n/', include('django.conf.urls.i18n')), -) + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) +] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT) if settings.DEBUG: - urlpatterns = patterns( - '', - + urlpatterns = [ url(r'^404/$', TemplateView.as_view(template_name='404.html')), url(r'^500/$', TemplateView.as_view(template_name='500.html')), url(r'^503/$', TemplateView.as_view(template_name='503.html')), - url(r'^media/(?P.*)$', 'django.views.static.serve', { + url(r'^media/(?P.*)$', serve, { 'document_root': settings.MEDIA_ROOT, }), - ) + urlpatterns + ] + urlpatterns From 0ed0a7a61ced1336bc01012d9c1afc4557541607 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 13 Sep 2016 17:34:46 -0300 Subject: [PATCH 59/63] Upgrade to Django 1.10.1 Signed-off-by: Luciano Almeida --- requirements/requirements.txt | 2 +- sigi/apps/casas/urls.py | 2 +- sigi/apps/home/urls.py | 2 +- sigi/apps/ocorrencias/urls.py | 2 +- sigi/urls.py | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index c8d6813f..dcb162ab 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -19,7 +19,7 @@ django-model-utils==2.4 django-sass-processor==0.3.4 django-easy-select2==1.3.2 django-simple-captcha==0.5.1 -Django==1.9.6 +Django==1.10.1 libsass==0.11.0 easy-thumbnails==2.3 eav-django==1.4.7 diff --git a/sigi/apps/casas/urls.py b/sigi/apps/casas/urls.py index 1c403dc7..fd22f503 100644 --- a/sigi/apps/casas/urls.py +++ b/sigi/apps/casas/urls.py @@ -1,5 +1,5 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url from sigi.apps.casas import views urlpatterns = [ diff --git a/sigi/apps/home/urls.py b/sigi/apps/home/urls.py index 3c28ec9d..8e05a51e 100644 --- a/sigi/apps/home/urls.py +++ b/sigi/apps/home/urls.py @@ -1,5 +1,5 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url from django.views.generic.base import TemplateView from sigi.apps.home import views diff --git a/sigi/apps/ocorrencias/urls.py b/sigi/apps/ocorrencias/urls.py index 536117b0..f50aa4dd 100644 --- a/sigi/apps/ocorrencias/urls.py +++ b/sigi/apps/ocorrencias/urls.py @@ -1,5 +1,5 @@ # coding: utf-8 -from django.conf.urls import patterns, url +from django.conf.urls import url from sigi.apps.ocorrencias import views urlpatterns = [ diff --git a/sigi/urls.py b/sigi/urls.py index 3552057d..b117e575 100644 --- a/sigi/urls.py +++ b/sigi/urls.py @@ -1,7 +1,7 @@ # -*- coding:utf-8 -*- from django.conf import settings -from django.conf.urls import include, patterns, url +from django.conf.urls import include, url from django.conf.urls.static import static from django.contrib import admin from django.views.generic.base import TemplateView From 9de6c62fe3e95d57124cc26087eafac4394c91e0 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 20 Sep 2016 15:56:00 -0300 Subject: [PATCH 60/63] Fix problem with django-eav and diagnosticos when trying to logout Signed-off-by: Luciano Almeida --- requirements/requirements.txt | 2 +- .../diagnosticos/templates/diagnosticos/diagnosticos_login.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index dcb162ab..037703e5 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,6 @@ -e git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=geraldo git+git://github.com/hellpanderrr/django-admin-bootstrapped-1.9-compatible.git@master#egg=django_admin_bootstrapped +git+git://github.com/interlegis/eav-django django-auth-ldap==1.2.8 django-autoslug==1.9.3 django-bootstrap3==7.0.1 @@ -22,7 +23,6 @@ django-simple-captcha==0.5.1 Django==1.10.1 libsass==0.11.0 easy-thumbnails==2.3 -eav-django==1.4.7 gunicorn==19.6.0 html5lib==0.9999999 Pillow==3.2.0 diff --git a/sigi/apps/diagnosticos/templates/diagnosticos/diagnosticos_login.html b/sigi/apps/diagnosticos/templates/diagnosticos/diagnosticos_login.html index febbb339..750cc87b 100644 --- a/sigi/apps/diagnosticos/templates/diagnosticos/diagnosticos_login.html +++ b/sigi/apps/diagnosticos/templates/diagnosticos/diagnosticos_login.html @@ -35,7 +35,7 @@

Erro ao logar

{% endif %}
- + {% csrf_token %}
From 6510a5c831f58dd7f6baaa264cb9d7b201c4dee5 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 20 Sep 2016 17:46:12 -0300 Subject: [PATCH 61/63] Apparently user OneToOneField doesn't have servidor_set anymore. ldap_sync test now passing. Signed-off-by: Luciano Almeida --- sigi/apps/servidores/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigi/apps/servidores/models.py b/sigi/apps/servidores/models.py index 6b649401..e835815f 100644 --- a/sigi/apps/servidores/models.py +++ b/sigi/apps/servidores/models.py @@ -63,7 +63,7 @@ class Servidor(models.Model): ) # usuario responsavel pela autenticação do servidor no sistema - user = models.OneToOneField(User) + user = models.ForeignKey(User, unique=True) nome_completo = models.CharField(max_length=128) apelido = models.CharField(max_length=50, blank=True) # caminho no sistema para arquivo com a imagem From a922472c2542d4267c3c4b1fc606920a7b468459 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 22 Sep 2016 14:45:04 -0300 Subject: [PATCH 62/63] Fix test-requirements.txt dependency. Signed-off-by: Luciano Almeida --- requirements/test-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/test-requirements.txt b/requirements/test-requirements.txt index e3bbda13..80e69360 100644 --- a/requirements/test-requirements.txt +++ b/requirements/test-requirements.txt @@ -1,6 +1,6 @@ -r requirements.txt +git+git://github.com/paulocheque/django-dynamic-fixture/@master coverage==4.1 -django-dynamic-fixture==1.9.0 django-webtest==1.7.9 pyPdf==1.13 pyquery==1.2.13 From a61c2a735b0f28e1e6e6c90e1b5ca20f92a7b203 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 22 Nov 2016 11:34:33 -0200 Subject: [PATCH 63/63] Fix sigla in atendimento Signed-off-by: Luciano Almeida --- Dockerfile | 10 ++++++++++ docker-compose.yml | 34 +++++++++++++++++----------------- sigi/apps/casas/models.py | 2 +- sigi/apps/servidores/models.py | 2 +- 4 files changed, 29 insertions(+), 19 deletions(-) diff --git a/Dockerfile b/Dockerfile index 789a107b..4ee11fc0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -54,3 +54,13 @@ RUN easy_install pip RUN pip2 install -r requirements/dev-requirements.txt RUN pip2 install --upgrade setuptools +RUN mkdir -p /var/log/sigi/ +RUN touch /var/log/sigi/application.log +RUN chmod -x /var/log/sigi/application.log + +RUN git clone https://github.com/marinho/geraldo.git +WORKDIR /sigi/geraldo/ +RUN python setup.py install +RUN cp -Rfv reporting geraldo `python -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())"` +WORKDIR /sigi +RUN rm -rf geraldo/ diff --git a/docker-compose.yml b/docker-compose.yml index 8702818a..2bd636b1 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,20 +1,20 @@ -localhost: - image: postgres - environment: - POSTGRES_PASSWORD: sigi - POSTGRES_USER: sigi - POSTGRES_DB: sigi - ports: - - "5532:5432" -web: - build: . - command: bash -c "python manage.py bower install && python manage.py migrate && python manage.py runserver 0.0.0.0:8000" - volumes: - - .:/sigi - ports: - - "8000:8000" - links: - - localhost +#localhost: +# image: postgres +# environment: +# POSTGRES_PASSWORD: sigi +# POSTGRES_USER: sigi +# POSTGRES_DB: sigi +# ports: +# - "5532:5432" +#web: +# build: . +# command: bash -c "python manage.py migrate && python manage.py runserver 0.0.0.0:8000" +# volumes: +# - .:/sigi +# ports: +# - "8000:8000" +# links: +# - localhost osticket: image: campbellsoftwaresolutions/osticket diff --git a/sigi/apps/casas/models.py b/sigi/apps/casas/models.py index 6ae4e4a2..e13cabf3 100644 --- a/sigi/apps/casas/models.py +++ b/sigi/apps/casas/models.py @@ -243,7 +243,7 @@ def gerarCodigoInterlegis(self): return codigo def __unicode__(self): - return self.nome + return self.nome + ' - ' + self.municipio.uf.sigla def save(self, *args, **kwargs): address_changed = False diff --git a/sigi/apps/servidores/models.py b/sigi/apps/servidores/models.py index e835815f..1b6980f8 100644 --- a/sigi/apps/servidores/models.py +++ b/sigi/apps/servidores/models.py @@ -63,7 +63,7 @@ class Servidor(models.Model): ) # usuario responsavel pela autenticação do servidor no sistema - user = models.ForeignKey(User, unique=True) + user = models.OneToOneField(User, unique=True) nome_completo = models.CharField(max_length=128) apelido = models.CharField(max_length=50, blank=True) # caminho no sistema para arquivo com a imagem
Nome de Usuário: {{object.username}}
Nome completo: {{object.nome_completo}}
Email: {{object.email}}
CPF: {{object.cpf}}
RG: {{object.rg}}
Casa Legislativa: {{object.casa_legislativa}}
Cargo: {{object.cargo}}
Vínculo: {{object.vinculo}}
Telefone(s):
Nome de Usuário: {{object.username}}
Nome completo: {{object.nome_completo}}
Email: {{object.email}}
CPF: {{object.cpf}}
RG: {{object.rg}}
Casa Legislativa: {{object.casa_legislativa}}
Cargo: {{object.cargo}}
Vínculo: {{object.vinculo}}
Telefone(s): {% for tel in telefones %} {{tel|last}}
From ca25653105997af7c8c2e96c5b7ee851b35e5d83 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 16:36:52 -0300 Subject: [PATCH 41/63] =?UTF-8?q?Muda=20links=20do=20bot=C3=A3o=20cancelar?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/crud/base.py | 2 +- sigi/apps/usuarios/forms.py | 55 +++++----------------------- sigi/apps/usuarios/layouts.yaml | 4 -- sigi/apps/usuarios/urls.py | 8 +--- sigi/apps/usuarios/views.py | 43 +--------------------- templates/usuarios/usuario_list.html | 38 ------------------- 6 files changed, 12 insertions(+), 138 deletions(-) delete mode 100644 templates/usuarios/usuario_list.html diff --git a/sigi/apps/crud/base.py b/sigi/apps/crud/base.py index b1a9ad39..d15b45b9 100644 --- a/sigi/apps/crud/base.py +++ b/sigi/apps/crud/base.py @@ -131,7 +131,7 @@ def get_url_regex(cls): @property def cancel_url(self): - return self.list_url + return '/atendimento' def get_success_url(self): return self.detail_url diff --git a/sigi/apps/usuarios/forms.py b/sigi/apps/usuarios/forms.py index e204d5f7..446fd744 100644 --- a/sigi/apps/usuarios/forms.py +++ b/sigi/apps/usuarios/forms.py @@ -5,7 +5,7 @@ from captcha.fields import CaptchaField from crispy_forms.helper import FormHelper -from crispy_forms.layout import HTML, Fieldset, Layout, Submit +from crispy_forms.layout import HTML, Button, Fieldset, Layout, Submit from django import forms from django.contrib.auth.forms import (AuthenticationForm, PasswordResetForm, SetPasswordForm) @@ -386,42 +386,6 @@ def save(self, commit=False): return usuario -class HabilitarEditForm(ModelForm): - habilitado = forms.ChoiceField( - widget=forms.Select(), - required=True, - choices=YES_NO_CHOICES) - - class Meta(object): - model = Usuario - fields = [u'cpf', u'nome_completo', u'email', u'habilitado'] - widgets = { - u'cpf': forms.TextInput(attrs={u'readonly': u'readonly'}), - u'nome_completo': forms.TextInput(attrs={u'readonly': u'readonly'} - ), - u'email': forms.TextInput(attrs={u'readonly': u'readonly'}) - } - - def __init__(self, *args, **kwargs): - super(HabilitarEditForm, self).__init__(*args, **kwargs) - row1 = sigi.apps.crispy_layout_mixin.to_row( - [(u'nome_completo', 4), - (u'cpf', 4), - (u'email', 4)]) - row2 = sigi.apps.crispy_layout_mixin.to_row([(u'habilitado', 12)]) - self.helper = FormHelper() - self.helper.layout = Layout( - Fieldset( - _(u'Editar usuário'), row1, row2, form_actions( - more=[ - Submit( - u'Cancelar', - u'Cancelar', - style=u'background-color:black; color:white;')]) - ) - ) - - class MudarSenhaForm(ModelForm): password = forms.CharField( @@ -434,8 +398,6 @@ class MudarSenhaForm(ModelForm): label=_(u'Confirmar Nova Senha'), widget=forms.PasswordInput()) - captcha = CaptchaField() - def valida_igualdade(self, texto1, texto2, msg): if texto1 != texto2: raise ValidationError(msg) @@ -460,24 +422,24 @@ def clean(self): class Meta(object): model = Usuario - fields = [u'password', u'password_confirm', u'captcha'] + fields = [u'password', u'password_confirm'] def __init__(self, *args, **kwargs): super(MudarSenhaForm, self).__init__(*args, **kwargs) row1 = sigi.apps.crispy_layout_mixin.to_row( [(u'password', 6), (u'password_confirm', 6)]) - row2 = sigi.apps.crispy_layout_mixin.to_row([(u'captcha', 12)]) self.helper = FormHelper() self.helper.layout = Layout( Fieldset( - _(u'Mudar Senha'), row1, row2, + _(u'Mudar Senha'), row1, form_actions( more=[ - Submit( + Button( u'Cancelar', u'Cancelar', - style=u'background-color:black; color:white;')]) + style=u'background-color:black; color:white;', + onclick="window.history.back()")]) ) ) @@ -493,10 +455,11 @@ def __init__(self, *args, **kwargs): Fieldset(_(u'Recuperar Senha'), row1, form_actions( - more=[Submit(u'Cancelar', + more=[Button(u'Cancelar', u'Cancelar', style=u'background-color:black;' - 'color:white;')]))) + 'color:white;', + onclick="window.history.back()")]))) def clean(self): email_existente_usuario = Usuario.objects.filter( diff --git a/sigi/apps/usuarios/layouts.yaml b/sigi/apps/usuarios/layouts.yaml index 227859b4..20ea31a7 100644 --- a/sigi/apps/usuarios/layouts.yaml +++ b/sigi/apps/usuarios/layouts.yaml @@ -7,10 +7,6 @@ CasaLegislativa: - telefone - endereco_web -Subsecretaria: - Subsecretaria: - - nome:8 sigla - Usuario: Dados do Usuário: - username nome_completo:9 diff --git a/sigi/apps/usuarios/urls.py b/sigi/apps/usuarios/urls.py index ca235f42..a14fd609 100644 --- a/sigi/apps/usuarios/urls.py +++ b/sigi/apps/usuarios/urls.py @@ -10,8 +10,7 @@ from sigi.apps.usuarios.forms import (LoginForm, RecuperacaoMudarSenhaForm, RecuperarSenhaEmailForm) from sigi.apps.usuarios.views import (ConfirmarEmailView, ConveniadoListView, - ConveniadoView, HabilitarDetailView, - HabilitarEditView, MudarSenhaView, + ConveniadoView, MudarSenhaView, ResponsavelListView, ResponsavelView, UsuarioCrud) @@ -55,11 +54,6 @@ url(ur'^atendimento/logout/$', logout, {u'next_page': u'/atendimento'}, name=u'logout'), url(ur'^atendimento/usuario/', include(UsuarioCrud.get_urls())), - - url(ur'^atendimento/habilitar/(?P\d+)$', - HabilitarDetailView.as_view(), name=u'habilitar_detail'), - url(ur'^atendimento/habilitar/(?P\d+)/edit$', - HabilitarEditView.as_view(), name=u'habilitar_edit'), url(ur'^atendimento/usuario/(?P\d+)/mudar_senha$', MudarSenhaView.as_view(), name=u'mudar_senha'), url(ur'^usuario/confirmar/(?P[0-9A-Za-z_\-]+)/' diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 2d67804b..bbd90328 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -167,7 +167,7 @@ def get_success_url(self): url_base = full_url[0][:full_url[0].find(u'atendimento') - 1], mensagem = (u"Este e-mail foi utilizado para fazer cadastro no " + u"Sistema de Atendimento ao Usuário do Interlegis.\n" + - u"Clique no link abaixo para confirmar o cadastro:\n\n" + + u"Clique no link abaixo para confirmar o cadastro:\n" + url_base[0] + reverse(u'usuarios:confirmar_email', kwargs=kwargs) + u"\n\nCaso você não tenha feito este cadastro, " + @@ -223,47 +223,6 @@ def get_context_data(self, **kwargs): def layout_key(self): return u'UsuarioDetail' - class BaseMixin(CrudBaseMixin): - list_field_names = [u'username', u'nome_completo', - u'data_criacao', u'habilitado', - u'data_ultima_atualizacao'] - - -class HabilitarDetailView(CrudDetailView): - template_name = u"usuarios/habilitar_detail.html" - - def get(self, request, *args, **kwargs): - context = {} - context[u'pk'] = self.kwargs[u'pk'] - context[u'usuario'] = Usuario.objects.get(pk=self.kwargs[u'pk']) - return self.render_to_response(context) - - -class HabilitarEditView(FormView): - template_name = u"crud/form.html" - - def get(self, request, *args, **kwargs): - context = {} - - usuario = Usuario.objects.get(pk=self.kwargs[u'pk']) - form = HabilitarEditForm(instance=usuario) - - context[u'pk'] = self.kwargs[u'pk'] - context[u'form'] = form - return self.render_to_response(context) - - def post(self, request, *args, **kwargs): - form = HabilitarEditForm(request.POST) - usuario = Usuario.objects.get(pk=self.kwargs[u'pk']) - usuario.habilitado = str2bool(form.data[u'habilitado']) - usuario.data_ultima_atualizacao = timezone.now() - - usuario.save() - return self.form_valid(form) - - def get_success_url(self): - return reverse(u'usuarios:usuario_list') - class MudarSenhaView(FormValidMessageMixin, FormView): template_name = u"crud/form.html" diff --git a/templates/usuarios/usuario_list.html b/templates/usuarios/usuario_list.html deleted file mode 100644 index e5961795..00000000 --- a/templates/usuarios/usuario_list.html +++ /dev/null @@ -1,38 +0,0 @@ -{% extends "crud/list.html" %} -{% load i18n %} - -{% block buttons %}{% endblock buttons %} - -{% block content %} - - {% if not rows %} -

{{ NO_ENTRIES_MSG }}

- {% else %} - - - - {% for name in headers %} - - {% endfor %} - - - - {% for value_list in rows %} - - {% for value, href in value_list %} - - {% endfor %} - - {% endfor %} - -
{{ name }}
- {% if href %} - {{ value }} - {% else %} - {{ value|safe }} - {% endif %} -
- {% endif %} - - {% include "paginacao.html" %} -{% endblock content %} From 16bdce305d7d339510e9ce033e2b7f079719e732 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 16:37:33 -0300 Subject: [PATCH 42/63] Remove import de HabilitarForm --- sigi/apps/usuarios/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index bbd90328..8992bf31 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -24,7 +24,7 @@ CrudDetailView, CrudListView, CrudUpdateView) from sigi.apps.crud.utils import str2bool -from .forms import (ConveniadoForm, HabilitarEditForm, MudarSenhaForm, +from .forms import (ConveniadoForm, MudarSenhaForm, ResponsavelForm, UsuarioEditForm, UsuarioForm) from .models import (AtestoConvenio, AtestoResponsavel, ConfirmaEmail, User, Usuario) From a486a4520515177e3c062a05bde187c44f9cb8a4 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 17:29:36 -0300 Subject: [PATCH 43/63] =?UTF-8?q?Adiciona=20permiss=C3=A3o=20=C3=A0=20tela?= =?UTF-8?q?=20de=20solicita=C3=A7=C3=A3o?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/solicitacoes/views.py | 4 +++- sigi/apps/usuarios/views.py | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sigi/apps/solicitacoes/views.py b/sigi/apps/solicitacoes/views.py index 6dae6d05..2ba8c732 100644 --- a/sigi/apps/solicitacoes/views.py +++ b/sigi/apps/solicitacoes/views.py @@ -20,7 +20,9 @@ class SolicitacaoCrud(LoginRequiredMixin, Crud): model = Solicitacao help_path = u'' - class ListView(CrudListView): + class ListView(GroupRequiredMixin, CrudListView): + template_name = u'solicitacoes/solicitacoes_list.html' + group_required = u'Usuario_Habilitado' def get_rows(self, object_list): object_list = Solicitacao.objects.filter( diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index 8992bf31..ad8a95f9 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -1,6 +1,7 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import +from braces.views import GroupRequiredMixin from braces.views import FormValidMessageMixin, GroupRequiredMixin from django.conf import settings From d744af9fdd3ff074bb59017f996a6ce7421d3faa Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 17:35:00 -0300 Subject: [PATCH 44/63] =?UTF-8?q?Mensagem=20de=20perfil=20habilitado/n?= =?UTF-8?q?=C3=A3o=20habilitado?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sigi/apps/usuarios/views.py | 1 - templates/usuarios/usuario_detail.html | 9 +++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/sigi/apps/usuarios/views.py b/sigi/apps/usuarios/views.py index ad8a95f9..8992bf31 100644 --- a/sigi/apps/usuarios/views.py +++ b/sigi/apps/usuarios/views.py @@ -1,7 +1,6 @@ # -*- coding: utf-8 -*- from __future__ import absolute_import -from braces.views import GroupRequiredMixin from braces.views import FormValidMessageMixin, GroupRequiredMixin from django.conf import settings diff --git a/templates/usuarios/usuario_detail.html b/templates/usuarios/usuario_detail.html index 1f60fa9c..ad1b5467 100644 --- a/templates/usuarios/usuario_detail.html +++ b/templates/usuarios/usuario_detail.html @@ -7,6 +7,14 @@ {% endblock actions %} +{% block msg %} + {% if usuario.conveniado and usuario.responsavel %} +

Esse perfil já está habilitado para uso das funcionalidades.

+ {% else %} +

Esse perfil ainda não está habilitado para uso das funcionalidades.

+ {% endif %} +{% endblock msg %} + {% block detail_content %}
@@ -26,4 +34,5 @@
+ {% endblock %} From 00b828b9a565931fedb0eb4b19d3ba14a77327e2 Mon Sep 17 00:00:00 2001 From: Eduardo Edson Batista Cordeiro Alves Date: Thu, 30 Jun 2016 17:42:08 -0300 Subject: [PATCH 45/63] =?UTF-8?q?remove=20bot=C3=B5es=20da=20tela=20de=20c?= =?UTF-8?q?onfirmar=20email?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- templates/usuarios/confirma_email.html | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/templates/usuarios/confirma_email.html b/templates/usuarios/confirma_email.html index fefbd27b..350df2ca 100644 --- a/templates/usuarios/confirma_email.html +++ b/templates/usuarios/confirma_email.html @@ -1,7 +1,8 @@ {% extends "crud/detail.html" %} {% load i18n %} - +{% block actions %}{% endblock actions %} {% block detail_content %} -Sua conta foi confirmada via e-mail. Clique aqui para fazer seu login. - -{% endblock %} \ No newline at end of file +

+ Sua conta foi confirmada via e-mail. Clique aqui para fazer seu login. +

+{% endblock %} From bd14ec630b274eff79ed5e47b67f5caa605f8145 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 4 Aug 2016 16:33:30 -0300 Subject: [PATCH 46/63] Update django-admin-bootstrapped to support django 1.9 Signed-off-by: Luciano Almeida --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index e7d0bed4..40b950b4 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ -e git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=geraldo -django-admin-bootstrapped==2.5.7 +git+git://github.com/hellpanderrr/django-admin-bootstrapped-1.9-compatible.git@master#egg=django_admin_bootstrappedj django-auth-ldap==1.2.8 django-autoslug==1.9.3 django-bootstrap3==7.0.1 From 8d3a611c91d94a8f2da426f9994e1ae696eff537 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Thu, 4 Aug 2016 18:02:27 -0300 Subject: [PATCH 47/63] Correcting typo in requirements.txt Signed-off-by: Luciano Almeida --- requirements/requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/requirements.txt b/requirements/requirements.txt index 40b950b4..c8d6813f 100644 --- a/requirements/requirements.txt +++ b/requirements/requirements.txt @@ -1,5 +1,5 @@ -e git://github.com/marinho/geraldo.git@868ebdce67176d9b6205cddc92476f642c783fff#egg=geraldo -git+git://github.com/hellpanderrr/django-admin-bootstrapped-1.9-compatible.git@master#egg=django_admin_bootstrappedj +git+git://github.com/hellpanderrr/django-admin-bootstrapped-1.9-compatible.git@master#egg=django_admin_bootstrapped django-auth-ldap==1.2.8 django-autoslug==1.9.3 django-bootstrap3==7.0.1 From 6ace02f5e650f1ae4692865b97fee048f524ae88 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Fri, 5 Aug 2016 14:58:10 -0300 Subject: [PATCH 48/63] Upgrading django-debug-toolbar to v1.5 to avoid errors Signed-off-by: Luciano Almeida --- requirements/dev-requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/dev-requirements.txt b/requirements/dev-requirements.txt index bac1a752..983588b8 100644 --- a/requirements/dev-requirements.txt +++ b/requirements/dev-requirements.txt @@ -1,5 +1,5 @@ -r test-requirements.txt -django-debug-toolbar==1.4 +django-debug-toolbar==1.5 ipdb==0.10.0 ipython==4.2.0 isort==4.2.5 From 5dcb6b0fb9f6262e0650e84cc600573f177e5ffd Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 9 Aug 2016 12:46:15 -0300 Subject: [PATCH 49/63] =?UTF-8?q?Correct=20error=20caused=20by=20django=20?= =?UTF-8?q?version=20upgrade=20in=20Munic=C3=ADpios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luciano Almeida --- sigi/apps/utils/__init__.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sigi/apps/utils/__init__.py b/sigi/apps/utils/__init__.py index af36701f..6bdcf1c1 100644 --- a/sigi/apps/utils/__init__.py +++ b/sigi/apps/utils/__init__.py @@ -3,6 +3,7 @@ from django.contrib import admin from django.db import models +from django.contrib.admin import ModelAdmin class SearchField(models.TextField): @@ -39,4 +40,4 @@ def queryset_ascii(self, request): if 'q' in request.GET: request.GET._mutable = True request.GET['q'] = to_ascii(request.GET['q']) - return admin.ModelAdmin.queryset(self, request) + return admin.ModelAdmin.get_queryset(self, request) From 180192e6007f2b3dd1748a02bd4160e667bb5878 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 9 Aug 2016 13:14:12 -0300 Subject: [PATCH 50/63] Correct error caused by django version upgrade in Ocorrencias Signed-off-by: Luciano Almeida --- sigi/apps/ocorrencias/admin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigi/apps/ocorrencias/admin.py b/sigi/apps/ocorrencias/admin.py index ccf8d884..59fcdf02 100644 --- a/sigi/apps/ocorrencias/admin.py +++ b/sigi/apps/ocorrencias/admin.py @@ -52,7 +52,7 @@ def get_queryset(self, request): if 'grupo' in self.params: grupo = self.params['grupo'] del self.params['grupo'] - qs = super(OcorrenciaChangeList, self).get_query_set(request) + qs = super(OcorrenciaChangeList, self).get_queryset(request) self.params = tmp_params.copy() if grupo: servidor = Servidor.objects.get(user=self.request.user) From 6eb7aca2f53554e9abe12c8badf7f443e2b48d86 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 9 Aug 2016 15:48:05 -0300 Subject: [PATCH 51/63] Fix to smart_pagination Signed-off-by: Luciano Almeida --- sigi/apps/home/templatetags/smart_pagination.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sigi/apps/home/templatetags/smart_pagination.py b/sigi/apps/home/templatetags/smart_pagination.py index 4dcbca22..4475cdcf 100644 --- a/sigi/apps/home/templatetags/smart_pagination.py +++ b/sigi/apps/home/templatetags/smart_pagination.py @@ -29,9 +29,9 @@ def smart_paginator(page_obj, querystring=None): else: querystring = '?' - page_range = page_obj.paginator.page_range + page_range = list(page_obj.paginator.page_range) mid = len(page_range) / 2 - + range = list(set(page_range[:3]) | set(page_range[mid-2:mid+1]) | set(page_range[-3:]) | set(page_range[page_obj.number-2:page_obj.number+1])) range.sort() From 30066bf831d6b4df16358b9e569405d2143ab912 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 9 Aug 2016 17:32:10 -0300 Subject: [PATCH 52/63] Fix removed request.REQUEST in Django 1.9 and fix OSTICKET_URL Signed-off-by: Luciano Almeida --- sigi/apps/diagnosticos/views.py | 4 ++-- sigi/apps/solicitacoes/forms.py | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sigi/apps/diagnosticos/views.py b/sigi/apps/diagnosticos/views.py index 3768c571..5435bbae 100644 --- a/sigi/apps/diagnosticos/views.py +++ b/sigi/apps/diagnosticos/views.py @@ -272,7 +272,7 @@ def diagnostico_pdf(request, id_diagnostico): def graficos(request): categorias = Categoria.objects.all() - sel_categoria = int(request.REQUEST.get("categoria", "3")) + sel_categoria = int(request.GET.get("categoria", "3")) perguntas = Pergunta.objects.filter(categoria=sel_categoria).all() context = RequestContext(request, { @@ -315,7 +315,7 @@ def grafico_api(request): '#BB9098', '#BDF1ED', ]) - pergunta_slug = request.REQUEST.get('id', None) + pergunta_slug = request.GET.get('id', None) pergunta = get_object_or_404(Pergunta, name=pergunta_slug) if pergunta.datatype == 'one': diff --git a/sigi/apps/solicitacoes/forms.py b/sigi/apps/solicitacoes/forms.py index 614e3c1a..b3fda31e 100644 --- a/sigi/apps/solicitacoes/forms.py +++ b/sigi/apps/solicitacoes/forms.py @@ -7,7 +7,7 @@ from django.db import transaction from django.forms import ModelForm -from sigi.settings.prod import OSTICKET_API_KEY, OSTICKET_URL +from sigi.settings.prod import OSTICKET_API_KEY, OSTICKET_ATENDIMENTO_URL from .models import Solicitacao @@ -27,7 +27,8 @@ def open_osticket(solicitacao): "subject": solicitacao.titulo, "ip": "", "message": solicitacao.resumo} - response = requests.post(OSTICKET_URL, headers=headers, json=data) + response = requests.post(OSTICKET_ATENDIMENTO_URL, + headers=headers, json=data) if response.status_code == requests.codes.created: return response.text else: From 8bbe2e2dc5b53aa628b2cf311f464993931a77f0 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 9 Aug 2016 19:00:53 -0300 Subject: [PATCH 53/63] =?UTF-8?q?Fix=20POST=20request=20in=20diagn=C3=B3st?= =?UTF-8?q?ico=20view?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Luciano Almeida --- sigi/apps/diagnosticos/views.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sigi/apps/diagnosticos/views.py b/sigi/apps/diagnosticos/views.py index 5435bbae..946300d4 100644 --- a/sigi/apps/diagnosticos/views.py +++ b/sigi/apps/diagnosticos/views.py @@ -272,7 +272,7 @@ def diagnostico_pdf(request, id_diagnostico): def graficos(request): categorias = Categoria.objects.all() - sel_categoria = int(request.GET.get("categoria", "3")) + sel_categoria = int(request.POST.get("categoria", "3")) perguntas = Pergunta.objects.filter(categoria=sel_categoria).all() context = RequestContext(request, { From c990164809d464c2aa60170f51d024915149a932 Mon Sep 17 00:00:00 2001 From: Luciano Almeida Date: Tue, 9 Aug 2016 19:21:01 -0300 Subject: [PATCH 54/63] Fix some static file path Signed-off-by: Luciano Almeida --- sigi/apps/convenios/templates/convenios/change_list.html | 2 +- .../templates/admin/diagnosticos/diagnostico/change_list.html | 2 +- .../metas/templates/admin/metas/planodiretor/change_list.html | 2 +- .../templates/admin/servicos/casaatendida/change_form.html | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sigi/apps/convenios/templates/convenios/change_list.html b/sigi/apps/convenios/templates/convenios/change_list.html index 3f0ce3e4..3dc6737f 100644 --- a/sigi/apps/convenios/templates/convenios/change_list.html +++ b/sigi/apps/convenios/templates/convenios/change_list.html @@ -5,7 +5,7 @@

{{ srv.tipo_servico.sigla }}

 {{ srv.tipo_servico }} {{ srv.hospedagem_interlegis }} {{ srv.data_ativacao|date:'SHORT_DATE_FORMAT' }} {{ srv.data_alteracao|date:'SHORT_DATE_FORMAT' }} {{ srv.data_desativacao|date:'SHORT_DATE_FORMAT' }}