Adds support for seeing results of voting

Also changes voting to round 2

app/assets/javascripts/controllers/voting_results_controller.js.coffee

@@ -0,0 +1,2 @@
+Proposals.VotingResultsController = Ember.Controller.extend()
+

app/assets/javascripts/models/result.js.coffee

@@ -0,0 +1,5 @@
+Proposals.Result = DS.Model.extend
+  proposal: DS.belongsTo('proposal')
+  voteCount: DS.attr('number')
+  title: DS.attr('string')
+  userName: DS.attr('string')

app/assets/javascripts/models/round.js.coffee

@@ -2,5 +2,6 @@ Proposals.Round = DS.Model.extend
   text: DS.attr('string')
   totalVotes: DS.attr('number')
   isAnonymous: DS.attr('boolean')
+  isCompleted: DS.attr('boolean')
   isCurrentRound: DS.attr('boolean')
   name: DS.attr('string')

app/assets/javascripts/router.js.coffee

@@ -1,5 +1,9 @@
 Proposals.Router.map ()->
   @resource('voting_round', path: '/round/:round')
+  @resource('voting_results', path: '/results/:round')
+  @resource('proposals', ->
+    @route('show', path: ':proposal_id')
+  )
 
 Proposals.Router.reopen
   rootURL: '/voting/'

app/assets/javascripts/routes/voting_results_route.js.coffee

@@ -0,0 +1,10 @@
+Proposals.VotingResultsRoute = Ember.Route.extend
+  model: (params) ->
+    Ember.RSVP.hash(
+      round: @store.find('round', params.round)
+      results: @store.find('result', round: params.round)
+    )
+
+  setupController: (controller, model) ->
+    controller.set('round', model.round)
+    controller.set('results', model.results)

app/assets/javascripts/routes/voting_round_route.js.coffee

@@ -2,7 +2,7 @@ Proposals.VotingRoundRoute = Ember.Route.extend
   model: (params) ->
     Ember.RSVP.hash(
       round: @store.find('round', params.round)
-      proposals: @store.find('proposal')
+      proposals: @store.find('proposal', round: params.round)
     )
 
   setupController: (controller, model) ->

app/assets/javascripts/templates/index.hbs

@@ -4,11 +4,18 @@
       <div class="small-12 medium-6 columns">
         <h2>{{round.text}}</h2>
 
