diff --git a/app/models/candidate.rb b/app/models/candidate.rb index 8587779..efc370a 100644 --- a/app/models/candidate.rb +++ b/app/models/candidate.rb @@ -28,7 +28,8 @@ class Candidate < ApplicationRecord def interview? return 'yes' if approved? - 'no' if declined? + return 'no' if declined? + '-' end def build_reviews diff --git a/app/views/admin/candidate/_form.html.erb b/app/views/admin/candidate/_form.html.erb index ca3e319..b28cca2 100644 --- a/app/views/admin/candidate/_form.html.erb +++ b/app/views/admin/candidate/_form.html.erb @@ -21,7 +21,9 @@ <%= form.text_field :project %> -
+
+ Position Type + <%= form.radio_button :position, 'full-time' %> <%= form.label "position_full-time", "Full-time" %> diff --git a/app/views/admin/candidate/index.html.erb b/app/views/admin/candidate/index.html.erb index 9601475..ceef8d5 100644 --- a/app/views/admin/candidate/index.html.erb +++ b/app/views/admin/candidate/index.html.erb @@ -31,7 +31,7 @@ <%= candidate.experience %> years <%= candidate.status %> <%= candidate.completed ? link_to("Submitted", admin_result_path(candidate.test_hash)) : "" %> - <%= candidate.reminded ? "Yes" : "" %> + <%= raw candidate.reminded ? "✓" : "·" %> <%= candidate.interview? %> <% end %> diff --git a/app/views/admin/profile/edit.html.erb b/app/views/admin/profile/edit.html.erb index 2603103..9228d72 100644 --- a/app/views/admin/profile/edit.html.erb +++ b/app/views/admin/profile/edit.html.erb @@ -3,6 +3,8 @@ content_for :title, "Profile - Skills Assessment Admin" %> +

Edit Profile

+ <%= render partial: 'shared/form_model_errors', locals: {obj: @user} %> <%= form_for @user, url: admin_profile_url, method: :post do |form| %> diff --git a/app/views/admin/question/_table_list.html.erb b/app/views/admin/question/_table_list.html.erb index fc8bf60..1d41aa9 100644 --- a/app/views/admin/question/_table_list.html.erb +++ b/app/views/admin/question/_table_list.html.erb @@ -14,7 +14,7 @@ <%= question.question %> <%= question.input_type %> <%= question.category %> - <%= question.active unless question.active? %> + <%= raw question.active? ? "✓" : "✗" %> <%= link_to 'Edit', admin_edit_question_path(question.to_i), { class: "" } %> <% end %> diff --git a/app/views/admin/result/_voting.html.erb b/app/views/admin/result/_voting.html.erb index 71656df..9c32656 100644 --- a/app/views/admin/result/_voting.html.erb +++ b/app/views/admin/result/_voting.html.erb @@ -27,16 +27,18 @@ <% if current_user.acts_as_manager? %>
<%= form_tag admin_interview_path(test_hash: @candidate.test_hash) do %> - Interview: +
+ Interview: - <%= radio_button_tag :review_status, :approved, checked = @candidate.approved? %> - <%= label_tag :review_status_approved, "Yes" %> + <%= radio_button_tag :review_status, :approved, checked = @candidate.approved? %> + <%= label_tag :review_status_approved, "Yes" %> - <%= radio_button_tag :review_status, :declined, checked = @candidate.declined? %> - <%= label_tag :review_status_declined, "No" %> + <%= radio_button_tag :review_status, :declined, checked = @candidate.declined? %> + <%= label_tag :review_status_declined, "No" %> +
- Review comments for recruiter + <%= label_tag :review_comments, "Review comments for recruiter" %> <%= text_area_tag :review_comments, @candidate.review_comments %> <%= submit_tag 'Send Request' %>
diff --git a/app/views/admin/result/view.html.erb b/app/views/admin/result/view.html.erb index 07e3ea7..2b53f24 100644 --- a/app/views/admin/result/view.html.erb +++ b/app/views/admin/result/view.html.erb @@ -18,11 +18,12 @@
<% @quiz.each do |question| %> - <%= form_for(:answer, url: '#never-post', html:{id: 'summary-form'}) do |form| %> + <%= form_for(:answer, url: '#never-post', html:{id: "summary-#{question.to_i}"}) do |form| %>

<%= question.question %>

<%= image_tag question.attachment if question.attachment.present? %>
+ Response <%= render partial: "quiz/#{question.input_type}", locals: {question: question, answer: question.answer, form: form} %>
<% end %> diff --git a/app/views/admin/user/_form.html.erb b/app/views/admin/user/_form.html.erb index 50aed47..0830739 100644 --- a/app/views/admin/user/_form.html.erb +++ b/app/views/admin/user/_form.html.erb @@ -16,16 +16,17 @@ <%= form.select :role, admin_role_options(user.role), include_blank: false %>
-
-
Quiz Review List
+
+
Quiz Review List

Quizzes this user should be reviewing the results of.
Admins and Recruiters should not have any checked, unless they are expected to participate in the technical review for that quiz.

+ <%= hidden_field_tag('user[quiz_ids][]') %>
    - <%= form.collection_check_boxes(:quiz_ids, Quiz.all, :id, :name, {}, {class: ""}) do | quiz | %> + <%= form.collection_check_boxes(:quiz_ids, Quiz.all, :id, :name, {include_hidden: false}, {class: ""}) do | quiz | %>
  • <%= quiz.check_box( checked: user.quizzes.include?(quiz.object)) %> <%= quiz.label %>