Changeset c1a2c1c

Timestamp:

02/10/10 19:25:21 (3 years ago)

Author:

olivier <>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test, video

Children:

12d665f

Parents:

622588f

git-author:

olivier <> (02/10/10 19:25:21)

git-committer:

olivier <> (02/10/10 19:25:21)

Message:

add autocompleted location input field to advanced search

Location:

telemeta

Files:

• htdocs/css/jquery.autocomplete.css (added)
• htdocs/js/jquery.autocomplete.js (added)
• models/query.py (modified) (1 diff)
• templates/telemeta/geo_continents.js (deleted)
• templates/telemeta_default/geo_continents.js (deleted)
• templates/telemeta_default/search_criteria.html (modified) (3 diffs)
• templates/telemeta_default/search_results.html (modified) (1 diff)
• urls.py (modified) (2 diffs)
• web/base.py (modified) (3 diffs)

telemeta/models/query.py

@@ -80 +80 @@
     def by_location(self, location):
         "Find items by location"
-        from telemeta.models import LocationRelation
-        descendants = LocationRelation.objects.filter(ancestor_location=location)
-        return self.filter(Q(location=location) | Q(location__in=descendants))
+        return self.filter(Q(location=location) | Q(location__in=location.descendants()))
            
     @staticmethod
     def __name_cmp(obj1, obj2):
         return unaccent_icmp(obj1.name, obj2.name)
+
+    def locations(self):
+        from telemeta.models import Location, LocationRelation
+        l = self.values('location')
+        r = LocationRelation.objects.filter(location__in=l).values('ancestor_location')
+        return Location.objects.filter(Q(pk__in=l) | Q(pk__in=r))
 
     def countries(self, group_by_continent=False):

telemeta/templates/telemeta_default/search_criteria.html

@@ -1 +1 @@
 {% extends "telemeta/base.html" %}
 {% load telemeta_utils %}
+{% load i18n %}
+
+{% block stylesheets %}
+{{ block.super }}
+<link rel="stylesheet" type="text/css" href="{% url telemeta-css "jquery.autocomplete.css" %}" />
+{% endblock %}
 
 {% block extra_javascript %}
-<script src="{% url telemeta-continents-js %}" type="text/javascript"></script>
+<script src="{% url telemeta-js "jquery.autocomplete.js" %}" type="text/javascript"></script>
+<script type="text/javascript">
+$(document).ready(function () {
+    $('#location').autocomplete('{% url telemeta-complete-location %}', {
+        max: 20,
+        formatResult: function(data) {
+            console.log(data);
+            return data[0].replace(/ *\([0-9]+.*\) *$/, '');
+        }
+    });
+});
+</script>
 {% endblock %}
 
@@ -13 +30 @@
 
     <p>
-    <label for="continent">Continent</label>
-    <select id="continent" name="continent" onchange="update_countries(this, document.getElementById('country'));">
-        <option value="">All continents</option>
-    {% for continent in continents %}
-        <option value="{{continent|escape}}">{{continent|escape}}</option>
-    {% endfor %}
-    </select>
-    </p>
-
-    <p>
-    <label for="country">Country</label>
-    <select name="country" id="country">
-        <option value="">All countries</option>
-    {% for country in countries %}
-        <option value="{{country.1|escape}}">{{country.1|escape}}</option>
-    {% endfor %}
-    </select>
+    <label for="location">{% trans "Location" %}</label>
+    <input type="text" name="location" id="location" />
     </p>
 
@@ -37 +39 @@
         <option value="">All ethnic groups</option>
     {% for group in ethnic_groups %}
-        <option value="{{group|escape}}">{{group|escape}}</option>
+        <option value="{{group.id}}">{{group|escape}}</option>
     {% endfor %}
     </select>

telemeta/templates/telemeta_default/search_results.html

@@ -10 +10 @@
     <li><b>Pattern:</b> {{criteria.pattern}}</li>
   {% endif %}
-  {% if criteria.continent %}
-    <li><b>Continent:</b> {{criteria.continent}}</li>
-  {% endif %}
-  {% if criteria.country %}
-    <li><b>Country:</b> {{criteria.country}}</li>
+  {% if criteria.location %}
+    <li><b>Location:</b> {{criteria.location}}</li>
   {% endif %}
   {% if criteria.ethnic_group %}

telemeta/urls.py

@@ -112 +112 @@
         name="telemeta-search-items"),
     url(r'^search/criteria/$', web_view.edit_search, name="telemeta-search-criteria"),
+    url(r'^complete_location/$', web_view.complete_location, name="telemeta-complete-location"),
 
     # administration        
@@ -145 +146 @@
         web_view.list_country_items, 
         name="telemeta-geo-country-items"),
-    url(r'^dynjs/continents.js$', web_view.get_continents_js, name="telemeta-continents-js"),
     url(r'^geo/country_info/(?P<id>[0-9A-Z]+)/$', 
         web_view.country_info, name="telemeta-country-info"),

telemeta/web/base.py

@@ -162 +162 @@
 
     def edit_search(self, request):
-        continents = MediaCollection.objects.list_continents()
-        countries = MediaCollection.objects.list_countries()
-        ethnic_groups = MediaItem.objects.list_ethnic_groups()
+        ethnic_groups = MediaItem.objects.all().ethnic_groups()
         return render_to_response('telemeta/search_criteria.html', 
-            {'continents': continents, 'countries': countries, 
-            'ethnic_groups': ethnic_groups})
+            {'ethnic_groups': ethnic_groups})
+
+    def complete_location(self, request, with_items=True):
+        input = request.REQUEST
+       
+        token = input['q']
+        limit = int(input['limit'])
+        if with_items:
+            locations = MediaItem.objects.all().locations()
+        else:
+            locations = Location.objects.all()
+
+        locations = locations.filter(name__istartswith=token).order_by('name')[:limit]
+        data = [unicode(l) + " (%d items)" % l.items().count() for l in locations]
+
+        return HttpResponse("\n".join(data))
 
     def search(self, request, type = None):
         """Perform a search through collections and items metadata"""
-        collections = MediaCollection.objects.all()
-        items = MediaItem.objects.all()
+        collections = MediaCollection.objects.enriched()
+        items = MediaItem.objects.enriched()
         input = request.REQUEST
         criteria = {}
@@ -183 +195 @@
                 collections.word_search('title', value), 
                 items.by_title(value)),
-            'country': lambda value: (
-                collections.by_country(value), 
-                items.filter(etat = value)),
+            'location': lambda value: (
+                collections.by_location(Location.objects.get(name=value)), 
+                items.by_location(Location.objects.get(name=value))),
             'continent': lambda value: (
                 collections.by_continent(value), 
@@ -347 +359 @@
             'country': country, 'continent': country.continents()[0]})
 
-    def get_continents_js(self, request):
-        countries = MediaCollection.objects.list_countries()
-        return render_to_response('telemeta/geo_continents.js', 
-                    {'countries': countries})
-
     def list_countries(self, request, continent):                    
         continent = Location.objects.by_flatname(continent)[0]