diff --git a/requirements.txt b/requirements.txt index f6965a2..31c590c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,3 +2,5 @@ * django-bootstrap3 * django_select2 + +* django-watson diff --git a/suivi/search.py b/suivi/search.py deleted file mode 100644 index 1ad6b71..0000000 --- a/suivi/search.py +++ /dev/null @@ -1,48 +0,0 @@ -from django.views.generic.edit import FormMixin, ProcessFormView -from django import forms - -from django.shortcuts import redirect - -class SearchForm(forms.Form): - - search_text = forms.CharField(64, widget=forms.widgets.TextInput(attrs={'placeholder':"NotYetImplemented"})) - - def __init__(self, *args, **kwargs): - kwargs['prefix'] = 'search' - return super().__init__(*args, **kwargs) - - def clean(self): - super().clean() - #Do search and store result - self.result = None - - def is_valid(self): - valid = super().is_valid() - if not self.result: - return False - return valid - -class SearchFormMixin(FormMixin): - """ Add 'search_form' to context. - Made compatible with NoteFormMixin using 'prefix' argument in get_form - """ - def get_form(self, prefix): - if prefix == 'search': - return SearchForm() - return super().get_form(prefix) - - def get_context_data(self, **kwargs): - context = super().get_context_data(**kwargs) - context['search_form'] = self.get_form('search') - return context - -""" What to do ? - -- We shall use 'django-watson', need to install it - -- Create view to parse search_form data then redirect -- Link form in menu_sujets to this view -""" - -class SearchFormProcessView(ProcessFormView): - pass diff --git a/suivi/templates/suivi/menu_sujets.html b/suivi/templates/suivi/menu_sujets.html index 136226c..51a5b30 100644 --- a/suivi/templates/suivi/menu_sujets.html +++ b/suivi/templates/suivi/menu_sujets.html @@ -3,12 +3,6 @@ Liste des sujets {% bootstrap_icon "list" %} - {% if search_form %} -
- {% bootstrap_form search_form show_label=False %} - {% bootstrap_button 'Chercher' button_type='submit' %} -
- {% endif %} {% if user.is_superuser %}
  • diff --git a/suivi/views.py b/suivi/views.py index ec1c7cf..301012d 100644 --- a/suivi/views.py +++ b/suivi/views.py @@ -6,7 +6,6 @@ from sujets.models import Sujet from .forms import * from notes.mixins import NoteFormMixin from notes.forms import AutoNoteForm -from .search import SearchFormMixin, SearchFormProcessView # Create your views here. from website import decorators as website webpage = website.webpage( @@ -18,7 +17,7 @@ webpage = website.webpage( @webpage -class IndexView(SearchFormMixin, NoteFormMixin, generic.TemplateView): +class IndexView(NoteFormMixin, generic.TemplateView): class PageInfo: title = "Suivi des bénéficiaires" header = "Suivi" diff --git a/sujets/__init__.py b/sujets/__init__.py index e69de29..f5b867c 100644 --- a/sujets/__init__.py +++ b/sujets/__init__.py @@ -0,0 +1 @@ +default_app_config = 'sujets.apps.SujetsConfig' diff --git a/sujets/apps.py b/sujets/apps.py index 5b36fe2..10e42b0 100644 --- a/sujets/apps.py +++ b/sujets/apps.py @@ -1,5 +1,9 @@ from django.apps import AppConfig - +from watson import search as watson class SujetsConfig(AppConfig): name = 'sujets' + + def ready(self): + Sujet = self.get_model("Sujet") + watson.register(Sujet, fields=('nom', 'prenom', 'surnom')) diff --git a/sujets/templates/sujets/sujet_liste.html b/sujets/templates/sujets/sujet_liste.html index dd9795e..dfd5ac0 100644 --- a/sujets/templates/sujets/sujet_liste.html +++ b/sujets/templates/sujets/sujet_liste.html @@ -5,7 +5,28 @@

    Sujets rencontrés

    - +
    +
    {% csrf_token %} +
    + + + + + + + +
    +
    + {% if query_text %}
    +

    '{{query_text}}'

    +

    + {% if not object_list %}Aucun résultat + {% else %} {{ object_list.count }} résultat(s) + {% endif %} +

    +
    {% endif %} +
    + {% if object_list %} {% for sujet in object_list %} @@ -15,15 +36,15 @@ {% endfor %}
    - {% if is_paginated %} -
    + {% if is_paginated %} +
    -
    - {% endif %} +
    + {% endif %}{% endif %}
    diff --git a/sujets/views.py b/sujets/views.py index e7ce42b..3bdd258 100644 --- a/sujets/views.py +++ b/sujets/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render +from django.shortcuts import render, redirect from django.views import generic from .models import Sujet @@ -38,7 +38,18 @@ class SujetListView(generic.ListView): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) self.insert_menu("suivi/menu_sujets.html") - + def post(self, request, **kwargs): + from watson import search as watson + search_text = request.POST.get('q') + results = watson.filter(Sujet, search_text) + if results.count() == 1: + return redirect(results[0].get_absolute_url()) + self.queryset = results + return self.get(request, **kwargs) + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['query_text'] = self.request.POST.get('q', None) + return context @webpage