X-Git-Url: http://git.hcoop.net/hcoop/portal.git/blobdiff_plain/5c705bcb58ea122dbd2b8163edc3e24c194d2ab1..47ea7c948ab73a626681f1f75f42a67921c0ca9f:/balance.sml diff --git a/balance.sml b/balance.sml index e400709..59622de 100644 --- a/balance.sml +++ b/balance.sml @@ -97,15 +97,18 @@ fun listBalanceUsers bal = fun sumOwnedBalances () = case C.oneRow (getDb ()) ($`SELECT SUM(amount) - FROM Balance JOIN WebUser - ON Balance.name = WebUser.name - AND WebUser.bal = Balance.id`) of + FROM Balance JOIN WebUser + ON Balance.name = WebUser.name + AND WebUser.bal = Balance.id + JOIN Membership + ON Membership.usr = WebUser.id + AND Membership.grp = 1`) of [amt] => C.realFromSql amt | _ => raise Fail "sumOwnedBalance: no rows" fun isNegative (bal : balance) = #amount bal < 0.0 -fun depositAmount _ = 5.0 * 3.0 +fun depositAmount _ = 7.0 * 3.0 (*fun depositAmount bal = let val db = getDb ()