From 005ca63f41560d41fd34c9a810e271738a50e1ae Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Mon, 12 Sep 2016 14:54:14 -0300
Subject: [PATCH 1/5] Fix #571

---
 sapl/templates/base.html | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/sapl/templates/base.html b/sapl/templates/base.html
index df70b2252..eebffba2e 100644
--- a/sapl/templates/base.html
+++ b/sapl/templates/base.html
@@ -42,13 +42,12 @@
           </div>
           <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
+              <li><a href="/" role="button" aria-haspopup="true" aria-expanded="false">Inicio<span class="caret"></span></a></li>
 
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Institucional <span class="caret"></span></a>
                   <ul class="dropdown-menu">
-                  {% if user.is_authenticated %}
                     <li class="nav__sub-item"><a class="nav__sub-link" href="{% url 'sapl.parlamentares:mesa_diretora' %}">Mesa Diretora</a></li>
-                  {% endif %}
                     <li class="nav__sub-item"><a class="nav__sub-link" href="{% url 'sapl.comissoes:comissao_list' %}">Comissões</a></li>
                     <!-- <li class="nav__sub-item"><a class="nav__sub-link" href="#">Bancadas</a></li> -->
                     <li class="nav__sub-item"><a class="nav__sub-link" href="{% url 'sapl.parlamentares:parlamentar_list' %}">Parlamentares</a></li>

From 7ce11100b4cf65a5e4a83af4b790a0fa0058f3cf Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Mon, 12 Sep 2016 15:05:39 -0300
Subject: [PATCH 2/5] Fix #575

---
 sapl/templates/sessao/resumo.html | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/sapl/templates/sessao/resumo.html b/sapl/templates/sessao/resumo.html
index 07a4e6bb9..43e936c20 100644
--- a/sapl/templates/sessao/resumo.html
+++ b/sapl/templates/sessao/resumo.html
@@ -43,15 +43,18 @@
 
 	<fieldset>
 		<legend>Expedientes</legend>
-    <div class="row">
-      {% for e in expedientes %}
-      <div class="col-md-12">
-        <b>{{e.tipo}}:</b>
-        <br />
-        {{e.conteudo|safe}}
-      </div>
-      {% endfor %}
-    </div>
+		<table class="table">
+			<thead class="thead-default">
+				{% for e in expedientes %}
+					<tr>
+						<td>
+							<b>{{e.tipo}}: </b> <br />
+							<p style="text-indent: 50px;">{{e.conteudo}}</p>
+						</td>
+					</tr>
+				{% endfor %}
+			</thead>
+		</table>
 	</fieldset>
 
 	<fieldset>
@@ -118,4 +121,4 @@
 	</fieldset>
 
 </fieldset>
-{% endblock detail_content %}
\ No newline at end of file
+{% endblock detail_content %}

From b866b02cf9416be8e44e61f77147ad36c50df14e Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Mon, 12 Sep 2016 15:54:51 -0300
Subject: [PATCH 3/5] Fix #573

---
 sapl/parlamentares/models.py | 13 +++++++++----
 sapl/parlamentares/views.py  |  4 +++-
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/sapl/parlamentares/models.py b/sapl/parlamentares/models.py
index d4c8d817a..1dd4db07f 100644
--- a/sapl/parlamentares/models.py
+++ b/sapl/parlamentares/models.py
@@ -18,11 +18,16 @@ class Legislatura(models.Model):
         verbose_name = _('Legislatura')
         verbose_name_plural = _('Legislaturas')
 
+    def atual(self):
+        current_year = datetime.now().year
+        if(self.data_inicio.year <= current_year and
+           self.data_fim.year >= current_year):
+            return True
+        else:
+            return False
+
     def __str__(self):
-        # XXX Usar id mesmo? Ou criar campo para nº legislatura?
-        current_date = datetime.now().year
-        if(self.data_inicio.year <= current_date and
-           self.data_fim.year >= current_date):
+        if self.atual():
             current = ' (%s)' % _('Atual')
         else:
             current = ''
diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py
index 0f2a8edfb..8b8237007 100644
--- a/sapl/parlamentares/views.py
+++ b/sapl/parlamentares/views.py
@@ -341,7 +341,9 @@ class ParlamentarCrud(Crud):
                 try:
                     legislatura_id = int(self.request.GET['periodo'])
                 except MultiValueDictKeyError:
-                    legislatura_id = legislaturas.first().id
+                    for l in Legislatura.objects.all():
+                        if l.atual():
+                            return l.id
                 return legislatura_id
             else:
                 return 0

From a31d6f5e84db26a36186a7e5fe6154aee3950114 Mon Sep 17 00:00:00 2001
From: Edward <edwardoliveira@users.noreply.github.com>
Date: Mon, 12 Sep 2016 16:16:29 -0300
Subject: [PATCH 4/5] HOT-FIX: conserta grupo de Autor

Ditto.
---
 scripts/inicializa_grupos_autorizacoes.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/inicializa_grupos_autorizacoes.py b/scripts/inicializa_grupos_autorizacoes.py
index 65f27f880..f0fe713ca 100644
--- a/scripts/inicializa_grupos_autorizacoes.py
+++ b/scripts/inicializa_grupos_autorizacoes.py
@@ -108,7 +108,7 @@ def cria_grupos_permissoes():
         grupo.permissions.add(p)
 
     nome_usuario = 'operador_autor'
-    cria_usuario(nome_usuario, grupo_geral)
+    cria_usuario(nome_usuario, grupo)
 
 if __name__ == '__main__':
     cria_grupos_permissoes()

From d337ce4cac2a315d8d63518e3879267fbea1e763 Mon Sep 17 00:00:00 2001
From: Eduardo Edson Batista Cordeiro Alves <eduardoalves@interlegis.leg.br>
Date: Mon, 12 Sep 2016 16:50:55 -0300
Subject: [PATCH 5/5] Fix #577

---
 sapl/parlamentares/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sapl/parlamentares/views.py b/sapl/parlamentares/views.py
index 8b8237007..fda746e0e 100644
--- a/sapl/parlamentares/views.py
+++ b/sapl/parlamentares/views.py
@@ -332,6 +332,7 @@ class ParlamentarCrud(Crud):
     class ListView(CrudListView):
         template_name = "parlamentares/parlamentares_list.html"
         paginate_by = None
+        ordering = '-nome_parlamentar'
 
         def take_legislatura_id(self):
             legislaturas = Legislatura.objects.all().order_by(
@@ -351,7 +352,8 @@ class ParlamentarCrud(Crud):
         def get_queryset(self):
             if self.take_legislatura_id() != 0:
                 mandatos = Mandato.objects.filter(
-                    legislatura_id=self.take_legislatura_id())
+                    legislatura_id=self.take_legislatura_id()).order_by(
+                        'parlamentar__nome_parlamentar')
                 return mandatos
             return []