-
-
-
-
-
-
-
- {% trans 'Datas podem ser: Um ano (aaaa), um mês (aaaa-mm) ou um dia (aaaa-mm-dd)' %}
+{% block extra_search %}
+
+{% comment %}
+
+{% endcomment %}
+{% endblock %}
\ No newline at end of file
diff --git a/sigi/apps/convenios/views.py b/sigi/apps/convenios/views.py
index 733dc18..a0a3710 100644
--- a/sigi/apps/convenios/views.py
+++ b/sigi/apps/convenios/views.py
@@ -11,7 +11,7 @@ from django.template import Context, loader
from django.utils.translation import ugettext as _
from geraldo.generators import PDFGenerator
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.contatos.models import UnidadeFederativa
from sigi.apps.convenios.models import Convenio, Projeto
from sigi.apps.convenios.reports import ConvenioPorCMReport, ConvenioPorALReport, ConvenioReportSemAceiteAL, ConvenioReportSemAceiteCM
@@ -249,7 +249,7 @@ def report_regiao(request, regiao='NE'):
projetos = Projeto.objects.all()
- camaras = CasaLegislativa.objects.filter(tipo__sigla='CM')
+ camaras = Orgao.objects.filter(tipo__sigla='CM')
tabelas = list()
# Geral
diff --git a/sigi/apps/diagnosticos/forms.py b/sigi/apps/diagnosticos/forms.py
index a271a1f..5ff92d5 100644
--- a/sigi/apps/diagnosticos/forms.py
+++ b/sigi/apps/diagnosticos/forms.py
@@ -11,7 +11,7 @@ from django.utils.translation import ugettext as _
from eav.fields import RangeField
from eav.forms import BaseDynamicEntityForm
-from sigi.apps.casas.models import CasaLegislativa, Funcionario
+from sigi.apps.casas.models import Orgao, Funcionario
from sigi.apps.contatos.models import Telefone
from sigi.apps.diagnosticos.models import Diagnostico
from sigi.apps.diagnosticos.widgets import EavCheckboxSelectMultiple, EavRadioSelect
@@ -132,23 +132,23 @@ class DiagnosticoMobileForm(BaseDynamicEntityForm):
self.initial[schema.name] = value
-class CasaLegislativaMobileForm(forms.ModelForm):
+class OrgaoMobileForm(forms.ModelForm):
data_instalacao = forms.DateField(label=_(u'Data de instalação da Casa Legislativa'), required=False)
data_criacao = forms.DateField()
class Meta:
- model = CasaLegislativa
+ model = Orgao
fields = ('cnpj', 'data_criacao', 'data_instalacao', 'logradouro', 'bairro', 'cep', 'email', 'pagina_web')
def __init__(self, *args, **kwargs):
- super(CasaLegislativaMobileForm, self).__init__(*args, **kwargs)
+ super(OrgaoMobileForm, self).__init__(*args, **kwargs)
self.fields['data_criacao'] = forms.DateField(
label=_(u'Data de criação do Município'),
initial=self.instance.municipio.data_criacao,
required=False)
def save(self, commit=True):
- super(CasaLegislativaMobileForm, self).save(commit=True)
+ super(OrgaoMobileForm, self).save(commit=True)
self.instance.municipio.data_criacao = self.cleaned_data['data_criacao']
if commit:
self.instance.municipio.save()
diff --git a/sigi/apps/diagnosticos/migrations/0004_auto_20210406_1945.py b/sigi/apps/diagnosticos/migrations/0004_auto_20210406_1945.py
new file mode 100644
index 0000000..78a6bd0
--- /dev/null
+++ b/sigi/apps/diagnosticos/migrations/0004_auto_20210406_1945.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('diagnosticos', '0003_auto_20201101_2240'),
+ ('casas', '0014_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='diagnostico',
+ name='casa_legislativa',
+ field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ ]
diff --git a/sigi/apps/diagnosticos/models.py b/sigi/apps/diagnosticos/models.py
index c55739d..bf67c28 100644
--- a/sigi/apps/diagnosticos/models.py
+++ b/sigi/apps/diagnosticos/models.py
@@ -14,7 +14,7 @@ class Diagnostico(BaseEntity):
em uma Casa Legislativa
"""
casa_legislativa = models.ForeignKey(
- 'casas.CasaLegislativa',
+ 'casas.Orgao',
verbose_name=_(u'Casa Legislativa'))
# campo de busca em caixa baixa e sem acento
diff --git a/sigi/apps/diagnosticos/views.py b/sigi/apps/diagnosticos/views.py
index 2807abe..2b4dfba 100644
--- a/sigi/apps/diagnosticos/views.py
+++ b/sigi/apps/diagnosticos/views.py
@@ -12,7 +12,7 @@ from sigi.apps.casas.models import Funcionario
from sigi.apps.contatos.models import Telefone
from sigi.apps.diagnosticos.decorators import validate_diagnostico
from sigi.apps.diagnosticos.forms import (DiagnosticoMobileForm,
- CasaLegislativaMobileForm, FuncionariosMobileForm)
+ OrgaoMobileForm, FuncionariosMobileForm)
from sigi.apps.diagnosticos.models import Diagnostico, Categoria, Pergunta
from sigi.apps.diagnosticos.urls import LOGIN_REDIRECT_URL
from sigi.apps.utils.decorators import login_required
@@ -117,7 +117,7 @@ def categoria_casa_legislativa(request, id_diagnostico):
casa_legislativa = diagnostico.casa_legislativa
if request.method == "POST":
- form = CasaLegislativaMobileForm(request.POST,
+ form = OrgaoMobileForm(request.POST,
instance=casa_legislativa)
if form.is_valid():
form.save()
@@ -133,7 +133,7 @@ def categoria_casa_legislativa(request, id_diagnostico):
json = simplejson.dumps(resposta)
return HttpResponse(json, content_type='application/json')
else:
- form = CasaLegislativaMobileForm(instance=casa_legislativa)
+ form = OrgaoMobileForm(instance=casa_legislativa)
context = RequestContext(request, {'form': form,
'diagnostico': diagnostico, 'casa_legislativa': casa_legislativa})
diff --git a/sigi/apps/eventos/migrations/0005_auto_20210406_1945.py b/sigi/apps/eventos/migrations/0005_auto_20210406_1945.py
new file mode 100644
index 0000000..17694f0
--- /dev/null
+++ b/sigi/apps/eventos/migrations/0005_auto_20210406_1945.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('eventos', '0004_remove_evento_curso_moodle_id'),
+ ('casas', '0014_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='convite',
+ name='casa',
+ field=models.ForeignKey(verbose_name='Casa convidada', to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ migrations.AlterField(
+ model_name='evento',
+ name='casa_anfitria',
+ field=models.ForeignKey(verbose_name='Casa anfitri\xe3', blank=True, to='casas.Orgao', null=True),
+ preserve_default=True,
+ ),
+ ]
diff --git a/sigi/apps/eventos/models.py b/sigi/apps/eventos/models.py
index 721c63e..b678a62 100644
--- a/sigi/apps/eventos/models.py
+++ b/sigi/apps/eventos/models.py
@@ -3,18 +3,18 @@
from django.db import models
from django.utils.functional import lazy
from django.utils.translation import ugettext as _
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.contatos.models import Municipio
from sigi.apps.servidores.models import Servidor
from django.core.exceptions import ValidationError
class TipoEvento(models.Model):
nome = models.CharField(_(u"Nome"), max_length=100)
-
+
class Meta:
ordering = ("nome",)
verbose_name, verbose_name_plural = _(u"Tipo de evento"), _(u"Tipos de evento")
-
+
def __unicode__(self):
return self.nome
@@ -33,7 +33,7 @@ class Evento(models.Model):
solicitante = models.CharField(_(u"Solicitante"), max_length=100)
data_inicio = models.DateField(_(u"Data de início"))
data_termino = models.DateField(_(u"Data de término"))
- casa_anfitria = models.ForeignKey(CasaLegislativa, verbose_name=_(u"Casa anfitriã"), blank=True,
+ casa_anfitria = models.ForeignKey(Orgao, verbose_name=_(u"Casa anfitriã"), blank=True,
null=True)
municipio = models.ForeignKey(Municipio)
local = models.TextField(_(u"Local do evento"), blank=True)
@@ -41,58 +41,58 @@ class Evento(models.Model):
status = models.CharField(_(u"Status"), max_length=1, choices=STATUS_CHOICES)
data_cancelamento = models.DateField(_(u"Data de cancelamento"), blank=True, null=True)
motivo_cancelamento = models.TextField(_(u"Motivo do cancelamento"), blank=True)
-
+
class Meta:
ordering = ("-data_inicio",)
verbose_name, verbose_name_plural = _(u"Evento"), _(u"Eventos")
-
+
def __unicode__(self):
return _("%(nome)s (%(tipo_evento)s): de %(data_inicio)s a %(data_termino)s") % dict(
nome=self.nome,
tipo_evento=unicode(self.tipo_evento),
data_inicio=self.data_inicio,
data_termino=self.data_termino)
-
- def save(self, *args, **kwargs):
+
+ def save(self, *args, **kwargs):
if self.status != 'C':
self.data_cancelamento = None
self.motivo_cancelamento = ""
if self.data_inicio > self.data_termino:
raise ValidationError(_(u"Data de término deve ser posterior à data de início"))
return super(Evento, self).save(*args, **kwargs)
-
+
class Funcao(models.Model):
nome = models.CharField(_(u"Função na equipe de evento"), max_length=100)
descricao = models.TextField(_(u"Descrição da função"))
-
+
class Meta:
ordering = ("nome",)
verbose_name, verbose_name_plural = _(u"Função"), _(u"Funções")
-
+
def __unicode__(self):
return self.nome
-
+
class Equipe(models.Model):
evento = models.ForeignKey(Evento)
membro = models.ForeignKey(Servidor, related_name="equipe_evento")
funcao = models.ForeignKey(Funcao, verbose_name=_(u"Função na equipe"))
observacoes = models.TextField(_(u"Observações"), blank=True)
-
+
class Meta:
ordering = ('evento', 'funcao', 'membro',)
verbose_name, verbose_name_plural = _(u"Membro da equipe"), _(u"Membros da equipe")
-
+
def __unicode__(self):
return u"%s (%s)" % (unicode(self.membro), unicode(self.funcao),)
-
+
class Convite(models.Model):
evento = models.ForeignKey(Evento)
- casa = models.ForeignKey(CasaLegislativa, verbose_name=_(u"Casa convidada"))
+ casa = models.ForeignKey(Orgao, verbose_name=_(u"Casa convidada"))
servidor = models.ForeignKey(Servidor, verbose_name=_(u"Servidor que convidou"))
data_convite = models.DateField(_(u"Data do convite"))
aceite = models.BooleanField(_("Aceitou o convite"), default=False)
participou = models.BooleanField(_(u"Participou do evento"), default=False)
-
+
class Meta:
ordering = ('evento', 'casa', '-data_convite')
unique_together = ('evento', 'casa')
diff --git a/sigi/apps/home/templatetags/menu_conf.yaml b/sigi/apps/home/templatetags/menu_conf.yaml
index afc56ae..4f7c310 100644
--- a/sigi/apps/home/templatetags/menu_conf.yaml
+++ b/sigi/apps/home/templatetags/menu_conf.yaml
@@ -8,15 +8,17 @@ main_menu:
url: contatos/unidadefederativa/
- title: Mesorregiões
url: contatos/mesorregiao/
- - title: Casas Legislativas
- url: casas/casalegislativa/
+ - title: Casas e órgãos
+ url: casas/orgao/
children:
- - title: Todas
- url: casas/casalegislativa/
+ - title: Todo legislativo
+ url: casas/orgao/?tipo__legislativo__exact=1
- title: Câmaras Municipais
- url: casas/casalegislativa/?tipo__id__exact=1
+ url: casas/orgao/?tipo__sigla__exact=CM
- title: Assembléias Legislativas
- url: casas/casalegislativa/?tipo__id__exact=2
+ url: casas/orgao/?tipo__sigla__exact=AL
+ - title: Demais órgãos
+ url: casas/orgao/?tipo__legislativo__exact=0
- title: Organizar relacionamentos
url: casas/portfolio/
- title: Carteira de relacionamentos
@@ -50,6 +52,8 @@ main_menu:
url: convenios/convenio/
- title: Planos diretores
url: metas/planodiretor/
+ - title: Tabela de acompanhamento
+ url: convenios/statusconvenio/
# - title: Inventário
# url: inventario/bem/
# children:
diff --git a/sigi/apps/home/views.py b/sigi/apps/home/views.py
index 442f13f..1f6543b 100644
--- a/sigi/apps/home/views.py
+++ b/sigi/apps/home/views.py
@@ -27,7 +27,7 @@ import calendar
from django.shortcuts import render, get_object_or_404
from django.utils.translation import ugettext as _
from itertools import cycle
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.convenios.models import Convenio, Projeto
from sigi.apps.diagnosticos.models import Diagnostico
from sigi.apps.metas.models import Meta
@@ -58,7 +58,7 @@ def resumo_convenios(request):
def resumo_seit(request):
mes = request.GET.get('mes', None)
ano = request.GET.get('ano', None)
-
+
try:
mes = datetime.date(year=int(ano), month=int(mes), day=1)
tabela_resumo_seit = busca_informacoes_seit(mes)
@@ -73,21 +73,21 @@ def resumo_seit(request):
def chart_seit(request):
mes = request.GET.get('mes', None)
ano = request.GET.get('ano', None)
-
+
try:
mes = datetime.date(year=int(ano), month=int(mes), day=1)
tabela_resumo_seit = busca_informacoes_seit(mes)
except:
tabela_resumo_seit = busca_informacoes_seit()
-
+
data = {
'type': 'line',
'prevlink': reverse('home_chartseit') + ('?ano=%s&mes=%s' %
(tabela_resumo_seit['mes_anterior'].year,
- tabela_resumo_seit['mes_anterior'].month)),
+ tabela_resumo_seit['mes_anterior'].month)),
'nextlink': reverse('home_chartseit') + ('?ano=%s&mes=%s' %
(tabela_resumo_seit['proximo_mes'].year,
- tabela_resumo_seit['proximo_mes'].month)),
+ tabela_resumo_seit['proximo_mes'].month)),
'options': {'bezierCurve': False, 'datasetFill': False, 'pointDot': False, 'responsive': True},
'data': {
'labels': ['%02d/%s' % (mes.month, mes.year) for mes in reversed(tabela_resumo_seit['meses'])],
@@ -100,7 +100,7 @@ def chart_seit(request):
for servico in tabela_resumo_seit['servicos']],
}
}
-
+
return JsonResponse(data)
@never_cache
@@ -123,19 +123,19 @@ def chart_carteira(request):
colors, highlights = color_palete()
data = {'type': 'pie',
'options': {'responsive': True},
- 'data': [{'value': r['total_casas'],
+ 'data': [{'value': r['total_casas'],
'color': colors.next(),
'highlight': highlights.next(),
'label': r['gerentes_interlegis__nome_completo']
}
- for r in CasaLegislativa.objects.exclude(
+ for r in Orgao.objects.exclude(
gerentes_interlegis=None).values(
'gerentes_interlegis__nome_completo').annotate(
total_casas=Count('pk')).order_by(
'gerentes_interlegis__nome_completo')
]
}
-
+
return JsonResponse(data)
@never_cache
@@ -144,11 +144,11 @@ def chart_performance(request):
servidor = request.GET.get('servidor', None)
if servidor is None:
- casas = CasaLegislativa.objects.exclude(gerentes_interlegis=None)
+ casas = Orgao.objects.exclude(gerentes_interlegis=None)
else:
gerente = get_object_or_404(Servidor, pk=servidor)
casas = gerente.casas_que_gerencia
-
+
data = {
'type': 'pie',
'options': {'responsive': True},
@@ -184,14 +184,14 @@ def report_sem_convenio(request):
casas = sc['total']
titulo = _(u"Casas sem convenio que utilizam algum serviço de registro "
u"e/ou hospedagem")
-
+
if fmt == 'csv':
response = HttpResponse(content_type='text/csv')
response['Content-Disposition'] = 'attachment; filename=casas.csv'
writer = csv.writer(response)
writer.writerow([titulo.encode('utf8')])
writer.writerow([u''])
- writer.writerow([u'casa', u'uf', u'gerentes',
+ writer.writerow([u'casa', u'uf', u'gerentes',
u'serviços'.encode('utf8')])
for casa in casas:
writer.writerow([
@@ -221,14 +221,14 @@ def report_sem_convenio(request):
else:
context = {'casas': casas, 'titulo': titulo}
return render_to_pdf('home/sem_convenio.html', context)
-
-
+
+
def busca_informacoes_camara():
"""
Busca informacoes no banco para montar tabela de resumo de camaras por projeto
Retorna um dicionario de listas
"""
- camaras = CasaLegislativa.objects.filter(tipo__sigla='CM')
+ camaras = Orgao.objects.filter(tipo__sigla='CM')
convenios = Convenio.objects.filter(casa_legislativa__tipo__sigla='CM')
projetos = Projeto.objects.all()
@@ -297,7 +297,7 @@ def busca_informacoes_camara():
# Unindo as duas listass para que o cabecalho da esquerda fique junto com sua
# respectiva linha
lista_zip = zip(cabecalho_esquerda, linhas)
-
+
# Retornando listas em forma de dicionario
return {
'cabecalho_topo': cabecalho_topo,
@@ -309,10 +309,10 @@ def busca_informacoes_camara():
def sem_convenio():
- total = CasaLegislativa.objects.exclude(servico=None).filter(servico__data_desativacao=None, convenio=None).order_by('municipio__uf__sigla', 'nome').distinct('municipio__uf__sigla', 'nome')
- hospedagem = CasaLegislativa.objects.exclude(servico=None).filter(servico__data_desativacao=None, servico__tipo_servico__modo='H', convenio=None).order_by('municipio__uf__sigla', 'nome').distinct('municipio__uf__sigla', 'nome')
+ total = Orgao.objects.exclude(servico=None).filter(servico__data_desativacao=None, convenio=None).order_by('municipio__uf__sigla', 'nome').distinct('municipio__uf__sigla', 'nome')
+ hospedagem = Orgao.objects.exclude(servico=None).filter(servico__data_desativacao=None, servico__tipo_servico__modo='H', convenio=None).order_by('municipio__uf__sigla', 'nome').distinct('municipio__uf__sigla', 'nome')
reg_keys = set(total.values_list('pk', flat=True)).difference(set(hospedagem.values_list('pk', flat=True)))
- registro = CasaLegislativa.objects.filter(pk__in=reg_keys).order_by('municipio__uf__sigla', 'nome')
+ registro = Orgao.objects.filter(pk__in=reg_keys).order_by('municipio__uf__sigla', 'nome')
return {
'total': total,
'hospedagem': hospedagem,
@@ -342,13 +342,13 @@ def busca_informacoes_seit(mes_atual=None):
mes_atual = datetime.date.today().replace(day=1)
mes_anterior = mes_atual - datetime.timedelta(days=1)
proximo_mes = mes_atual + datetime.timedelta(days=calendar.monthrange(mes_atual.year, mes_atual.month)[1])
-
+
meses = []
mes = mes_atual
for i in range(1, 13):
meses.append(mes)
mes = (mes - datetime.timedelta(days=1)).replace(day=1)
-
+
result = {
'mes_atual': mes_atual,
'mes_anterior': mes_anterior,
@@ -360,7 +360,7 @@ def busca_informacoes_seit(mes_atual=None):
'Novas casas em %s/%s' % (mes_atual.month, mes_atual.year)
],
'servicos': [],
- }
+ }
for tipo_servico in TipoServico.objects.all():
por_mes = []
@@ -374,7 +374,7 @@ def busca_informacoes_seit(mes_atual=None):
'novos_mes_anterior': tipo_servico.servico_set.filter(data_ativacao__year=mes_anterior.year, data_ativacao__month=mes_anterior.month).count(),
'novos_mes_atual': tipo_servico.servico_set.filter(data_ativacao__year=mes_atual.year, data_ativacao__month=mes_atual.month).count(),
'novos_por_mes': por_mes,
- 'cor': colors.next(),
+ 'cor': colors.next(),
}
)
@@ -410,5 +410,5 @@ def color_palete():
'#B3B6F1',
'#BB9098',
'#BDF1ED', ])
-
+
return (colors, highlights)
diff --git a/sigi/apps/inventario/migrations/0002_auto_20210406_1945.py b/sigi/apps/inventario/migrations/0002_auto_20210406_1945.py
new file mode 100644
index 0000000..0473f66
--- /dev/null
+++ b/sigi/apps/inventario/migrations/0002_auto_20210406_1945.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('inventario', '0001_initial'),
+ ('casas', '0014_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='bem',
+ name='casa_legislativa',
+ field=models.ForeignKey(to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ ]
diff --git a/sigi/apps/inventario/models.py b/sigi/apps/inventario/models.py
index e86a5e0..cdb67cc 100644
--- a/sigi/apps/inventario/models.py
+++ b/sigi/apps/inventario/models.py
@@ -72,7 +72,7 @@ class Equipamento(models.Model):
class Bem(models.Model):
- casa_legislativa = models.ForeignKey('casas.CasaLegislativa')
+ casa_legislativa = models.ForeignKey('casas.Orgao')
equipamento = models.ForeignKey(Equipamento)
fornecedor = models.ForeignKey(Fornecedor)
num_serie = models.CharField(
diff --git a/sigi/apps/metas/migrations/0002_auto_20210406_1945.py b/sigi/apps/metas/migrations/0002_auto_20210406_1945.py
new file mode 100644
index 0000000..c590ad0
--- /dev/null
+++ b/sigi/apps/metas/migrations/0002_auto_20210406_1945.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('metas', '0001_initial'),
+ ('casas', '0014_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='planodiretor',
+ name='casa_legislativa',
+ field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ ]
diff --git a/sigi/apps/metas/models.py b/sigi/apps/metas/models.py
index 3ca3c36..e7d5a90 100644
--- a/sigi/apps/metas/models.py
+++ b/sigi/apps/metas/models.py
@@ -3,7 +3,7 @@ from datetime import date
from django.db import models
from django.utils.translation import ugettext as _
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.convenios.models import Projeto, Convenio
from sigi.apps.diagnosticos.models import Diagnostico
from sigi.apps.financeiro.models import Desembolso
@@ -115,7 +115,7 @@ class PlanoDiretor(models.Model):
('I', _(u'Implantado')),
)
projeto = models.ForeignKey(Projeto, verbose_name=_(u'Projeto'))
- casa_legislativa = models.ForeignKey(CasaLegislativa, verbose_name=_(u'Casa Legislativa'))
+ casa_legislativa = models.ForeignKey(Orgao, verbose_name=_(u'Casa Legislativa'))
casa_legislativa.casa_uf_filter = True
status = models.CharField(_(u'Status'), max_length=1, choices=STATUS_CHOICE, default='E')
data_entrega = models.DateField(_(u'Data de entrega'), blank=True, null=True)
diff --git a/sigi/apps/metas/templatetags/mapa_tags.py b/sigi/apps/metas/templatetags/mapa_tags.py
index 79039a6..273176a 100644
--- a/sigi/apps/metas/templatetags/mapa_tags.py
+++ b/sigi/apps/metas/templatetags/mapa_tags.py
@@ -2,7 +2,7 @@
from django import template
from django.utils.safestring import mark_safe
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.metas.views import parliament_summary
@@ -11,7 +11,7 @@ register = template.Library()
@register.filter(name='map_desc_serv')
def descricao_servicos(casa):
- if not isinstance(casa, CasaLegislativa):
+ if not isinstance(casa, Orgao):
return ""
summary = parliament_summary(casa)
diff --git a/sigi/apps/metas/views.py b/sigi/apps/metas/views.py
index f2f9ff4..0cf636c 100644
--- a/sigi/apps/metas/views.py
+++ b/sigi/apps/metas/views.py
@@ -17,7 +17,7 @@ from django.utils.translation import ugettext as _
from django.views.decorators.cache import cache_page
from easy_thumbnails.templatetags.thumbnail import thumbnail_url
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.contatos.models import UnidadeFederativa
from sigi.apps.convenios.models import Projeto
from sigi.apps.financeiro.models import Desembolso
@@ -76,7 +76,7 @@ def mapa(request):
[(x.sigla, x.sigla, x.nome, True)
for x in TipoServico.objects.all()]),
("convenios", _(u'Por Casas conveniadas'),
- [(x.sigla,
+ [(x.sigla,
'convenio_' + x.sigla,
_(u'ao {projeto}').format(projeto=x.sigla),
x.sigla == 'PML') for x in projetos]),
@@ -128,9 +128,9 @@ def map_search(request):
q = request.GET.get('q')
if len(q.split(',')) > 1:
municipio, uf = [s.strip() for s in q.split(',')]
- casas = CasaLegislativa.objects.filter(search_text__icontains=to_ascii(municipio), municipio__uf__sigla__iexact=uf)
+ casas = Orgao.objects.filter(search_text__icontains=to_ascii(municipio), municipio__uf__sigla__iexact=uf)
else:
- casas = CasaLegislativa.objects.filter(search_text__icontains=to_ascii(q))
+ casas = Orgao.objects.filter(search_text__icontains=to_ascii(q))
if casas.count() > 0:
response = {'result': 'FOUND', 'ids': [c.pk for c in casas]}
@@ -225,11 +225,11 @@ def map_list(request):
srv = {x[0]: x[1] for x in TipoServico.objects.values_list('id', 'nome')}
cnv = {x[0]: x[1] for x in Projeto.objects.values_list('id', 'sigla')}
-
- head = [s.encode('utf-8') for s in
+
+ head = [s.encode('utf-8') for s in
[u'código IBGE', u'nome da casa', u'município', u'UF', u'região', ] +
[x for x in srv.values()] +
- reduce(lambda x, y: x + y,
+ reduce(lambda x, y: x + y,
[['conveniada ao %s' % x, 'equipada por %s' % x] for x in cnv.values()])]
writer.writerow(head)
@@ -240,7 +240,7 @@ def map_list(request):
casa.municipio.nome.encode('utf-8'),
casa.municipio.uf.sigla.encode('utf-8'),
casa.municipio.uf.get_regiao_display().encode('utf-8'), ]
-
+
for id in srv.keys():
try:
sv = casa.servico_set.get(tipo_servico__id=id)
@@ -286,27 +286,27 @@ def filtrar_casas(seit, convenios, equipadas, regioes, estados, diagnosticos,
qConvenio = Q(convenio__projeto__sigla__in=convenios)
qEquipada = Q(convenio__projeto__sigla__in=equipadas,
convenio__equipada=True)
-
+
qRegiao = Q(municipio__uf__regiao__in=regioes)
qEstado = Q(municipio__uf__sigla__in=estados)
-
+
if gerentes:
qGerente = Q(gerentes_interlegis__id__in=gerentes)
else:
qGerente = Q()
if diagnosticos:
- qDiagnostico = Q(diagnostico__publicado__in=[p == 'P'
+ qDiagnostico = Q(diagnostico__publicado__in=[p == 'P'
for p in diagnosticos])
else:
qDiagnostico = Q()
-
- casas = CasaLegislativa.objects.filter(qRegiao | qEstado).filter(qGerente)
-
+
+ casas = Orgao.objects.filter(qRegiao | qEstado).filter(qGerente)
+
if seit or convenios or equipadas or diagnosticos:
casas = casas.filter(qServico | qConvenio | qEquipada | qDiagnostico)
else:
- casas = casas.filter(Q(servico=None) & Q(convenio=None) &
+ casas = casas.filter(Q(servico=None) & Q(convenio=None) &
Q(diagnostico=None))
return casas
@@ -323,7 +323,7 @@ def gera_map_data_file(cronjob=False):
casas = {}
- for c in CasaLegislativa.objects.prefetch_related('servico_set', 'convenio_set', 'diagnostico_set').all().distinct():
+ for c in Orgao.objects.prefetch_related('servico_set', 'convenio_set', 'diagnostico_set').all().distinct():
# if c.servico_set.count() == 0 and c.convenio_set.count() == 0 and c.diagnostico_set.count() == 0:
# continue
# # Salta essa casa, pois ela não tem nada com o Interlegis
@@ -369,7 +369,7 @@ def parliament_summary(parliament):
'equipadas': [],
'info': []
}
-
+
if parliament.gerentes_interlegis.exists():
summary['info'].append(_(u"Gerentes Interlegis: {lista}").format(
lista=parliament.lista_gerentes(fmt='lista')))
@@ -378,14 +378,14 @@ def parliament_summary(parliament):
summary['info'].append(
_(u"{name} ativado em {date}").format(
name=sv.tipo_servico.nome,
- date=sv.data_ativacao.strftime('%d/%m/%Y') if sv.data_ativacao
+ date=sv.data_ativacao.strftime('%d/%m/%Y') if sv.data_ativacao
else _(u'
')) +
(u" 
").format(sv.url, STATIC_URL))
summary['seit'].append(sv.tipo_servico.sigla)
for cv in parliament.convenio_set.all():
- if ((cv.data_retorno_assinatura is None) and
+ if ((cv.data_retorno_assinatura is None) and
(cv.equipada and cv.data_termo_aceite is not None)):
summary['info'].append(
_(u"Equipada em {date} pelo {project}").format(
@@ -397,7 +397,7 @@ def parliament_summary(parliament):
_(u"Adesão ao projeto {project}, em {date}").format(
project=cv.projeto.sigla, date=cv.data_adesao))
summary['convenios'].append(cv.projeto.sigla)
- if ((cv.data_retorno_assinatura is not None) and not
+ if ((cv.data_retorno_assinatura is not None) and not
(cv.equipada and cv.data_termo_aceite is not None)):
summary['info'].append(
_(u"Conveniada ao %(project)s em %(date)s").format(
@@ -421,8 +421,8 @@ def parliament_summary(parliament):
_(u"Diagnosticada no período de {initial_date} "
u"a {final_date}").format(
initial_date=dg.data_visita_inicio.strftime('%d/%m/%Y')
- if dg.data_visita_inicio is not None
- else _(u""),
+ if dg.data_visita_inicio is not None
+ else _(u""),
final_date=dg.data_visita_fim.strftime('%d/%m/%Y')
if dg.data_visita_fim
else _(u"")))
diff --git a/sigi/apps/ocorrencias/migrations/0003_auto_20210406_1945.py b/sigi/apps/ocorrencias/migrations/0003_auto_20210406_1945.py
new file mode 100644
index 0000000..03ef359
--- /dev/null
+++ b/sigi/apps/ocorrencias/migrations/0003_auto_20210406_1945.py
@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('ocorrencias', '0002_auto_20160308_0828'),
+ ('casas', '0014_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='ocorrencia',
+ name='casa_legislativa',
+ field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ ]
diff --git a/sigi/apps/ocorrencias/models.py b/sigi/apps/ocorrencias/models.py
index 2bfe120..0774147 100644
--- a/sigi/apps/ocorrencias/models.py
+++ b/sigi/apps/ocorrencias/models.py
@@ -34,7 +34,7 @@ class Ocorrencia(models.Model):
STATUS_RESOLVIDO = 3
STATUS_FECHADO = 4
STATUS_DUPLICADO = 5
-
+
STATUS_CHOICES = (
(STATUS_ABERTO , _(u'Aberto')),
(STATUS_REABERTO , _(u'Reaberto')),
@@ -51,7 +51,7 @@ class Ocorrencia(models.Model):
(5, _(u'Baixíssimo')),
)
- casa_legislativa = models.ForeignKey('casas.CasaLegislativa', verbose_name=_(u'Casa Legislativa'))
+ casa_legislativa = models.ForeignKey('casas.Orgao', verbose_name=_(u'Casa Legislativa'))
casa_legislativa.convenio_uf_filter = True
casa_legislativa.convenio_cl_tipo_filter = True
data_criacao = models.DateField(_(u'Data de criação'), null=True, blank=True, auto_now_add=True)
@@ -80,7 +80,7 @@ class Ocorrencia(models.Model):
if self.ticket is not None and Ocorrencia.objects.exclude(pk=self.pk).filter(ticket=self.ticket).exists():
raise ValidationError({'ticket': _(u"Já existe ocorrência registrada para este ticket")})
return super(Ocorrencia, self).clean()
-
+
def get_ticket_url(self):
return mark_safe(settings.OSTICKET_URL % self.ticket)
@@ -91,7 +91,7 @@ class Comentario(models.Model):
usuario = models.ForeignKey('servidores.Servidor', verbose_name=_(u'Usuário'))
novo_status = models.IntegerField(_(u'Novo status'), choices=Ocorrencia.STATUS_CHOICES, blank=True, null=True)
encaminhar_setor = models.ForeignKey('servidores.Servico', verbose_name=_(u'Encaminhar para setor'), blank=True, null=True)
-
+
def save(self, *args, **kwargs):
if self.encaminhar_setor and (self.encaminhar_setor != self.ocorrencia.setor_responsavel):
self.ocorrencia.setor_responsavel = self.encaminhar_setor
diff --git a/sigi/apps/ocorrencias/views.py b/sigi/apps/ocorrencias/views.py
index 640fc4c..d5d8296 100644
--- a/sigi/apps/ocorrencias/views.py
+++ b/sigi/apps/ocorrencias/views.py
@@ -8,7 +8,7 @@ from django.views.decorators.http import require_POST
from django.template.loader import render_to_string
from django.template import RequestContext
from sigi.apps.utils import to_ascii
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.contatos.models import UnidadeFederativa
from sigi.apps.servidores.models import Servidor, Servico
from sigi.apps.ocorrencias.models import Ocorrencia, Anexo
@@ -20,33 +20,33 @@ def painel_ocorrencias(request):
tipo = request.GET.get('type', None)
id = request.GET.get('id', None)
painel = request.GET.get('painel', None)
-
+
data = {}
-
+
if tipo is None or tipo == 'error':
tipo = 'servidor'
u = get_object_or_404(Servidor, user=request.user)
id = u.pk
-
+
if id is None:
raise Http404("id não definido")
-
+
if tipo == 'casa':
- casa = get_object_or_404(CasaLegislativa, pk=id)
+ casa = get_object_or_404(Orgao, pk=id)
ocorrencias = casa.ocorrencia_set.all()
panel_title = u"{casa}, {uf}".format(
casa=casa.nome,
uf=casa.municipio.uf.sigla
- )
+ )
elif tipo == 'servidor':
servidor = get_object_or_404(Servidor, pk=id)
panel_title = servidor.nome_completo
-
+
paineis = {'gerente': u"Minhas casas", 'servico': u"Meu setor",
'timeline': u"Comentados por mim"}
if painel is None:
- if CasaLegislativa.objects.filter(
+ if Orgao.objects.filter(
gerentes_interlegis=servidor).count() > 0:
painel = 'gerente'
elif Ocorrencia.objects.filter(
@@ -54,10 +54,10 @@ def painel_ocorrencias(request):
painel = 'servico'
else:
painel = 'timeline'
-
+
data.update({'paineis': paineis, 'painel': painel,
'servidor': servidor})
-
+
if painel == 'gerente':
ocorrencias = Ocorrencia.objects.filter(
casa_legislativa__gerentes_interlegis=servidor)
@@ -87,7 +87,7 @@ def painel_ocorrencias(request):
'anexo_set'
)
ocorrencias = ocorrencias.annotate(total_anexos=Count('anexo'))
-
+
data.update(
{'ocorrencias': ocorrencias,
'panel_title': panel_title,
@@ -96,7 +96,7 @@ def painel_ocorrencias(request):
'PRIORITY_CHOICES': Ocorrencia.PRIORITY_CHOICES
}
)
-
+
return render(request, 'ocorrencias/painel.html', data)
@login_required
@@ -106,22 +106,22 @@ def busca_nominal(request, origin="tudo"):
return JsonResponse([{'label': _(u'Erro na pesquisa por termo'), 'value': 'type=error'}], safe=False)
data = []
-
- if origin == "casa" or origin == "tudo":
- casas = CasaLegislativa.objects.filter(search_text__icontains=to_ascii(term)).select_related('municipio', 'municipio__uf')[:10]
+
+ if origin == "casa" or origin == "tudo":
+ casas = Orgao.objects.filter(search_text__icontains=to_ascii(term)).select_related('municipio', 'municipio__uf')[:10]
data += [{'value': c.pk, 'label': "%s, %s" % (c.nome, c.municipio.uf.sigla,), 'origin': 'casa'} for c in casas]
-
- if origin == "servidor" or origin == "tudo":
+
+ if origin == "servidor" or origin == "tudo":
servidores = Servidor.objects.filter(nome_completo__icontains=term)[:10]
data += [{'value': s.pk, 'label': s.nome_completo, 'origin': 'servidor'} for s in servidores]
-
+
if origin == "servico" or origin == "tudo":
setores = Servico.objects.filter(nome__icontains=term) | Servico.objects.filter(sigla__icontains=term)
setores = setores[:10]
data += [{'value': s.pk, 'label': '%s - %s' % (s.sigla, s.nome), 'origin': 'servico'} for s in setores]
-
+
data = sorted(data, key=lambda d: d['label'])
-
+
return JsonResponse(data, safe=False)
@login_required
@@ -129,44 +129,44 @@ def busca_nominal(request, origin="tudo"):
def muda_prioridade(request):
id_ocorrencia = request.POST.get('id_ocorrencia', None)
prioridade = request.POST.get('prioridade', None)
-
+
if id_ocorrencia is None or prioridade is None:
return JsonResponse({'result': 'error', 'message': _(u'Erro nos parâmetros')})
-
+
if not any([int(prioridade) == p[0] for p in Ocorrencia.PRIORITY_CHOICES]):
return JsonResponse({'result': 'error', 'message': _(u'Valor de prioridade não aceito')})
-
+
try:
ocorrencia = Ocorrencia.objects.get(pk=id_ocorrencia)
except Exception as e:
return JsonResponse({'result': 'error', 'message': str(e)})
-
+
ocorrencia.prioridade = prioridade
ocorrencia.save()
-
+
return JsonResponse({'result': 'success', 'message': _(u'Prioridade alterada')})
@login_required
def exclui_anexo(request):
anexo_id = request.GET.get('anexo_id', None)
-
+
if anexo_id is None:
return JsonResponse({'result': 'error', 'message': _(u'Erro nos parâmetros')})
-
+
try:
anexo = Anexo.objects.get(pk=anexo_id)
except Exception as e:
return JsonResponse({'result': 'error', 'message': str(e)})
-
+
ocorrencia = anexo.ocorrencia
anexo.delete()
-
+
link_label = (ungettext('%s arquivo anexo', '%s arquivos anexos', ocorrencia.anexo_set.count()) %
(ocorrencia.anexo_set.count(),))
painel = render_to_string('ocorrencias/anexos_snippet.html', {'ocorrencia': ocorrencia},
context_instance=RequestContext(request))
-
+
return JsonResponse({'result': 'success', 'message': _(u'Anexo %s excluído com sucesso' % (anexo_id,)),
'link_label': link_label, 'anexos_panel': painel})
@@ -176,7 +176,7 @@ def inclui_anexo(request):
form = AnexoForm(request.POST, request.FILES)
if form.is_valid():
anexo = form.save()
- return HttpResponse('' %
+ return HttpResponse('' %
escape(anexo.ocorrencia_id))
else:
ocorrencia = form.instance.ocorrencia
@@ -186,7 +186,7 @@ def inclui_anexo(request):
form = AnexoForm(instance=Anexo(ocorrencia=ocorrencia))
return render(request, 'ocorrencias/anexo_form.html',
{'form': form, 'ocorrencia': ocorrencia, 'is_popup': True})
-
+
@login_required
def anexo_snippet(request):
ocorrencia_id = request.GET.get('ocorrencia_id', None)
@@ -205,19 +205,19 @@ def inclui_comentario(request):
form = ComentarioForm()
else:
ocorrencia = form.instance.ocorrencia
-
+
painel = render_to_string('ocorrencias/ocorrencia_snippet.html', {'ocorrencia': ocorrencia,
'comentario_form': form,}, context_instance=RequestContext(request))
-
+
return JsonResponse({'ocorrencia_id': ocorrencia.id, 'ocorrencia_panel': painel})
@login_required
@require_POST
def inclui_ocorrencia(request):
form = OcorrenciaForm(request.POST)
-
+
data = {}
-
+
if form.is_valid():
ocorrencia = form.save(commit=False)
ocorrencia.servidor_registro = Servidor.objects.get(user=request.user)
@@ -230,9 +230,9 @@ def inclui_ocorrencia(request):
context_instance=RequestContext(request))
else:
data['result'] = 'error'
-
+
data['ocorrencia_form'] = render_to_string('ocorrencias/ocorrencia_form.html',
{'ocorrencia_form': form},
context_instance=RequestContext(request))
-
+
return JsonResponse(data)
\ No newline at end of file
diff --git a/sigi/apps/parlamentares/migrations/0002_auto_20210406_1945.py b/sigi/apps/parlamentares/migrations/0002_auto_20210406_1945.py
new file mode 100644
index 0000000..b645ba0
--- /dev/null
+++ b/sigi/apps/parlamentares/migrations/0002_auto_20210406_1945.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('parlamentares', '0001_initial'),
+ ('casas', '0014_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='legislatura',
+ name='casa_legislativa',
+ field=models.ForeignKey(to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ migrations.AlterField(
+ model_name='mesadiretora',
+ name='casa_legislativa',
+ field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ ]
diff --git a/sigi/apps/parlamentares/models.py b/sigi/apps/parlamentares/models.py
index 2d80d38..238b62e 100644
--- a/sigi/apps/parlamentares/models.py
+++ b/sigi/apps/parlamentares/models.py
@@ -2,7 +2,7 @@
from django.db import models
from django.utils.translation import ugettext as _
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
class Partido(models.Model):
@@ -82,7 +82,7 @@ class Mandato(models.Model):
class Legislatura(models.Model):
- casa_legislativa = models.ForeignKey(CasaLegislativa)
+ casa_legislativa = models.ForeignKey(Orgao)
numero = models.PositiveSmallIntegerField(_(u'número legislatura'))
data_inicio = models.DateField(_(u'início'))
data_fim = models.DateField(_(u'fim'))
@@ -174,7 +174,7 @@ class SessaoLegislativa(models.Model):
class MesaDiretora(models.Model):
casa_legislativa = models.ForeignKey(
- 'casas.CasaLegislativa',
+ 'casas.Orgao',
verbose_name=_(u'Casa Legislativa')
)
diff --git a/sigi/apps/parlamentares/reports.py b/sigi/apps/parlamentares/reports.py
index adbe021..4e076b0 100644
--- a/sigi/apps/parlamentares/reports.py
+++ b/sigi/apps/parlamentares/reports.py
@@ -47,7 +47,7 @@ class ParlamentaresLabels(Report):
Usage example::
>>> from geraldo.generators import PDFGenerator
- >>> queryset = CasaLegislativa.objects.filter(municipio__uf__sigla='MG')
+ >>> queryset = Orgao.objects.filter(municipio__uf__sigla='MG')
>>> report = LabelsReport(queryset)
>>> report.generate_by(PDFGenerator, filename='./inline-detail-report.pdf')
@@ -268,7 +268,7 @@ def label_text(text):
return "%s: " % text
-class InfoCasaLegislativa(ReportDefault):
+class InfoOrgao(ReportDefault):
title = _(u'Casa Legislativa')
class band_summary(ReportBand):
diff --git a/sigi/apps/parlamentares/views.py b/sigi/apps/parlamentares/views.py
index 33d66e4..d7f2090 100644
--- a/sigi/apps/parlamentares/views.py
+++ b/sigi/apps/parlamentares/views.py
@@ -10,7 +10,7 @@ from django.http import HttpResponse, HttpResponseRedirect
from django.views.decorators.csrf import csrf_protect
from django.template import RequestContext
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.parlamentares.models import Parlamentar
from sigi.apps.parlamentares.reports import ParlamentaresLabels
diff --git a/sigi/apps/servicos/admin.py b/sigi/apps/servicos/admin.py
index 74f5765..9dcb4b9 100644
--- a/sigi/apps/servicos/admin.py
+++ b/sigi/apps/servicos/admin.py
@@ -7,8 +7,9 @@ from django.utils.encoding import force_unicode
from django.utils.translation import ugettext as _
from sigi.apps.casas.admin import FuncionariosInline
-from sigi.apps.casas.models import CasaLegislativa
-from sigi.apps.servicos.models import Servico, LogServico, CasaAtendida, TipoServico
+from sigi.apps.casas.models import Orgao
+from sigi.apps.servicos.models import (Servico, LogServico, CasaAtendida,
+ TipoServico)
from sigi.apps.utils.base_admin import BaseModelAdmin
@@ -163,7 +164,7 @@ class ServicoAdmin(BaseModelAdmin):
if not id_casa:
raise Http404
- obj.casa_legislativa = CasaAtendida.objects.get(pk=id_casa)
+ obj.casa_legislativa = Orgao.objects.get(pk=id_casa)
return obj
@@ -210,7 +211,7 @@ class CasaAtendidaAdmin(BaseModelAdmin):
def change_view(self, request, object_id, extra_context=None):
# Se a Casa ainda não é atendida, gerar o código interlegis para ela
# Assim ela passa a ser uma casa atendida
- casa = CasaLegislativa.objects.get(id=object_id)
+ casa = Orgao.objects.get(id=object_id)
if casa.codigo_interlegis == '':
casa.gerarCodigoInterlegis()
diff --git a/sigi/apps/servicos/migrations/0004_delete_casaatendida.py b/sigi/apps/servicos/migrations/0004_delete_casaatendida.py
new file mode 100644
index 0000000..6e42dc8
--- /dev/null
+++ b/sigi/apps/servicos/migrations/0004_delete_casaatendida.py
@@ -0,0 +1,17 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('servicos', '0003_auto_20170407_1003'),
+ ]
+
+ operations = [
+ migrations.DeleteModel(
+ name='CasaAtendida',
+ ),
+ ]
diff --git a/sigi/apps/servicos/migrations/0005_auto_20210406_1945.py b/sigi/apps/servicos/migrations/0005_auto_20210406_1945.py
new file mode 100644
index 0000000..0a86dc2
--- /dev/null
+++ b/sigi/apps/servicos/migrations/0005_auto_20210406_1945.py
@@ -0,0 +1,27 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('servicos', '0004_delete_casaatendida'),
+ ('casas', '0014_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.AlterField(
+ model_name='casamanifesta',
+ name='casa_legislativa',
+ field=models.OneToOneField(to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ migrations.AlterField(
+ model_name='servico',
+ name='casa_legislativa',
+ field=models.ForeignKey(verbose_name='Casa Legislativa', to='casas.Orgao'),
+ preserve_default=True,
+ ),
+ ]
diff --git a/sigi/apps/servicos/migrations/0006_casaatendida.py b/sigi/apps/servicos/migrations/0006_casaatendida.py
new file mode 100644
index 0000000..6a58804
--- /dev/null
+++ b/sigi/apps/servicos/migrations/0006_casaatendida.py
@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import models, migrations
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('casas', '0014_auto_20210406_1945'),
+ ('servicos', '0005_auto_20210406_1945'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='CasaAtendida',
+ fields=[
+ ],
+ options={
+ 'proxy': True,
+ 'verbose_name_plural': 'Casas atendidas',
+ },
+ bases=('casas.orgao',),
+ ),
+ ]
diff --git a/sigi/apps/servicos/models.py b/sigi/apps/servicos/models.py
index 02c228c..74b344e 100644
--- a/sigi/apps/servicos/models.py
+++ b/sigi/apps/servicos/models.py
@@ -2,7 +2,7 @@
from datetime import date
from django.db import models
-from sigi.apps.casas.models import CasaLegislativa, Funcionario
+from sigi.apps.casas.models import Orgao, Funcionario
from django.utils.translation import ugettext as _
@@ -37,7 +37,7 @@ class TipoServico(models.Model):
class Servico(models.Model):
- casa_legislativa = models.ForeignKey(CasaLegislativa, verbose_name=_(u'Casa Legislativa'))
+ casa_legislativa = models.ForeignKey(Orgao, verbose_name=_(u'Casa Legislativa'))
tipo_servico = models.ForeignKey(TipoServico, verbose_name=_(u'Tipo de serviço'))
contato_tecnico = models.ForeignKey(Funcionario, verbose_name=_(u'Contato técnico'), related_name='contato_tecnico', on_delete=models.PROTECT)
contato_administrativo = models.ForeignKey(Funcionario, verbose_name=_(u'Contato administrativo'), related_name='contato_administrativo', on_delete=models.PROTECT)
@@ -183,7 +183,7 @@ class CasaAtendidaManager(models.Manager):
return qs
-class CasaAtendida(CasaLegislativa):
+class CasaAtendida(Orgao):
class Meta:
proxy = True
@@ -193,7 +193,7 @@ class CasaAtendida(CasaLegislativa):
class CasaManifesta(models.Model):
- casa_legislativa = models.OneToOneField(CasaLegislativa)
+ casa_legislativa = models.OneToOneField(Orgao)
data_manifestacao = models.DateTimeField(auto_now_add=True)
data_atualizacao = models.DateTimeField(auto_now=True)
informante = models.CharField(_(u'Nome do informante'), max_length=100, blank=True)
@@ -219,4 +219,4 @@ class RegistroServico(models.Model):
class Meta:
verbose_name_plural = _(u'Registro de serviços')
-
+
diff --git a/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_list.html b/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_list.html
index 11d0569..104fd94 100644
--- a/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_list.html
+++ b/sigi/apps/servicos/templates/admin/servicos/casaatendida/change_list.html
@@ -15,7 +15,7 @@ function dismissRelatedLookupPopup(win, chosenId) {
{% block object-tools-items %}
+ href="{% url 'admin:casas_orgao_changelist' %}?codigo_interlegis__exact=" class="addlink">
{% blocktrans with cl.opts.verbose_name as name %}Add {{ name }}{% endblocktrans %}
diff --git a/sigi/apps/servicos/views.py b/sigi/apps/servicos/views.py
index ab7a47c..d49bcd9 100644
--- a/sigi/apps/servicos/views.py
+++ b/sigi/apps/servicos/views.py
@@ -10,9 +10,10 @@ from django.template.context import RequestContext
from django.utils.translation import ugettext as _
from django.views.generic.base import TemplateView
-from sigi.apps.casas.models import CasaLegislativa
+from sigi.apps.casas.models import Orgao
from sigi.apps.contatos.models import UnidadeFederativa
-from sigi.apps.servicos.models import TipoServico, CasaAtendida, CasaManifesta, ServicoManifesto
+from sigi.apps.servicos.models import (TipoServico, CasaManifesta, CasaAtendida,
+ ServicoManifesto)
class MapaView(TemplateView):
@@ -75,7 +76,7 @@ class CasaManifestaProtoForm(forms.Form):
def casa_manifesta_view(request):
if 'casa_id' in request.GET:
casa_id = request.GET.get('casa_id')
- casa = get_object_or_404(CasaLegislativa, pk=casa_id)
+ casa = get_object_or_404(Orgao, pk=casa_id)
# Criar um formulário dinâmico
@@ -138,7 +139,7 @@ def casa_manifesta_view(request):
extra_context = {'casa': casa, 'cmf': cmf}
elif 'uf' in request.GET:
uf = request.GET.get('uf')
- extra_context = {'casa_list': CasaLegislativa.objects.filter(municipio__uf__sigla=uf)}
+ extra_context = {'casa_list': Orgao.objects.filter(municipio__uf__sigla=uf)}
else:
extra_context = {'uf_list': UnidadeFederativa.objects.all()}
diff --git a/sigi/test_cart.py b/sigi/test_cart.py
index d9d7d53..eb4df2f 100644
--- a/sigi/test_cart.py
+++ b/sigi/test_cart.py
@@ -8,7 +8,7 @@ from sigi.testutils import pdf_text
@pytest.mark.parametrize("url, some_entries, form_action, name_attr, verbose_name_plural", [
('/parlamentares/parlamentar/', some_parliamentarians, 'adiciona_parlamentar', 'nome_completo', 'Parlamentares'),
- ('/casas/casalegislativa/', some_parliaments, 'adicionar_casas', 'nome', 'Casas Legislativas'),
+ ('/casas/orgao/', some_parliaments, 'adicionar_casas', 'nome', 'Casas Legislativas'),
])
def test_add_to_cart(url, some_entries, form_action, name_attr, verbose_name_plural, app):
@@ -41,7 +41,7 @@ def test_add_to_cart(url, some_entries, form_action, name_attr, verbose_name_plu
@pytest.mark.parametrize("url, some_entries, all_expression", [
('/parlamentares/parlamentar/', some_parliamentarians, 'todos os parlamentares', ),
- ('/casas/casalegislativa/', some_parliaments, 'todas as casas', ),
+ ('/casas/orgao/', some_parliaments, 'todas as casas', ),
])
def test_no_selection_brings_everyone_to_the_cart(url, some_entries, all_expression, app):
@@ -56,7 +56,7 @@ def test_no_selection_brings_everyone_to_the_cart(url, some_entries, all_express
@pytest.mark.parametrize("url, generate_entries", [
('/parlamentares/parlamentar/', parliamentarians_from_names, ),
- ('/casas/casalegislativa/', parliaments_from_names, ),
+ ('/casas/orgao/', parliaments_from_names, ),
])
def test_pagination(url, generate_entries, app, live_server):
diff --git a/templates/admin/change_list.html b/templates/admin/change_list.html
index 5dbbabb..f1a7f8a 100644
--- a/templates/admin/change_list.html
+++ b/templates/admin/change_list.html
@@ -33,7 +33,6 @@
{% block coltype %}flex{% endblock %}
{% block object-tools %}
-
-
{% if cl.has_filters %}
{% endif %}
{% block search %}{% search_form cl %}{% endblock %}
-
{% endblock %}
{% block content %}
+{% block extra_search %}{% endblock %}