-        {{#if round.isCurrentRound}}
-          <p>Voting is now open for {{round.text}}. {{link-to "Cast your vote." "voting_round" round.id}}</p>
-        {{else}}
-          <p>Voting is closed for {{round.text}}.</p>
-        {{/if}}
+        <p>
+          {{#if round.isCurrentRound}}
+            Voting is now open for {{round.text}}. {{link-to "Cast your vote." "voting_round" round.id}}</p>
+          {{else}}
+            Voting is closed for {{round.text}}.
+          {{/if}}
+
+          {{#if round.isCompleted}}
+            {{link-to 'View results' 'voting_results' round.id}}
+          {{/if}}
+        </p>
+
 
         <h3>Your votes for {{round.text}}</h3>
         <ol>

app/assets/javascripts/templates/proposals/show.hbs

@@ -0,0 +1,44 @@
+<div class="voting">
+  <div class="proposal-show">
+    <h1>{{title}}</h1>
+
+    {{#if userName}}
+      <div class="user-info content">
+        <h2>Submitter info</h2>
+        <dl>
+          <dt>Name</dt>
+          <dd>{{userName}}</dd>
+          {{#if twitter}}
+            <dt><i class="fi-social-twitter"></i></dt>
+            <dd>{{format-twitter twitter}}</dd>
+          {{/if}}
+          {{#if github}}
+            <dt><i class="fi-social-github"></i></dt>
+            <dd>{{format-github github}}</dd>
+          {{/if}}
+        </dl>
+
+        <div class="bio">
+          {{unbound format-markdown userBio}}
+        </div>
+      </div>
+    {{/if}}
+
+    <div class="content">
+      <h2>Abstract</h2>
+      {{format-markdown abstract}}
+    </div>
+
+    <div class="content">
+      <h2>Notes</h2>
+      {{format-markdown notes}}
+    </div>
+
+    {{#if pitch}}
+      <div class="content">
+        <h2>Pitch</h2>
+        {{format-markdown pitch}}
+      </div>
+    {{/if}}
+  </div>
+</div>

app/assets/javascripts/templates/voting_results.hbs

@@ -0,0 +1,17 @@
+<div class="voting">
+  <div class="results">
+    <h1>Voting Results for {{round.text}}</h1>
+
+    <ol>
+      {{#each results}}
+        <li>
+          [<span class="count">{{voteCount}} votes</span>]
+          {{link-to title 'proposals.show' id className="title"}}
+          {{#if userName}}by <span class="username">{{userName}}</span>{{/if}}
+        </li>
+      {{else}}
+        Loading...
+      {{/each}}
+    </ol>
+  </div>
+</div>

app/assets/stylesheets/style.css.scss

@@ -95,3 +95,15 @@ textarea {
 .filters {
   @include sub-nav();
 }
+
+.results {
+  .username {
+    font-weight: bold;
+  }
+}
+
+.proposal-show {
+  .content {
+    @include grid-column(12);
+  }
+}

app/controllers/api/proposals_controller.rb

@@ -15,5 +15,10 @@ def index
         current_votes: current_votes,
         current_hidden_votes: current_hidden_votes
     end
+
+    def show
+      proposal = Proposal.find(params[:id])
+      respond_with proposal, serializer: ProposalSerializer
+    end
   end
 end

app/controllers/api/results_controller.rb

@@ -0,0 +1,22 @@
+module Api
+  class ResultsController < ApplicationController
+    respond_to :json
+    before_filter :require_voter!, :verify_round_complete
+
+    def index
+      respond_with Vote.results_for_round(round)
+    end
+
+    private
+
+    def round
+      Round.detect { |round| round.to_i == params[:round].to_i }
+    end
+
+    def verify_round_complete
+      unless round.completed?
+        render json: {}, status: :unauthorized
+      end
+    end
+  end
+end

app/enums/round.rb

@@ -1,5 +1,9 @@
 class Round < ClassyEnum::Base
   include ActiveModel::Serialization
+
+  def completed?
+    self < Rails.configuration.current_round
+  end
 end
 
 class Round::One < Round

app/models/vote.rb

@@ -3,4 +3,26 @@ class Vote < ActiveRecord::Base
   belongs_to :proposal
 
   classy_enum_attr :round
+
+  # Only show proposals with more than this many votes in results
+  MIN_VOTE_THRESHOLD = 1
+
+  def self.results_for_round(round)
+    votes = where(round: round).includes(proposal: :user).group_by(&:proposal)
+
+    votes.map {|proposal, votes|
+      {
+        id:         proposal.id,
+        title:      proposal.title,
+        user_name:  anonymous? ? nil : proposal.user_name,
+        vote_count: votes.count
+      }
+    }.select {|result|
+      result[:vote_count] > MIN_VOTE_THRESHOLD
+    }.sort {|a,b| b[:vote_count] <=> a[:vote_count] }
+  end
+
+  def self.anonymous?
+    Rails.configuration.current_round.anonymous?
+  end
 end

app/serializers/proposal_serializer.rb

@@ -8,12 +8,16 @@ class ProposalSerializer < ActiveModel::Serializer
   has_one :hidden_vote
 
   def vote
+    return if options[:current_votes].nil?
+
     vote = options[:current_votes].detect { |vote| vote.proposal_id == object.id }
     return if vote.nil?
     VoteSerializer.new(vote)
   end
 
   def hidden_vote
+    return if options[:current_hidden_votes].nil?
+
     vote = options[:current_hidden_votes].detect { |vote| vote.proposal_id == object.id }
     return if vote.nil?
     HiddenVoteSerializer.new(vote)
@@ -28,28 +32,28 @@ def visible
   end
 
   def pitch
-    object.pitch unless anonymous_round?
+    object.pitch unless anonymous?
   end
 
   def user_name
-    object.user_name unless anonymous_round?
+    object.user_name unless anonymous?
   end
 
   def user_bio
-    object.user_bio unless anonymous_round?
+    object.user_bio unless anonymous?
   end
 
   def twitter
-    object.user.twitter unless anonymous_round?
+    object.user.twitter unless anonymous?
   end
 
   def github
-    object.user.github unless anonymous_round?
+    object.user.github unless anonymous?
   end
 
   private
 
-  def anonymous_round?
+  def anonymous?
     Rails.configuration.current_round.anonymous?
   end
 end

app/serializers/round_serializer.rb

@@ -1,7 +1,8 @@
 class RoundSerializer < ActiveModel::Serializer
   root false
 
-  attributes :id, :text, :total_votes, :is_anonymous, :is_current_round, :name
+  attributes :id, :text, :total_votes, :is_anonymous, :is_current_round, :name,
+    :is_completed
 
   def name
     object.to_s
@@ -15,6 +16,10 @@ def is_anonymous
     object.anonymous?
   end
 
+  def is_completed
+    object.completed?
+  end
+
   def is_current_round
     object == Rails.configuration.current_round
   end

app/serializers/voting_serializer.rb

@@ -3,7 +3,7 @@ class VotingSerializer < ActiveModel::Serializer
 
   embed :ids, include: true
   attributes :id, :round
-  has_one :proposal, serializer: ProposalListSerializer
+  has_one :proposal, serializer: ProposalSerializer
 
   def round
     object.round.to_s

config/initializers/current_round.rb

@@ -1 +1 @@
-Rails.application.config.current_round = Round::One.new
+Rails.application.config.current_round = Round::Two.new

config/routes.rb

@@ -11,11 +11,13 @@
     get '/rounds' => 'rounds#index'
     get '/rounds/:id' => 'rounds#show'
     get '/proposals' => 'proposals#index'
+    get '/proposals/:id' => 'proposals#show'
     get '/votes' => 'votes#index'
     post '/votes' => 'votes#create'
     delete '/votes/:id' => 'votes#destroy'
     post '/hidden_votes' => 'hidden_votes#create'
     delete '/hidden_votes/:id' => 'hidden_votes#destroy'
+    get '/results' => 'results#index'
   end
 
   # Ember app root

test/integration/voting_test.rb

@@ -6,6 +6,14 @@ class VotingTest < ActionDispatch::IntegrationTest
 
     @user = users(:voter)
     login_user @user
+
+    # These tests assume the current round is 1
+    @prev_round = Rails.configuration.current_round
+    Rails.configuration.current_round = Round::One.new
+  end
+
+  teardown do
+    Rails.configuration.current_round = @prev_round
   end
 
   test 'Voter votes for proposals in round 1' do