Add linsting for Proposicoes Incorporadas, Não Incorporadas e Recebidas

materia/models.py

@@ -451,7 +451,7 @@ class Proposicao(models.Model):
 
     status = models.CharField(blank=True,
                               null=True,
-                              max_length = 1,
+                              max_length=1,
                               choices=(('E', 'Enviada'),
                                        ('D', 'Devolvida'),
                                        ('I', 'Incorporada')),

protocoloadm/views.py

@@ -14,7 +14,7 @@ from django.views.generic.base import TemplateView
 from django.views.generic.edit import FormMixin
 from vanilla import GenericView
 
-from materia.models import TipoMateriaLegislativa
+from materia.models import Proposicao, TipoMateriaLegislativa
 from sapl.crud import build_crud
 
 from .models import (Autor, DocumentoAcessorioAdministrativo,
@@ -449,7 +449,8 @@ class ProtocoloMateriaForm(forms.Form):
         widget=forms.Textarea, label='Ementa', required=True)
     autor = forms.CharField(label='Autor', required=True)
     observacao = forms.CharField(required=True,
-                                 widget=forms.Textarea, label='Observação')
+                                 widget=forms.Textarea,
+                                 label='Observação')
 
 
 class ProtocoloMateriaView(FormMixin, GenericView):
@@ -485,7 +486,7 @@ class ProtocoloMateriaView(FormMixin, GenericView):
             protocolo.autor = Autor.objects.get(id=request.POST['autor'])
             protocolo.anulado = False
             protocolo.tipo_materia = TipoMateriaLegislativa.objects.get(
-                                            id=request.POST['tipo_materia'])
+                id=request.POST['tipo_materia'])
             protocolo.numero_paginas = request.POST['num_paginas']
             protocolo.observacao = sub(
                 ' ', ' ', strip_tags(request.POST['observacao']))
@@ -506,13 +507,32 @@ class ProposicaoReceberView(TemplateView):
     template_name = "protocoloadm/proposicao_receber.html"
 
 
-class ProposicoesNaoRecebidasView(TemplateView):
+class ProposicoesNaoRecebidasView(ListView):
     template_name = "protocoloadm/proposicoes_naorecebidas.html"
+    model = Proposicao
+    paginate_by = 10
 
+    def get_queryset(self):
+        return Proposicao.objects.filter(data_envio__isnull=False, status='E')
 
-class ProposicoesNaoIncorporadasView(TemplateView):
+
+class ProposicoesNaoIncorporadasView(ListView):
     template_name = "protocoloadm/proposicoes_naoincorporadas.html"
+    model = Proposicao
+    paginate_by = 10
 
+    def get_queryset(self):
+        return Proposicao.objects.filter(data_envio__isnull=False,
+                                         data_devolucao__isnull=False,
+                                         status='D')
 
-class ProposicoesIncorporadasView(TemplateView):
+
+class ProposicoesIncorporadasView(ListView):
     template_name = "protocoloadm/proposicoes_incorporadas.html"
+    model = Proposicao
+    paginate_by = 10
+
+    def get_queryset(self):
+        return Proposicao.objects.filter(data_envio__isnull=False,
+                                         data_recebimento__isnull=False,
+                                         status='I')

templates/protocoloadm/proposicoes_incorporadas.html

@@ -3,5 +3,54 @@
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
-	Proposições Incorporadas
+			<h2>Proposições Incorporadas</h2>
+			<table>
+				{% for p in object_list %}
+				<tr>
+					<td>
+						{{ p.data_envio|date:"d/m/Y" }}
+					</td>
+					<td>
+						{{ p.tipo.descricao }}
+					</td>					
+					<td>
+						{{ p.descricao }}
+					</td>
+					<td>
+						{{ p.autor }}
+					</td>
+				</tr>
+				{% endfor %}
+			</table>
+			{% if is_paginated %}
+			  <nav class="pagination-centered">
+			    <ul class="pagination">
+			      {% if page_obj.has_previous %}
+			        <li>
+			          <a href="?page={{ page_obj.previous_page_number }}">
+			            <span class="arrow">&laquo;</span>
+			          </a>
+			        </li>
+			      {% else %}
+			        <li class="arrow unavailable"><a href="">&laquo;</a></li>
+			      {% endif %}
+
+			      {% for page in paginator.page_range %}
+			        <li {% if page == page_obj.number %}class="active current"{% endif %}>
+			          <a href="?page={{ page }}">{{ page }}</a>
+			        </li>
+			      {% endfor %}
+
+			      {% if page_obj.has_next %}
+			        <li>
+			          <a href="?page={{ page_obj.next_page_number }}">
+			            <span class="arrow">&raquo;</span>
+			          </a>
+			        </li>
+			      {% else %}
+			        <li class="arrow unavailable"><a href="">&raquo;</a></li>
+			      {% endif %}
+			    </ul>
+			  </nav>
+			{% endif %}
 {% endblock detail_content %}

