added voting based on candidate id

Election/app/controllers/votes_controller.rb

@@ -24,7 +24,11 @@ class VotesController < ApplicationController
   end
 
   def profile
+    @positions = Position.all
+    @candidates = Candidate.all
+    @user = current_user
     @votes = current_user.votes
+    render "votes/user_profile.html.erb"
   end
 
   private

Election/app/models/vote.rb

@@ -5,5 +5,5 @@ class Vote < ActiveRecord::Base
 	def to_s
 		"#{candidate.first_name} #{candidate.last_name}"
 	end
-	accepts_nested_attributes_for :votes
+	#accepts_nested_attributes_for :votes
 end

Election/app/views/admin/candidates/show.html.erb

@@ -7,5 +7,17 @@
 	<li>Female Voters: <%= @votes_female.size %></li>
 </ul>
 
+<<<<<<< HEAD
 <%= link_to "Votes for Candidate", "/election/vote/#{@candidate.id}" %>
+=======
+<h2>People who voted for <%= @candidate.first_name %> <%= @candidate.last_name %>:</h2>
+<ul>
+	<li>User - Comment</li>
+	<% @votes.each do |v| %>
+	<li>
+		<%= v.user.email %> - <%= v.comment %>
+	</li>
+	<% end %>
+</ul>
+>>>>>>> 4a293966901c2565a4eea2574a3086d230d926fc
 <%= link_to "Back to Candidates", admin_candidates_path %>
\ No newline at end of file

Election/app/views/candidates/show.html.erb

+<h2>Candidate: <%= @candidate.first_name %> <%= @candidate.last_name %> </h2>
+<h4>Party List: <%= @candidate.party_list.name %></h4>
+<h3><%= @candidate.last_name %>'s Slogan: <%= @candidate.slogan %></h3>
+<ul>
+	<li>Votes: <%= @votes_male.size + @votes_female.size %></li>
+	<li>Male Voters: <%= @votes_male.size %></li>
+	<li>Female Voters: <%= @votes_female.size %></li>
+</ul>
+
+<h2>People who voted for <%= @candidate.first_name %> <%= @candidate.last_name %>:</h2>
+<ul>
+	<li>User - Comment</li>
+	<% @votes.each do |v| %>
+	<li>
+		<%= v.user.email %> - <%= v.comment %>
+	</li>
+	<% end %>
+</ul>
+<%= link_to "Back to Candidates", admin_candidates_path %>
\ No newline at end of file

Election/app/views/pages/index.html.erb

@@ -25,7 +25,7 @@
 	</tr>
   	<% p.candidates.each do |candidate| %>
     	<td><%= candidate.first_name %> <%= candidate.last_name %></td> 
-    	<td><%= candidate.votes.count %></td>
+    	<td><%= Vote.where(candidate_id: candidate.id).count %></td>
     <% end %>
   </table>
 <% end %>

Election/app/views/votes/user_profile.html.erb

 <h1>Profile Page</h1>
-<h2><%= @user.first_name %> <%= @user.last_name %></h2>
+<h2><%= current_user.id %> <%= current_user.first_name %> <%= current_user.last_name %></h2>
 <hr>
-<table class="table table-striped">
-	<thead>
-		<th>Vote ID</th>
-		<th>Candidate Voted</th>
-		<th>Voted on</th>
-	</thead>
-	<tbody>
-		<% @votes.each do |v| %>
-			<tr>
-				<td><%= v.id %></td>
-				<td><%= v.candidate.first_name %>  "<%= v.candidate.nickname %>"  <%= v.candidate.last_name %></td>
-				<td><%= v.created_at %></td>
-			</tr>
+<h2>Positions</h2>
+	<% @positions.each do |p| %>
+		<h3><%= p.name %></h3>
+	<% p.candidates.each do |c| %>	
+		<% c.votes.each do |v| %>
+				<% if v.user_id == current_user.id %>
+				<%= v.candidate.first_name %> <%= v.candidate.last_name %> <%= v.comments %>
+				<% else %>
+				<% end %>
 		<% end %>
-	</tbody>
-</table>
+		<% end %>
+	<% end %>
 <hr>