Changeset 962

Timestamp:

11/03/08 16:38:53 (2 months ago)

Author:

lucy

Message:

filters added back to browse page, this time with javascript so that react to dropdown changes. removed ajax part, tho. with pagination, what's the point?

Location:

huginmunin/trunk/web/hm

Files:

• app/media/css/general.css (modified) (2 diffs)
• app/media/js/main.js (modified) (1 diff)
• app/templates/graph/list.html (modified) (1 diff)
• app/views/main.py (modified) (1 diff)
• db/calculations (deleted)
• db/rating.py (modified) (1 diff)
• db/tag.py (modified) (1 diff)

huginmunin/trunk/web/hm/app/media/css/general.css

@@ -667 +667 @@
 #list_of_nodes .node .r { float: right; font-size: .9em; }
 #list_of_nodes .node .quote { padding: 5px 25px 5px 25px; clear: both; }
+/** browse controls **/
+.letter { cursor:pointer; text-decoration:underline; padding: 2px; }
+.letter + .selected { text-decoration: none; cursor: default; background: yellow; }
 
 /****** PAGINATION ******/
@@ -681 +684 @@
 .horizontal_menu_item { padding: 2px 5px 2px 5px; margin: 2px 4px 2px 4px; float: left; background: #CCF; }
 .horizontal_menu_item a { color: black; text-decoration: none; }
+

huginmunin/trunk/web/hm/app/media/js/main.js

@@ -490 +490 @@
         $("#"+container+" textarea").addClass("rte_zone").rte("/Main/media/css/rte.css");
 }
+
+
+function dropdown_submit(key, select) {
+    var val = (select.options[select.selectedIndex].value);
+    get_paramter_submit(key, val);
+}
+function get_paramter_submit(key, val) {
+    if (val) {
+            new_location = location.href;
+            if (val.indexOf("none") > -1) { new_location = remove_get_parameter(key); }
+            else {
+                if (new_location.indexOf(key) > -1)
+                        { new_location = remove_get_parameter(key); }
+                if (new_location.indexOf("?") > -1)
+                        { new_location = new_location + "&" + key + "=" + val; }
+                else
+                        { new_location = new_location + "?" + key + "=" + val; }
+            }
+            location.href = new_location
+        }
+}
+function remove_get_parameter(key) {
+        two_parts = location.href.split("?");
+        if (two_parts.length > 1) {
+                params = two_parts[1].split("&");
+                new_params = "";
+                for (i=0; i < params.length; i++) {
+                        kv = params[i].split("=");
+                        if (kv[0].indexOf(key) == -1) {
+                                new_params += params[i];
+                        }
+                }
+                if (new_params.length > 0) {
+                        return two_parts[0] + "?" + new_params;
+                } else {
+                        return two_parts[0];
+                }
+        } else {
+                return location.href;
+        }
+}

huginmunin/trunk/web/hm/app/templates/graph/list.html

@@ -1 +1 @@
 <div class="left">
+
+<DIV id="controls">
+        <SELECT name="filter_by_type" onChange="dropdown_submit('filter_by_type', this);">
+                <OPTION value="none">No filter</OPTION>
+                {% for type in types %}
+                        <OPTION value="{{ type.id }}" {% ifequal selected_type type.id %} selected {% endifequal %}>{{ type.label }}</OPTION>
+                {% endfor %}
+        </SELECT>
+        <SELECT name="filter_by_tag" onChange="dropdown_submit('filter_by_tag', this);">
+                <OPTION value="none">No filter</OPTION>
+                {% for tag in tags %}
+                        <OPTION value="{{ tag.id }}" {% ifequal selected_tag tag.id %} selected {% endifequal %}>{{ tag.tag }}</OPTION>
+                {% endfor %} 
+        </SELECT>
+        
+        <SELECT name="filter_by_interest" onChange="dropdown_submit('filter_by_interest', this);">
+                <OPTION value="none">No filter</OPTION>
+                {% for interest in interests %}
+                        <OPTION value="{{ interest.id }}" {% ifequal selected_interest interest.id %} selected {% endifequal %}>{{ interest.label }}</OPTION>
+                {% endfor %}
+        </SELECT>
+        
+        <DIV>
+                <SPAN class="letter {% ifequal selected_letter "none" %}selected {% endifequal %}" onClick="location.href = remove_get_parameter('filter_by_letter');">all</SPAN>
+                {% for letter in letters %}
+                        <SPAN class="letter {% ifequal selected_letter letter %}selected{% endifequal %}" onClick="get_paramter_submit('filter_by_letter', '{{ letter }}');">{{ letter }}</SPAN>
+                {% endfor %}
+        </DIV>
+</DIV>
 
 <DIV id="list_of_nodes">

huginmunin/trunk/web/hm/app/views/main.py

@@ -325 +325 @@
 
 def graph_centric(request):
-    nodes = Node.find().select_related().order_by('label')[:]
-    data = {
-        #'NodeTypes' : to_json(JSON["NodeType"].render(NodeType.find()[:])),
-        #'EdgeTypes' : to_json(JSON["EdgeType"].render(EdgeType.find()[:])),
-        }.items()
-    types = JSON["NodeType"].render(NodeType.find()[:])
-    tags = JSON["Tag"].render(Tag.cloud_qs(nodes))
-    dimensions = JSON["Dimension"].render(Dimension.find()[:])
-    filters = [1,2]
+    params = run_params(request.GET)
+    nodes = Node.find().select_related().order_by('label')
+    
+    order = 'alphabetical'
+    
+    selected_type = selected_letter = selected_tag = selected_interest = "none"
+
+    if 'filter_by_type' in params:
+        filter_by_type = params['filter_by_type']
+        selected_type = int(filter_by_type)
+        nodes = nodes.filter(nodetypecast__type__id__in=filter_by_type)
+
+    if 'filter_by_letter' in params:
+        filter_by_letter = params['filter_by_letter']
+        selected_letter = filter_by_letter
+        nodes = nodes.filter(label__istartswith=filter_by_letter)
+
+    if 'filter_by_tag' in params:
+        filter_by_tag = params['filter_by_tag']
+        selected_tag = int(filter_by_tag)
+        ids = [n.id for n in Node.by_tag_id(int(filter_by_tag))]
+        nodes = nodes.filter(id__in=ids)
+
+    if 'filter_by_interest' in params:
+        filter_by_interest = params['filter_by_interest']
+        selected_interest = int(filter_by_interest)
+        nodes = nodes.filter(behavior_set__dimension__id__in=filter_by_interest)
+    
+    types = NodeType.objects.all().order_by('label')
+    tags = Tag.objects.all().order_by('tag')
+    interests = Dimension.objects.all().order_by('label')
+    letters = [x for x in 'ABCDEFGHIJKLMNOPQRSTUVWXYZ']
     page = 'graph'
     number_nodes_displayed = 10

huginmunin/trunk/web/hm/db/rating.py

@@ -391 +391 @@
                 return sum / count
         else:
+            # could use current_user() rather than no user
             return self.score(None)
 

huginmunin/trunk/web/hm/db/tag.py

@@ -506 +506 @@
         condition = 'tagging_count.item_id = %(db_table)s.id' % params
         order = '-value'
+        print "select: %s" % select
+        print "tables: %s" % subquery
+        print "condition: %s" % condition
+        print "order: %s" % order
         return klass.find().extra(select=select, tables=[subquery],
                                   where=[condition]).order_by(order)