From f338ef06785a9a847f3636f2c961415794f75929 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Thu, 19 May 2016 12:53:45 -0300
Subject: [PATCH 1/7] =?UTF-8?q?Separa=20Protocolo=20de=20Documento=20Admin?=
 =?UTF-8?q?istrativo=20e=20cria=20o=20bot=C3=A3o=20de=20adicionar=20docume?=
 =?UTF-8?q?nto?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 templates/base.html                                       | 8 +++++++-
 .../protocoloadm/documentoadministrativo_filter.html      | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/templates/base.html b/templates/base.html
index 4fe933103..2ed64bfe5 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -57,13 +57,19 @@
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Protocolo <span class="caret"></span></a>
                   <ul class="dropdown-menu">
                     <li class="nav__sub-item"><a class="nav__sub-link" href="{% url 'protocoloadm:protocolo' %}">Pesquisar Protocolo</a></li>
-                    <li class="nav__sub-item"><a class="nav__sub-link" href="{% url 'protocoloadm:pesq_doc_adm' %}">Pesquisar Documento Administrativo</a></li>
                     <!-- <li class="nav__sub-item"><a class="nav__sub-link" href="/materia">Protocolo Legislativo</a></li> -->
                     {# <li class="nav__sub-item"><a class="nav__sub-link" href="">Protocolo Geral</a></li> #}
                     {# <li class="nav__sub-item"><a class="nav__sub-link" href="{% url 'protocoloadm:proposicao' %}">Proposições</a></li> #}
                   </ul>
                 </li>
 
+              <li class="dropdown">
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Documentos Administrativos <span class="caret"></span></a>
+                  <ul class="dropdown-menu">
+                    <li class="nav__sub-item"><a class="nav__sub-link" href="{% url 'protocoloadm:pesq_doc_adm' %}">Pesquisar Documento </a></li>
+                  </ul>
+                </li>
+
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Atividade Legislativa <span class="caret"></span></a>
                   <ul class="dropdown-menu">
diff --git a/templates/protocoloadm/documentoadministrativo_filter.html b/templates/protocoloadm/documentoadministrativo_filter.html
index 21435b7a8..e947609de 100644
--- a/templates/protocoloadm/documentoadministrativo_filter.html
+++ b/templates/protocoloadm/documentoadministrativo_filter.html
@@ -1,10 +1,16 @@
 {% extends "crud/detail.html" %}
 {% load i18n %}
 {% load crispy_forms_tags %}
-{% block actions %}{% endblock %}
 
 {% block sections_nav %} {% endblock %}
 
+{% block actions %}
+  <div class="actions btn-group pull-right" role="group">
+    <a href="docadm/create" class="btn btn-default">{% trans 'Adicionar Documento' %}</a>
+  </div>
+{% endblock actions %}
+
+
 {% block detail_content %}
   <h1><b>Pesquisar Documento Administrativo</b></h1>
   <br></br>

From abde4dc087d366512ff21cde473ba1646e7ec2f3 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Fri, 20 May 2016 09:20:48 -0300
Subject: [PATCH 2/7] Refatora Tramitacoes de Documentos Administrativos e faz
 alguns ajustes

---
 materia/migrations/0036_merge.py              | 16 +++++++++
 protocoloadm/forms.py                         | 36 +++++++++----------
 protocoloadm/layouts.yaml                     |  9 +++++
 ..._remove_tramitacaoadministrativo_ultima.py | 19 ++++++++++
 protocoloadm/models.py                        |  1 -
 protocoloadm/urls.py                          |  4 ++-
 protocoloadm/views.py                         | 36 ++++++++++++++++++-
 .../documentoadministrativo_detail.html       | 10 ++++++
 .../documentoadministrativo_filter.html       |  6 ++--
 templates/protocoloadm/protocolo_filter.html  |  2 --
 .../protocoloadm/protocolo_pesquisa.html      |  9 -----
 .../protocoloadm/protocoloadm_detail.html     |  1 +
 12 files changed, 113 insertions(+), 36 deletions(-)
 create mode 100644 materia/migrations/0036_merge.py
 create mode 100644 protocoloadm/migrations/0013_remove_tramitacaoadministrativo_ultima.py
 create mode 100644 templates/protocoloadm/documentoadministrativo_detail.html
 delete mode 100644 templates/protocoloadm/protocolo_pesquisa.html

diff --git a/materia/migrations/0036_merge.py b/materia/migrations/0036_merge.py
new file mode 100644
index 000000000..46be53b44
--- /dev/null
+++ b/materia/migrations/0036_merge.py
@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-20 11:53
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('materia', '0032_auto_20160503_0926'),
+        ('materia', '0035_auto_20160510_0949'),
+    ]
+
+    operations = [
+    ]
diff --git a/protocoloadm/forms.py b/protocoloadm/forms.py
index f01bc67fc..aec065756 100644
--- a/protocoloadm/forms.py
+++ b/protocoloadm/forms.py
@@ -1,9 +1,9 @@
 import django_filters
 from crispy_forms.bootstrap import InlineRadios
 from crispy_forms.helper import FormHelper
-from crispy_forms.layout import HTML, Button, Field, Fieldset, Layout, Submit
+from crispy_forms.layout import HTML, Button, Fieldset, Layout, Submit
 from django import forms
-from django.core.exceptions import ObjectDoesNotExist
+from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
 from django.forms import ModelForm
 from django.utils.translation import ugettext_lazy as _
@@ -523,7 +523,6 @@ class TramitacaoAdmForm(ModelForm):
                   'data_encaminhamento',
                   'data_fim_prazo',
                   'texto',
-                  'documento',
                   ]
 
         widgets = {
@@ -532,22 +531,21 @@ class TramitacaoAdmForm(ModelForm):
             'data_fim_prazo': forms.DateInput(format='%d/%m/%Y'),
         }
 
