Changeset 516

Timestamp:

11/05/08 16:57:21 (2 months ago)

Author:

jesus

Message:

fix up worksheet support, refs #22

Files:

• trunk/ui/web/htdocs/.htaccess (modified) (1 diff)
• trunk/ui/web/htdocs/css/style.css (modified) (2 diffs)
• trunk/ui/web/htdocs/graph_panel.inc (modified) (1 diff)
• trunk/ui/web/htdocs/js/recon.js (modified) (2 diffs)
• trunk/ui/web/htdocs/worksheet_info.php (modified) (1 diff)
• trunk/ui/web/htdocs/worksheet_panel.inc (modified) (5 diffs)
• trunk/ui/web/htdocs/worksheet_search_json.php (added)
• trunk/ui/web/htdocs/ws_search_simple.inc (added)
• trunk/ui/web/lib/Reconnoiter_DB.php (modified) (4 diffs)

trunk/ui/web/htdocs/.htaccess

@@ -4 +4 @@
-RewriteRule ^json/ds/([^/]+)/([^/]+)/([^/]+)/([^/]+)/([^/]+)$ datapoint_browse_json.php?l1=$1&l2=$2&l3=$3&l4=$4&l5=$5 [PT,QSA]
-RewriteRule ^json/worksheet/info/([^/]*)$ worksheet_info.php?id=$1 [PT,QSA]
+RewriteRule ^json/worksheet/store$ worksheet_store.php [PT,QSA]
+RewriteRule ^json/worksheet/search$ worksheet_search_json.php [PT,QSA]
-RewriteRule ^json/graph/info/([^/]*)$ graph_info.php?id=$1 [PT,QSA]
-RewriteRule ^json/graph/store$ graph_store.php [PT,QSA]

trunk/ui/web/htdocs/css/style.css

