SPDT
/
sapl
mirror of https://github.com/interlegis/sapl.git
5
0
Fork 0
Code Issues Releases Wiki Activity
Browse Source

Adiciona tela usuario em DocAdm e correcoes de testes

pull/2736/head
Cesar Carvalho 7 years ago
parent
8cfa6df6e2
commit
a833f2748b
8 changed files with 76 additions and 40 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      sapl/materia/forms.py
  2. 4
      sapl/materia/tests/test_materia_form.py
  3. 8
      sapl/materia/views.py
  4. 12
      sapl/protocoloadm/forms.py
  5. 2
      sapl/protocoloadm/tests/test_protocoloadm.py
  6. 11
      sapl/protocoloadm/views.py
  7. 38
      sapl/templates/materia/tramitacao_detail.html
  8. 37
      sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html

4
sapl/materia/forms.py
View File

@ -470,8 +470,6 @@ class TramitacaoForm(ModelForm):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(TramitacaoForm, self).__init__(*args, **kwargs) super(TramitacaoForm, self).__init__(*args, **kwargs)
self.fields['data_tramitacao'].initial = timezone.now().date() self.fields['data_tramitacao'].initial = timezone.now().date()
self.fields['user'].initial = kwargs['initial']['user']
self.fields['ip'].initial = kwargs['initial']['ip']
ust = UnidadeTramitacao.objects.select_related().all() ust = UnidadeTramitacao.objects.select_related().all()
unidade_tramitacao_destino = [('', '---------')] + [(ut.pk, ut) unidade_tramitacao_destino = [('', '---------')] + [(ut.pk, ut)
for ut in ust if ut.comissao and ut.comissao.ativa] for ut in ust if ut.comissao and ut.comissao.ativa]
@ -562,8 +560,6 @@ class TramitacaoForm(ModelForm):
tramitacao_nova.pk = None tramitacao_nova.pk = None
tramitacao_nova.materia = ma tramitacao_nova.materia = ma
tramitacao_nova.save() tramitacao_nova.save()
tramitacao.ip = self.fields['ip'].initial
tramitacao.user = self.fields['user'].initial
return tramitacao return tramitacao

4
sapl/materia/tests/test_materia_form.py
View File

@ -194,7 +194,7 @@ def test_valida_campos_obrigatorios_relatoria_form():
@pytest.mark.django_db(transaction=False) @pytest.mark.django_db(transaction=False)
def test_valida_campos_obrigatorios_tramitacao_form(): def test_valida_campos_obrigatorios_tramitacao_form():
form = forms.TramitacaoForm(data={}, initial={'user':None, 'ip':''}) form = forms.TramitacaoForm(data={})
assert not form.is_valid() assert not form.is_valid()
@ -212,7 +212,7 @@ def test_valida_campos_obrigatorios_tramitacao_form():
@pytest.mark.django_db(transaction=False) @pytest.mark.django_db(transaction=False)
def test_valida_campos_obrigatorios_tramitacao_update_form(): def test_valida_campos_obrigatorios_tramitacao_update_form():
form = forms.TramitacaoUpdateForm(data={}, initial={'user':None, 'ip':''}) form = forms.TramitacaoUpdateForm(data={})
assert not form.is_valid() assert not form.is_valid()

8
sapl/materia/views.py
View File

@ -1222,8 +1222,6 @@ class TramitacaoCrud(MasterDetailCrud):
self.object = form.save() self.object = form.save()
username = self.request.user.username username = self.request.user.username
form.instance.user = self.request.user
form.instance.ip = get_client_ip(self.request)
if form.instance.status.indicador == 'F': if form.instance.status.indicador == 'F':
form.instance.materia.em_tramitacao = False form.instance.materia.em_tramitacao = False
@ -1254,12 +1252,6 @@ class TramitacaoCrud(MasterDetailCrud):
layout_key = 'TramitacaoUpdate' layout_key = 'TramitacaoUpdate'
def get_initial(self):
initial = super(UpdateView, self).get_initial()
initial['ip'] = get_client_ip(self.request)
initial['user'] = self.request.user
return initial
def form_valid(self, form): def form_valid(self, form):
self.object = form.save() self.object = form.save()
username = self.request.user.username username = self.request.user.username

12
sapl/protocoloadm/forms.py
View File

@ -658,12 +658,7 @@ class TramitacaoAdmForm(ModelForm):
'ip'] 'ip']
widgets = {'user': forms.HiddenInput(), widgets = {'user': forms.HiddenInput(),
'ip': forms.HiddenInput()} 'ip': forms.HiddenInput()}
def __init__(self, *args, **kwargs):
super(TramitacaoAdmForm, self).__init__(*args, **kwargs)
self.fields['user'].initial = kwargs['initial']['user']
self.fields['ip'].initial = kwargs['initial']['ip']
def clean(self): def clean(self):
cleaned_data = super(TramitacaoAdmForm, self).clean() cleaned_data = super(TramitacaoAdmForm, self).clean()
@ -756,7 +751,10 @@ class TramitacaoAdmEditForm(TramitacaoAdmForm):
'data_encaminhamento', 'data_encaminhamento',
'data_fim_prazo', 'data_fim_prazo',
'texto', 'texto',
] 'user',
'ip']
widgets = {'user': forms.HiddenInput(),
'ip': forms.HiddenInput()}
def clean(self): def clean(self):
super(TramitacaoAdmEditForm, self).clean() super(TramitacaoAdmEditForm, self).clean()

