klmp200/Sith
1
0
Fork 0
mirror of https://github.com/ae-utbm/sith.git synced 2025-07-09 19:40:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

All: Apply Black coding rules

Browse Source
This commit is contained in:
Antoine Bartuccio
2018-10-04 21:29:19 +02:00
parent 0581c667de
commit cb58b00b6e
204 changed files with 13173 additions and 6376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
matmat/urls.py
View File

@ -27,8 +27,8 @@ from django.conf.urls import url
from matmat.views import *
urlpatterns = [
url(r'^$', SearchNormalFormView.as_view(), name="search"),
url(r'^reverse$', SearchReverseFormView.as_view(), name="search_reverse"),
url(r'^quick$', SearchQuickFormView.as_view(), name="search_quick"),
url(r'^clear$', SearchClearFormView.as_view(), name="search_clear"),
url(r"^$", SearchNormalFormView.as_view(), name="search"),
url(r"^reverse$", SearchReverseFormView.as_view(), name="search_reverse"),
url(r"^quick$", SearchQuickFormView.as_view(), name="search_quick"),
url(r"^clear$", SearchClearFormView.as_view(), name="search_clear"),
]

89
matmat/views.py
View File

@ -54,28 +54,29 @@ class SearchForm(forms.ModelForm):
class Meta:
model = User
fields = [
'first_name',
'last_name',
'nick_name',
'role',
'department',
'semester',
'promo',
'date_of_birth',
'phone',
"first_name",
"last_name",
"nick_name",
"role",
"department",
"semester",
"promo",
"date_of_birth",
"phone",
]
widgets = {
'date_of_birth': SelectDate,
'phone': PhoneNumberInternationalFallbackWidget,
"date_of_birth": SelectDate,
"phone": PhoneNumberInternationalFallbackWidget,
}
sex = forms.ChoiceField([
("MAN", _("Man")),
("WOMAN", _("Woman")),
("INDIFFERENT", _("Indifferent"))
], widget=forms.RadioSelect, initial="INDIFFERENT", label=_('Sex'))
sex = forms.ChoiceField(
[("MAN", _("Man")), ("WOMAN", _("Woman")), ("INDIFFERENT", _("Indifferent"))],
widget=forms.RadioSelect,
initial="INDIFFERENT",
label=_("Sex"),
)
quick = forms.CharField(label=_('Last/First name or nickname'), max_length=255)
quick = forms.CharField(label=_("Last/First name or nickname"), max_length=255)
def __init__(self, *args, **kwargs):
super(SearchForm, self).__init__(*args, **kwargs)
@ -86,10 +87,11 @@ class SearchForm(forms.ModelForm):
def cleaned_data_json(self):
data = self.cleaned_data
for key in data.keys():
if key in ('date_of_birth', 'phone') and data[key] is not None:
if key in ("date_of_birth", "phone") and data[key] is not None:
data[key] = str(data[key])
return data
# Views
@ -97,16 +99,16 @@ class SearchFormListView(FormerSubscriberMixin, SingleObjectMixin, ListView):
model = User
ordering = ["-id"]
paginate_by = 12
template_name = 'matmat/search_form.jinja'
template_name = "matmat/search_form.jinja"
def dispatch(self, request, *args, **kwargs):
self.form_class = kwargs['form']
self.search_type = kwargs['search_type']
self.form_class = kwargs["form"]
self.search_type = kwargs["search_type"]
self.session = request.session
self.last_search = self.session.get('matmat_search_result', str([]))
self.last_search = self.session.get("matmat_search_result", str([]))
self.last_search = literal_eval(self.last_search)
if 'valid_form' in kwargs.keys():
self.valid_form = kwargs['valid_form']
if "valid_form" in kwargs.keys():
self.valid_form = kwargs["valid_form"]
else:
self.valid_form = None
@ -124,18 +126,18 @@ class SearchFormListView(FormerSubscriberMixin, SingleObjectMixin, ListView):
def get_context_data(self, **kwargs):
self.object = None
kwargs = super(SearchFormListView, self).get_context_data(**kwargs)
kwargs['form'] = self.form_class
kwargs['result_exists'] = self.result_exists
kwargs["form"] = self.form_class
kwargs["result_exists"] = self.result_exists
return kwargs
def get_queryset(self):
q = self.init_query
if self.valid_form is not None:
if self.search_type == SearchType.REVERSE:
q = q.filter(phone=self.valid_form['phone']).all()
q = q.filter(phone=self.valid_form["phone"]).all()
elif self.search_type == SearchType.QUICK:
if self.valid_form['quick'].strip():
q = search_user(self.valid_form['quick'])
if self.valid_form["quick"].strip():
q = search_user(self.valid_form["quick"])
else:
q = []
if not self.can_see_hidden and len(q) > 0:
@ -143,7 +145,9 @@ class SearchFormListView(FormerSubscriberMixin, SingleObjectMixin, ListView):
else:
search_dict = {}
for key, value in self.valid_form.items():
if key not in ('phone', 'quick') and not (value == '' or value is None or value == 'INDIFFERENT'):
if key not in ("phone", "quick") and not (
value == "" or value is None or value == "INDIFFERENT"
):
search_dict[key + "__icontains"] = value
q = q.filter(**search_dict).all()
else:
@ -155,7 +159,7 @@ class SearchFormListView(FormerSubscriberMixin, SingleObjectMixin, ListView):
self.last_search = []
for user in q:
self.last_search.append(user.id)
self.session['matmat_search_result'] = str(self.last_search)
self.session["matmat_search_result"] = str(self.last_search)
return q
@ -163,13 +167,14 @@ class SearchFormView(FormerSubscriberMixin, FormView):
"""
Allows users to search inside the user list
"""
form_class = SearchForm
def dispatch(self, request, *args, **kwargs):
self.session = request.session
self.init_query = User.objects
kwargs['form'] = self.get_form()
kwargs['search_type'] = self.search_type
kwargs["form"] = self.get_form()
kwargs["search_type"] = self.search_type
return super(SearchFormView, self).dispatch(request, *args, **kwargs)
def get(self, request, *args, **kwargs):
@ -180,14 +185,14 @@ class SearchFormView(FormerSubscriberMixin, FormView):
form = self.get_form()
view = SearchFormListView.as_view()
if form.is_valid():
kwargs['valid_form'] = form.clean()
request.session['matmat_search_form'] = form.cleaned_data_json
kwargs["valid_form"] = form.clean()
request.session["matmat_search_form"] = form.cleaned_data_json
return view(request, *args, **kwargs)
def get_initial(self):
init = self.session.get('matmat_search_form', {})
init = self.session.get("matmat_search_form", {})
if not init:
init['department'] = ''
init["department"] = ""
return init
@ -210,8 +215,8 @@ class SearchClearFormView(FormerSubscriberMixin, View):
def dispatch(self, request, *args, **kwargs):
super(SearchClearFormView, self).dispatch(request, *args, **kwargs)
if 'matmat_search_form' in request.session.keys():
request.session.pop('matmat_search_form')
if 'matmat_search_result' in request.session.keys():
request.session.pop('matmat_search_result')
return HttpResponseRedirect(reverse('matmat:search'))
if "matmat_search_form" in request.session.keys():
request.session.pop("matmat_search_form")
if "matmat_search_result" in request.session.keys():
request.session.pop("matmat_search_result")
return HttpResponseRedirect(reverse("matmat:search"))