fix qa_check and insert timestampdmixin

base/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

comissoes/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

comissoes/migrations/0002_auto_20150729_1310.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

comissoes/urls.py

@@ -1,7 +1,7 @@
 from django.conf.urls import include, url
 
-from comissoes.views import (ComissaoParlamentarIncluirView, ComposicaoView,
+from comissoes.views import (ComissaoParlamentarEditView,
-                             ComissaoParlamentarEditView,
+                             ComissaoParlamentarIncluirView, ComposicaoView,
                              MateriasView, ReunioesView, cargo_crud,
                              comissao_crud, periodo_composicao_crud,
                              tipo_comissao_crud)

compilacao/forms.py

@@ -0,0 +1,8 @@
+from django import forms
+from django.utils.translation import ugettext_lazy as _
+
+
+class UpLoadImportFileForm(forms.Form):
+    import_file = forms.FileField(
+        required=True,
+        label=_('Arquivo formato ODF para Importanção'))

compilacao/migrations/0001_initial.py

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
 from django.conf import settings
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0002_auto_20150907_2334.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0003_auto_20150911_1735.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0004_auto_20150914_0842.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0005_auto_20150924_1012.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0006_auto_20150924_1121.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0007_auto_20150924_1131.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0008_auto_20151005_1023.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0009_auto_20151007_1635.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

compilacao/migrations/0016_auto_20151119_0950.py

@@ -1,8 +1,9 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import migrations, models
 import datetime
+
+from django.db import migrations, models
 from django.utils.timezone import utc
 
 

compilacao/models.py

@@ -368,7 +368,7 @@ class VeiculoPublicacao(models.Model):
         return '%s: %s' % (self.sigla, self.nome)
 
 
-class Publicacao(models.Model):
+class Publicacao(TimestampedMixin):
     norma = models.ForeignKey(
         NormaJuridica, verbose_name=_('Norma Jurídica'))
     veiculo_publicacao = models.ForeignKey(
@@ -380,7 +380,6 @@ class Publicacao(models.Model):
         blank=True, null=True, verbose_name=_('Pg. Início'))
     pagina_fim = models.PositiveIntegerField(
         blank=True, null=True, verbose_name=_('Pg. Fim'))
-    timestamp = models.DateTimeField()
 
     class Meta:
         verbose_name = _('Publicação')
@@ -852,7 +851,7 @@ class Dispositivo(BaseModel, TimestampedMixin):
                 tipo_dispositivo_id=self.tipo_dispositivo.pk))
 
         else:  # contagem continua restrita a articulacao
