From 9ff8f02a45913f450ae6e0ed01812377538a1634 Mon Sep 17 00:00:00 2001
From: klmp200 <klmp200@klmp200.net>
Date: Sun, 23 Jul 2017 12:54:12 +0200
Subject: [PATCH] Form remember last entered values

---
 core/templates/core/base.jinja            |  2 +-
 matmat/templates/matmat/search_form.jinja | 25 +++++++++++-
 matmat/urls.py                            |  3 +-
 matmat/views.py                           | 50 +++++++++++++++--------
 4 files changed, 61 insertions(+), 19 deletions(-)

diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
index 75a0460a..40889d00 100644
--- a/core/templates/core/base.jinja
+++ b/core/templates/core/base.jinja
@@ -88,7 +88,7 @@
         {% if not popup %}
         <nav>
             <a href="https://ae.utbm.fr/">{% trans %}Main{% endtrans %}</a>
-            <a href="https://ae.utbm.fr/matmatronch/">{% trans %}Matmatronch{% endtrans %}</a>
+            <a href="{{ url('matmat:search_clear') }}">{% trans %}Matmatronch{% endtrans %}</a>
             <a href="{{ url('core:page', page_name="Index") }}">{% trans %}Wiki{% endtrans %}</a>
             <a href="{{ url('sas:main') }}">{% trans %}SAS{% endtrans %}</a>
             <a href="{{ url('forum:main') }}">{% trans %}Forum{% endtrans %}</a>
diff --git a/matmat/templates/matmat/search_form.jinja b/matmat/templates/matmat/search_form.jinja
index cf0d2862..4c674db9 100644
--- a/matmat/templates/matmat/search_form.jinja
+++ b/matmat/templates/matmat/search_form.jinja
@@ -1,3 +1,4 @@
+{% from "core/macros.jinja" import user_mini_profile, paginate %}
 {% extends "core/base.jinja" %}
 
 {% block title %}
@@ -5,11 +6,33 @@
 {% endblock %}
 
 {% block content %}
+<style type="text/css">
+.matmat_user {
+	/*position: absolute;*/
+	display: inline-block;
+    width: 240px;
+    height: 191px;
+    top: 6px;
+    left: 6px;
+    overflow: hidden;
+    border-width: 3px;
+    border-style: solid;
+    border-color: black;
+}
+</style>
 {% if object_list.exists() %}
 <h2>{% trans %}User found{% endtrans %}</h2>
 {% for user in object_list %}
-	{{ user }}
+
+    <div class="matmat_user">
+    	<a href="{{ url("core:user_profile", user_id=user.id) }}">
+		{{ user_mini_profile(user) }}
+		</a>
+	</div>
+
 {% endfor %}
+<br><br>
+{{ paginate(page_obj, paginator) }}
 {% endif %}
 <h2>{% trans %}Search user{% endtrans %}</h2>
 <h3>{% trans %}Search by profile{% endtrans %}</h3>
diff --git a/matmat/urls.py b/matmat/urls.py
index 8a637b20..c4885bca 100644
--- a/matmat/urls.py
+++ b/matmat/urls.py
@@ -28,5 +28,6 @@ from matmat.views import *
 
 urlpatterns = [
     url(r'^$', SearchFormView.as_view(), name="search"),
-    url(r'^search_reverse$', SearchReverseFormView.as_view(), name="search_reverse"),
+    url(r'^reverse$', SearchReverseFormView.as_view(), name="search_reverse"),
+    url(r'^clear$', SearchClearFormView.as_view(), name="search_clear"),
 ]
diff --git a/matmat/views.py b/matmat/views.py
index a6e63402..c81ff142 100644
--- a/matmat/views.py
+++ b/matmat/views.py
@@ -22,19 +22,12 @@
 #
 #
 
-from django.shortcuts import render
-
-# Create your views here.
-
-from django.shortcuts import get_object_or_404
-from django.views.generic import ListView
+from django.views.generic import ListView, View
 from django.views.generic.edit import FormView
-from django.core.urlresolvers import reverse_lazy, reverse
 from django.utils.translation import ugettext_lazy as _
 from django.views.generic.detail import SingleObjectMixin
-from django.core.exceptions import PermissionDenied
-from django.db import transaction
-from django.forms import CheckboxSelectMultiple
+from django.http.response import HttpResponseRedirect
+from django.core.urlresolvers import reverse
 from django import forms
 
 from core.models import User
@@ -52,7 +45,6 @@ class SearchForm(forms.ModelForm):
             'first_name',
             'last_name',
             'nick_name',
-            'sex',
             'role',
             'department',
             'semester',
@@ -63,21 +55,34 @@ class SearchForm(forms.ModelForm):
         widgets = {
             'date_of_birth': SelectDate,
             'phone': PhoneNumberInternationalFallbackWidget,
-            # 'sex': CheckboxSelectMultiple,
         }
 
+    sex = forms.ChoiceField([
+        ("MAN", _("Man")),
+        ("WOMAN", _("Woman")),
+        ("INDIFFERENT", _("Indifferent"))
+    ], widget=forms.RadioSelect, initial="INDIFFERENT")
+
     def __init__(self, *args, **kwargs):
         super(SearchForm, self).__init__(*args, **kwargs)
         for key in self.fields.keys():
             self.fields[key].required = False
-        self.fields['sex'].choices.append(("INDIFFERENT", _("Indifferent")))
 
+    @property
+    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:
+                data[key] = str(data[key])
+        return data
 
 # Views
 
+
 class SearchFormListView(WasSuscribed, SingleObjectMixin, ListView):
     model = User
     template_name = 'matmat/search_form.jinja'
+    paginate_by = 3
 
     def dispatch(self, request, *args, **kwargs):
         self.form_class = kwargs['form']
@@ -99,7 +104,7 @@ class SearchFormListView(WasSuscribed, 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['form'] = self.form_class
         return kwargs
 
     def get_queryset(self):
@@ -122,8 +127,9 @@ class SearchFormView(WasSuscribed, FormView):
     reverse = False
 
     def dispatch(self, request, *args, **kwargs):
+        self.session = request.session
         self.init_query = User.objects
-        kwargs['form'] = self.get_form_class()
+        kwargs['form'] = self.get_form()
         kwargs['reverse'] = self.reverse
         return super(SearchFormView, self).dispatch(request, *args, **kwargs)
 
@@ -136,11 +142,23 @@ class SearchFormView(WasSuscribed, FormView):
         view = SearchFormListView.as_view()
         if form.is_valid():
             kwargs['valid_form'] = form.clean()
+            request.session['matmat_search'] = form.cleaned_data_json
         return view(request, *args, **kwargs)
 
     def get_initial(self):
-        return super(SearchFormView, self).get_initial()
+        return self.session.get('matmat_search', {})
 
 
 class SearchReverseFormView(SearchFormView):
     reverse = True
+
+
+class SearchClearFormView(WasSuscribed, View):
+    """
+    Clear SearchFormView and redirect to it
+    """
+
+    def dispatch(self, request, *args, **kwargs):
+        super(SearchClearFormView, self).dispatch(request, *args, **kwargs)
+        request.session.pop('matmat_search')
+        return HttpResponseRedirect(reverse('matmat:search'))