Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

3058 refatorar tela composicao de comissao para vue #3084

Open
wants to merge 8 commits into
base: 3.1.x
Choose a base branch
from
Open

3058 refatorar tela composicao de comissao para vue #3084

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
f696e1e
refatorando composicao_list
ricardocanela Jan 7, 2020
87028ea
alterando div composicao_list
ricardocanela Jan 9, 2020
b330900
refatorando botoes
ricardocanela Jan 14, 2020
92dec19
refatorando composicao_list
ricardocanela Jan 7, 2020
1a52af3
refatorando botoes
ricardocanela Jan 14, 2020
446175b
inserindo arquivos de front-end
ricardocanela Feb 5, 2020
6e6ad96
corrigindo arquivos de front-end
ricardocanela Feb 5, 2020
365e83a
ajusta botões de inserção de participantes e composição
LeandroJatai Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Empty file added sapl/static/sapl/frontend/css/comissoes.0e433876.css
View file
Open in desktop
Empty file.
1 change: 1 addition & 0 deletions sapl/static/sapl/frontend/js/comissoes.24ef3c79.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added sapl/static/sapl/frontend/js/comissoes.24ef3c79.js.gz
View file
Open in desktop
Binary file not shown.
103 changes: 58 additions & 45 deletions sapl/templates/comissoes/composicao_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,45 +1,43 @@
{% extends "crud/list.html" %}
{% load i18n common_tags crispy_forms_tags%}
{% extends "base.html" %}
{% load i18n %}
{% load crispy_forms_tags cropping%}
{% load common_tags %}
{% load render_bundle from webpack_loader %}
{% load webpack_static from webpack_loader %}

{% block base_content %}

<div id="composicao_list">

<fieldset class="form-group">
<legend>Selecione o Período</legend>
<form method="GET">
<select @change="getParlamentares" class="form-control" v-model="composicao_id">
<option v-for="option in periodo_list" v-bind:value="option.id">
[[ option.__str__ ]]
</option>
</select>
</form>
</fieldset>


{% block actions %}
{% if user.is_authenticated and perms.comissoes.add_composicao %}
<div class="actions btn-group float-right btn-group-lg" role="group">
{% if view.create_url %}
<a href="{{ view.create_url }}" class="btn btn-outline-primary">
{% blocktrans with verbose_name=view.verbose_name %} Adicionar {{ verbose_name }} {% endblocktrans %}
<div class="d-flex flex-column flex-sm-row mb-3 justify-content-between align-items-center">
{% if user.is_authenticated and perms.comissoes.add_participacao and composicao_list %}
<a v-bind:href="'/comissao/'+composicao_id+'/participacao/create'" class="btn btn-outline-primary">
Adicionar Participação em Comissão
</a>
{% endif %}
{% block more_buttons %}{% endblock more_buttons %}
</div>
{% endif %}
{% endif %}
{% if user.is_authenticated and perms.comissoes.add_composicao %}
<a href="composicao/create" class="btn btn-outline-primary btn-lg">
Adicionar Composição de Comissão
</a>
{% endif %}
</div>
{% endblock actions %}

{% block extra_content %}
<form method="GET">
<fieldset class="form-group">
<legend>Selecione o Período</legend>
<select name="pk" class="form-control" onChange="form.submit();">
{% for c in composicao_list %}
<option value="{{c.id}}" {% if composicao_pk == c.id %} selected {% endif %}>
{{c}}
</option>
{% endfor %}
</select>
</fieldset>
</form>
<br/>
{% endblock %}

{% block container_table_list %}
{% if user.is_authenticated and perms.comissoes.add_participacao and composicao_list %}
<div class="context-actions clearfix">
<div class="actions btn-group mb-2" role="group">
<a href="{% url 'sapl.comissoes:participacao_create' composicao_pk %}" class="btn btn-outline-primary">
Adicionar Participação em Comissão
</a>
</div>
</div>
{% endif %}
<div class="container-table">
<table class="table table-striped table-hover table-link-ordering">
<thead>
Expand All @@ -54,20 +52,35 @@
</tr>
</thead>
<tbody>
{% for p in participacao_set %}
<tr>
<tr v-for="p in parlamentares">

<td>
<a href="{% url 'sapl.comissoes:participacao_detail' p.pk %}">{{ p.parlamentar }}</a>
<a v-bind:href="'/comissao/participacao/' + p.id">[[ p.nome ]]</a>
</td>
<td>{{p.cargo}}</td>
<td>{{p.titular|yesno:"Sim,Não"}}</td>
<td>{{p.data_designacao}}</td>
<td>{{p.data_desligamento|default:""}}</td>
<td>{{p.motivo_desligamento}}</td>
<td>{{p.observacao}}</td>
<td>[[p.cargo]]</td>
<td>[[p.titular]]</td>
<td>[[p.data_designacao]]</td>
<td>[[p.data_desligamento]]</td>
<td>[[p.motivo_desligamento]]</td>
<td>[[p.observacao]]</td>
</tr>
{% endfor %}
</tbody>
</table>
</div>
{% endblock %}

</div>

{% endblock base_content %}


{% block webpack_loader_css %}
{{ block.super }}
{% render_bundle 'comissoes' 'css' %}
{% endblock %}