-    def __init__(self, *args, **kwargs):
-        self.helper = FormHelper()
-        self.helper.layout = Layout(
-            Fieldset(_('Incluir Tramitação'),
-                     'data_tramitacao',
-                     'unidade_tramitacao_local',
-                     'status',
-                     'unidade_tramitacao_destino',
-                     'data_encaminhamento',
-                     'data_fim_prazo',
-                     'texto'),
-            Field('documento', type="hidden"),
-            form_actions()
-        )
-        super(TramitacaoAdmForm, self).__init__(
-            *args, **kwargs)
+    def clean(self):
+        if self.errors:
+            return self.errors
+
+        # ultima_tramitacao = TramitacaoAdministrativo.objects.filter(
+        #     documento_id=self.instance.documento.id).last()
+
+        # if ultima_tramitacao:
+        #     destino = ultima_tramitacao.unidade_tramitacao_destino
+        #     if (destino != self.cleaned_data['unidade_tramitacao_local']):
+        #         msg = _('A origem da nova tramitação deve ser igual ao '
+        #                 'destino  da última adicionada!')
+        #         raise ValidationError(msg)
+
+        return self.cleaned_data
 
 
 class DocumentoAdministrativoForm(ModelForm):
diff --git a/protocoloadm/layouts.yaml b/protocoloadm/layouts.yaml
index 32ba858ee..098c5ff01 100644
--- a/protocoloadm/layouts.yaml
+++ b/protocoloadm/layouts.yaml
@@ -14,6 +14,15 @@ DocumentoAdministrativo:
   - dias_prazo  data_fim_prazo
   - observacao
 
+TramitacaoAdministrativo:
+  Indentificação Básica:
+  - data_tramitacao  unidade_tramitacao_local
+  - unidade_tramitacao_destino  status
+
+  Outras Informações:
+  - dias_prazo  data_fim_prazo
+  - observacao
+
 DocumentoAcessorioAdministrativo:
   Documento Acessório:
   - tipo  nome  data
diff --git a/protocoloadm/migrations/0013_remove_tramitacaoadministrativo_ultima.py b/protocoloadm/migrations/0013_remove_tramitacaoadministrativo_ultima.py
new file mode 100644
index 000000000..4753f9059
--- /dev/null
+++ b/protocoloadm/migrations/0013_remove_tramitacaoadministrativo_ultima.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.5 on 2016-05-20 11:54
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('protocoloadm', '0012_auto_20160503_0926'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='tramitacaoadministrativo',
+            name='ultima',
+        ),
+    ]
diff --git a/protocoloadm/models.py b/protocoloadm/models.py
index 9d2f922cd..081b8b277 100644
--- a/protocoloadm/models.py
+++ b/protocoloadm/models.py
@@ -175,7 +175,6 @@ class TramitacaoAdministrativo(models.Model):
         null=True,
         related_name='adm_tramitacoes_destino',
         verbose_name=_('Unidade Destino'))
