[Checkins] SVN: Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/ Spacer not required for charting and dummy data supplied for testing.
Charlie Clark
charlie at begeistert.org
Sun Dec 4 18:45:10 UTC 2011
Log message for revision 123570:
Spacer not required for charting and dummy data supplied for testing.
Activity results dictionary only needs extending not rewriting.
Link generation moved from template to view for less repetition.
Changed:
U Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/activity.py
U Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/templates/activity.pt
-=-
Modified: Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/activity.py
===================================================================
--- Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/activity.py 2011-12-04 17:11:33 UTC (rev 123569)
+++ Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/activity.py 2011-12-04 18:45:10 UTC (rev 123570)
@@ -18,18 +18,25 @@
from Acquisition import aq_inner
from DateTime import DateTime
+#dummy data
+
+activity = {'start_time': 'Dec 4, 2011 6:15 pm GMT+1', 'total_load_count': 0, 'end_time': 'Dec 4, 2011 7:15 pm GMT+1',
+ 'divs': [{'stores': 0, 'connections': 0, 'store_len': 50, 'end': 1323019271.8497, 'start': 1323018911.8497, 'load_len': 100, 'loads': 0, 'time_offset': '-54m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 40, 'end': 1323019631.8497, 'start': 1323019271.8497, 'load_len': 100, 'loads': 0, 'time_offset': '-48m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 30, 'end': 1323019991.8497, 'start': 1323019631.8497, 'load_len': 100, 'loads': 0, 'time_offset': '-42m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 20, 'end': 1323020351.8497, 'start': 1323019991.8497, 'load_len': 110, 'loads': 0, 'time_offset': '-36m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 10, 'end': 1323020711.8497, 'start': 1323020351.8497, 'load_len': 120, 'loads': 0, 'time_offset': '-30m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 0, 'end': 1323021071.8497, 'start': 1323020711.8497, 'load_len': 130, 'loads': 0, 'time_offset': '-24m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 100,'end': 1323021431.8497, 'start': 1323021071.8497, 'load_len': 100, 'loads': 0, 'time_offset': '-18m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 110,'end': 1323021791.8497, 'start': 1323021431.8497, 'load_len': 80, 'loads': 0, 'time_offset': '-12m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 10, 'end': 1323022151.8497, 'start': 1323021791.8497, 'load_len': 20, 'loads': 0, 'time_offset': '-6m', 'link':''},
+ {'stores': 0, 'connections': 0, 'store_len': 40, 'end': 1323022511.8497, 'start': 1323022151.8497, 'load_len': 30, 'loads': 0, 'time_offset': '0m', 'link':''}],
+ 'total_store_count': 0, 'total_connections': 0}
+
class View(object):
- # dummy variables for bootstrapping view
- getHistoryLength = 1
- start_time = "start_time"
- end_time = "end_time"
- divs = ()
- connections = "connections"
- trans_len = "trans_len"
- store_len = "store_len"
- load_len = "load_len"
- total_store_count = "total_store_count"
+ start_time = 'start_time'
+ end_time = 'end_time'
def __init__(self, context, request):
self.context = context
@@ -73,14 +80,14 @@
else:
analysis = am.getActivityAnalysis()
- total_load_count = 0
- total_store_count = 0
+ total_loads = 0
+ total_stores = 0
total_connections = 0
limit = 0
divs = []
for div in analysis:
- total_store_count = total_store_count + div['stores']
- total_load_count = total_load_count + div['loads']
+ total_stores = total_stores + div['stores']
+ total_loads = total_loads + div['loads']
total_connections = total_connections + div['connections']
sum = div['stores'] + div['loads']
if sum > limit:
@@ -116,18 +123,14 @@
else:
# Show fractions.
time_offset = '%.2fs' % t
- divs.append({
- 'store_len': store_len,
- 'load_len': load_len,
- 'trans_len': max(segment_height - store_len - load_len, 0),
- 'store_count': div['stores'],
- 'load_count': div['loads'],
- 'connections': div['connections'],
- 'start': div['start'],
- 'end': div['end'],
- 'time_offset': time_offset,
- })
+ div.update({'link': 'chart_start=%s&chart_end=%s' % (div['start'], div['end']),
+ 'time_offset': time_offset,
+ 'store_len': store_len,
+ 'load_len': load_len,
+ })
+ divs.append(div)
+
if analysis:
start_time = DateTime(divs[0]['start']).aCommonZ()
end_time = DateTime(divs[-1]['end']).aCommonZ()
@@ -138,9 +141,12 @@
res = {'start_time': start_time,
'end_time': end_time,
'divs': divs,
- 'total_store_count': total_store_count,
- 'total_load_count': total_load_count,
+ 'total_store_count': total_stores,
+ 'total_load_count': total_loads,
'total_connections': total_connections,
}
return res
+ #def getActivityChartData(self):
+ #"""test graphing"""
+ #return activity
\ No newline at end of file
Modified: Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/templates/activity.pt
===================================================================
--- Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/templates/activity.pt 2011-12-04 17:11:33 UTC (rev 123569)
+++ Sandbox/jens/zmi.core/trunk/src/zmi/core/browser/database/templates/activity.pt 2011-12-04 18:45:10 UTC (rev 123570)
@@ -42,6 +42,7 @@
display:block;
float: left;
width: 3em;
+ vertical-align: bottom;
}
span.blue {
@@ -76,7 +77,7 @@
</form>
<h2>Displayed Range</h2>
- <span tal:content="view/start_time"> </span>to<br />
+ <span tal:content="view/start_time"> </span> to<br />
<span tal:content="view/end_time"></span>
<form method="GET" action="./">
@@ -89,10 +90,9 @@
<tr>
<td></td>
- <td tal:repeat="result activity/divs">
+ <td valign="bottom" tal:repeat="result activity/divs">
<a href=""
- tal:attributes="href python: request['URL'] + ('?chart_start=%s&chart_end=%s' % (result['start'], result['end']))">
- <span class="bar" tal:attributes="style string:height: ${result/trans_len}"></span>
+ ttal:attributes="href string: ${request/URL}?${result/link}">
<span class="bar red" tal:attributes="style string:height: ${result/store_len}"></span>
<span class="bar blue" tal:attributes="style string:height: ${result/load_len}"></span>
</a>
@@ -106,8 +106,8 @@
<tr class="red">
<td class="title">Object stores</td>
<td tal:repeat="result activity/divs">
- <a href="" tal:content="result/store_count"
- tal:attributes="href python: request['URL'] + ('?chart_start=%s&chart_end=%s' % (result['start'], result['end']))"></a>
+ <a href="" tal:content="result/stores"
+ tal:attributes="href string: ${request/URL}?${result/link}"></a>
</td>
<td class="total" tal:content="activity/total_store_count">total_store_count</td>
</tr>
@@ -115,26 +115,24 @@
<tr class="blue">
<td class="title">Object loads</td>
<td tal:repeat="result activity/divs">
- <a href="" tal:content="result/load_count"
- tal:attributes="href python: request['URL'] + ('?chart_start=%s&chart_end=%s' % (result['start'], result['end']))"></a>
+ <a href="" tal:content="result/loads"
+ tal:attributes="href string: ${request/URL}?${result/link}"></a>
</td>
<td class="total" tal:content="activity/total_load_count">total_load_count</td>
</tr>
<tr>
<td class="title">Connections</td>
- <td tal:repeat="result activity/divs">
- <a href="" tal:content="result/connections"
- tal:attributes="href python: request['URL'] + ('?chart_start=%s&chart_end=%s' % (result['start'], result['end']))"></a>
+ <td tal:repeat="result activity/divs"
+ tal:content="result/connections">Connections
</td>
<td class="total" tal:content="activity/total_connections">total_connections</td>
</tr>
<tr>
<td>Time offset</td>
- <td tal:repeat="result activity/divs">
- <a href="" tal:content="result/time_offset"
- tal:attributes="href python: request['URL'] + ('?chart_start=%s&chart_end=%s' % (result['start'], result['end']))"></a>
+ <td tal:repeat="result activity/divs"
+ tal:content="result/time_offset">Time offset
</td>
</tr>
</table>
More information about the checkins
mailing list