From 597cd0c3a9c51e4239fab535a9d41dc66497ad8e Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Fri, 18 Oct 2019 14:19:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E5=AE=A1=E6=A0=B8=E5=90=8E?=
 =?UTF-8?q?=E5=8F=B0=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/admins/shixun_authorizations_controller.rb | 2 +-
 .../admins/shixun_authorizations/shared/_list.html.erb     | 7 +++++++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/app/controllers/admins/shixun_authorizations_controller.rb b/app/controllers/admins/shixun_authorizations_controller.rb
index 31bd5faf7..14d43b00a 100644
--- a/app/controllers/admins/shixun_authorizations_controller.rb
+++ b/app/controllers/admins/shixun_authorizations_controller.rb
@@ -26,7 +26,7 @@ class Admins::ShixunAuthorizationsController < Admins::BaseController
     @applies = paginate applies.includes(user: :user_extension)
 
     shixun_ids = @applies.map(&:container_id)
-    @shixun_map = Shixun.where(id: shixun_ids).each_with_object({}) { |s, h| h[s.id] = s }
+    @shixun_map = Shixun.where(id: shixun_ids).includes(:shixun_reviews).each_with_object({}) { |s, h| h[s.id] = s }
   end
 
   def agree
diff --git a/app/views/admins/shixun_authorizations/shared/_list.html.erb b/app/views/admins/shixun_authorizations/shared/_list.html.erb
index 042e4096e..fdb33fdde 100644
--- a/app/views/admins/shixun_authorizations/shared/_list.html.erb
+++ b/app/views/admins/shixun_authorizations/shared/_list.html.erb
@@ -6,6 +6,7 @@
     <th width="8%">头像</th>
     <th width="14%">创建者</th>
     <th width="28%" class="text-left">实训名称</th>
+    <th width="10">审核情况（内容/性能）</th>
     <th width="12%">任务数</th>
     <th width="16%">时间</th>
     <% if is_processed %>
@@ -21,6 +22,8 @@
     <% applies.each do |apply| %>
       <% user = apply.user %>
       <% shixun = shixun_map[apply.container_id] %>
+      <% content_review = shixun.shixun_reviews.select{|sr| sr.review_type == 'Content'}.first %>
+      <% perference_review = shixun.shixun_reviews.select{|sr| sr.review_type == 'Performance'}.first %>
       <tr class="shixun-authorization-item shixun-authorization-<%= apply.id %>">
         <td>
           <%= link_to "/users/#{user.login}", class: 'shixun-authorization-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
@@ -33,6 +36,10 @@
             <%= overflow_hidden_span shixun.name, width: 300 %>
           <% end %>
         </td>
+        <td>
+          <%= check_box_tag :content, content_review&.status, content_review&.status.to_i == 1, class:"shixun-setting-form" ,title:"内容审核"%>
+          <%= check_box_tag :perference, perference_review&.status, perference_review&.status.to_i == 1, class:"shixun-setting-form" ,title:"性能审核"%>
+        </td>
         <td><%= shixun.challenges_count %></td>
         <td><%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %></td>