From 5745ff8c28a2bf46ae4ece12669665cdb241696c Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 25 Nov 2019 20:36:38 +0800
Subject: [PATCH] 1

---
 .../shixun_feedback_messages_controller.rb    |  4 ++-
 .../hack_user_lastest_codes_controller.rb     |  2 +-
 .../shixun_feedback_messages/index.html.erb   |  4 +--
 .../shixun_feedback_messages/index.js.erb     |  1 +
 .../shared/_list.html.erb                     | 28 +++++++++++--------
 .../result.json.jbuilder                      | 13 ++++++---
 app/views/hacks/edit.json.jbuilder            |  2 +-
 7 files changed, 33 insertions(+), 21 deletions(-)
 create mode 100644 app/views/admins/shixun_feedback_messages/index.js.erb

diff --git a/app/controllers/admins/shixun_feedback_messages_controller.rb b/app/controllers/admins/shixun_feedback_messages_controller.rb
index c7e6a9586..27c3f4225 100644
--- a/app/controllers/admins/shixun_feedback_messages_controller.rb
+++ b/app/controllers/admins/shixun_feedback_messages_controller.rb
@@ -1,6 +1,8 @@
 class Admins::ShixunFeedbackMessagesController < Admins::BaseController
 
   def index
-
+    default_sort('created_at', 'desc')
+    @params_page = params[:page] || 1
+    @discusses = paginate Discuss.where(:dis_type => 'Shixun').preload(:user)
   end
 end
\ No newline at end of file
diff --git a/app/controllers/hack_user_lastest_codes_controller.rb b/app/controllers/hack_user_lastest_codes_controller.rb
index a4b41a162..2d749ce75 100644
--- a/app/controllers/hack_user_lastest_codes_controller.rb
+++ b/app/controllers/hack_user_lastest_codes_controller.rb
@@ -35,7 +35,7 @@ class HackUserLastestCodesController < ApplicationController
   # 提交结果显示
   def result
     if @my_hack.submit_status == 1
-      render json: {status:0, message: "正在评测中"}
+      render json: {status: 1, message: "正在评测中"}
     else
       @mode = params[:mode]
       @result =
diff --git a/app/views/admins/shixun_feedback_messages/index.html.erb b/app/views/admins/shixun_feedback_messages/index.html.erb
index 02e696cd3..730729646 100644
--- a/app/views/admins/shixun_feedback_messages/index.html.erb
+++ b/app/views/admins/shixun_feedback_messages/index.html.erb
@@ -9,6 +9,6 @@
   <% end %>
 </div>
 
-<div class="box admin-list-container">
-  <%= render(partial: 'admins/shixun_feedback_messages/shared/list', locals: {}) %>
+<div class="box admin-list-container shixun_feedback_messages-list-container">
+  <%= render(partial: 'admins/shixun_feedback_messages/shared/list', locals: {discusses: @discusses}) %>
 </div>
\ No newline at end of file
diff --git a/app/views/admins/shixun_feedback_messages/index.js.erb b/app/views/admins/shixun_feedback_messages/index.js.erb
new file mode 100644
index 000000000..38c393589
--- /dev/null
+++ b/app/views/admins/shixun_feedback_messages/index.js.erb
@@ -0,0 +1 @@
+$(".shixun_feedback_messages-list-container").html("<%= j render partial: "admins/shixun_feedback_messages/shared/list", locals: {shixun_settings:@discusses} %>")
\ No newline at end of file
diff --git a/app/views/admins/shixun_feedback_messages/shared/_list.html.erb b/app/views/admins/shixun_feedback_messages/shared/_list.html.erb
index 65b9e0035..370ac9df2 100644
--- a/app/views/admins/shixun_feedback_messages/shared/_list.html.erb
+++ b/app/views/admins/shixun_feedback_messages/shared/_list.html.erb
@@ -1,24 +1,28 @@
 <table class="table table-hover text-center">
   <thead class="thead-light">
   <tr>
-    <th width="6%">ID</th>
-    <th width="10%">标识</th>
-    <th width="22%" class="text-left">实训名称</th>
-    <th width="10%">实训老师</th>
-    <th width="6%">完成</th>
-    <th width="6%">经验值</th>
-    <th width="10%">学员姓名</th>
-    <th width="16%" class="text-left">学员单位</th>
-    <th width="14%">11</th>
+    <th width="5%">序号</th>
+    <th width="25%" class="text-left">实训名称</th>
+    <th width="50%" class="text-left">评论内容</th>
+    <th width="10%">评论者</th>
+    <th width="10%">评论时间</th>
   </tr>
   </thead>
   <tbody>
-  <% if true %>
-
+  <% if discusses.present? %>
+    <% discusses.each_with_index do |discuss, index| %>
+      <tr>
+        <td><%= (@params_page.to_i - 1) * 20 + index + 1 %></td>
+        <td class="text-left"><%= discuss.dis.name %></td>
+        <td class="text-left"><%= content_safe discuss.content %></td>
+        <td><%= discuss.user.show_real_name %></td>
+        <td><%= format_time discuss.created_at %></td>
+      </tr>
+    <% end %>
   <% else %>
     <%= render 'admins/shared/no_data_for_table' %>
   <% end %>
   </tbody>
 </table>
 
-<%#= render partial: 'admins/shared/paginate', locals: { objects: myshixuns } %>
\ No newline at end of file
+<%= render partial: 'admins/shared/paginate', locals: { objects: discusses } %>
\ No newline at end of file
diff --git a/app/views/hack_user_lastest_codes/result.json.jbuilder b/app/views/hack_user_lastest_codes/result.json.jbuilder
index 31164d4f7..2561d4ecd 100644
--- a/app/views/hack_user_lastest_codes/result.json.jbuilder
+++ b/app/views/hack_user_lastest_codes/result.json.jbuilder
@@ -1,7 +1,12 @@
-json.(@result, :id, :status, :error_line, :error_msg,
-    :input, :output, :execute_time, :execute_memory)
+json.status 0
+json.message "评测成功"
+json.data do
+  json.(@result, :id, :status, :error_line, :error_msg,
+      :input, :output, :execute_time, :execute_memory)
 # 提交模式多了一个预计输出
-if @mode == "submit"
-  json.expected_output @result.expected_output
+  if @mode == "submit"
+    json.expected_output @result.expected_output
+  end
 end
 
+
diff --git a/app/views/hacks/edit.json.jbuilder b/app/views/hacks/edit.json.jbuilder
index efbf424b6..24d51385b 100644
--- a/app/views/hacks/edit.json.jbuilder
+++ b/app/views/hacks/edit.json.jbuilder
@@ -1,5 +1,5 @@
 # 编程内容
-json.(@hack, :name, :description, :language, :difficult, :category, :time_limit)
+json.(@hack, :name, :description, :language, :difficult, :category, :time_limit, :open_or_not)
 
 # 代码
 json.language @hack.language