2
sapl/protocoloadm/tests/test_protocoloadm.py
View File

@ -162,7 +162,7 @@ def test_create_tramitacao(admin_client):
msg = force_text(_('A origem da nova tramitação deve ser igual ao ' msg = force_text(_('A origem da nova tramitação deve ser igual ao '
'destino da última adicionada!')) 'destino da última adicionada!'))
# Verifica se a origem da nova tramitacao é igual ao destino da última # Verifica se a origem da nova tramitacao é igual ao destino da última
assert msg in response.context_data[ assert msg in response.context_data[
'form'].errors['__all__'] 'form'].errors['__all__']

11
sapl/protocoloadm/views.py
View File

@ -1116,6 +1116,8 @@ class TramitacaoAdmCrud(MasterDetailCrud):
else: else:
initial['unidade_tramitacao_local'] = '' initial['unidade_tramitacao_local'] = ''
initial['data_tramitacao'] = timezone.now().date() initial['data_tramitacao'] = timezone.now().date()
initial['ip'] = get_client_ip(self.request)
initial['user'] = self.request.user
return initial return initial
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
@ -1183,7 +1185,14 @@ class TramitacaoAdmCrud(MasterDetailCrud):
class DetailView(DocumentoAdministrativoMixin, class DetailView(DocumentoAdministrativoMixin,
MasterDetailCrud.DetailView): MasterDetailCrud.DetailView):
pass
template_name = 'protocoloadm/tramitacaoadministrativo_detail.html'
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
context['user'] = self.request.user
return context
class DeleteView(MasterDetailCrud.DeleteView): class DeleteView(MasterDetailCrud.DeleteView):

38
sapl/templates/materia/tramitacao_detail.html
View File

@ -4,32 +4,36 @@
{% block actions %} {% endblock %} {% block actions %} {% endblock %}
{% block detail_content %} {% block detail_content %}
{{ block.super }} {{ block.super }}
{% if tramitacao.user and user.is_superuser %} {% if user.is_superuser %}
<div class="row"> <div class="row">
<div class="col-sm-6"> {% if tramitacao.user %}
<div id="div_id_user" class="form-group"> <div class="col-sm-6">
<p class="control-label">Usuário</p> <div id="div_id_user" class="form-group">
<div class="controls"> <p class="control-label">Usuário</p>
<div class="form-control-static"> <div class="controls">
<div class="dont-break-out"> <div class="form-control-static">
<a href="{% url 'sapl.base:user_edit' user.pk %}">{{tramitacao.user}}</a> <div class="dont-break-out">
<a href="{% url 'sapl.base:user_edit' user.pk %}">{{tramitacao.user}}</a>
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> {% endif %}
<div class="col-sm-6"> {% if tramitacao.ip %}
<div id="div_ip_user" class="form-group"> <div class="col-sm-6">
<p class="control-label">IP</p> <div id="div_ip_user" class="form-group">
<div class="controls"> <p class="control-label">IP</p>
<div class="form-control-static"> <div class="controls">
<div class="dont-break-out"> <div class="form-control-static">
{{tramitacao.ip}} <div class="dont-break-out">
{{tramitacao.ip}}
</div>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</div> {% endif %}
</div> </div>
{% endif %} {% endif %}
{% endblock detail_content %} {% endblock detail_content %}

37
sapl/templates/protocoloadm/tramitacaoadministrativo_detail.html
View File

@ -1,5 +1,6 @@
{% extends "crud/detail.html" %} {% extends "crud/detail.html" %}
{% load i18n %} {% load i18n %}
{% block actions %} {% block actions %}
{% load common_tags %} {% load common_tags %}
@ -13,3 +14,39 @@
{% endif %} {% endif %}
</div> </div>
{% endblock actions %} {% endblock actions %}
{% block detail_content %}
{{ block.super }}
{% if user.is_superuser %}
<div class="row">
{% if tramitacaoadministrativo.user %}
<div class="col-sm-6">
<div id="div_id_user" class="form-group">
<p class="control-label">Usuário</p>
<div class="controls">
<div class="form-control-static">
<div class="dont-break-out">
<a href="{% url 'sapl.base:user_edit' user.pk %}">{{tramitacaoadministrativo.user}}</a>
</div>
</div>
</div>
</div>
</div>
{% endif %}
{% if tramitacaoadministrativo.ip %}
<div class="col-sm-6">
<div id="div_ip_user" class="form-group">
<p class="control-label">IP</p>
<div class="controls">
<div class="form-control-static">
<div class="dont-break-out">
{{tramitacaoadministrativo.ip}}
</div>
</div>
</div>
</div>
</div>
{% endif %}
</div>
{% endif %}
{% endblock detail_content %}

Write Preview
Loading…
Cancel
Save