emphasize transactions that the logged-in user is part of, deemphasize others

diff --git a/bluechips/lib/base.py b/bluechips/lib/base.py
index 259bb0dd5613f8c1c43980ef1964ddf7dda08a8c..d94eeb664e40d3fda2561fda30b042f1f50e3893 100644 (file)
--- a/bluechips/lib/base.py
+++ b/bluechips/lib/base.py
@@ -32,6 +32,8 @@ class BaseController(WSGIController):
                 environ['PATH_INFO'] += '/'
                 raise HTTPMovedPermanently(construct_url(environ))
         try:
+            c.user = meta.Session.query(model.User).\
+                    filter_by(username=unicode(environ['REMOTE_USER'])).one()
             return WSGIController.__call__(self, environ, start_response)
         finally:
             meta.Session.remove()

diff --git a/bluechips/model/expenditure.py b/bluechips/model/expenditure.py
index f7e69344dc2cf88bf09cb7f0fa6ea9a81fdc4cb9..dda06c1e0a9c7bf837e3668eef7835dc5cf2ca70 100644 (file)
--- a/bluechips/model/expenditure.py
+++ b/bluechips/model/expenditure.py
@@ -86,4 +86,11 @@ class Expenditure(object):
             s = Split(self, user, share)
             meta.Session.add(s)
 
+    def involves(self, user):
+        "Returns True if ``user`` is involved in this expenditure."
+        return (meta.Session.query(Split.id).\
+                filter(Split.expenditure == self).\
+                filter(Split.user == user).\
+                filter(Split.share != 0).first() is not None)
+
 __all__ = ['Expenditure']

diff --git a/bluechips/model/transfer.py b/bluechips/model/transfer.py
index 55303a80b7187cd0d564e28b681590459b68b844..512e0f37937d472bd38f3083018da36baab51721 100644 (file)
--- a/bluechips/model/transfer.py
+++ b/bluechips/model/transfer.py
@@ -11,4 +11,7 @@ class Transfer(object):
                                                      self.creditor,
                                                      self.amount)
 
+    def involves(self, user):
+        return (self.debtor == user) or (self.creditor == user)
+
 __all__ = ['Transfer']

diff --git a/bluechips/public/css/main.css b/bluechips/public/css/main.css
index 3897fe07ef78883ee2ca7ae1efb450494b077b9a..fe58b9995a557556fd3bb69d23cbed3e647345fa 100644 (file)
--- a/bluechips/public/css/main.css
+++ b/bluechips/public/css/main.css
@@ -69,3 +69,6 @@ td.labelcol {
     text-align: right;
     font-weight: bold;
 }
+tr.user-not-involved {
+    color: #aaa;
+}

diff --git a/bluechips/templates/base.mako b/bluechips/templates/base.mako
index d12f45688243b2b7e4d40ce4dd62f2a9a7df49bf..97ae8576a4281ee0bae862eb6aff564d19d2cec6 100644 (file)
--- a/bluechips/templates/base.mako
+++ b/bluechips/templates/base.mako
@@ -67,8 +67,8 @@
 </%def>
 
 <%def name="formatUser(user)">
-  % if user.username == request.environ['REMOTE_USER']:
-    <strong>${user.name}</strong>
+  % if user == c.user:
+    <strong>Me</strong>
   % else:
     ${user.name}
   % endif
@@ -84,7 +84,13 @@
       <th class="editlink"></th>
     </tr>
     % for e in es:
-      <tr>
+      <%
+        if e.involves(c.user):
+          klass = 'user-involved'
+        else:
+          klass = 'user-not-involved'
+      %>
+      <tr class="${klass}">
         <td class="date">${e.date}</td>
         <td class="user">${formatUser(e.spender)}</td>
         <td class="description">${e.description}</td>
@@ -106,7 +112,13 @@
       <th class="editlink"></th>
     </tr>
     % for t in ts:
-      <tr>
+      <%
+        if t.involves(c.user):
+          klass = 'user-involved'
+        else:
+          klass = 'user-not-involved'
+      %>
+      <tr class="${klass}">
         <td class="date">${t.date}</td>
         <td class="user">${formatUser(t.debtor)}</td>
         <td class="user">${formatUser(t.creditor)}</td>