Add detail sections to comissoes

comissoes/urls.py

@@ -0,0 +1,14 @@
+from django.conf.urls import url
+
+from comissoes.views import (
+    comissao_crud, ComposicaoListView, MateriasListView, ReunioesListView)
+
+
+urlpatterns = comissao_crud.urlpatterns + [
+    url(r'^(?P<pk>\d+)/composicao$', ComposicaoListView.as_view(), name='composicao'),
+    url(r'^(?P<pk>\d+)/materias$', MateriasListView.as_view(), name='materias'),
+    url(r'^(?P<pk>\d+)/reunioes$', ReunioesListView.as_view(), name='reunioes'),
+    # url(r'^materias$', MateriasListView.as_view(), name='materias'),
+    # url(r'^reunioes$', ReunioesListView.as_view(), name='reunioes'),
+]
+comissoes_urls = urlpatterns, comissao_crud.namespace, comissao_crud.namespace

comissoes/views.py

@@ -3,6 +3,7 @@ from django.utils.translation import ugettext_lazy as _
 from .models import (TipoComissao, Comissao, Periodo, CargoComissao)
 from sapl.crud import build_crud
 
+
 cargo_crud = build_crud(
     CargoComissao,
 
@@ -52,3 +53,15 @@ comissao_crud = build_crud(
       ('data_prorrogada_temp', 4),
       ('data_fim_comissao', 4)]],
 )
+
+
+class ComposicaoListView(comissao_crud.CrudDetailView):
+    template_name = 'comissoes/composicao.html'
+
+
+class MateriasListView(comissao_crud.CrudDetailView):
+    template_name = 'comissoes/materias.html'
+
+
+class ReunioesListView(comissao_crud.CrudDetailView):
+    template_name = 'comissoes/reunioes.html'

sapl/crud.py

@@ -217,7 +217,7 @@ def build_crud(model, *layout):
     crud.CrudDeleteView = CrudDeleteView
 
     # XXX transform into a property of Crud to enable override
-    crud.urls = [
+    crud.urlpatterns = [
         url(r'^$', CrudListView.as_view(), name='list'),
         url(r'^create$', CrudCreateView.as_view(), name='create'),
         url(r'^(?P<pk>\d+)$', CrudDetailView.as_view(), name='detail'),
@@ -225,6 +225,7 @@ def build_crud(model, *layout):
             CrudUpdateView.as_view(), name='update'),
         url(r'^(?P<pk>\d+)/delete$',
             CrudDeleteView.as_view(), name='delete'),
-    ], crud.namespace, crud.namespace
+    ]
+    crud.urls = crud.urlpatterns, crud.namespace, crud.namespace
 
     return crud

sapl/urls.py

@@ -17,8 +17,8 @@ from django.conf.urls import include, url
 from django.contrib import admin
 from django.views.generic.base import TemplateView
 