-    ultima = models.BooleanField()
     texto = models.TextField(
         blank=True, verbose_name=_('Texto da Ação'))
     data_fim_prazo = models.DateField(
diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py
index 09951476d..2548ebbd5 100644
--- a/protocoloadm/urls.py
+++ b/protocoloadm/urls.py
@@ -19,6 +19,7 @@ from protocoloadm.views import (AnularProtocoloAdmView,
                                 ProtocoloPesquisaView,
                                 StatusTramitacaoAdministrativoCrud,
                                 TipoDocumentoAdministrativoCrud,
+                                TramitacaoAdmCrud,
                                 TramitacaoAdmDeleteView, TramitacaoAdmEditView,
                                 TramitacaoAdmIncluirView,
                                 TramitacaoAdministrativoCrud,
@@ -31,7 +32,8 @@ app_name = AppConfig.name
 
 urlpatterns = [
     url(r'^protocoloadm/docadm/',
-        include(DocumentoAdministrativoCrud.get_urls())),
+        include(DocumentoAdministrativoCrud.get_urls() +
+                TramitacaoAdmCrud.get_urls())),
     url(r'^protocoloadm/tipo-documento-adm/',
         include(TipoDocumentoAdministrativoCrud.get_urls())),
     url(r'^protocoloadm/doc-acessorio/',
diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index 5f874ef78..cdf101a61 100644
--- a/protocoloadm/views.py
+++ b/protocoloadm/views.py
@@ -1,4 +1,6 @@
 import json
+import crud.base
+
 from datetime import date, datetime
 
 from braces.views import FormValidMessageMixin
@@ -13,6 +15,7 @@ from django.views.generic.base import TemplateView
 from django_filters.views import FilterView
 
 from crud.base import Crud, make_pagination
+from crud.masterdetail import MasterDetailCrud
 from materia.models import Proposicao, TipoMateriaLegislativa
 from sapl.utils import create_barcode, get_client_ip
 
@@ -28,7 +31,6 @@ from .models import (Autor, DocumentoAcessorioAdministrativo,
 
 TipoDocumentoAdministrativoCrud = Crud.build(TipoDocumentoAdministrativo,
                                              '')
-DocumentoAdministrativoCrud = Crud.build(DocumentoAdministrativo, '')
 DocumentoAcessorioAdministrativoCrud = Crud.build(
     DocumentoAcessorioAdministrativo, '')
 StatusTramitacaoAdministrativoCrud = Crud.build(
@@ -40,6 +42,16 @@ ProtocoloDocumentoCrud = Crud.build(Protocolo, '')
 ProtocoloMateriaCrud = Crud.build(Protocolo, '')
 
 
+class DocumentoAdministrativoCrud(Crud):
+    model = DocumentoAdministrativo
+    help_path = ''
+
+    class BaseMixin(crud.base.CrudBaseMixin):
+        list_field_names = ['tipo', 'numero', 'ano', 'data',
+                            'numero_protocolo', 'assunto',
+                            'interessado', 'tramitacao', 'texto_integral']
+
+
 class ProtocoloPesquisaView(FilterView):
     model = Protocolo
     filterset_class = ProtocoloFilterSet
@@ -544,6 +556,28 @@ class DocumentoAcessorioAdministrativoView(FormView):
         return reverse('protocoloadm:doc_ace_adm', kwargs={'pk': pk})
 
 
+class TramitacaoAdmCrud(MasterDetailCrud):
+    model = TramitacaoAdministrativo
+    parent_field = 'documento'
+    help_path = ''
+
+    class BaseMixin(MasterDetailCrud.BaseMixin):
+        list_field_names = ['data_tramitacao', 'unidade_tramitacao_local',
+                            'unidade_tramitacao_destino', 'status']
+
+    class CreateView(MasterDetailCrud.CreateView):
+        form_class = TramitacaoAdmForm
+
+    class UpdateView(MasterDetailCrud.UpdateView):
+        form_class = TramitacaoAdmForm
+
+    class ListView(MasterDetailCrud.ListView):
+        def get_queryset(self):
+            qs = super(MasterDetailCrud.ListView, self).get_queryset()
+            kwargs = {self.crud.parent_field: self.kwargs['pk']}
+            return qs.filter(**kwargs).order_by('-data_tramitacao')
+
+
 class TramitacaoAdmView(FormView):
     template_name = "protocoloadm/tramitacao.html"
 
diff --git a/templates/protocoloadm/documentoadministrativo_detail.html b/templates/protocoloadm/documentoadministrativo_detail.html
new file mode 100644
index 000000000..a56d176f3
--- /dev/null
+++ b/templates/protocoloadm/documentoadministrativo_detail.html
@@ -0,0 +1,10 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+{% block actions %}
+<h1><b>Protocolos</b></h1>
+<div class="actions btn-group pull-right" role="group">
+<a href="{% url 'protocoloadm:tramitacaoadministrativo_list' object.pk %}" class="btn btn-default">{% trans 'Tramitações' %}</a>
+  <a href="{{ view.update_url }}" class="btn btn-default">{% trans 'Editar' %}</a>
+  <a href="{{ view.delete_url }}" class="btn btn-default">{% trans 'Excluir' %}</a>
+</div>
+{% endblock actions %}
\ No newline at end of file
diff --git a/templates/protocoloadm/documentoadministrativo_filter.html b/templates/protocoloadm/documentoadministrativo_filter.html
index e947609de..e4e0e73bb 100644
--- a/templates/protocoloadm/documentoadministrativo_filter.html
+++ b/templates/protocoloadm/documentoadministrativo_filter.html
@@ -5,15 +5,15 @@
 {% block sections_nav %} {% endblock %}
 
 {% block actions %}
+  <h1><b>Documentos Administrativos</b></h1>
   <div class="actions btn-group pull-right" role="group">
-    <a href="docadm/create" class="btn btn-default">{% trans 'Adicionar Documento' %}</a>
+    <a href="docadm/create" class="btn btn-default">{% trans 'Adicionar Documento Administrativo' %}</a>
   </div>
 {% endblock actions %}
 
 
 {% block detail_content %}
-  <h1><b>Pesquisar Documento Administrativo</b></h1>
-  <br></br>
+
  
 
   {% crispy filter.form %}
diff --git a/templates/protocoloadm/protocolo_filter.html b/templates/protocoloadm/protocolo_filter.html
index 0a93bc5ce..7fb7d0f5c 100644
--- a/templates/protocoloadm/protocolo_filter.html
+++ b/templates/protocoloadm/protocolo_filter.html
@@ -6,8 +6,6 @@
 {% block sections_nav %} {% endblock %}
 
 {% block detail_content %}
-  <h1><b>Pesquisa de Protocolo</b></h1>
-  <br></br>
 
   {% crispy filter.form %}
   {% if filter_url %}
diff --git a/templates/protocoloadm/protocolo_pesquisa.html b/templates/protocoloadm/protocolo_pesquisa.html
deleted file mode 100644
index 60a795994..000000000
--- a/templates/protocoloadm/protocolo_pesquisa.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block detail_content %}
-	<legend>Pesquisa Avançada</legend>
-		{% crispy form %}
-	</fieldset>
-{% endblock detail_content %}
diff --git a/templates/protocoloadm/protocoloadm_detail.html b/templates/protocoloadm/protocoloadm_detail.html
index c447da52c..d54f344e0 100644
--- a/templates/protocoloadm/protocoloadm_detail.html
+++ b/templates/protocoloadm/protocoloadm_detail.html
@@ -1,6 +1,7 @@
 {% extends "crud/detail.html" %}
 {% load i18n %}
 {% block actions %}
+<h1><b>Protocolos</b></h1>
 <div class="actions btn-group pull-right" role="group">
   <a href="{% url 'protocoloadm:protocolo' %}" class="btn btn-default">{% trans 'Pesquisa Protocolo' %}</a>
   <a href="{% url 'protocoloadm:protocolar_doc' %}" class="btn btn-default">{% trans 'Protocolar Documento' %}</a>

From b3fd9c1547b8477ad29edc65693e1b50bb35d3da Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Fri, 20 May 2016 09:30:57 -0300
Subject: [PATCH 3/7] Remove antigo codigo da tramitacao de documento adm

---
 protocoloadm/views.py | 86 -------------------------------------------
 1 file changed, 86 deletions(-)

diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index cdf101a61..7041f3712 100644
--- a/protocoloadm/views.py
+++ b/protocoloadm/views.py
@@ -578,92 +578,6 @@ class TramitacaoAdmCrud(MasterDetailCrud):
             return qs.filter(**kwargs).order_by('-data_tramitacao')
 
 
-class TramitacaoAdmView(FormView):
-    template_name = "protocoloadm/tramitacao.html"
-
-    def get(self, request, *args, **kwargs):
-
-        pk = kwargs['pk']
-        documento = DocumentoAdministrativo.objects.get(id=pk)
-        tramitacoes = TramitacaoAdministrativo.objects.filter(
-            documento=documento).order_by('-data_tramitacao')
-
-        return self.render_to_response({'documento': documento,
-                                        'tramitacoes': tramitacoes})
-
-
-class TramitacaoAdmIncluirView(FormView):
-    template_name = "protocoloadm/tramitacao_incluir.html"
-
-    def get(self, request, *args, **kwargs):
-        pk = kwargs['pk']
-        documento = DocumentoAdministrativo.objects.get(id=pk)
-        data = {'documento': documento}
-        form = TramitacaoAdmForm(initial=data)
-
-        return self.render_to_response({'documento': documento, 'form': form})
-
-    def post(self, request, *args, **kwargs):
-        pk = kwargs['pk']
-        form = TramitacaoAdmForm(request.POST or None)
-
-        if form.is_valid():
-            tramitacao = form.save(commit=False)
-            tramitacao.ultima = False
-            tramitacao.save()
-            return HttpResponseRedirect(reverse(
-                'protocoloadm:tramitacao_adm', kwargs={'pk': pk}))
-        else:
-            return self.form_invalid(form)
-
-
-class TramitacaoAdmEditView(FormView):
-
-    template_name = "protocoloadm/tramitacao_edit.html"
-
-    def get(self, request, *args, **kwargs):
-        pk = kwargs['pk']
-        tramitacao = TramitacaoAdministrativo.objects.get(id=pk)
-        documento = tramitacao.documento
-        form = TramitacaoAdmForm(instance=tramitacao)
-
-        return self.render_to_response({'documento': documento, 'form': form})
-
-    def post(self, request, *args, **kwargs):
-        pk = kwargs['pk']
-        tramitacao = TramitacaoAdministrativo.objects.get(id=pk)
-        form = TramitacaoAdmForm(request.POST, instance=tramitacao)
-
-        if form.is_valid():
-            tramitacao = form.save(commit=False)
-            tramitacao.ultima = False
-            tramitacao.save()
-            return HttpResponseRedirect(
-                reverse('protocoloadm:tramitacao_adm',
-                        kwargs={'pk': tramitacao.documento.id}))
-        else:
-            return self.form_invalid(form)
-
-
-class TramitacaoAdmDeleteView(DetailView):
-
-    template_name = "protocoloadm/tramitacao.html"
-
-    def get(self, request, *args, **kwargs):
-        pk = kwargs['pk']
-        oid = kwargs['oid']
-
-        documento = DocumentoAdministrativo.objects.get(id=pk)
-
-        tramitacao = TramitacaoAdministrativo.objects.get(id=oid)
-        tramitacao.delete()
-        tramitacoes = TramitacaoAdministrativo.objects.filter(
-            documento=documento)
-
-        return self.render_to_response({'documento': documento,
-                                        'tramitacoes': tramitacoes})
-
-
 def get_nome_autor(request):
     nome_autor = ''
     if request.method == 'GET':

From d71f4d83a16b0a72562c0edb1c9390324b6aa684 Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Fri, 20 May 2016 09:38:26 -0300
Subject: [PATCH 4/7] Remove varios templates relacionados a tramitacao de
 documentos

---
 protocoloadm/urls.py                          | 17 +-------
 protocoloadm/views.py                         |  1 -
 templates/protocoloadm/tramitacao.html        | 40 -------------------
 templates/protocoloadm/tramitacao_edit.html   | 15 -------
 .../protocoloadm/tramitacao_incluir.html      | 14 -------
 5 files changed, 1 insertion(+), 86 deletions(-)
 delete mode 100644 templates/protocoloadm/tramitacao.html
 delete mode 100644 templates/protocoloadm/tramitacao_edit.html
 delete mode 100644 templates/protocoloadm/tramitacao_incluir.html

diff --git a/protocoloadm/urls.py b/protocoloadm/urls.py
index 2548ebbd5..7ea129b29 100644
--- a/protocoloadm/urls.py
+++ b/protocoloadm/urls.py
@@ -19,11 +19,7 @@ from protocoloadm.views import (AnularProtocoloAdmView,
                                 ProtocoloPesquisaView,
                                 StatusTramitacaoAdministrativoCrud,
                                 TipoDocumentoAdministrativoCrud,
-                                TramitacaoAdmCrud,
-                                TramitacaoAdmDeleteView, TramitacaoAdmEditView,
-                                TramitacaoAdmIncluirView,
-                                TramitacaoAdministrativoCrud,
-                                TramitacaoAdmView, get_nome_autor,
+                                TramitacaoAdmCrud, get_nome_autor,
                                 pesquisa_autores)
 
 from .apps import AppConfig
@@ -40,8 +36,6 @@ urlpatterns = [
         include(DocumentoAcessorioAdministrativoCrud.get_urls())),
     url(r'^protocoloadm/status-tramitacao-adm/',
         include(StatusTramitacaoAdministrativoCrud.get_urls())),
-    url(r'^protocoloadm/tramitacao-adm/',
-        include(TramitacaoAdministrativoCrud.get_urls())),
     url(r'^protocoloadm/protocolo-doc/',
         include(ProtocoloDocumentoCrud.get_urls())),
     url(r'^protocoloadm/protocolo-mat/',
@@ -68,15 +62,6 @@ urlpatterns = [
         DocumentoAcessorioAdministrativoEditView.as_view(),
         name='doc_ace_adm_edit'),
 
-    url(r'^protocoloadm/(?P<pk>\d+)/tramitacao$',
-        TramitacaoAdmView.as_view(), name='tramitacao_adm'),
-    url(r'^protocoloadm/(?P<pk>\d+)/tramitacao_incluir',
-        TramitacaoAdmIncluirView.as_view(), name='tramitacao_incluir'),
-    url(r'^protocoloadm/(?P<pk>\d+)/tramitacao_edit',
-        TramitacaoAdmEditView.as_view(), name='tramitacao_edit'),
-    url(r'^protocoloadm/(?P<pk>\d+)/tramitacao_delete/(?P<oid>\d+)',
-        TramitacaoAdmDeleteView.as_view(), name='tramitacao_delete'),
-
     url(r'^protocoloadm/(?P<pk>\d+)/(?P<ano>\d+)/comprovante$',
         ComprovanteProtocoloView.as_view(), name='comprovante_protocolo'),
     url(r'^protocoloadm/(?P<pk>\d+)/(?P<ano>\d+)/criar_documento$',
diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index 7041f3712..1ab25798d 100644
--- a/protocoloadm/views.py
+++ b/protocoloadm/views.py
@@ -35,7 +35,6 @@ DocumentoAcessorioAdministrativoCrud = Crud.build(
     DocumentoAcessorioAdministrativo, '')
 StatusTramitacaoAdministrativoCrud = Crud.build(
     StatusTramitacaoAdministrativo, '')
-TramitacaoAdministrativoCrud = Crud.build(TramitacaoAdministrativo, '')
 ProtocoloDocumentoCrud = Crud.build(Protocolo, '')
 
 # FIXME precisa de uma chave diferente para o layout
diff --git a/templates/protocoloadm/tramitacao.html b/templates/protocoloadm/tramitacao.html
deleted file mode 100644
index 121ea5b54..000000000
--- a/templates/protocoloadm/tramitacao.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block detail_content %}
-	
-<fieldset>
-	Tipo: {{documento.tipo.sigla}}	Número: {{documento.numero}}	Ano: {{documento.ano}}</br>
-	Assunto: {{documento.assunto}}
-</fieldset>
-
-<fieldset>
-	<h2>Tramitação</h2>
-	{% if tramitacoes %}
-		<table>
-			<tr>
-				<td>Data Ação</td>
-				<td>Origem</td>
-				<td>Destino</td>
-				<td>Status</td>
-				<td>Excluir</td>
-			</tr>
-			{% for t in tramitacoes %}
-				<tr>
-					<td><a href="{% url 'protocoloadm:tramitacao_edit' t.id %}">{{t.data_encaminhamento|date:"d/m/Y"}}</a></td>
-					<td>{{t.unidade_tramitacao_local}}</td>
-					<td>{{t.unidade_tramitacao_destino}}</td>
-					<td>{{t.status.sigla}}</td>
-					<td><a href="{% url 'protocoloadm:tramitacao_delete' documento.id t.id %}">Excluir</ad></td>
-				</tr>
-
-			{% endfor %}
-		</table>
-	{% else %}
-		<strong>Nenhuma tramitação cadastrada para este documento.</strong>
-	{% endif %}
-	</br>
-	<a href="{% url 'protocoloadm:tramitacao_incluir' documento.id %}" class="button primary">Incluir Tramitação</a>
-</fieldset>
-{% endblock detail_content %}
\ No newline at end of file
diff --git a/templates/protocoloadm/tramitacao_edit.html b/templates/protocoloadm/tramitacao_edit.html
deleted file mode 100644
index 2842504a0..000000000
--- a/templates/protocoloadm/tramitacao_edit.html
+++ /dev/null
@@ -1,15 +0,0 @@
-{% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block detail_content %}
-	
-<fieldset>
-	Tipo: {{documento.tipo.sigla}}	Número: {{documento.numero}}	Ano: {{documento.ano}}</br>
-	Assunto: {{documento.assunto}}
-</fieldset>
-
-	<h2>Tramitação Edit</h2>
-	{% crispy form %}
-{% endblock detail_content %}
-
diff --git a/templates/protocoloadm/tramitacao_incluir.html b/templates/protocoloadm/tramitacao_incluir.html
deleted file mode 100644
index 292cc6519..000000000
--- a/templates/protocoloadm/tramitacao_incluir.html
+++ /dev/null
@@ -1,14 +0,0 @@
-{% extends "protocoloadm/protocoloadm_detail.html" %}
-{% load i18n %}
-{% load crispy_forms_tags %}
-
-{% block detail_content %}
-	
-<fieldset>
-	Tipo: {{documento.tipo.sigla}}	Número: {{documento.numero}}	Ano: {{documento.ano}}</br>
-	Assunto: {{documento.assunto}}
-</fieldset>
-
-	<h2>Tramitação</h2>
-	{% crispy form %}
-{% endblock detail_content %}
\ No newline at end of file

From 65d8d4ea2cd0cf6efb8998bfa4f398a47fb1ac6c Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Fri, 20 May 2016 11:40:03 -0300
Subject: [PATCH 5/7] Cria validacao do formulario de tramitacao adm

---
 protocoloadm/forms.py                                    | 6 ++++++
 .../protocoloadm/documentoadministrativo_detail.html     | 1 -
 .../protocoloadm/tramitacaoadministrativo_detail.html    | 9 +++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 templates/protocoloadm/tramitacaoadministrativo_detail.html

diff --git a/protocoloadm/forms.py b/protocoloadm/forms.py
index aec065756..a398ba711 100644
--- a/protocoloadm/forms.py
+++ b/protocoloadm/forms.py
@@ -535,6 +535,12 @@ class TramitacaoAdmForm(ModelForm):
         if self.errors:
             return self.errors
 
+        if (not self.cleaned_data['data_tramitacao'] or
+           not self.cleaned_data['status'] or
+           not self.cleaned_data['unidade_tramitacao_local']):
+            msg = _('Você deixou campos obrigatórios em branco!')
+            raise ValidationError(msg)
+
         # ultima_tramitacao = TramitacaoAdministrativo.objects.filter(
         #     documento_id=self.instance.documento.id).last()
 
diff --git a/templates/protocoloadm/documentoadministrativo_detail.html b/templates/protocoloadm/documentoadministrativo_detail.html
index a56d176f3..f443579c0 100644
--- a/templates/protocoloadm/documentoadministrativo_detail.html
+++ b/templates/protocoloadm/documentoadministrativo_detail.html
@@ -1,7 +1,6 @@
 {% extends "crud/detail.html" %}
 {% load i18n %}
 {% block actions %}
-<h1><b>Protocolos</b></h1>
 <div class="actions btn-group pull-right" role="group">
 <a href="{% url 'protocoloadm:tramitacaoadministrativo_list' object.pk %}" class="btn btn-default">{% trans 'Tramitações' %}</a>
   <a href="{{ view.update_url }}" class="btn btn-default">{% trans 'Editar' %}</a>
diff --git a/templates/protocoloadm/tramitacaoadministrativo_detail.html b/templates/protocoloadm/tramitacaoadministrativo_detail.html
new file mode 100644
index 000000000..e26007f83
--- /dev/null
+++ b/templates/protocoloadm/tramitacaoadministrativo_detail.html
@@ -0,0 +1,9 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+{% block actions %}
+<div class="actions btn-group pull-right" role="group">
+<a href="{% url 'protocoloadm:documentoadministrativo_detail' root_pk %}" class="btn btn-default">{% trans 'Início' %}</a>
+  <a href="{{ view.update_url }}" class="btn btn-default">{% trans 'Editar' %}</a>
+  <a href="{{ view.delete_url }}" class="btn btn-default">{% trans 'Excluir' %}</a>
+</div>
+{% endblock actions %}
\ No newline at end of file

From 48babe730c3677508ef621dd261930f5cfb795fb Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Fri, 20 May 2016 12:35:21 -0300
Subject: [PATCH 6/7] Faz validacao na unidade local da nova tramitacao

---
 parlamentares/forms.py |  4 ++--
 parlamentares/views.py |  1 -
 protocoloadm/forms.py  | 22 ++++++++++++++--------
 protocoloadm/views.py  |  3 +--
 4 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/parlamentares/forms.py b/parlamentares/forms.py
index c19b3cb48..561ff5d5f 100644
--- a/parlamentares/forms.py
+++ b/parlamentares/forms.py
@@ -10,8 +10,8 @@ from floppyforms.widgets import ClearableFileInput
 import sapl
 from sapl.utils import intervalos_tem_intersecao
 
-from .models import (ComposicaoColigacao, Filiacao, Legislatura,
-                     Mandato, Parlamentar)
+from .models import (ComposicaoColigacao, Filiacao, Legislatura, Mandato,
+                     Parlamentar)
 
 
 class ImageThumbnailFileInput(ClearableFileInput):
diff --git a/parlamentares/views.py b/parlamentares/views.py
index 371103328..4243ad214 100644
--- a/parlamentares/views.py
+++ b/parlamentares/views.py
@@ -12,7 +12,6 @@ from crud.masterdetail import MasterDetailCrud
 
 from .forms import (ComposicaoColigacaoForm, FiliacaoForm, LegislaturaForm,
                     ParlamentarCreateForm, ParlamentarForm)
-
 from .models import (CargoMesa, Coligacao, ComposicaoColigacao, ComposicaoMesa,
                      Dependente, Filiacao, Legislatura, Mandato,
                      NivelInstrucao, Parlamentar, Partido, SessaoLegislativa,
diff --git a/protocoloadm/forms.py b/protocoloadm/forms.py
index a398ba711..efce6c224 100644
--- a/protocoloadm/forms.py
+++ b/protocoloadm/forms.py
@@ -5,6 +5,7 @@ from crispy_forms.layout import HTML, Button, Fieldset, Layout, Submit
 from django import forms
 from django.core.exceptions import ObjectDoesNotExist, ValidationError
 from django.db import models
+from django.db.models import Max
 from django.forms import ModelForm
 from django.utils.translation import ugettext_lazy as _
 
@@ -541,15 +542,20 @@ class TramitacaoAdmForm(ModelForm):
             msg = _('Você deixou campos obrigatórios em branco!')
             raise ValidationError(msg)
 
-        # ultima_tramitacao = TramitacaoAdministrativo.objects.filter(
-        #     documento_id=self.instance.documento.id).last()
+        ultima_data_tram = TramitacaoAdministrativo.objects.filter(
+            documento_id=5).aggregate(Max('data_tramitacao'))
+        data = ultima_data_tram.get('data_encaminhamento__max')
 
-        # if ultima_tramitacao:
-        #     destino = ultima_tramitacao.unidade_tramitacao_destino
-        #     if (destino != self.cleaned_data['unidade_tramitacao_local']):
-        #         msg = _('A origem da nova tramitação deve ser igual ao '
-        #                 'destino  da última adicionada!')
-        #         raise ValidationError(msg)
+        ultima_tramitacao = TramitacaoAdministrativo.objects.filter(
+            documento_id=5, data_encaminhamento=data).order_by(
+            'data_encaminhamento').first()
+
+        if ultima_tramitacao:
+            destino = ultima_tramitacao.unidade_tramitacao_destino
+            if (destino != self.cleaned_data['unidade_tramitacao_local']):
+                msg = _('A origem da nova tramitação deve ser igual ao '
+                        'destino  da última adicionada!')
+                raise ValidationError(msg)
 
         return self.cleaned_data
 
diff --git a/protocoloadm/views.py b/protocoloadm/views.py
index 1ab25798d..39b8f103e 100644
--- a/protocoloadm/views.py
+++ b/protocoloadm/views.py
@@ -1,6 +1,4 @@
 import json
-import crud.base
-
 from datetime import date, datetime
 
 from braces.views import FormValidMessageMixin
@@ -14,6 +12,7 @@ from django.views.generic import CreateView, DetailView, FormView, ListView
 from django.views.generic.base import TemplateView
 from django_filters.views import FilterView
 
+import crud.base
 from crud.base import Crud, make_pagination
 from crud.masterdetail import MasterDetailCrud
 from materia.models import Proposicao, TipoMateriaLegislativa

From 39650383119e14e395f65b66e4f91dd73ea2a51d Mon Sep 17 00:00:00 2001
From: Eduardo Calil <dudusaid@gmail.com>
Date: Fri, 20 May 2016 12:53:23 -0300
Subject: [PATCH 7/7] Faz com que apenas os resultados sejam mostrados quando
 feita uma pesquisa

---
 .../documentoadministrativo_filter.html             | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/templates/protocoloadm/documentoadministrativo_filter.html b/templates/protocoloadm/documentoadministrativo_filter.html
index e4e0e73bb..f2112c728 100644
--- a/templates/protocoloadm/documentoadministrativo_filter.html
+++ b/templates/protocoloadm/documentoadministrativo_filter.html
@@ -9,14 +9,23 @@
   <div class="actions btn-group pull-right" role="group">
     <a href="docadm/create" class="btn btn-default">{% trans 'Adicionar Documento Administrativo' %}</a>
   </div>
+  {% if filter_url %}
+    <div class="actions btn-group pull-right" role="group">
+    <a href="{% url 'protocoloadm:pesq_doc_adm' %}" class="btn btn-default">{% trans 'Fazer Nova Pesquisa' %}</a>
+    </div>
+  {% endif %}
+
 {% endblock actions %}
 
 
 {% block detail_content %}
 
- 
+  {% if not filter_url %}
+    
+    {% crispy filter.form %}
+
+  {% endif %}
 
-  {% crispy filter.form %}
   {% if filter_url %}      
   <p></p>
   <table class="table table-striped table-bordered">