-            proxima_articulacao = self.get_proxima_articulacao()
+            proxima_articulacao = self.get_proximo_nivel_zero()
 
             if proxima_articulacao is None:
                 irmaos = list(Dispositivo.objects.filter(
@@ -940,7 +939,7 @@ class Dispositivo(BaseModel, TimestampedMixin):
             irmao.clean()
             irmao.save()
 
-    def get_proxima_articulacao(self):
+    def get_proximo_nivel_zero(self):
         proxima_articulacao = Dispositivo.objects.filter(
             ordem__gt=self.ordem,
             nivel=0,
@@ -1025,8 +1024,7 @@ class Dispositivo(BaseModel, TimestampedMixin):
                 dispositivo.set_numero_completo([1, 0, 0, 0, 0, 0, ])
 
 
-class Vide(models.Model):
+class Vide(TimestampedMixin):
-    data_criacao = models.DateTimeField(verbose_name=_('Data de Criação'))
     texto = models.TextField(verbose_name=_('Texto do Vide'))
 
     tipo = models.ForeignKey(TipoVide, verbose_name=_('Tipo do Vide'))
@@ -1048,7 +1046,7 @@ class Vide(models.Model):
         return _('Vide %s') % self.texto
 
 
-class Nota(models.Model):
+class Nota(TimestampedMixin):
     NPRIV = 1
     NSTRL = 2
     NINST = 3
@@ -1070,7 +1068,6 @@ class Nota(models.Model):
         blank=True,
         verbose_name=_('Url externa'))
 
-    data_criacao = models.DateTimeField(verbose_name=_('Data de Criação'))
     publicacao = models.DateTimeField(verbose_name=_('Data de Publicação'))
     efetifidade = models.DateTimeField(verbose_name=_('Data de Efeito'))
 

compilacao/views.py

@@ -2,7 +2,6 @@ from collections import OrderedDict
 from datetime import datetime, timedelta
 from os.path import sys
 
-from django import forms
 from django.core.signing import Signer
 from django.db.models import Q
 from django.http.response import JsonResponse
@@ -14,6 +13,7 @@ from django.views.generic.edit import FormMixin
 from django.views.generic.list import ListView
 
 from compilacao.file2dispositivo import Parser
+from compilacao.forms import UpLoadImportFileForm
 from compilacao.models import (Dispositivo, PerfilEstruturalTextosNormativos,
                                TipoDispositivo, TipoNota, TipoPublicacao,
                                TipoVide, VeiculoPublicacao)
@@ -253,12 +253,6 @@ class DispositivoView(CompilacaoView):
         return itens
 
 
-class UpLoadImportFileForm(forms.Form):
-    import_file = forms.FileField(
-        required=True,
-        label=_('Arquivo formato ODF para Importanção'))
-
-
 def handle_uploaded_file(f, outfilepath):
     with open(outfilepath, 'wb+') as destination:
         for chunk in f.chunks():
@@ -1018,7 +1012,7 @@ class ActionsEditMixin(object):
                 pkfilho = dispositivo.pk
                 dispositivo = dispositivo.dispositivo_pai
 
-                proxima_articulacao = dispositivo.get_proxima_articulacao()
+                proxima_articulacao = dispositivo.get_proximo_nivel_zero()
 
                 if proxima_articulacao is not None:
                     parents = Dispositivo.objects.filter(

lexml/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

lexml/migrations/0002_auto_20150806_1614.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0002_auto_20150729_1310.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0003_auto_20150729_1717.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0004_materialegislativa_texto_original.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+
 import materia.models
 
 

materia/migrations/0005_auto_20150923_0941.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0006_proposicao_status.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0007_auto_20151021_1200.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0008_auto_20151029_1416.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0009_auto_20151029_1420.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

materia/migrations/0010_auto_20151117_1551.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+
 import materia.models
 
 

materia/urls.py

@@ -1,4 +1,5 @@
 from django.conf.urls import include, url
+
 from materia.views import (AutoriaEditView, AutoriaView,
                            DespachoInicialEditView, DespachoInicialView,
                            DocumentoAcessorioEditView, DocumentoAcessorioView,

materia/views.py

@@ -1,6 +1,5 @@
 from datetime import date
 
-from comissoes.models import Comissao
 from crispy_forms.helper import FormHelper
 from crispy_forms.layout import HTML, ButtonHolder, Fieldset, Layout, Submit
 from django import forms
@@ -10,10 +9,11 @@ from django.forms import ModelForm
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic.edit import FormMixin
+from vanilla import GenericView
+
+from comissoes.models import Comissao, Composicao
 from norma.models import LegislacaoCitada, NormaJuridica, TipoNormaJuridica
-from comissoes.models import Composicao
 from sapl.crud import build_crud
-from vanilla import GenericView
 
 from .models import (Anexada, Autor, Autoria, DespachoInicial,
                      DocumentoAcessorio, MateriaLegislativa, Numeracao, Orgao,

norma/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

norma/migrations/0002_auto_20150729_1717.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

norma/migrations/0003_auto_20150906_0239.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

norma/migrations/0004_auto_20150907_0004.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

norma/migrations/0005_auto_20150915_1141.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

norma/urls.py

@@ -1,6 +1,6 @@
-from django.conf.urls import url, include
+from django.conf.urls import include, url
 
-from norma.views import NormaIncluirView, tipo_norma_crud, assunto_norma_crud
+from norma.views import NormaIncluirView, assunto_norma_crud, tipo_norma_crud
 
 urlpatterns = [
     # url(r'^norma/', include(norma_url_patterns,

painel/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

parlamentares/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

parlamentares/migrations/0002_auto_20150729_1310.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

parlamentares/migrations/0003_auto_20150729_1717.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

parlamentares/migrations/0004_auto_20150929_1425.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

parlamentares/migrations/0005_parlamentar_fotografia.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+
 import parlamentares.models
 
 

parlamentares/migrations/0006_auto_20151119_1318.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

parlamentares/urls.py

@@ -1,4 +1,5 @@
 from django.conf.urls import include, url
+
 from parlamentares.views import (ParlamentaresView, cargo_mesa_crud,
                                  coligacao_crud, legislatura_crud,
                                  nivel_instrucao_crud, parlamentar_crud,

parlamentares/views.py

@@ -1,15 +1,14 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
-from sapl.crud import build_crud
 from vanilla import GenericView
-from django import forms
+
+from sapl.crud import build_crud
 
 from .models import (CargoMesa, Coligacao, Dependente, Filiacao, Legislatura,
                      Mandato, NivelInstrucao, Parlamentar, Partido,
                      SessaoLegislativa, SituacaoMilitar, TipoAfastamento,
                      TipoDependente)
 
-
 cargo_mesa_crud = build_crud(
     CargoMesa, 'cargo_mesa', [
 

protocoloadm/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

protocoloadm/migrations/0002_auto_20150729_1717.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

protocoloadm/migrations/0003_documentoacessorioadministrativo_texto_integral.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+
 import protocoloadm.models
 
 

protocoloadm/migrations/0004_auto_20151007_1035.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+
 import protocoloadm.models
 
 

protocoloadm/migrations/0005_auto_20151008_0744.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+
 import protocoloadm.models
 
 

protocoloadm/urls.py

@@ -4,9 +4,8 @@ from protocoloadm.views import (AnularProtocoloAdmView,
                                 DetailDocumentoAdministrativo,
                                 DocumentoAcessorioAdministrativoView,
                                 PesquisarDocumentoAdministrativo,
-                                ProposicaoReceberView, ProposicaoView,
+                                ProposicaoDetailView, ProposicaoReceberView,
-                                ProposicaoDetailView,
+                                ProposicaoView, ProposicoesIncorporadasView,
-                                ProposicoesIncorporadasView,
                                 ProposicoesNaoIncorporadasView,
                                 ProposicoesNaoRecebidasView,
                                 ProtocoloDocumentoView, ProtocoloListView,

sapl/settings.py

@@ -60,8 +60,7 @@ INSTALLED_APPS = (
     'sass_processor',
 )
 if DEBUG:
-    # INSTALLED_APPS += ('debug_toolbar',)
+    INSTALLED_APPS += ('debug_toolbar',)
-    pass
 
 MIDDLEWARE_CLASSES = (
     'django.contrib.sessions.middleware.SessionMiddleware',
@@ -120,7 +119,7 @@ USE_L10N = False
 USE_TZ = True
 # DATE_FORMAT = 'N j, Y'
 DATE_FORMAT = 'd/m/Y'
-SHORT_DATE_FORMAT='d/m/Y'
+SHORT_DATE_FORMAT = 'd/m/Y'
 DATE_INPUT_FORMATS = ('%d/%m/%Y', '%m-%d-%Y', '%Y-%m-%d')
 
 LOCALE_PATHS = (

sessao/migrations/0001_initial.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sessao/migrations/0002_auto_20150729_1450.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sessao/migrations/0003_remove_sessaoplenaria_tipo_expediente.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sessao/migrations/0004_auto_20150806_1614.py

@@ -1,7 +1,8 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
+
 import sessao.models
 
 

sessao/migrations/0005_remove_presencaordemdia_data_ordem.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sessao/migrations/0006_auto_20150929_1425.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sessao/migrations/0007_auto_20150929_1426.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sessao/migrations/0008_auto_20151005_0814.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

sessao/migrations/0009_auto_20151005_0934.py

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-from django.db import models, migrations
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):