@@ -9,7 +9,7 @@ class VotesController < ApplicationController # Is the current_user allowed to vote on this hiring_stage? if hiring_stage && vetting_stage && current_user.positions.include?( hiring_stage.position ) # Does this user already have a vote for this hiring stage for this position? - vote = Vote.find_vote_by_hiring_stage_and_vetting_stage( hiring_stage, vetting_stage ) + vote = Vote.find_vote_by_hiring_stage_and_vetting_stage( current_user, hiring_stage, vetting_stage ) if vote.nil? vote = Vote.new.construct_from_basic_elements( current_user, hiring_stage, vote_value ) else app/controllers/votes_controller.rb @@ -21,7 +21,7 @@ module PositionsHelper row = '<tr class="separated">' row += '<td><span class="small">' + applicant.id.to_s + '</span> ' + link_to( applicant.name, applicant_path( applicant ), :class => 'new_link' ) + '</td>' row += render_vetting_stage_cell( hiring_stage, root ) - row += render_vetting_stage_controls( hiring_stage, applicant ) if hiring_stage.position.reviewers.include?( current_user ) + row += render_vetting_stage_controls_cell( hiring_stage, applicant ) if hiring_stage.position.reviewers.include?( current_user ) row += '</tr>' return row @@ -52,9 +52,9 @@ module PositionsHelper if hiring_stage.vetting_stage == v_stage if current_user.can_vote_on_position?( hiring_stage.position ) - vote = Vote.find_vote_by_hiring_stage_and_vetting_stage( hiring_stage, v_stage ) + vote = Vote.find_vote_by_hiring_stage_and_vetting_stage( current_user, hiring_stage, v_stage ) - cell += "<div class='vote_value_#{vote.vote_value.to_s} text_right'>" if vote + cell += "<div class='vote_value_#{vote.vote_value.to_s}'>" if vote if vote cell += link_to( image_tag( 'mini_closebox.png', :alt => 'delete', :width=>'16', :height=>'16', :title => 'Change your vote', :class => 'delete_icon right' ), user_vote_path( current_user, vote ), :method => :delete ) cell += render( :partial => 'positions/applicant_vetting_stage_stats', :locals => { :hiring_stage => hiring_stage, :vetting_stage => v_stage } ) @@ -73,7 +73,8 @@ module PositionsHelper end - def render_vetting_stage_controls( hiring_stage, applicant ) + # Renders the checkmark and red x buttons for voting + def render_vetting_stage_controls_cell( hiring_stage, applicant ) return '<td class="t c">' + render( :partial => 'positions/voting_stage_controls', :locals => { :hiring_stage => hiring_stage, :position => @position, :applicant => applicant } ) + '</td>' end end \ No newline at end of file app/helpers/positions_helper.rb @@ -12,8 +12,8 @@ class Vote < ActiveRecord::Base # TODO: I think I can just pass in the hiring stage here and infer the vetting stage from it - def self.find_vote_by_hiring_stage_and_vetting_stage( hiring_stage, vetting_stage ) - return self.find( :first, :conditions => "hiring_stage_id = #{hiring_stage.id} AND vetting_stage_id = #{vetting_stage.id}" ) + def self.find_vote_by_hiring_stage_and_vetting_stage( current_user, hiring_stage, vetting_stage ) + return self.find( :first, :conditions => "user_id = #{current_user.id} AND hiring_stage_id = #{hiring_stage.id} AND vetting_stage_id = #{vetting_stage.id}" ) end app/models/vote.rb @@ -1,10 +1,10 @@ -<%= image_tag( 'applicant.png' ) %> - -<div id="vote_data_container" class="xsmall right"> +<div id="vote_data_container" class="xsmall"> + <%= image_tag( 'applicant.png', :class => 'left' ) %> <div class="vote_data left"> Yes: <%= hiring_stage.position.find_votes_for_applicant( hiring_stage.applicant, vetting_stage, :yea ).length.to_s %>, </div> <div class="vote_data left"> No: <%= hiring_stage.position.find_votes_for_applicant( hiring_stage.applicant, vetting_stage, :nay ).length.to_s %> </div> -</div> \ No newline at end of file +</div> +<div class="clear"></div> \ No newline at end of file app/views/positions/_applicant_vetting_stage_stats.html.erb e71700af716aa0cac7204441cc765fe3d8a53fa0 Chris chris@ChoOyu.local http://github.com/senorprogrammer/applican/commit/9bb978a0f9f55804e56da9936e9f6c639f4e52ea 9bb978a0f9f55804e56da9936e9f6c639f4e52ea 2008-07-04T15:04:14-07:00 2008-07-04T15:04:14-07:00 Improvements to display of voting data in FF 2a569d29257c96e66997520408efd59166cf7423 Chris chris@ChoOyu.local