Index: openacs-4/packages/oct-election/tcl/oct-election-procs.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/tcl/oct-election-procs.tcl,v diff -u -N -r1.1.1.1.4.9 -r1.1.1.1.4.10 --- openacs-4/packages/oct-election/tcl/oct-election-procs.tcl 21 Oct 2008 09:22:27 -0000 1.1.1.1.4.9 +++ openacs-4/packages/oct-election/tcl/oct-election-procs.tcl 9 Sep 2013 14:48:53 -0000 1.1.1.1.4.10 @@ -26,7 +26,7 @@ return [list $status $text] } - set num_days 90 + set num_days 180 set valid_voter_p 0 db_1row get_election { @@ -54,6 +54,7 @@ if {$num_posts < 2} { set status 0 + ns_log warning "not valid voter b/c forums $user_id" set text "You are not a valid voter for this election because you have not posted at least twice in the OpenACS forums since $pretty_vote_forum_cutoff. See OpenACS Governance" } else { set valid_voter_p 1 Index: openacs-4/packages/oct-election/www/election.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election.tcl,v diff -u -N -r1.3.2.3 -r1.3.2.4 --- openacs-4/packages/oct-election/www/election.tcl 17 Nov 2006 15:10:29 -0000 1.3.2.3 +++ openacs-4/packages/oct-election/www/election.tcl 9 Sep 2013 14:48:53 -0000 1.3.2.4 @@ -10,7 +10,7 @@ set valid_voter_p [lindex $valid_voter 0] set valid_voter_text [lindex $valid_voter 1] -db_1row get_election { +if {![db_0or1row get_election { select start_time, end_time, vote_forum_cutoff, @@ -20,7 +20,9 @@ (case when now() > start_time then 1 else 0 end) as past_start_p, (case when now() > end_time then 1 else 0 end) as past_end_p from oct_election - where election_id = :election_id + where election_id = :election_id and election_id <> 2 +}]} { + ad_returnredirect "election2" } set pretty_start_time [lc_time_fmt $start_time %c] Index: openacs-4/packages/oct-election/www/election2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/election2.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/oct-election/www/election2.adp 9 Sep 2013 14:48:53 -0000 1.1.2.1 @@ -0,0 +1,11 @@ + +Andrew Grumet has advised us that he will not be able to serve on the OCT if he is reelected. +

+To make sure everyone's is able to get their full 5 votes, the election will be restarted with a new ballot with Andrew's name removed. +

+The election starts now and will continue until Midnight 11 Novemeber UTC. +

+I apologize for the inconvenience, I hope everyone who has the opporunity to vote will take it. +

+The URL of the election is http://openacs.org/oct-election/election?election%5fid=3 + Index: openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp 17 Nov 2006 15:10:29 -0000 1.1.2.1 +++ openacs-4/packages/oct-election/www/find-match-cvs-users-2.adp 9 Sep 2013 14:48:53 -0000 1.1.2.2 @@ -4,7 +4,7 @@ - +

  • @users.last_name@, @users.first_names@ (@users.email@) - CVS user: @users.username@
  • Index: openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl,v diff -u -N -r1.1.2.1 -r1.1.2.2 --- openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl 17 Nov 2006 15:10:29 -0000 1.1.2.1 +++ openacs-4/packages/oct-election/www/find-match-cvs-users-2.tcl 9 Sep 2013 14:48:53 -0000 1.1.2.2 @@ -24,7 +24,7 @@ set title "Searching user" set context [list $title] -db_multirow users select_users { +db_multirow -extend {assigned_p} users select_users { select pe.person_id, pe.first_names, pe.last_name, @@ -37,6 +37,10 @@ or lower(first_names) like lower('%' || :search_text || '%') or lower(email) like lower('%' || :search_text || '%')) } { + set assigned_p 1 + if {$username eq "" || [util_email_valid_p $username]} { + set assigned_p 0 + } } ad_return_template Index: openacs-4/packages/oct-election/www/user-list.adp =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/user-list.adp,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/oct-election/www/user-list.adp 9 Sep 2013 14:48:53 -0000 1.1.2.1 @@ -0,0 +1,6 @@ + + @page_title;noquote@ + "@context;noquote@" + + + Index: openacs-4/packages/oct-election/www/user-list.tcl =================================================================== RCS file: /usr/local/cvsroot/openacs-4/packages/oct-election/www/user-list.tcl,v diff -u -N --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ openacs-4/packages/oct-election/www/user-list.tcl 9 Sep 2013 14:48:54 -0000 1.1.2.1 @@ -0,0 +1,109 @@ +ad_page_contract { + @cvs-id $Id: user-list.tcl,v 1.1.2.1 2013/09/09 14:48:54 victorg Exp $ +} { +} + +set page_title "OCT Voting List" +set context $page_title + +template::list::create \ + -name voters_foo \ + -multirow voters \ + -elements { + name { + label "Name" + html { align center} + aggregate count + aggregate_label "Total" + } + cvs_user { + label "cvs_user" + html { align center} + } + num_posts { + label "num_posts" + html { align center} + } + } + +# set up basic vars + +set election_id 5 + +db_1row get_election { + select start_time, + end_time, + vote_forum_cutoff, + label, + (case when now() > start_time then 1 else 0 end) as past_start_p, + (case when now() > end_time then 1 else 0 end) as past_end_p + from oct_election + where election_id = :election_id +} +set cvs_history_days [db_string get_cvs_days { + select cvs_history_days + from oct_election + where election_id = :election_id +} ] + + + +set num_days 90 +set valid_voter_p 0 + +set before_sql "to_date(:vote_forum_cutoff, 'YYYY-MM-DD')" + +set usernames [list] + + +db_multirow \ + -extend { + mailto + name + } voters voters_select " + (select u2.user_id, u2.username as cvs_user, count(message_id) as num_posts + from users u2, forums_messages + where u2.user_id = forums_messages.user_id + and posting_date between $before_sql - interval \'$num_days days\' and $before_sql + group by u2.user_id, u2.username + having count(*) > 1) + UNION + (select user_id, username as cvs_user, -1 as num_post from users + where username not like '%@%') + order by num_posts DESC + " { + + # don't repeat users + if {[lsearch -exact $usernames $cvs_user] != -1} { + continue + } + lappend usernames $cvs_user + + set status 0 + if {$num_posts < 2} { + + set num_posts "Through CVS commits" + #Checking CVS commit history + # set cvs_user [acs_user::get_element -user_id $user_id -element username] + if {$cvs_history_days eq 0} { + set cvs_history_days "all" + } + set service_url "http://xarg.net/tools/cvs/rss/?user=$cvs_user&days=$cvs_history_days" + if {![catch { + set commit_info [ns_httpget $service_url] + } errmsg] } { + set doc [dom parse $commit_info] + set root_node [$doc documentElement] + set commits [llength [$root_node selectNodes /rss/channel/item]] + if {!$commits} { + continue + } + } else { + continue + } + + } + + set name [acs_user::get_element -user_id $user_id -element name] + + }