@@ -680 +680 @@
-padding:0 0.5em;
-}
-#
+.
-height:450px;
-overflow:auto;
-}
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-list-style-image:none;
-list-style-position:outside;
-list-style-type:none;
-}
-
+
+
+
+
+
+
-display:block;
-margin-bottom:4px;
-padding:2px 0;
-}
-#
+.
-background:transparent url(../images/icon-worksheet.png) no-repeat scroll 0 1px;
-padding-left:15px;
-}
-#
+.
-background:#E6E4E5 none repeat scroll 0 0;
-display:block;
+}
+.worksheetlist ul li ul li {
+border-left:1px solid #C0BBBD;
+color:#82787B;
+display:inline;
+font-size:10px;
+margin-bottom:6px;
+padding:0 5px;
+}
+.worksheetlist ul li ul li.xx {
+border-left:medium none;
+color:#82787B;
+display:inline;
+font-size:10px;
+padding-left:15px;
+}
+.worksheetlist ul li ul li a em {
+color:#82787B;
+padding-left:3px;
+}
+.worksheetlist ul li ul li a.viewws {
+background:transparent url(../images/icon-viewws.png) no-repeat scroll 0 0;
+display:inline;
+font-size:10px;
+padding-left:20px;
-}
-ul#worksheet-graphs {
@@ -710 +752 @@
-list-style-type:none;
-margin:1.5em 1em 0 0;
+}
+span.rememberWorksheet {
+border:1px solid #DDDDDD;
+display:none;
+float:right;
+margin-left:4px;
+padding:0 4px;
+}
+span.blankWorksheet {
+border:1px solid #DDDDDD;
+float:right;
+margin-left:4px;
+padding:0 4px;
-}
-span.rememberGraph {

trunk/ui/web/htdocs/graph_panel.inc

@@ -29 +29 @@
-           if(d.error) $("#gtool-error").html(d.error).fadeIn('fast');
-           else $("#gtool-error").fadeOut('fast');
-
+
+
-             $(".rememberGraph").html('"Remember" this graph.').fadeIn('slow');
-             $(".rememberGraph").click(function() {

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

@@ -158 +158 @@
-                         graphs_for_edit, graph_search_summary);
-}
+function perform_ws_search_edit(params) {
+  perform_generic_search('json/worksheet/search', params,
+                         perform_ws_search_edit,
+                         ws_for_edit, ws_search_summary);
+}
-function perform_datapoint_search_add(params) {
-  perform_generic_search('json/datapoint/search', params,
-                         perform_datapoint_search_add,
-                         datapoints_for_graph, datapoint_search_summary);
+}
+function ws_search_summary(r) {
+  return r.count + ' worksheet' + (r.count == 1 ? '' : 's' ) + ' found for \'' + htmlentities(r.query) + '\'';
-}
-function graph_search_summary(r) {
@@ -254 +262 @@
-  li.append($('<a/>').html(g.title)).append(ul);
-}
+function ws_for_edit(li, ws, params) {
+  var add = $('<a href="#"/>');
+  add.html('View').addClass('addtows');
+  add.click(
+    (function(sheetid) {
+        return function() {
+          load_worksheet(sheetid);
+          return false;
+        }
+     })(ws.sheetid)
+  );
+  var ul = $('<ul/>');
+  ul.append($('<li/>').html(ws.last_update));
+  ul.append($('<li/>').append(add));
+  li.append($('<a/>').html(ws.title)).append(ul);
+}
-function graphs_for_worksheet(li, g, params) {
-  var add = $('<a href="#"/>');

trunk/ui/web/htdocs/worksheet_info.php

@@ -6 +6 @@
-
-try {
-GET['sheet
+_GET['
-  print json_encode($results);
-}

trunk/ui/web/htdocs/worksheet_panel.inc

@@ -5 +5 @@
-<!--
-var ws_displayinfo = { start : 14*86400, cnt: '100', end: '' };
+var wsinfo = {};
+function update_current_worksheet(f) {
+  var str = JSON.stringify(wsinfo);
+  $.post("json/worksheet/store",
+         {'json':str},
+         function(d) {
+           wsinfo.id = d.id;
+           if(d.error) $("#ws-tool-error").html(d.error).fadeIn('fast');
+           else $("#ws-tool-error").fadeOut('fast');
+           if(wsinfo.id && wsinfo.title && wsinfo.saved != true &&
+              $(".rememberWorksheet:visible").length == 0) {
+             $(".rememberWorksheet").html('"Remember" this worksheet.').fadeIn('slow');
+             $(".rememberWorksheet").click(function() {
+               wsinfo.saved = true;
+               update_current_worksheet(function(r) {
+                 if(r.error) wsinfo.saved = false;
+                 else $(".rememberWorksheet").html('Remebered').fadeOut('slow');
+               });
+             });
+           }
+           if(f) f(d);
+         }, 'json');
+}
+
-function process_worksheet_json(r) {
-
+
+
-  var ul = $("ul#worksheet-graphs");
-.
+#
-  ul.empty();
-  for(var i = 0; i < r.graphs.length; i++) {
-
-
-
-
+
+
+
+
+
+
-    ul.append($('<li/>').append(o));
-    o.ReconGraphRefresh();
@@ -30 +57 @@
-  o.ReconGraphRefresh();
-  ul.sortable("refresh");
+  if(!wsinfo.graphs) wsinfo.graphs = new Array();
+alert('pushing ' + graphid);
+  wsinfo.graphs.push(graphid);
+  update_current_worksheet();
-}
-function refresh_worksheet() {
@@ -42 +73 @@
--->
-</script>
-
+
+
+
-<p/>
-<!-- date range box -->
@@ -54 +87 @@
-                           };
-        var state = false;
+        $("h2#worksheetTitle").editable(function(value, settings) {
+          wsinfo.title = value;
+          update_current_worksheet();
+          return(value);
+        }, { });
-        $("#ws_datetool .btn-slide").click(function(){
-                $("#ws_widgetCalendar").stop().animate({
@@ -101 +139 @@
-                stop:
-                  function (e,ui) {
-var ol
+wsinfo.graphs
-                    ui.item.parent().find("> li > div").each(
-ol
+wsinfo.graphs
-                    );
-
-
+
-                  }
-              });

trunk/ui/web/lib/Reconnoiter_DB.php

@@ -126 +126 @@
-                 'offset' => $offset, count => $r['count'], 'results' => $a);
-  }
+  function get_worksheets($searchstring, $offset, $limit) {
+    return $this->run_tsearch($searchstring,
+      "select count(*) as count
+         from prism.saved_worksheets,
+              (select ? ::text as query) q
+        where saved = true and
+           ((ts_search_all @@ to_tsquery(query) or query = '')
+            or sheetid in (select sheetid
+                            from prism.saved_worksheets_dep wd
+                            join prism.saved_graphs g
+                           using (graphid)
+                            join prism.saved_graphs_dep gd
+                           using (graphid)
+                            join stratcon.metric_name_summary s
+                           using (sid,metric_name,metric_type)
+                           where g.ts_search_all @@ to_tsquery(query)
+                              or s.ts_search_all @@ to_tsquery(query)))",
+      "select sheetid, title,
+              to_char(last_update, 'YYYY/mm/dd') as last_update
+         from prism.saved_worksheets,
+              (select ? ::text as query) q
+        where saved = true and
+           ((ts_search_all @@ to_tsquery(query) or query = '')
+            or sheetid in (select sheetid
+                            from prism.saved_worksheets_dep wd
+                            join prism.saved_graphs g
+                           using (graphid)
+                            join prism.saved_graphs_dep gd
+                           using (graphid)
+                            join stratcon.metric_name_summary s
+                           using (sid,metric_name,metric_type)
+                           where g.ts_search_all @@ to_tsquery(query)
+                              or s.ts_search_all @@ to_tsquery(query)))
+     order by last_update desc",
+      $offset, $limit);
+  }
-  function get_graphs($searchstring, $offset, $limit) {
-    return $this->run_tsearch($searchstring,
@@ -304 +340 @@
-  }
-  function getWorksheetByID($id) {
-*
-
-     join prism.saved_worksheets_dep
+w.sheetid, w.title, wd.graphid
+ as w
+left join prism.saved_worksheets_dep as wd
-                                using (sheetid)
-
+
+
-    $sth->execute(array($id));
-    $a = array();
-
-
+
+
+
+
+
+
+
-    }
-    return $a;
@@ -333 +375 @@
-        $sth = $this->db->prepare("delete from prism.saved_worksheets_dep
-                                    where sheetid=?");
-ws['id']
+id
-      }
-      else {
@@ -356 +398 @@
-      throw(new Exception('DB: ' . $e->getMessage()));
-    }
+    return $id;
-  }
-  function getGraphByID($id) {