Reports for figuring out which accounts to freeze or boot; most of new SSL request...

[bpt/portal.git] / poll.mlt

diff --git a/poll.mlt b/poll.mlt
index 4b7d968..735a201 100644 (file)
--- a/poll.mlt
+++ b/poll.mlt
@@ -27,9 +27,13 @@ elseif $"vote" <> "" then
 <tr> <td>Start:</td> <td><% Web.html (#starts poll) %></td> </tr>
 <tr> <td>End:</td> <td><% Web.html (#ends poll) %></td> </tr>
 <tr> <td>Votes/person:</td> <td><% #votes poll %></td> </tr>
+<tr> <td>Official:</td> <td><% if #official poll then "yes" else "no" end %></td> </tr>
 <tr> <td>Description:</td> <td><% Web.htmlNl (#descr poll) %></td> </tr>
 </table>
 
+<% if #official poll and Poll.membershipLength (Init.getUserId ()) < Poll.votingMembershipRequirement then %>
+   <h3>You haven't been a member long enough to vote in an official poll.</h3>
+<% else %>
 <h3>Choices</h3>
 
 <form action="poll" method="post">
@@ -47,7 +51,8 @@ foreach (you, cho) in choices do %>
 <input type="submit" value="Vote">
 </form>
 
-<% elseif $"vote2" <> "" then
+<% end
+elseif $"vote2" <> "" then
        val id = Web.stoi ($"vote2");
        val poll = Poll.lookupPoll id;
        editingPoll := SOME id;
@@ -56,7 +61,9 @@ foreach (you, cho) in choices do %>
                  [""] => []
                | v => map Web.stoi v;
 
-       if length votes > #votes poll then
+       if #official poll and Poll.membershipLength (Init.getUserId ()) < Poll.votingMembershipRequirement then
+               %><h3>You haven't been a member long enough to vote in an official poll.</h3><%
+       elseif length votes > #votes poll then
                %><h3>You can't vote for that many different choices!</h3><%
        elseif not (Poll.noDupes votes) then
                %><h3>You can't vote multiple times for the same choice!</h3><%
@@ -70,6 +77,7 @@ elseif $"cmd" = "add" then
        val starts = $"starts";
        val ends = $"ends";
        val votes = Web.stoi ($"votes");
+       val official = $"official" = "on";
        if title = "" then
                %><h3>Your poll must have a title.</h3><%
        elseif not pollAdmin and not (Poll.dateGeNow starts) then
@@ -79,7 +87,7 @@ elseif $"cmd" = "add" then
        elseif votes <= 0 then
                %><h3>You must specify a positive number of votes per person.</h3><%
        else
-               val id = Poll.addPoll (Init.getUserId(), title, $"descr", starts, ends, votes);
+               val id = Poll.addPoll (Init.getUserId(), title, $"descr", starts, ends, votes, official);
                editingPoll := SOME id;
                %><h3>Poll added!</h3><%
        end
@@ -98,6 +106,7 @@ elseif $"mod" <> "" then
 <tr> <td>Start date:</td> <td><input name="starts" value="<% Web.html (#starts poll) %>"></td> </tr>
 <tr> <td>End date:</td> <td><input name="ends" value="<% Web.html (#ends poll) %>"></td> </tr>
 <tr> <td>Max votes/person:</td> <td><input name="votes" value="<% #votes poll %>"></td> </tr>
+<tr> <td>Official:</td> <td><input type="checkbox" name="official"<% if #official poll then " checked" end %>></td> </tr>
 <tr> <td>Description:</td> <td><textarea name="descr" wrap="soft" rows="5" cols="80"><% Web.html (#descr poll) %></textarea></td> </tr>
 <tr> <td><input type="submit" name="cmd" value="Save"></td> </tr>
 </table>
@@ -112,6 +121,7 @@ elseif $"mod" <> "" then
        val starts = $"starts";
        val ends = $"ends";
        val votes = Web.stoi ($"votes");
+       val official = $"official" = "on";
        if title = "" then
                %><h3>Your poll must have a title.</h3><%
        elseif not pollAdmin and not (Poll.dateGeNow starts) then
@@ -121,7 +131,7 @@ elseif $"mod" <> "" then
        elseif votes <= 0 then
                %><h3>You must specify a positive number of votes per person.</h3><%
        else
-               Poll.modPoll {poll with title = title, descr = $"descr", starts = starts, ends = ends, votes = votes};
+               Poll.modPoll {poll with title = title, descr = $"descr", starts = starts, ends = ends, votes = votes, official = official};
                editingPoll := SOME (#id poll);
                %><h3>Poll record saved.</h3><%
        end
@@ -224,6 +234,7 @@ elseif $"delChoice" <> "" then
 <tr> <td>Start:</td> <td><% Web.html (#starts poll) %></td> </tr>
 <tr> <td>End:</td> <td><% Web.html (#ends poll) %></td> </tr>
 <tr> <td>Votes/person:</td> <td><% #votes poll %></td> </tr>
+<tr> <td>Official:</td> <td><% if #official poll then "yes" else "no" end %></td> </tr>
 <tr> <td>Description:</td> <td><% Web.htmlNl (#descr poll) %></td> </tr>
 </table>
 
@@ -263,6 +274,7 @@ end %>
 <tr> <td>Start:</td> <td><% Web.html (#starts poll) %></td> </tr>
 <tr> <td>End:</td> <td><% Web.html (#ends poll) %></td> </tr>
 <tr> <td>Votes/person:</td> <td><% #votes poll %></td> </tr>
+<tr> <td>Official:</td> <td><% if #official poll then "yes" else "no" end %></td> </tr>
 <tr> <td>Description:</td> <td><% Web.htmlNl (#descr poll) %></td> </tr>
 </table>
 
@@ -315,7 +327,11 @@ end %>
 <%     | NONE =>
 if showNormal then
 
-val polls = Poll.listCurrentPolls ();
+val mlen = Poll.membershipLength (Init.getUserId ()) %>
+
+<p>You have been an HCoop member for <% mlen %> days, so you <b>are<% if mlen < Poll.votingMembershipRequirement then %> not<% end %></b> eligible to vote in official polls.</p>
+
+<% val polls = Poll.listCurrentPolls ();
 switch polls of
        _::_ => %>
 <h3><a href="poll">Current polls</a></h3>
@@ -338,6 +354,7 @@ end %>
 <tr> <td>Start date:</td> <td><input name="starts"></td> </tr>
 <tr> <td>End date:</td> <td><input name="ends"></td> </tr>
 <tr> <td>Max votes/person:</td> <td><input name="votes"></td> </tr>
+<tr> <td>Official:</td> <td><input type="checkbox" name="official"></td> </tr>
 <tr> <td>Description:</td> <td><textarea name="descr" wrap="soft" rows="5" cols="80"></textarea></td> </tr>
 <tr> <td><input type="submit" value="Create"></td> </tr>
 </table>