Add "joined this month" annotations in bootworthy list

[bpt/portal.git] / money.sml

diff --git a/money.sml b/money.sml
index 6701459..1ca22a2 100644 (file)
--- a/money.sml
+++ b/money.sml
@@ -313,11 +313,11 @@ fun bootworthyPledgers () =
     let
        val baseDues = 5.0
 
-       fun makeRow [id, name, amount] = {id = C.intFromSql id, name = C.stringFromSql name,
-                                         balance = C.realFromSql amount}
+       fun makeRow [id, name, amount, j] = {id = C.intFromSql id, name = C.stringFromSql name,
+                                            balance = C.realFromSql amount, joinedThisMonth = C.boolFromSql j}
          | makeRow row = Init.rowError ("Bad bootworthyPledgers", row)
     in
-       C.map (getDb ()) makeRow ($`SELECT WebUserPaying.id, WebUserPaying.name, amount
+       C.map (getDb ()) makeRow ($`SELECT WebUserPaying.id, WebUserPaying.name, amount, CURRENT_TIMESTAMP - joined < INTERVAL '1 month'
                                    FROM WebUserPaying JOIN Balance ON Balance.id = bal
                                    WHERE amount < ^(C.realToSql baseDues) * ^(C.intToSql graceMonths)
                                    ORDER BY name`)