Skip to content

Commit

Permalink
make lint
Browse files Browse the repository at this point in the history
  • Loading branch information
@marcmatias
marcmatias committed Feb 15, 2022
1 parent b1966e4 commit 23d1536
Show file tree
Hide file tree
Showing 4 changed files with 57 additions and 116 deletions.
39 changes: 7 additions & 32 deletions brasilio_auth/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,47 +18,22 @@ def is_valid_username(username):

class UserCreationForm(RegistrationFormUniqueEmail):
username = forms.CharField(
widget=forms.TextInput(
attrs={
'type':'text',
'class':"form-control"
}
),
label=_("Usuário"),
required=True
widget=forms.TextInput(attrs={"type": "text", "class": "form-control"}), label=_("Usuário"), required=True
)

email = forms.EmailField(
widget=forms.TextInput(
attrs={
'placeholder': '[email protected]',
'type':'email',
'class':"form-control"
}
),
required=True
widget=forms.TextInput(attrs={"placeholder": "[email protected]", "type": "email", "class": "form-control"}),
required=True,
)
password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput(
attrs={
'class':"form-control"
}
))
password1 = forms.CharField(label=_("Password"), widget=forms.PasswordInput(attrs={"class": "form-control"}))
password2 = forms.CharField(
label=_("Password confirmation"),
widget=forms.PasswordInput(
attrs={
'class':"form-control"
}),
widget=forms.PasswordInput(attrs={"class": "form-control"}),
help_text=_("Enter the same password as above, for verification."),
)
captcha = ReCaptchaField()
subscribe_newsletter = forms.BooleanField(widget=forms.CheckboxInput(
attrs={
'type':'checkbox',
'class':'form-check-input'
},
),
required=False
subscribe_newsletter = forms.BooleanField(
widget=forms.CheckboxInput(attrs={"type": "checkbox", "class": "form-check-input"},), required=False
)

class Meta:
Expand Down
60 changes: 17 additions & 43 deletions clipping/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,64 +8,38 @@
class ClippingForm(ModelForm):
category = forms.CharField(
widget=forms.Select(
attrs={
'aria-label': 'Seletor de categoria',
'class':'form-select'
},
choices=settings.CATEGORY_CHOICES
),
label="Categoria"
attrs={"aria-label": "Seletor de categoria", "class": "form-select"}, choices=settings.CATEGORY_CHOICES
),
label="Categoria",
)
date = forms.CharField(
widget=forms.TextInput(
attrs={
"type":"text",
"class":"datepicker_input form-control",
"placeholder":"aaaa/mm/dd",
"autocomplete":"off",
"type": "text",
"class": "datepicker_input form-control",
"placeholder": "aaaa/mm/dd",
"autocomplete": "off",
}
),
label="Data"
),
label="Data",
)
vehicle = forms.CharField(
widget=forms.TextInput(
attrs={
'type':'text',
'class':"form-control",
"placeholder":"Veículo que exibiu o conteúdo",
}
attrs={"type": "text", "class": "form-control", "placeholder": "Veículo que exibiu o conteúdo",}
),
label="Veículo"
label="Veículo",
)
author = forms.CharField(
widget=forms.TextInput(
attrs={
'type':'text',
'class':"form-control",
"placeholder":"Autor do conteúdo",
}
),
label="Autor"
widget=forms.TextInput(attrs={"type": "text", "class": "form-control", "placeholder": "Autor do conteúdo",}),
label="Autor",
)
title = forms.CharField(
widget=forms.TextInput(
attrs={
'type':'text',
'class':"form-control",
"placeholder":"Título do conteúdo",
}
),
label="Título"
widget=forms.TextInput(attrs={"type": "text", "class": "form-control", "placeholder": "Título do conteúdo",}),
label="Título",
)
url = forms.CharField(
widget=forms.TextInput(
attrs={
'type':'url',
'class':"form-control",
"placeholder":"http://site.com",
}
),
label="URL"
widget=forms.TextInput(attrs={"type": "url", "class": "form-control", "placeholder": "http://site.com",}),
label="URL",
)

class Meta:
Expand Down
40 changes: 11 additions & 29 deletions core/forms.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,27 +45,11 @@ def _get_name(obj, person_type):


class ContactForm(forms.Form):
name = forms.CharField(
required=True,
label="Nome",
widget=forms.TextInput(
attrs={"class": "form-control"}
)
)
name = forms.CharField(required=True, label="Nome", widget=forms.TextInput(attrs={"class": "form-control"}))
email = forms.EmailField(
required=True,
label="E-mail",
widget=forms.TextInput(
attrs={"class": "form-control", "autofocus": ""}
),
)
message = forms.CharField(
required=True,
label="Mensagem",
widget=forms.Textarea(
attrs={"class": "form-control"}
),
required=True, label="E-mail", widget=forms.TextInput(attrs={"class": "form-control", "autofocus": ""}),
)
message = forms.CharField(required=True, label="Mensagem", widget=forms.Textarea(attrs={"class": "form-control"}),)
captcha = ReCaptchaField()


Expand All @@ -79,29 +63,27 @@ def config_dynamic_filter(model_field):
kwargs = {
"required": False,
"label": dynamic_field.title,
"widget": forms.TextInput(attrs={'type':'text', 'class':"form-control"}),
"widget": forms.TextInput(attrs={"type": "text", "class": "form-control"}),
}
field_factory = model_field.formfield

