tooltip for network progress meter giving method-call summary

git-svn-id: svn://svn.open-ils.org/ILS/branches/staff-client-experiment@12036 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
index cc8fea8..f72b3fb 100644 (file)
--- a/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
+++ b/Open-ILS/xul/staff_client/chrome/locale/en-US/offline.properties
@@ -137,6 +137,7 @@ menu.close_all_tabs.error=Error closing all tabs
 menu.new_tab.tab=Tab
 main.session_cookie.error=Error setting session cookie: %1$s
 menu.set_tab.error=pause for error
+menu.reset_network_stats=Reset network activity summary?
 main.testing=Testing
 main.transaction_export.title=Save Transaction File As
 main.transaction_export.prompt=Would you like to overwrite the existing file %1$s?

diff --git a/Open-ILS/xul/staff_client/server/main/menu.js b/Open-ILS/xul/staff_client/server/main/menu.js
index e146a7d..082cde8 100644 (file)
--- a/Open-ILS/xul/staff_client/server/main/menu.js
+++ b/Open-ILS/xul/staff_client/server/main/menu.js
@@ -12,7 +12,18 @@ main.menu = function () {
        JSAN.use('util.window'); this.window = new util.window();
 
        this.w = window;
-    document.getElementById('network_progress').setAttribute('count','0');
+    var x = document.getElementById('network_progress');
+    x.setAttribute('count','0');
+    x.addEventListener(
+        'click',
+        function() {
+            if ( window.confirm(offlineStrings.getString('menu.reset_network_stats')) ) {
+                var x = document.getElementById('network_progress_rows');
+                while(x.firstChild) { x.removeChild( x.lastChild ); }
+            }
+        },
+        false
+    );
 }
 
 main.menu.prototype = {
@@ -884,18 +895,56 @@ main.menu.prototype = {
        },
 
     'network_meter' : {
-        'inc' : function(msg) {
-            var m = document.getElementById('network_progress');
-            var count = 1 + Number( m.getAttribute('count') );
-            m.setAttribute('mode','undetermined');
-            m.setAttribute('count', count);
+        'inc' : function(app,method) {
+            try {
+                var m = document.getElementById('network_progress');
+                var count = 1 + Number( m.getAttribute('count') );
+                m.setAttribute('mode','undetermined');
+                m.setAttribute('count', count);
+                var rows = document.getElementById('network_progress_rows');
+                var row = document.getElementById('network_progress_tip_'+app+'_'+method);
+                if (!row) {
+                    row = document.createElement('row'); row.setAttribute('id','network_progress_tip_'+app+'_'+method);
+                    var a = document.createElement('label'); a.setAttribute('value','App:');
+                    var b = document.createElement('label'); b.setAttribute('value',app);
+                    var c = document.createElement('label'); c.setAttribute('value','Method:');
+                    var d = document.createElement('label'); d.setAttribute('value',method);
+                    var e = document.createElement('label'); e.setAttribute('value','Total:');
+                    var f = document.createElement('label'); f.setAttribute('value','0'); 
+                    f.setAttribute('id','network_progress_tip_total_'+app+'_'+method);
+                    var g = document.createElement('label'); g.setAttribute('value','Outstanding:');
+                    var h = document.createElement('label'); h.setAttribute('value','0');
+                    h.setAttribute('id','network_progress_tip_out_'+app+'_'+method);
+                    row.appendChild(a); row.appendChild(b); row.appendChild(c);
+                    row.appendChild(d); row.appendChild(e); row.appendChild(f);
+                    row.appendChild(g); row.appendChild(h); rows.appendChild(row);
+                }
+                var total = document.getElementById('network_progress_tip_total_'+app+'_'+method);
+                if (total) {
+                    total.setAttribute('value', 1 + Number( total.getAttribute('value') ));
+                }
+                var out = document.getElementById('network_progress_tip_out_'+app+'_'+method);
+                if (out) {
+                    out.setAttribute('value', 1 + Number( out.getAttribute('value') ));
+                }
+            } catch(E) {
+                dump('network_meter.inc(): ' + E + '\n');
+            }
         },
-        'dec' : function(msg) {
-            var m = document.getElementById('network_progress');
-            var count = 1 - Number( m.getAttribute('count') );
-            if (count < 0) count = 0;
-            if (count == 0) m.setAttribute('mode','determined');
-            m.setAttribute('count', count);
+        'dec' : function(app,method) {
+            try {
+                var m = document.getElementById('network_progress');
+                var count = -1 + Number( m.getAttribute('count') );
+                if (count < 0) count = 0;
+                if (count == 0) m.setAttribute('mode','determined');
+                m.setAttribute('count', count);
+                var out = document.getElementById('network_progress_tip_out_'+app+'_'+method);
+                if (out) {
+                    out.setAttribute('value', -1 + Number( out.getAttribute('value') ));
+                }
+            } catch(E) {
+                dump('network_meter.dec(): ' + E + '\n');
+            }
         }
     },
 

diff --git a/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul b/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul
index 71af057..3771cde 100644 (file)
--- a/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul
+++ b/Open-ILS/xul/staff_client/server/main/menu_frame_overlay.xul
@@ -41,9 +41,25 @@
     <statusbar>
         <statusbarpanel />
         <spacer flex="1" />
-        <progressmeter id="network_progress" flex="1" mode="determined" value="0" />
+        <progressmeter id="network_progress" flex="1" mode="determined" value="0" tooltip="network_progress_tip"/>
         <statusbarpanel />
     </statusbar>
+    <tooltip id="network_progress_tip" noautohide="true">
+        <grid>
+            <columns>
+                <column/>
+                <column/>
+                <column/>
+                <column flex="1"/>
+                <column/>
+                <column/>
+                <column/>
+                <column/>
+            </columns>
+            <rows id="network_progress_rows">
+            </rows>
+        </grid>
+    </tooltip>
 </box>
 
 <!-- The main top level menubar -->