1 files changed, 18 insertions, 4 deletions
diff --git a/templates/userpage.hamlet b/templates/userpage.hamlet
index 27353d0..4205d2c 100644
--- a/templates/userpage.hamlet
+++ b/templates/userpage.hamlet
@@ -1,21 +1,35 @@
 <h1>#{username}
 
-$if isUser
+$forall Entity _ emp <- employments
+  <p>From #
+    <strong>
+      #{show (employmentStartDate emp)}
+    $maybe enddate <- employmentEndDate emp
+      \ until #
+      <strong>
+        #{show enddate}
+
+$if isThisUser
   <p>
     <form method=post action=@{UserR cid}#form enctype=#{formEnctype}>
       ^{formWidget}
       <input type="submit" value="Submit time entry">
 $else
 
+
 <table>
     <tr>
       <th>Category
       <th>Hours
       <th>Date
-  $forall (a,b,c) <- entries
+      <th>Note
+  $forall (a,b,c,d,e) <- entries
     <tr .timeentry>
-      <td>#{a}
-      <td>#{b}
+      <td>
+        <a href=@{CategoryR a}>
+          #{timeCategoryName b}
       <td>#{c}
+      <td>#{d}
+      <td>#{e}
 
 ^{pageNavWidget}