-from comissoes.views import (tipo_comissao_crud, comissao_crud,
+from comissoes.views import (
-                             periodo_composicao_crud, cargo_crud)
+    tipo_comissao_crud, periodo_composicao_crud, cargo_crud)
 from parlamentares.views import (legislatura_crud, coligacao_crud,
                                  partido_crud, tipo_dependente_crud,
                                  nivel_instrucao_crud, tipo_afastamento_crud,
@@ -33,16 +33,18 @@ from lexml.views import (lexml_provedor_crud, lexml_publicador_crud)
 from norma.views import (tipo_norma_crud, assunto_norma_crud)
 from sessao.views import (tipo_sessao_crud, tipo_resultado_votacao_crud,
                           tipo_expediente_crud)
+from comissoes.urls import comissoes_urls
 
 urlpatterns = [
     url(r'^$', TemplateView.as_view(template_name='index.html')),
     url(r'^admin/', include(admin.site.urls)),
 
     # main apps
-    url(r'^comissoes/', include(comissao_crud.urls)),
+    url(r'^comissoes/', include(comissoes_urls)),
     url(r'^sessao/', include('sessao.urls')),
 
-    # system data
+    # SYSTEM DATA
+
     # parlamentares
     url(r'^sistema/parlamentares/legislatura/',
         include(legislatura_crud.urls)),

templates/comissoes/comissao_detail.html

@@ -0,0 +1,11 @@
+{% extends "crud/detail.html" %}
+{% load i18n %}
+
+{% block sections_nav %}
+  <dl class="sub-nav left">
+    <dd><a href="{% url 'comissao:detail' object.pk %}" class="button secondary">{% trans 'Início' %}</a></dd>
+    <dd><a href="{% url 'comissao:composicao' object.pk %}" class="button secondary">{% trans 'Composição' %}</a></dd>
+    <dd><a href="{% url 'comissao:materias'   object.pk %}" class="button secondary">{% trans 'Matérias em tramitação' %}</a></dd>
+    <dd><a href="{% url 'comissao:reunioes'   object.pk %}" class="button secondary">{% trans 'Reuniões' %}</a></dd>
+  </dl>
+{% endblock sections_nav %}

templates/comissoes/composicao.html

@@ -0,0 +1,6 @@
+{% extends "comissoes/comissao_detail.html" %}
+{% load i18n %}
+
+{% block detail_content %}
+    TODO ... Composição
+{% endblock detail_content %}

templates/comissoes/materias.html

@@ -0,0 +1,6 @@
+{% extends "comissoes/comissao_detail.html" %}
+{% load i18n %}
+
+{% block detail_content %}
+    TODO ... Matérias
+{% endblock detail_content %}

templates/comissoes/reunioes.html

@@ -0,0 +1,6 @@
+{% extends "comissoes/comissao_detail.html" %}
+{% load i18n %}
+
+{% block detail_content %}
+    TODO ... Reuniões
+{% endblock detail_content %}

templates/crud/detail.html

@@ -1,36 +1,37 @@
 {% extends "base.html" %}
-{% load i18n crispy_forms_tags %}
+{% load i18n %}
 
 {% block base_content %}
 
   {# FIXME is this the best markup to use? #}
-  <dl class="sub-nav">
+  <div class="clearfix">
-    <dd><a href="{{ view.update_url }}">
+    <dl class="sub-nav right">
-      {% blocktrans with verbose_name=view.verbose_name %} Editar {{ verbose_name }} {% endblocktrans %}
+      <dd><a href="{{ view.update_url }}" class="button">{% trans 'Editar' %}</a></dd>
-    </a></dd>
+      <dd><a href="{{ view.delete_url }}" class="button alert">{% trans 'Excluir' %}</a></dd>
-    <dd><a href="{{ view.delete_url }}">
+    </dl>
-      {% blocktrans with verbose_name=view.verbose_name %} Excluir {{ verbose_name }} {% endblocktrans %}
+    {% block sections_nav %}{% endblock %}
-    </a></dd>
+  </div>
-  </dl>
 
-  {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #}
+  {% block detail_content %}
-  {% for fieldset in view.fieldsets %}
+    {# TODO replace fieldset for something semantically correct, but with similar visual grouping style #}
-  <fieldset>
+    {% for fieldset in view.fieldsets %}
-    <legend>{{ fieldset.legend }}</legend>
+    <fieldset>
-    {% for row in fieldset.rows %}
+      <legend>{{ fieldset.legend }}</legend>
-    <div class="row">
+      {% for row in fieldset.rows %}
-        {% for column in row %}
+      <div class="row">
-        <div class="columns large-{{ column.span }}">
+          {% for column in row %}
-            <div id="div_id_{{ column.id }}" class="holder">
+          <div class="columns large-{{ column.span }}">
-                <label>{{ column.verbose_name }}</label> {# TODO replace labels, probably (are they correct here?) #}
+              <div id="div_id_{{ column.id }}" class="holder">
-                <p>{{ column.text }}</p>
+                  <label>{{ column.verbose_name }}</label> {# TODO replace labels, probably (are they correct here?) #}
-            </div>
+                  <p>{{ column.text }}</p>
-        </div>
+              </div>
-        {% endfor %}
+          </div>
-    </div>
+          {% endfor %}
+      </div>
+      {% endfor %}
+    </fieldset>
     {% endfor %}
-  </fieldset>
+  {% endblock detail_content %}
-  {% endfor %}
 
 {% endblock %}