Update of /cvsroot/hcoop/portal
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv19130
Modified Files:
money.mlt money.sig money.sml
Log Message:
Annotate freezeworthy list with whether members joined this month
Index: money.mlt
===================================================================
RCS file: /cvsroot/hcoop/portal/money.mlt,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** money.mlt 26 Apr 2008 16:21:59 -0000 1.29
--- money.mlt 22 May 2008 13:31:42 -0000 1.30
***************
*** 578,582 ****
<tr> <th>Member</th> <th>Balance</th> </tr>
<% foreach dq in dqs do %>
! <tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td>$<%
#balance dq %></td> </tr>
<% end %>
</table>
--- 578,583 ----
<tr> <th>Member</th> <th>Balance</th> </tr>
<% foreach dq in dqs do %>
! <tr> <td><a href="user?id=<% #id dq %>"><% #name dq %></a></td> <td>$<%
#balance dq %></td>
! <% if #joinedThisMonth dq then %><td><i>(joined this month)</i></td><% end
%></tr>
<% end %>
</table>
Index: money.sml
===================================================================
RCS file: /cvsroot/hcoop/portal/money.sml,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** money.sml 22 May 2008 00:13:54 -0000 1.16
--- money.sml 22 May 2008 13:31:45 -0000 1.17
***************
*** 299,307 ****
val baseDues = 5.0
! fun makeRow [id, name, amount] = {id = C.intFromSql id, name =
C.stringFromSql name,
! balance = C.realFromSql amount}
| makeRow row = Init.rowError ("Bad freezeworthyPledgers", row)
in
! C.map (getDb ()) makeRow ($`SELECT WebUserPaying.id,
WebUserPaying.name, amount
FROM WebUserPaying JOIN Balance ON
Balance.id = bal
WHERE amount >= ^(C.realToSql baseDues) *
^(C.intToSql graceMonths)
--- 299,307 ----
val baseDues = 5.0
! 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 freezeworthyPledgers", row)
in
! 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)
Index: money.sig
===================================================================
RCS file: /cvsroot/hcoop/portal/money.sig,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** money.sig 26 Apr 2008 16:21:59 -0000 1.8
--- money.sig 22 May 2008 13:31:45 -0000 1.9
***************
*** 38,42 ****
val resetPledges : int list -> unit
! val freezeworthyPledgers : unit -> { id : int, name : string, balance :
real } list
val bootworthyPledgers : unit -> { id : int, name : string, balance :
real } list
--- 38,42 ----
val resetPledges : int list -> unit
! val freezeworthyPledgers : unit -> { id : int, name : string, balance :
real, joinedThisMonth : bool } list
val bootworthyPledgers : unit -> { id : int, name : string, balance :
real } list
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
hcoop-cvs mailing list
hcoop-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/hcoop-cvs
