mmoser/skill-assessment-app
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

review comment tweaks - completes #104

Browse Source
This commit is contained in:
Mark Moser
2017-03-07 16:35:59 -06:00
parent 2c0020a280
commit e0ff645926
6 changed files with 44 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/admin/result/_comment_form.html.erb
View File

@ -1,5 +1,3 @@
<%= render partial: 'shared/form_model_errors', locals: { obj: comment } %>
<% if comment.id.nil? %>
<%= form_for comment, url: admin_create_comment_path(test_hash: test_hash), method: :post do |form| %>

10
app/views/admin/result/_voting.html.erb
View File

@ -4,7 +4,7 @@
<div class="review_meta__votes" data-id="vote-count">
<strong>Votes: </strong>
<% if @candidate.pending? %>
<% if @candidate.pending? && current_user.commented_on?(@candidate.test_hash) %>
<%= link_to admin_up_vote_path(test_hash: @candidate.test_hash), remote: true do %>
Yea (<span data-id="up-votes"><%= @candidate.votes.yea.count %></span>)
<% end %>
@ -12,6 +12,10 @@
<%= link_to admin_down_vote_path(test_hash: @candidate.test_hash), remote: true do %>
Nay (<span data-id="down-votes"><%= @candidate.votes.nay.count %></span>)
<% end %>
<% elsif @candidate.pending? %>
<div>You must comment before you can vote</div>
<span>Yea (<span data-id="up-votes"><%= @candidate.votes.yea.count %></span>)</span>
<span>Nay (<span data-id="down-votes"><%= @candidate.votes.nay.count %></span>)</span>
<% else %>
Voting closed -
Yea (<%= @candidate.votes.yea.count %>) -
@ -43,4 +47,8 @@
<% else %>
<strong>Candidate Interview Status: </strong><%= @candidate.review_status %>
<% unless @candidate.review_status.blank? %>
<div>Review Status Comments:</div>
<div><%= @candidate.review_comments %></div>
<% end %>
<% end %>

5
app/views/admin/result/view.html.erb
View File

@ -55,11 +55,12 @@
</div>
<div>
<h2 class="prft-heading">Comments</h2>
<%= render partial: 'comment', collection: @comments, locals: { test_hash: @candidate.test_hash } %>
<h2 id="comment-header" class="prft-heading">Comments</h2>
<% if policy(QuizComment).new? %>
<%= render partial: 'comment_form', locals: {comment: @comment, test_hash: @candidate.test_hash } %>
<% end %>
<%= render partial: 'comment', collection: @comments, locals: { test_hash: @candidate.test_hash } %>
<a href="#comment-header">Back to top</a>
</div>
</div>
</div>