From b04bf8fdfcc0d8fb198d46b4795312764721dbd2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andrej=20Tokar=C4=8D=C3=ADk?= Date: Fri, 29 Feb 2008 11:03:27 +0000 Subject: [PATCH] ProgressMeterMacro: cleancode git-svn-id: https://trac-hacks.org/svn/progressmetermacro@3291 7322e99d-02ea-0310-aa39-e9a107903beb --- 0.11/progressmeter/macro.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/0.11/progressmeter/macro.py b/0.11/progressmeter/macro.py index 831d5fd..7068b5f 100644 --- a/0.11/progressmeter/macro.py +++ b/0.11/progressmeter/macro.py @@ -38,9 +38,10 @@ def expand_macro(self, formatter, name, content): ticket_value = kwargs.pop('ticket_value', 'list').strip().lower() query_string = '&'.join(['%s=%s' % item for item in kwargs.iteritems()]) - cnt = []; qs_add = ['', '&status=closed'] for i in [0, 1]: + # first cycle -- getting number of all tickets matching the criteria (cnt[0]) + # second cycle -- getting number of closed tickets matching the criteria (cnt[1]) query_string = '&'.join(['%s=%s' % item for item in kwargs.iteritems()]) + qs_add[i] query = Query.from_string(self.env, query_string) @@ -50,8 +51,9 @@ def expand_macro(self, formatter, name, content): # Getting percent of active/closed tickets + formatting output percents = {} # list of percent and style for each type of tickets (closed, active) - percents['closed'] = [float(cnt[1]) / float(cnt[0]), 'background: #bae0ba'] - percents['active'] = [1 - percents['closed'][0], 'background: #f5f5f5'] + property = 'background' + percents['closed'] = [float(cnt[1]) / float(cnt[0]), '%s: #bae0ba' % property] + percents['active'] = [1 - percents['closed'][0], '%s: #f5f5f5' % property] # CSS styles are mostly copied from htdocs/css/rodamap.css # in standard trac distribution @@ -68,12 +70,12 @@ def expand_macro(self, formatter, name, content): table = tag.table(style=table_css)(tag.tr()) for key in reversed(percents.keys()): - # reversing because we want the closed tickets to be first + # reversing because we want the closed tickets to be processed firstly percents[key][0] = unicode(int(percents[key][0] * 100)) + u'%' table.children[0](tag.td(style='width: '+percents[key][0]+'; '+percents[key][1]+'; padding: 0')('')) percent_para = tag.p(style='font-size: 10px; line-height: 2.4em')(percents['closed'][0]) output = table + percent_para - # Returning... - return output + return output # Returning... +