templates/protocoloadm/proposicoes_naoincorporadas.html

@@ -3,5 +3,54 @@
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
-	Receber Não Incorporadas
+			<h2>Proposições Não Incorporadas</h2>
+			<table>
+				{% for p in object_list %}
+				<tr>
+					<td>
+						{{ p.data_envio|date:"d/m/Y" }}
+					</td>
+					<td>
+						{{ p.tipo.descricao }}
+					</td>
+					<td>
+						{{ p.descricao }}
+					</td>
+					<td>
+						{{ p.autor }}
+					</td>
+				</tr>
+				{% endfor %}
+			</table>
+			{% if is_paginated %}
+			  <nav class="pagination-centered">
+			    <ul class="pagination">
+			      {% if page_obj.has_previous %}
+			        <li>
+			          <a href="?page={{ page_obj.previous_page_number }}">
+			            <span class="arrow">&laquo;</span>
+			          </a>
+			        </li>
+			      {% else %}
+			        <li class="arrow unavailable"><a href="">&laquo;</a></li>
+			      {% endif %}
+
+			      {% for page in paginator.page_range %}
+			        <li {% if page == page_obj.number %}class="active current"{% endif %}>
+			          <a href="?page={{ page }}">{{ page }}</a>
+			        </li>
+			      {% endfor %}
+
+			      {% if page_obj.has_next %}
+			        <li>
+			          <a href="?page={{ page_obj.next_page_number }}">
+			            <span class="arrow">&raquo;</span>
+			          </a>
+			        </li>
+			      {% else %}
+			        <li class="arrow unavailable"><a href="">&raquo;</a></li>
+			      {% endif %}
+			    </ul>
+			  </nav>
+			{% endif %}
 {% endblock detail_content %}

templates/protocoloadm/proposicoes_naorecebidas.html

@@ -3,5 +3,54 @@
 {% load crispy_forms_tags %}
 
 {% block detail_content %}
-	Proposições Não Recebidas
+			<h2>Proposições Não Recebidas</h2>
+			<table>
+				{% for p in object_list %}
+				<tr>
+					<td>
+						{{ p.data_envio|date:"d/m/Y" }}
+					</td>
+					<td>
+						{{ p.tipo.descricao }}
+					</td>					
+					<td>
+						{{ p.descricao }}
+					</td>
+					<td>
+						{{ p.autor }}
+					</td>
+				</tr>
+				{% endfor %}
+			</table>
+			{% if is_paginated %}
+			  <nav class="pagination-centered">
+			    <ul class="pagination">
+			      {% if page_obj.has_previous %}
+			        <li>
+			          <a href="?page={{ page_obj.previous_page_number }}">
+			            <span class="arrow">&laquo;</span>
+			          </a>
+			        </li>
+			      {% else %}
+			        <li class="arrow unavailable"><a href="">&laquo;</a></li>
+			      {% endif %}
+
+			      {% for page in paginator.page_range %}
+			        <li {% if page == page_obj.number %}class="active current"{% endif %}>
+			          <a href="?page={{ page }}">{{ page }}</a>
+			        </li>
+			      {% endfor %}
+
+			      {% if page_obj.has_next %}
+			        <li>
+			          <a href="?page={{ page_obj.next_page_number }}">
+			            <span class="arrow">&raquo;</span>
+			          </a>
+			        </li>
+			      {% else %}
+			        <li class="arrow unavailable"><a href="">&raquo;</a></li>
+			      {% endif %}
+			    </ul>
+			  </nav>
+			{% endif %}
 {% endblock detail_content %}