From: Emilie <zawadzki@ircam.fr>
Date: Wed, 23 Nov 2016 17:54:41 +0000 (+0100)
Subject: Autocomplete : add event info while searching : is_parent + date
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=308ce1ea2fb330904f7c1583c1dc749c2aafabee;p=mezzo.git

Autocomplete : add event info while searching : is_parent + date
---

diff --git a/app/local_settings.py b/app/local_settings.py
index 763359f6..0fe59bd7 100644
--- a/app/local_settings.py
+++ b/app/local_settings.py
@@ -167,6 +167,7 @@ PAGES_PUBLISHED_INCLUDE_LOGIN_REQUIRED = True
 
 SEARCH_PER_PAGE = 10
 MAX_PAGING_LINKS = 10
+DAL_MAX_RESULTS = 20
 
 RATINGS_ACCOUNT_REQUIRED = True
 
diff --git a/app/organization/agenda/views.py b/app/organization/agenda/views.py
index acaddea1..3482cb68 100644
--- a/app/organization/agenda/views.py
+++ b/app/organization/agenda/views.py
@@ -5,6 +5,7 @@ from dal_select2_queryset_sequence.views import Select2QuerySetSequenceView
 from organization.magazine.models import Article
 from organization.pages.models import CustomPage
 from mezzanine_agenda.models import Event
+from organization.core.views import autocomplete_result_formatting
 
 class ConfirmationView(TemplateView):
 
@@ -18,6 +19,8 @@ class ConfirmationView(TemplateView):
 
 class DynamicContentEventView(Select2QuerySetSequenceView):
 
+    paginate_by = settings.DAL_MAX_RESULTS
+
     def get_queryset(self):
 
         articles = Article.objects.all()
@@ -37,3 +40,7 @@ class DynamicContentEventView(Select2QuerySetSequenceView):
         qs = self.mixup_querysets(qs)
 
         return qs
+
+    def get_results(self, context):
+        results = autocomplete_result_formatting(self, context)
+        return results
diff --git a/app/organization/core/views.py b/app/organization/core/views.py
index 19b750da..785075a0 100644
--- a/app/organization/core/views.py
+++ b/app/organization/core/views.py
@@ -3,8 +3,10 @@ from django.http import Http404
 from django.views.generic.base import View
 from django.views.generic import DetailView, ListView, TemplateView
 from django.apps import apps
+from django.utils import six, timezone, formats
 from django.utils.translation import ugettext_lazy as _
 from django.http import QueryDict
+from django.template.defaultfilters import capfirst
 from mezzanine.conf import settings
 from mezzanine.utils.views import paginate
 from organization.core.models import *
@@ -133,3 +135,42 @@ class CustomSearchView(TemplateView):
         context['filter_dict'] = filter_dict
         # context.update(extra_context or {})
         return self.render_to_response(context)
+
+
+def autocomplete_result_formatting(self, context):
+    """
+    Return a list of results usable by Select2.
+    It will render as a list of one <optgroup> per different content type
+    containing a list of one <option> per model.
+    """
+    groups = {}
+
+    for result in context['object_list']:
+        groups.setdefault(type(result), [])
+        groups[type(result)].append(result)
+
+    all_results = []
+    for model, results in groups.items():
+        children = []
+        for result in results:
+            text = six.text_type(result)
+            if model._meta.verbose_name == "Event":
+                event_date = timezone.localtime(result.start)
+                is_parent = ""
+                if not result.parent:
+                    is_parent =  " ♦ -"
+                text = "%s -%s%s" % (six.text_type(result), is_parent, formats.date_format(event_date, "d-m-y H:i"))
+
+            children.append({
+                'id': self.get_result_value(result),
+                'text': text,
+            })
+
+        curr_model_result = {
+             'id': None,
+             'text': capfirst(model._meta.verbose_name),
+             'children': children
+        }
+        all_results.append(curr_model_result)
+
+    return all_results
diff --git a/app/organization/magazine/views.py b/app/organization/magazine/views.py
index d917465f..f2113eef 100644
--- a/app/organization/magazine/views.py
+++ b/app/organization/magazine/views.py
@@ -15,7 +15,7 @@ from mezzanine.conf import settings
 from organization.magazine.models import *
 from organization.network.models import DepartmentPage
 from organization.pages.models import CustomPage, DynamicContentPage
-from organization.core.views import SlugMixin
+from organization.core.views import SlugMixin, autocomplete_result_formatting
 from django.template.defaultfilters import slugify
 
 
@@ -95,6 +95,9 @@ class TopicDetailView(SlugMixin, DetailView):
 
 
 class ObjectAutocomplete(Select2QuerySetSequenceView):
+
+    paginate_by = settings.DAL_MAX_RESULTS
+
     def get_queryset(self):
 
         articles = Article.objects.all()
@@ -118,8 +121,15 @@ class ObjectAutocomplete(Select2QuerySetSequenceView):
 
         return qs
 
+    def get_results(self, context):
+        results = autocomplete_result_formatting(self, context)
+        return results
+
 
 class DynamicContentArticleView(Select2QuerySetSequenceView):
