X-Git-Url: https://projects.mako.cc/source/selectricity/blobdiff_plain/2857ac6197adfe972a5e6129a3f26af9e148edb1..8a444bfe3f442135ba66e5d9b8cdddfa9e3b50f2:/app/models/vote.rb?ds=sidebyside diff --git a/app/models/vote.rb b/app/models/vote.rb index 8852fa5..21b5408 100644 --- a/app/models/vote.rb +++ b/app/models/vote.rb @@ -71,16 +71,6 @@ class Vote < ActiveRecord::Base confirmed == 1 end - def votestring=(string="") - candidate_ids = voter.election.candidates.sort.collect \ - { |candidate| candidate.id.to_i } - - rel_votes = string.split("").collect { |vote| vote.to_i } - - # covert relative orders to absolute candidate ids - self.votes = rel_votes.collect { |vote| candidate_ids[ vote - 1 ] } - end - def votestring # create a mapping of candidates ids and the relative order of the # candidates as they appear when sorted alphabetically @@ -90,7 +80,7 @@ class Vote < ActiveRecord::Base end # assemble the votestring - self.votes.collect {|v| cand_relnums[v]}.join("") + self.votes.collect {|v| (cand_relnums[v] + 64).chr}.join("") end # the following subroutine is used for quickvotes, but need for elections now