fixed split display so that it works with zero-value expenditures

[bluechips.git] / bluechips / templates / spend / index.mako

diff --git a/bluechips/templates/spend/index.mako b/bluechips/templates/spend/index.mako
index e3195f2c367d5467a9158f5a61393669625fb03d..25f1db2c432683a70f76ccf02136ded4fb043174 100644 (file)
--- a/bluechips/templates/spend/index.mako
+++ b/bluechips/templates/spend/index.mako
@@ -12,7 +12,7 @@
     </tr>
     <tr>
       <th><label for="amount">Amount</label></th>
-      <td>$${h.text('amount', "%0.2f" % (int(c.expenditure.amount) / 100.), size=8)}</td>
+      <td>${h.currency('amount', c.expenditure.amount, size=8)}</td>
     </tr>
     <tr>
       <th><label for="date">Date</label></th>
@@ -27,30 +27,16 @@
   <p>Change how an expenditure is split up. Enter a percentage, or something like a percentage, for each user. They don't have to add to 100.</p>
 
   <table class="form">
-    % for user_id, user in c.users:
+    % for ii, user_row in enumerate(c.users):
       <%
-        try:
-            percent = c.values['shares-%d.amount' % user_id]
-        except TypeError:
-            if c.id != '':
-                try:
-                    share = [s.share for s in c.expenditure.splits if s.user == user][0]
-                    percent = (Decimal(100) * Decimal(int(share)) / Decimal(int(c.expenditure.amount))).quantize(Decimal("0.001"))
-                except IndexError:
-                    percent = 0
-            else:
-                if user == request.environ['user']:
-                    percent = 1
-                else:
-                    percent = 0
+        user_id, user = user_row
+        percent = c.values['shares-%d.amount' % ii]
       %>
       <tr>
-        <th>
-          <label for="shares-${user_id}amount">${user.name}</label>
-        </th>
+        <th><label for="shares-${ii}amount">${user.name}</label></th>
         <td>
-          ${h.text('shares-%d.amount' % user_id, percent)}
-          ${h.hidden('shares-%d.user_id' % user_id, user.id)}
+          ${h.text('shares-%d.amount' % ii, percent)}
+          ${h.hidden('shares-%d.user_id' % ii, user.id)}
         </td>
       </tr>
     % endfor