Changeset 510

Timestamp:

10/30/08 22:38:26 (2 months ago)

Author:

jesus

Message:

refactor the ajax search, refs #22

Files:

• trunk/ui/web/htdocs/js/recon.js (modified) (4 diffs)
• trunk/ui/web/htdocs/search_saved_graphs.inc (modified) (2 diffs)
• trunk/ui/web/htdocs/search_simple.inc (modified) (1 diff)
• trunk/ui/web/htdocs/ws_search_graphs.inc (modified) (2 diffs)

trunk/ui/web/htdocs/js/recon.js

@@ -136 +136 @@
-})(jQuery);
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            function(r) {
-r.count + ' graph' + (r.count == 1 ? '' : 's' ) + ' found for \'' + htmlentities(r.query) + '\''
+summary_func(r)
-              if(r.error) summary = 'Error: ' + htmlentities(r.error);
-domid + " > p.graph-
+params.domid + " > p.
-              var c = new Number(r.count);
-              var l = new Number(r.limit);
-              var o = new Number(r.offset);
-
+params.
-              page.html('');
-              if(c > l) {
@@ -153 +174 @@
-                  $('<a/>').html( (po+1) + ' - ' + (po+l) )
-                           .click(function() {
-
+
+
+
+
-                             return false;
-                           }).appendTo(page);
@@ -159 +183 @@
-                page.append($('<span/>').html((o+1) + '-' + (o+l)).addClass('searchselect'));
-                if(o + l < c) {
-
- + 1) + '-' + (po
+p
+p + 1) + '-' + (pop
-                           .click(function() {
-
+
+
+
+
-                             return false;
-                           }).appendTo(page);
@@ -169 +196 @@
-              }
-              else page.slideUp('fast');
-domid + " > ul.graph-
+params.domid + " > ul.
-              for(var i=0; r.results && i<r.results.length; i++) {
-                var g = r.results[i];
-                var add = $('<a href="#"/>');
-                add.html('Add').addClass('addtows');
-                add.click(
-                  (function(graphid) {
-                      return function() {
-                        add_graph_to_worksheet(graphid);
-                        return false;
-                      }
-                   })(g.graphid)
-                );
-                var edit = $('<a href="#"/>');
-                edit.html('Edit').addClass('editgraph');
-                edit.click(
-                  (function(graphid) {
-                      return function() {
-                        set_current_graph_id(graphid);
-                        return false;
-                      }
-                   })(g.graphid)
-                );
-                var li = $('<li/>');
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-              }
-            });
-}
+
+function graphs_for_edit(li, g, params) {
+  var edit = $('<a href="#"/>');
+  edit.html('Edit').addClass('editgraph');
+  edit.click(
+    (function(graphid) {
+        return function() {
+          set_current_graph_id(graphid);
+          return false;
+        }
+     })(g.graphid)
+  );
+  var del = $('<a href="#"/>');
+  del.html('Forget').addClass('deletegraph');
+  del.click(
+    (function(graphid, li) {
+        return function() {
+          $.getJSON('json/graph/forget/' + graphid,
+            function (r) {
+              if(r.error) { alert(r.error); }
+              else {
+                perform_graph_search(params);
+              }
+            });
+          return false;
+        }
+     })(g.graphid, li)
+  );
+  var ul = $('<ul/>');
+  ul.append($('<li/>').html(g.last_update));
+  ul.append($('<li/>').append(edit));
+  ul.append($('<li/>').append(del));
+  li.append($('<a/>').html(g.title)).append(ul);
+}
+function graphs_for_worksheet(li, g, params) {
+  var add = $('<a href="#"/>');
+  add.html('Add').addClass('addtows');
+  add.click(
+    (function(graphid) {
+        return function() {
+          add_graph_to_worksheet(graphid);
+          return false;
+        }
+     })(g.graphid)
+  );
+  var ul = $('<ul/>');
+  ul.append($('<li/>').html(g.last_update));
+  ul.append($('<li/>').append(add));
+  li.append($('<a/>').html(g.title)).append(ul);
+}
+function datapoints_for_graph(li, ds, params) {
+  var a = $('<a href="#"/>');
+  a.html(ds.target + '`' + ds.name + '`' + ds.metric_name);
+  a.click(
+    (function(ds_c) {
+        return function() {
+          graph_add_datapoint({'sid':ds_c.sid,
+                               'name':ds_c.target + '`' + ds_c.metric_name,
+                               'metric_name':ds_c.metric_name,
+                               'metric_type':ds_c.metric_type
+                              });
+          return false;
+        }
+     })(ds)
+  );
+  if(ds.metric_type == 'text') li.addClass('txt');
+  li.append(a);
+}