+
+    paginate_by = settings.DAL_MAX_RESULTS
+
     def get_queryset(self):
 
         articles = Article.objects.all()
@@ -142,3 +152,7 @@ class DynamicContentArticleView(Select2QuerySetSequenceView):
         qs = self.mixup_querysets(qs)
 
         return qs
+
+    def get_results(self, context):
+        results = autocomplete_result_formatting(self, context)
+        return results
diff --git a/app/organization/media/views.py b/app/organization/media/views.py
index 6a4ebcef..f4c7ffb2 100644
--- a/app/organization/media/views.py
+++ b/app/organization/media/views.py
@@ -3,7 +3,6 @@ from collections import defaultdict
 from organization.media.models import *
 from organization.core.views import *
 from dal import autocomplete
-from dal_select2_queryset_sequence.views import Select2QuerySetSequenceView
 from django.core.exceptions import FieldDoesNotExist
 
 # temporarily excluse not ready models
diff --git a/app/organization/network/views.py b/app/organization/network/views.py
index 271b3e48..819ac924 100644
--- a/app/organization/network/views.py
+++ b/app/organization/network/views.py
@@ -1,6 +1,5 @@
 from django.shortcuts import render
 from dal import autocomplete
-from dal_select2_queryset_sequence.views import Select2QuerySetSequenceView
 from organization.network.models import *
 from organization.core.views import *
 
diff --git a/app/organization/pages/views.py b/app/organization/pages/views.py
index 4e089bd1..ae1a3138 100644
--- a/app/organization/pages/views.py
+++ b/app/organization/pages/views.py
@@ -6,14 +6,14 @@ from dal import autocomplete
 from dal_select2_queryset_sequence.views import Select2QuerySetSequenceView
 from django.core.urlresolvers import reverse, reverse_lazy
 from django.utils.translation import ugettext_lazy as _
+from mezzanine.conf import settings
 from organization.pages.models import CustomPage
-from organization.core.views import SlugMixin
+from organization.core.views import SlugMixin, autocomplete_result_formatting
 from organization.magazine.models import Article, Topic, Brief
 from organization.pages.models import Home
 from organization.agenda.models import Event
 from organization.media.models import Playlist
 
-
 class HomeView(SlugMixin, ListView):
 
     model = Home
@@ -58,9 +58,15 @@ class DynamicContentHomeSliderView(Select2QuerySetSequenceView):
 
         return qs
 
+    def get_results(self, context):
+        results = autocomplete_result_formatting(self, context)
+        return results
+
 
 class DynamicContentHomeBodyView(Select2QuerySetSequenceView):
 
+    paginate_by = settings.DAL_MAX_RESULTS
+
     def get_queryset(self):
 
         articles = Article.objects.all()
@@ -87,6 +93,11 @@ class DynamicContentHomeBodyView(Select2QuerySetSequenceView):
         return qs
 
 
+    def get_results(self, context):
+        results = autocomplete_result_formatting(self, context)
+        return results
+
+
 class DynamicContentHomeMediaView(Select2QuerySetSequenceView):
 
     def get_queryset(self):
@@ -131,3 +142,7 @@ class DynamicContentPageView(Select2QuerySetSequenceView):
         qs = self.mixup_querysets(qs)
 
         return qs
+
+    def get_results(self, context):
+        results = autocomplete_result_formatting(self, context)
+        return results    
diff --git a/app/organization/projects/views.py b/app/organization/projects/views.py
index b58a1d6e..89567b93 100644
--- a/app/organization/projects/views.py
+++ b/app/organization/projects/views.py
@@ -1,13 +1,13 @@
 from django.shortcuts import render
 from dal import autocomplete
 from dal_select2_queryset_sequence.views import Select2QuerySetSequenceView
+from mezzanine_agenda.models import Event
+from mezzanine.conf import settings
 from organization.projects.models import *
 from organization.core.views import *
 from organization.magazine.views import Article
-from mezzanine_agenda.models import Event
 from organization.pages.models import CustomPage
 
-
 class ProjectDetailView(SlugMixin, DetailView):
 
     model = Project
@@ -38,6 +38,8 @@ class ProjectDetailView(SlugMixin, DetailView):
 
 class DynamicContentProjectView(Select2QuerySetSequenceView):
 
+    paginate_by = settings.DAL_MAX_RESULTS
+
     def get_queryset(self):
 
         articles = Article.objects.all()
@@ -58,6 +60,10 @@ class DynamicContentProjectView(Select2QuerySetSequenceView):
 
         return qs
 
+    def get_results(self, context):
+        results = autocomplete_result_formatting(self, context)
+        return results
+
 
 class ProjectDemoDetailView(SlugMixin, DetailView):
 
diff --git a/app/static/admin/css/organization.css b/app/static/admin/css/organization.css
index be6b6c13..8d5a827c 100644
--- a/app/static/admin/css/organization.css
+++ b/app/static/admin/css/organization.css
@@ -10,3 +10,7 @@
     padding: 20px;
     background: yellow;
 }
+
+.select2-container {
+    min-width: 70em;
+}