From: adamch <adamch>
Date: Sun, 19 Jun 2005 15:21:06 +0000 (+0000)
Subject: Undo bad change
X-Git-Url: https://git.hcoop.net/hcoop/zz_old/portal.git/commitdiff_plain/d0dd06fa53e29eb65768852e271a1ad35480a28c

Undo bad change
---

diff --git a/money.mlt b/money.mlt
index 1e1f692..236eda5 100644
--- a/money.mlt
+++ b/money.mlt
@@ -2,7 +2,17 @@
 
 ref showNormal = true;
 
-if $"cmd" = "list" then
+if $"hist" <> "" then
+	showNormal := false;
+	val id = Web.stoi ($"hist") %>
+<table>
+<tr> <td><b>Date</b></td> <td><b>Description</b></td> <td><b>Amount</b></td> </tr>
+<% foreach (amount, trn) in Money.listUserTransactions id do %>
+<tr> <td><% #d trn %></td> <td><a href="money?trn=<% #id trn %>"><% Web.html (#descr trn) %></a></td> <td><% amount %>/<% #amount trn %></td> </tr>
+<% end %>
+</table>
+
+<% elseif $"cmd" = "list" then
 	val admin = Group.inGroupName "money";
 	showNormal := false %>
 
@@ -35,9 +45,9 @@ end %>
 <% switch Balance.listBalanceUsers (#id bal) of
 	  [] =>
 	| (user :: users) =>
-		%><a href="user?id=<% #id user %>"><% Web.html (#name user) %></a><%
+		%><a href="money?hist=<% #id user %>"><% Web.html (#name user) %></a><%
 		foreach user in users do
-			%>, <a href="user?id=<% # id user %>"><% Web.html (#name user) %></a><%
+			%>, <a href="money?hist=<% # id user %>"><% Web.html (#name user) %></a><%
 		end
 end %></td> </tr>
 <% end %>
diff --git a/money.sml b/money.sml
index 4ff587a..ea9255a 100644
--- a/money.sml
+++ b/money.sml
@@ -112,7 +112,7 @@ val mkChargeRow' =
      | row => Init.rowError ("name+charge", row)
 
 fun listChargesWithNames trn =
-    C.map (getDb ()) mkChargeRow' ($`SELECT name, trn, usr, amount, app FROM Charge, WebUser
+    C.map (getDb ()) mkChargeRow' ($`SELECT name, trn, usr, amount FROM Charge, WebUser
 			             WHERE trn = ^(C.intToSql trn)
 					AND usr = id
 				     ORDER BY name`)