[rhmessaging-commits] rhmessaging commits: r1134 - mgmt/cumin/python/cumin.

[rhmessaging-commits at lists.jboss.org]

Author: justi9
Date: 2007-10-22 11:13:17 -0400 (Mon, 22 Oct 2007)
New Revision: 1134

Modified:
   mgmt/cumin/python/cumin/queue.py
   mgmt/cumin/python/cumin/queue.strings
Log:
Splits the statistics tabs into two views, current and historical.



Modified: mgmt/cumin/python/cumin/queue.py
===================================================================
--- mgmt/cumin/python/cumin/queue.py	2007-10-22 14:58:58 UTC (rev 1133)
+++ mgmt/cumin/python/cumin/queue.py	2007-10-22 15:13:17 UTC (rev 1134)
@@ -367,18 +367,33 @@
     def render_item_low(self, session, measure):
         return measure.get_low()
 
-    def render_item_average_value(self, session, measure):
+    def render_item_average(self, session, measure):
         return "%0.2f" % (sum(measure.values) / float(len(measure.values)))
 
-class QueueStatistics(Widget):
+class QueueStatistics(TabSet):
     def __init__(self, app, name):
         super(QueueStatistics, self).__init__(app, name)
 
-        self.add_child(MeasurementSet(app, "general_stats", "general"))
-        self.add_child(MeasurementSet(app, "disk_stats", "disk"))
-        self.add_child(MeasurementSet \
-                       (app, "transactional_stats", "transactional"))
-        self.add_child(MeasurementSet(app, "persistent_stats", "persistent"))
+        self.add_tab(self.StatisticsCurrent(app, "current"))
+        self.add_tab(self.StatisticsHistory(app, "history"))
 
     def render_title(self, session, queue):
         return "Statistics"
+
+    class StatisticsCurrent(Widget):
+        def __init__(self, app, name):
+            super(QueueStatistics.StatisticsCurrent, self).__init__(app, name)
+
+            self.add_child(MeasurementSet(app, "general_stats", "general"))
+            self.add_child(MeasurementSet(app, "disk_stats", "disk"))
+            self.add_child(MeasurementSet \
+                           (app, "transactional_stats", "transactional"))
+            self.add_child(MeasurementSet \
+                           (app, "persistent_stats", "persistent"))
+
+        def render_title(self, session, queue):
+            return "Current"
+
+    class StatisticsHistory(Widget):
+        def render_title(self, session, queue):
+            return "History"

Modified: mgmt/cumin/python/cumin/queue.strings
===================================================================
--- mgmt/cumin/python/cumin/queue.strings	2007-10-22 14:58:58 UTC (rev 1133)
+++ mgmt/cumin/python/cumin/queue.strings	2007-10-22 15:13:17 UTC (rev 1134)
@@ -163,13 +163,17 @@
 }())
 </script>
 
-[QueueStatistics.css]
-table.QueueStatistics {
+[QueueStatistics.html]
+<ul class="radiotabs tabs">{tabs}</ul>
+<div class="radiotabs mode">{mode}</div>
+
+[StatisticsCurrent.css]
+table.StatisticsCurrent {
   width: 100%;
 }
 
-[QueueStatistics.html]
-<table class="QueueStatistics">
+[StatisticsCurrent.html]
+<table class="StatisticsCurrent">
   <tr>
     <td class="twocol">
       <h2>General</h2>