{% block webpack_loader_js %}
{% render_chunk_vendors 'js' %}
{% render_bundle 'global' 'js' %}
{% render_bundle 'comissoes' 'js' %}
{% endblock %}
1 change: 1 addition & 0 deletions sapl/templates/parlamentares/parlamentares_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,7 @@ <h2>Pesquisar Parlamentar</h2>
</tbody>
</table>
</div>
</div>

{% endblock base_content %}

Expand Down
2 changes: 1 addition & 1 deletion sapl/webpack-stats.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"status":"done","publicPath":"/static/sapl/frontend/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.04c72a76.css","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css"},{"name":"js/chunk-vendors.826c3ecf.js","publicPath":"/static/sapl/frontend/js/chunk-vendors.826c3ecf.js","path":"../sapl/sapl/static/sapl/frontend/js/chunk-vendors.826c3ecf.js"},{"name":"css/chunk-vendors.04c72a76.css.map","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map"}],"compilacao":[{"name":"css/compilacao.eff62463.css","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css"},{"name":"js/compilacao.77fbad73.js","publicPath":"/static/sapl/frontend/js/compilacao.77fbad73.js","path":"../sapl/sapl/static/sapl/frontend/js/compilacao.77fbad73.js"},{"name":"css/compilacao.eff62463.css.map","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css.map","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css.map"}],"global":[{"name":"css/global.a77827ad.css","publicPath":"/static/sapl/frontend/css/global.a77827ad.css","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css"},{"name":"js/global.e051cc2f.js","publicPath":"/static/sapl/frontend/js/global.e051cc2f.js","path":"../sapl/sapl/static/sapl/frontend/js/global.e051cc2f.js"},{"name":"css/global.a77827ad.css.map","publicPath":"/static/sapl/frontend/css/global.a77827ad.css.map","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css.map"}],"painel":[{"name":"css/painel.5d957a9b.css","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css"},{"name":"js/painel.35e9809a.js","publicPath":"/static/sapl/frontend/js/painel.35e9809a.js","path":"../sapl/sapl/static/sapl/frontend/js/painel.35e9809a.js"},{"name":"css/painel.5d957a9b.css.map","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css.map","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css.map"}],"parlamentar":[{"name":"css/parlamentar.0e433876.css","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css"},{"name":"js/parlamentar.d5d320f2.js","publicPath":"/static/sapl/frontend/js/parlamentar.d5d320f2.js","path":"../sapl/sapl/static/sapl/frontend/js/parlamentar.d5d320f2.js"},{"name":"css/parlamentar.0e433876.css.map","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css.map","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css.map"}]}}
{"status":"done","publicPath":"/static/sapl/frontend/","chunks":{"chunk-vendors":[{"name":"css/chunk-vendors.04c72a76.css","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css"},{"name":"js/chunk-vendors.826c3ecf.js","publicPath":"/static/sapl/frontend/js/chunk-vendors.826c3ecf.js","path":"../sapl/sapl/static/sapl/frontend/js/chunk-vendors.826c3ecf.js"},{"name":"css/chunk-vendors.04c72a76.css.map","publicPath":"/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map","path":"../sapl/sapl/static/sapl/frontend/css/chunk-vendors.04c72a76.css.map"}],"compilacao":[{"name":"css/compilacao.eff62463.css","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css"},{"name":"js/compilacao.77fbad73.js","publicPath":"/static/sapl/frontend/js/compilacao.77fbad73.js","path":"../sapl/sapl/static/sapl/frontend/js/compilacao.77fbad73.js"},{"name":"css/compilacao.eff62463.css.map","publicPath":"/static/sapl/frontend/css/compilacao.eff62463.css.map","path":"../sapl/sapl/static/sapl/frontend/css/compilacao.eff62463.css.map"}],"global":[{"name":"css/global.a77827ad.css","publicPath":"/static/sapl/frontend/css/global.a77827ad.css","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css"},{"name":"js/global.e051cc2f.js","publicPath":"/static/sapl/frontend/js/global.e051cc2f.js","path":"../sapl/sapl/static/sapl/frontend/js/global.e051cc2f.js"},{"name":"css/global.a77827ad.css.map","publicPath":"/static/sapl/frontend/css/global.a77827ad.css.map","path":"../sapl/sapl/static/sapl/frontend/css/global.a77827ad.css.map"}],"painel":[{"name":"css/painel.5d957a9b.css","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css"},{"name":"js/painel.35e9809a.js","publicPath":"/static/sapl/frontend/js/painel.35e9809a.js","path":"../sapl/sapl/static/sapl/frontend/js/painel.35e9809a.js"},{"name":"css/painel.5d957a9b.css.map","publicPath":"/static/sapl/frontend/css/painel.5d957a9b.css.map","path":"../sapl/sapl/static/sapl/frontend/css/painel.5d957a9b.css.map"}],"parlamentar":[{"name":"css/parlamentar.0e433876.css","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css"},{"name":"js/parlamentar.d5d320f2.js","publicPath":"/static/sapl/frontend/js/parlamentar.d5d320f2.js","path":"../sapl/sapl/static/sapl/frontend/js/parlamentar.d5d320f2.js"},{"name":"css/parlamentar.0e433876.css.map","publicPath":"/static/sapl/frontend/css/parlamentar.0e433876.css.map","path":"../sapl/sapl/static/sapl/frontend/css/parlamentar.0e433876.css.map"}]}}