adding of filters to UI from object selection

Author: Gaurav SinghaRoy

app/assets/javascripts/resources/querybuilder.js

@@ -259,6 +259,23 @@ QueryBuilder = {
         property_click : function(uri, name, type){
             show_loading();
             $.get("/query/property_ranges.js?property_uri="+uri+"&type="+type+"&dataset="+QueryBuilder.datasets.get_selected()+"&property_name="+name);
+        },
+        filter : {
+            add_objects : function(property_uri, property_name,  data){
+                $("#qb_properties_properties_selected_filters_header").show();
+                $("#qb_properties_properties_selected_filters_list").show();
+                var uris = "";
+                var names = "";
+                for(var i=0;i<data.length;i++){
+                    if(i>0){
+                        uris += ",";
+                        names += ", ";
+                    }
+                    uris += data[i].uri;
+                    names += "'"+data[i].name+"'";
+                }
+                $("#qb_properties_properties_selected_filters_list").append("<div class=\"list-group-item\" property-uri=\""+property_uri+"\" filter-value=\""+uris+"\"><strong>"+property_name+"</strong> "+names+"</div>");
+            }
         }
     },
 
@@ -380,6 +397,13 @@ QueryBuilder = {
                 result.push({name : $(this).attr("object-name"), uri : $(this).attr("uri")})
             }); 
             return result;
+        },
+        done_click : function(){
+            var selected_objects = QueryBuilder.objects.get_selected_objects();
+            if(selected_objects.length > 0){
+                QueryBuilder.properties.filter.add_objects($("#hdn_selector_property_uri").val(),$("#hdn_selector_property_name").val(),selected_objects);
+            }
+            $("#class_selector_modal").modal('hide');
         }
 
     }

app/views/query/_properties_selector_body.html.erb

@@ -5,7 +5,7 @@
         </div>
         <div class="col-md-5">
             <div class="btn-group pull-right">
-                <button type="button" class="btn btn-success" data-dismiss="modal">Done</button>
+                <button type="button" class="btn btn-success" onclick="QueryBuilder.objects.done_click()">Done</button>
                 <button type="button" class="btn btn-danger" data-dismiss="modal">Cancel</button>
             </div>
         </div>
@@ -18,6 +18,8 @@
     <div class="row" id="class_selector_class_main">
         <div class="col-md-12">
             <input type="hidden" id="hdn_objects_of_class" />
+            <input type="hidden" id="hdn_selector_property_uri"/>
+            <input type="hidden" id="hdn_selector_property_name"/>
             <input type="text" class="form-control" placeholder="Type in objects here ... " id="txt_search_objects" required >
             <input type="hidden" id="hdn_searched_object_value" />
             <input type="hidden" id="hdn_done_searching_object" value="false"/>

app/views/query/builder.html.erb

@@ -113,7 +113,16 @@
                                         </div>
                                     </div>
                                     <div class="panel-body">
-                                        <small> Filter some specific properties of the selected class</small>
+                                        <div class="row">
+                                            <div class="col-md-12">
+                                                <small> Filter some specific properties of the selected class</small>
+                                            </div>
+                                        </div>
+                                    </div>
+                                    <div class="panel-heading alert" style="display:none;" id="qb_properties_properties_selected_filters_header">
+                                        Selected filters
+                                    </div>
+                                    <div class="list-group" id="qb_properties_properties_selected_filters_list" style="display:none;"> 
                                     </div>
                                     <div class="panel-heading alert">
                                         <div class="row">

app/views/query/property_ranges.js.erb

@@ -13,6 +13,8 @@ selector_modal.find(".modal-title").first().html("\"<%=params[:property_name]%>\
 		end
 	%>
 	$("#object_selector_header").find("p").first().html("Search objects for <%=display_object_classes.html_safe%>");
+	$("#hdn_selector_property_uri").val("<%=params[:property_uri]%>");
+	$("#hdn_selector_property_name").val("<%=params[:property_name]%>");
 	selector_modal.find(".modal-footer").hide();
 <%else%>
 	selector_modal.find(".modal-body").first().html("<%=escape_javascript render :partial=>'query/properties_selector_body', :locals=>{:mode=>'datatype'}%>");