@@ -1,18 +1,20 @@ -$def with (items, what) +$def with (items, what, name) $var width: 90% $var color: white -$var title: Distribution of $what +$var title: Distribution of $(name or what) -<h1>Distribution of $what</h1> +<h1>Distribution of $(name or what)</h1> <ol class="chartlist"> $for item in items: <li id="$item.id"> <a href="$item.path">$item.name</a> - <span class="count">$item[what]</span> + <span class="count">$item[what] + $if what.startswith('pct_'): % + </span> <span class="index" style="width: $abs(int(item.pct))%"></span> </li> </ol> \ No newline at end of file templates/dproperty.html @@ -611,6 +611,24 @@ class politician_group: r_safeproperty = re.compile('^[a-z0-9_]+$') table_map = {'us': 'district', 'p': 'politician'} +def namesmap(): + d = {} + cols = [cname for cname, c in schema.Politician.columns.items() if c.sql_type in ('real', 'int')] + prefix_map = dict(n_='number of <>', pct_='money from <>', amt_='amount of <>') + for c in cols: + for prefix in prefix_map: + if c.startswith(prefix): + x = web.lstrips(c, prefix).split('_') + if x[0] in ('earmark', 'vote', 'bill', 'smalldonor'): x[0] += 's' #make plural + if c == 'pct_spent': + d[c] = 'money spent' + else: + d[c] = prefix_map[prefix].replace('<>', ' '.join(x)) + for c in cols: + if c not in d: + d[c] = c.replace('_', ' ') + return d + class dproperty: def GET(self, table, what): try: @@ -641,7 +659,7 @@ class dproperty: item.name = '%s %s (%s%s)' % (item.firstname, item.lastname, (item.party or 'I')[0], state) item.path = '/p/' + item.id - return render.dproperty(items, what) + return render.dproperty(items, what, namesmap().get(what)) def sparkpos(table, what, id): if table == 'district': webapp.py 05621943e3237f933e0c4654830c6ddf961f6dc4 Devi asldevi@gmail.com http://github.com/aaronsw/watchdog/commit/0c5bd359f015a407d5fa72a65dbe8fd6375639b0 0c5bd359f015a407d5fa72a65dbe8fd6375639b0 2009-03-24T04:45:30-07:00 2009-03-24T04:35:20-07:00 better titles for /p/by/<xxx> pages; differentiate between pct and amt 426dbbaf2ddd15333c727496664d1c099c35aa22 Devi asldevi@gmail.com