trunk/ui/web/htdocs/search_saved_graphs.inc

@@ -3 +3 @@
-$(document).ready(function(){
-        $("#graph-searchform").submit(function() {
-
+
+
+
+
-                return false;
-        });
@@ -19 +22 @@
-</div>
-<div id="graphlist" class="graphlist">
-graph-
-graph-
+
+
-  </ul>
-</div>

trunk/ui/web/htdocs/search_simple.inc

@@ -1 +1 @@
-<script type="text/javascript">
-<!--
-function perform_datapoint_search(string, offset, limit) {
-  $.getJSON('json/datapoint/search',
-            { 'q' : string, 'o' : offset, 'l' : limit },
-            function(r) {
-              var summary = 'Found ' + r.count + ' data point' + (r.count == 1 ? '' : 's' ) + ' found for \'' + htmlentities(r.query) + '\'';
-              if(r.error) summary = 'Error: ' + htmlentities(r.error);
-              $("#searchlist > p.search-summary").html(summary).fadeIn('fast');
-              var c = new Number(r.count);
-              var l = new Number(r.limit);
-              var o = new Number(r.offset);
-              var page = $("#searchlist > p.paginate");
-              page.html('');
-              if(c > l) {
-                if(o > 0) {
-                  var pop = Math.max(o-l, 0);
-                  $('<a/>').html( (pop+1) + ' - ' + (pop+l) )
-                           .click(function() {
-                             perform_datapoint_search(string,pop,r.limit);
-                             return false;
-                           }).appendTo(page);
-                }
-                page.append($('<span/>').html((o+1) + '-' + (o+l)).addClass('searchselect'));
-                if(o + l < c) {
-                  var po = o + l;
-                  $('<a/>').html( (po + 1) + '-' + (po+l) )
-                           .click(function() {
-                             perform_datapoint_search(string,po,r.limit);
-                             return false;
-                           }).appendTo(page);
-                }
-                page.slideDown('fast');
-              }
-              else page.slideUp('fast');
-              $("#searchresults > li").remove();
-              for(var i=0; r.results && i<r.results.length; i++) {
-                var ds = r.results[i];
-                var a = $('<a href="#"/>');
-                var li = $('<li/>');
-                a.html(ds.target + '`' + ds.name + '`' + ds.metric_name);
-                a.click(
-                  (function(ds_c) {
-                      return function() {
-                        graph_add_datapoint({'sid':ds_c.sid,
-                                             'name':ds_c.target + '`' + ds_c.metric_name,
-                                             'metric_name':ds_c.metric_name,
-                                             'metric_type':ds_c.metric_type
-                                            });
-                        return false;
-                      }
-                   })(ds)
-                );
-                if(ds.metric_type == 'text') li.addClass('txt');
-                $("#searchresults").append(li.append(a));
-              }
-            });
-}
-$(document).ready(function(){
-        $("#datapoint-searchform").submit(function() {
-
+
+
+
+
-                return false;
-        });

trunk/ui/web/htdocs/ws_search_graphs.inc

@@ -3 +3 @@
-$(document).ready(function(){
-        $("#ws-graph-searchform").submit(function() {
-
+
+
+
+
-                return false;
-        });
@@ -19 +22 @@
-</div>
-<div id="ws-graphlist" class="graphlist">
-graph-
-graph-
+
+
-  </ul>
-</div>