Browse Source

Fixes #1391

pull/1405/head
Edward Ribeiro 8 years ago
parent
commit
9dcf58b3eb
  1. 19
      sapl/parlamentares/migrations/0005_auto_20170814_1615.py
  2. 4
      sapl/parlamentares/models.py
  3. 23
      sapl/sessao/migrations/0012_auto_20170814_1615.py
  4. 8
      sapl/sessao/models.py
  5. 10
      sapl/templates/sistema.html

19
sapl/parlamentares/migrations/0005_auto_20170814_1615.py

@ -0,0 +1,19 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.11 on 2017-08-14 16:15
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('parlamentares', '0004_auto_20170711_1305'),
]
operations = [
migrations.AlterModelOptions(
name='frente',
options={'verbose_name': 'Frente Parlamentar', 'verbose_name_plural': 'Frentes Parlamentares'},
),
]

4
sapl/parlamentares/models.py

@ -554,8 +554,8 @@ class Frente(models.Model):
))
class Meta:
verbose_name = _('Frente')
verbose_name_plural = _('Frentes')
verbose_name = _('Frente Parlamentar')
verbose_name_plural = _('Frentes Parlamentares')
def get_parlamentares(self):
return Parlamentar.objects.filter(ativo=True)

23
sapl/sessao/migrations/0012_auto_20170814_1615.py

@ -0,0 +1,23 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.11 on 2017-08-14 16:15
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('sessao', '0011_auto_20170814_1409'),
]
operations = [
migrations.AlterModelOptions(
name='bancada',
options={'ordering': ('-legislatura__numero',), 'verbose_name': 'Bancada Parlamentar', 'verbose_name_plural': 'Bancadas Parlamentares'},
),
migrations.AlterModelOptions(
name='bloco',
options={'verbose_name': 'Bloco Parlamentar', 'verbose_name_plural': 'Blocos Parlamentares'},
),
]

8
sapl/sessao/models.py

@ -59,8 +59,8 @@ class Bancada(models.Model):
))
class Meta:
verbose_name = _('Bancada')
verbose_name_plural = _('Bancadas')
verbose_name = _('Bancada Parlamentar')
verbose_name_plural = _('Bancadas Parlamentares')
ordering = ('-legislatura__numero', )
def __str__(self):
@ -507,8 +507,8 @@ class Bloco(models.Model):
))
class Meta:
verbose_name = _('Bloco')
verbose_name_plural = _('Blocos')
verbose_name = _('Bloco Parlamentar')
verbose_name_plural = _('Blocos Parlamentares')
def __str__(self):
return self.nome

10
sapl/templates/sistema.html

@ -39,12 +39,12 @@
</div>
<hr />
<h2>Módulo Bancadas</h2>
<h2>Módulo Bancadas Parlamentares</h2>
<div class="row">
<div class="col-md-6"><a href="{% url 'sapl.sessao:bancada_list' %}" class="btn btn-link">Bancadas</a></div>
<div class="col-md-6"><a href="{% url 'sapl.sessao:cargobancada_list' %}" class="btn btn-link">Cargo de Bancada</a></div>
<div class="col-md-6"><a href="{% url 'sapl.parlamentares:frente_list' %}" class="btn btn-link">Frente</a></div>
<div class="col-md-6"><a href="{% url 'sapl.sessao:bloco_list' %}" class="btn btn-link">Bloco</a></div>
<div class="col-md-6"><a href="{% url 'sapl.sessao:bancada_list' %}" class="btn btn-link">Bancadas Parlamentares</a></div>
<div class="col-md-6"><a href="{% url 'sapl.sessao:cargobancada_list' %}" class="btn btn-link">Cargo de Bancada Parlamentar</a></div>
<div class="col-md-6"><a href="{% url 'sapl.parlamentares:frente_list' %}" class="btn btn-link">Frente Parlamentar</a></div>
<div class="col-md-6"><a href="{% url 'sapl.sessao:bloco_list' %}" class="btn btn-link">Bloco Parlamentar</a></div>
</div>
<hr />

Loading…
Cancel
Save