X-Git-Url: http://git.hcoop.net/hcoop/zz_old/portal.git/blobdiff_plain/fd650826a845b48172835747e2394d160b8863de..22969c7b360ec1b72f027ca7a1e3c937f588e62e:/poll.sml diff --git a/poll.sml b/poll.sml index e549218..06d49a8 100644 --- a/poll.sml +++ b/poll.sml @@ -196,7 +196,7 @@ fun noDupes l = | h::t => List.all (fn x => x <> h) t andalso noDupes t fun listVoters cho = - C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app + C.map (getDb ()) mkUserRow ($`SELECT id, name, rname, bal, joined, app, shares, paypal, checkout FROM WebUser, Vote WHERE usr = id AND cho = ^(C.intToSql cho) @@ -209,7 +209,7 @@ fun countVoters pol = | row => Init.rowError ("countVoters", row) fun listPollVoters pol = - C.map (getDb ()) mkUserRow ($`SELECT DISTINCT WebUser.id, name, rname, bal, joined, app + C.map (getDb ()) mkUserRow ($`SELECT DISTINCT WebUser.id, name, rname, bal, joined, app, shares, paypal, checkout FROM WebUser, Vote JOIN PollChoice ON cho = PollChoice.id WHERE pol = ^(C.intToSql pol) AND usr = WebUser.id