Browse Source

Remove TipoInstituicao

pull/701/head
Eduardo Edson Batista Cordeiro Alves 8 years ago
parent
commit
eae797de15
  1. 18
      sapl/protocoloadm/migrations/0002_delete_tipoinstituicao.py
  2. 11
      sapl/protocoloadm/models.py
  3. 5
      sapl/protocoloadm/urls.py
  4. 3
      sapl/protocoloadm/views.py
  5. 4
      sapl/templates/protocoloadm/layouts.yaml

18
sapl/protocoloadm/migrations/0002_delete_tipoinstituicao.py

@ -0,0 +1,18 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2016-10-05 17:42
from __future__ import unicode_literals
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
('protocoloadm', '0001_initial'),
]
operations = [
migrations.DeleteModel(
name='TipoInstituicao',
),
]

11
sapl/protocoloadm/models.py

@ -9,17 +9,6 @@ from sapl.materia.models import (Autor, TipoMateriaLegislativa,
from sapl.utils import RANGE_ANOS, YES_NO_CHOICES from sapl.utils import RANGE_ANOS, YES_NO_CHOICES
class TipoInstituicao(models.Model):
descricao = models.CharField(max_length=50, verbose_name=_('Descrição'))
class Meta:
verbose_name = _('Tipo de Instituição')
verbose_name_plural = _('Tipos de Instituições')
def __str__(self):
return self.descricao
class TipoDocumentoAdministrativo(models.Model): class TipoDocumentoAdministrativo(models.Model):
sigla = models.CharField(max_length=5, verbose_name=_('Sigla')) sigla = models.CharField(max_length=5, verbose_name=_('Sigla'))
descricao = models.CharField(max_length=50, verbose_name=_('Descrição')) descricao = models.CharField(max_length=50, verbose_name=_('Descrição'))

5
sapl/protocoloadm/urls.py

@ -17,8 +17,7 @@ from sapl.protocoloadm.views import (AnularProtocoloAdmView,
ProtocoloPesquisaView, ProtocoloPesquisaView,
StatusTramitacaoAdministrativoCrud, StatusTramitacaoAdministrativoCrud,
TipoDocumentoAdministrativoCrud, TipoDocumentoAdministrativoCrud,
TipoInstituicaoCrud, TramitacaoAdmCrud, TramitacaoAdmCrud, pesquisa_autores)
pesquisa_autores)
from .apps import AppConfig from .apps import AppConfig
@ -35,8 +34,6 @@ urlpatterns = [
include(TramitacaoAdmCrud.get_urls())), include(TramitacaoAdmCrud.get_urls())),
url(r'^protocoloadm/status-tramitacao-adm/', url(r'^protocoloadm/status-tramitacao-adm/',
include(StatusTramitacaoAdministrativoCrud.get_urls())), include(StatusTramitacaoAdministrativoCrud.get_urls())),
url(r'^protocoloadm/tipo-instituicao/',
include(TipoInstituicaoCrud.get_urls())),
url(r'^protocoloadm/protocolo-doc/', url(r'^protocoloadm/protocolo-doc/',
include(ProtocoloDocumentoCrud.get_urls())), include(ProtocoloDocumentoCrud.get_urls())),
url(r'^protocoloadm/protocolo-mat/', url(r'^protocoloadm/protocolo-mat/',

3
sapl/protocoloadm/views.py

@ -29,12 +29,11 @@ from .forms import (AnularProcoloAdmForm, DocumentoAcessorioAdministrativoForm,
from .models import (Autor, DocumentoAcessorioAdministrativo, from .models import (Autor, DocumentoAcessorioAdministrativo,
DocumentoAdministrativo, Protocolo, DocumentoAdministrativo, Protocolo,
StatusTramitacaoAdministrativo, StatusTramitacaoAdministrativo,
TipoDocumentoAdministrativo, TipoInstituicao, TipoDocumentoAdministrativo,
TramitacaoAdministrativo) TramitacaoAdministrativo)
TipoDocumentoAdministrativoCrud = CrudAux.build( TipoDocumentoAdministrativoCrud = CrudAux.build(
TipoDocumentoAdministrativo, '') TipoDocumentoAdministrativo, '')
TipoInstituicaoCrud = CrudAux.build(TipoInstituicao, '')
ProtocoloDocumentoCrud = Crud.build(Protocolo, '') ProtocoloDocumentoCrud = Crud.build(Protocolo, '')

4
sapl/templates/protocoloadm/layouts.yaml

@ -46,7 +46,3 @@ Protocolo:
- assunto_ementa - assunto_ementa
- autor - autor
- observacao - observacao
TipoInstituicao:
{% trans 'Tipo de Instituição' %}:
- descricao

Loading…
Cancel
Save