if dynamic_field.has_choices and dynamic_field.choices:
choices = dynamic_field.choices.get("data", [])
if dynamic_field.type == "date":
kwargs["widget"] = forms.TextInput(
attrs={
"type":"text",
"class":"datepicker_input form-control",
"placeholder":"aaaa-mm-dd",
"autocomplete":"off",
"type": "text",
"class": "datepicker_input form-control",
"placeholder": "aaaa-mm-dd",
"autocomplete": "off",
"data-min-date": min(choices),
"data-max-date": max(choices),
}
)
field_factory = forms.CharField
else:
kwargs["choices"] = [("", "Todos")] + [
(c, c if c != "None" else "(vazio)") for c in choices
]
kwargs["widget"] = forms.Select(attrs={'class':'form-select'})
kwargs["choices"] = [("", "Todos")] + [(c, c if c != "None" else "(vazio)") for c in choices]
kwargs["widget"] = forms.Select(attrs={"class": "form-select"})

field_factory = forms.ChoiceField

Expand Down
34 changes: 22 additions & 12 deletions core/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import uuid

from django.conf import settings
from django.contrib import messages
from django.contrib.contenttypes.models import ContentType
from django.core.exceptions import ObjectDoesNotExist
from django.core.mail import EmailMessage
Expand All @@ -21,7 +22,7 @@
from core.util import cached_http_get_json
from data_activities_log.activites import recent_activities
from traffic_control.logging import log_blocked_request
from django.contrib import messages


class Echo:
def write(self, value):
Expand Down Expand Up @@ -107,6 +108,7 @@ def dataset_list(request):
context = {"datasets": Dataset.objects.filter(q).order_by("name"), "form": form}
return render(request, "core/dataset-list.html", context)


def dataset_list_detail(request, slug, listname):
if len(request.GET) > 0 and not request.user.is_authenticated:
return redirect(f"{settings.LOGIN_URL}?next={request.get_full_path()}")
Expand All @@ -119,20 +121,23 @@ def dataset_list_detail(request, slug, listname):
dataset = Dataset.objects.get(slug=slug)
clipping_type_dataset = ContentType.objects.get(app_label="core", model="dataset")
clipping_dataset = list(
ClippingRelation.objects.filter(content_type=clipping_type_dataset.id, object_id=dataset.pk, clipping__published=True).distinct("clipping__vehicle")
ClippingRelation.objects.filter(
content_type=clipping_type_dataset.id, object_id=dataset.pk, clipping__published=True
).distinct("clipping__vehicle")
)
except Dataset.DoesNotExist:
context = {"message": "Dataset does not exist"}
return render(request, "404.html", context, status=404)

context = {
"listname": listname.replace('_', ' '),
"listname": listname.replace("_", " "),
"dataset": dataset,
"clipping": clipping_dataset,
}

return render(request, "core/dataset-list-detail.html", context, status=200)


def dataset_detail(request, slug):
if len(request.GET) > 0 and not request.user.is_authenticated:
return redirect(f"{settings.LOGIN_URL}?next={request.get_full_path()}")
Expand All @@ -142,10 +147,12 @@ def dataset_detail(request, slug):
except Dataset.DoesNotExist:
context = {"message": "Dataset does not exist"}
return render(request, "404.html", context, status=404)

clipping_type_dataset = ContentType.objects.get(app_label="core", model="dataset")
clipping_dataset = list(
ClippingRelation.objects.filter(content_type=clipping_type_dataset.id, object_id=dataset.pk, clipping__published=True).distinct("clipping__vehicle")
ClippingRelation.objects.filter(
content_type=clipping_type_dataset.id, object_id=dataset.pk, clipping__published=True
).distinct("clipping__vehicle")
)

context = {
Expand All @@ -155,6 +162,7 @@ def dataset_detail(request, slug):

return render(request, "core/dataset-detail.html", context, status=200)


def dataset_table_detail(request, slug, tablename=""):
if len(request.GET) > 0 and not request.user.is_authenticated:
return redirect(f"{settings.LOGIN_URL}?next={request.get_full_path()}")
Expand Down Expand Up @@ -271,30 +279,32 @@ def dataset_table_detail(request, slug, tablename=""):
status = 400
return render(request, "core/dataset-table-detail.html", context, status=status)


def dataset_clipping_suggestion(request):
if len(request.GET) > 0 and not request.user.is_authenticated:
return redirect(f"{settings.LOGIN_URL}?next={request.get_full_path()}")

if request.method == "POST":
clipping_form = ClippingForm(request.POST)
if clipping_form.is_valid():
clipping = clipping_form.save(commit=False)
clipping.added_by = request.user
clipping.save()

messages.success(request, "Sugestão enviada com sucesso", extra_tags='success')
return redirect(request.POST.get('next', '/'))
messages.success(request, "Sugestão enviada com sucesso", extra_tags="success")

return redirect(request.POST.get("next", "/"))
else:
messages.error(request, "Verifique o formulário novamente", extra_tags='danger')
messages.error(request, "Verifique o formulário novamente", extra_tags="danger")
else:
clipping_form = ClippingForm()

context = {
"form": clipping_form,
}
return render(request, "core/dataset-form-clipping.html", context)


def dataset_suggestion(request):
return render(request, "core/dataset-suggestion.html", {})

Expand Down

0 comments on commit 23d1536

Please sign in to comment.