Statistics

[bpt/portal.git] / balance.sml

diff --git a/balance.sml b/balance.sml
index b2e905c..4e56812 100644 (file)
--- a/balance.sml
+++ b/balance.sml
@@ -10,7 +10,7 @@ type balance = {id :int, name : string, amount : real}
 
 fun mkBalanceRow [id, name, amount] =
     {id = C.intFromSql id, name = C.stringFromSql name, amount = C.realFromSql amount}
-  | mkBalanceRow row = raise Fail ("Bad balance row : " ^ makeSet id row)
+  | mkBalanceRow row = Init.rowError ("balance", row)
 
 fun addBalance name =
     let
@@ -18,8 +18,8 @@ fun addBalance name =
        val id = nextSeq (db, "BalanceSeq")
     in
        C.dml db ($`INSERT INTO Balance (id, name, amount)
-                    VALUES (^id, ^(C.stringToSql name), 0.0)`);
-       C.intFromSql id
+                    VALUES (^(C.intToSql id), ^(C.stringToSql name), 0.0)`);
+       id
     end
 
 fun lookupBalance id =
@@ -57,7 +57,7 @@ fun balanceNameToId name =
       | _ => NONE
 
 fun listBalanceUsers bal =
-    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined
+    C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app
                                  FROM WebUser
                                  WHERE bal = ^(C.intToSql bal)
                                  ORDER BY name`)