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

Cria model forms dinâmicos para poder validar inputs de querystring #455

Merged
merged 16 commits into from Oct 3, 2020
Merged

Cria model forms dinâmicos para poder validar inputs de querystring #455

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
28ca632
Deixa a tabela como um dado extra do model para conseguir ver as conf…
berinhard Sep 29, 2020
2ba9e6b
Constrói model form dinâmico baseado no model
berinhard Sep 29, 2020
5459397
Constrói campos com choices se field dinâmicos possuir informação
berinhard Sep 29, 2020
2407323
Merge branch 'develop' into feature/validate-filter-data
berinhard Oct 1, 2020
717969c
Move construção de form dinâmico para a view
berinhard Oct 1, 2020
d9ebffa
Refatora HTML de detalhe de dataset para usar form dinâmico
berinhard Oct 1, 2020
ab650c3
Popula o label do campo com o atributo title do field dinâmico
berinhard Oct 1, 2020
997fe44
Apresenta mensagem de erro no formulário
berinhard Oct 1, 2020
309d9af
Adiciona validação de querystring na API
berinhard Oct 1, 2020
3140392
Remove campo que não é apresentado no html
berinhard Oct 2, 2020
8bbcf07
Retorna status code 400 no caso de erro de formulário
berinhard Oct 2, 2020
d3997a9
Remove templatefilter que não é mais utilizada
berinhard Oct 2, 2020
3fe930a
Remove método auxiliar de filtragem que só era usado na API
berinhard Oct 2, 2020
c14c1df
Remove método para parsear querystring do model
berinhard Oct 2, 2020
92db67b
Cria função auxiliar para facilitar a recuperação do campo da tabela
berinhard Oct 2, 2020
5dcd56f
Cria testes unitários para form construído dinamicamente
berinhard Oct 2, 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
3 changes: 3 additions & 0 deletions core/templates/core/dataset-detail.html
View file
Open in desktop
Expand Up @@ -86,6 +86,9 @@ <h5>Filtros</h5>
<div class="input-field col s6">
<label class="active" for="{{ field.name }}">{{ field.label }}</label>
{{ field }}
{% if field.errors %}
<span class="filter-error">{{ field.errors.as_text }}</span>
{% endif %}
</div>
{% endfor %}
berinhard marked this conversation as resolved.
Show resolved Hide resolved

Expand Down
7 changes: 4 additions & 3 deletions core/views.py
View file
Open in desktop
Expand Up @@ -153,10 +153,11 @@ def dataset_detail(request, slug, tablename=""):

DynamicForm = get_table_dynamic_form(table)
filter_form = DynamicForm(data=query)
if not filter_form.is_valid():
raise Exception(str(filter_form.errors))
if filter_form.is_valid():
query = {k: v for k, v in filter_form.cleaned_data.items() if v != ""}
else:
berinhard marked this conversation as resolved.
Show resolved Hide resolved
query = {}

query = {k: v for k, v in filter_form.cleaned_data.items() if v != ""}
all_data = TableModel.objects.composed_query(query, search_query, order_by)

if download_csv:
Expand Down
7 changes: 6 additions & 1 deletion static/css/base.css
View file
Open in desktop
Expand Up @@ -191,4 +191,9 @@ a {

.error-container p{
font-size: 1.4rem;
}
}

.filter-error {
color: #ee6e73;
font-size: 1rem;
}