实训发布优化2.0、超管页面调整

app/controllers/shixuns_controller.rb

@@ -215,7 +215,8 @@ class ShixunsController < ApplicationController
 				if @shixun.shixun_info.present?
 					ShixunInfo.create!(shixun_id: @new_shixun.id,
 														 description: @shixun.description,
-														 evaluate_script: @shixun.evaluate_script)
+														 evaluate_script: @shixun.evaluate_script,
+														 shixun_reason: params[:reason].to_s.strip)
 				end
 
 				# 同步私密版本库

app/helpers/application_helper.rb

@@ -64,7 +64,7 @@ module ApplicationHelper
 
     shixun_id = shixun_id.blank? ? -1 : shixun_id.join(",")
     Shixun.select([:id, :name, :user_id, :challenges_count, :myshixuns_count, :trainee, :identifier]).where("id
-                   in(#{shixun_id})").unhidden.order("homepage_show asc, myshixuns_count desc").limit(3)
+                   in(#{shixun_id})").unhidden.publiced.order("homepage_show asc, myshixuns_count desc").limit(3)
 
   end
 

app/models/shixun.rb

@@ -103,6 +103,19 @@ class Shixun < ApplicationRecord
     shixun_info.try(:evaluate_script)
   end
 
+  def fork_reason
+    case shixun_info.try(:fork_reason)
+    when 'Shixun'
+      '实训内容升级'
+    when 'Course'
+      '课堂教学使用'
+    when 'Subject'
+      '实践课程使用'
+    else
+      shixun_info.try(:fork_reason)
+    end
+  end
+
   def fork_identifier
     self.fork_from.nil? ? "--" : fork_shixuns.first&.identifier
   end

app/queries/admins/shixun_query.rb

@@ -33,6 +33,16 @@ class Admins::ShixunQuery < ApplicationQuery
     all_shixuns = all_shixuns.where(status: status) if status.present?
     all_shixuns = all_shixuns.where(public: public) if public.present?
 
+    if params[:fork_status].present?
+      all_shixuns = all_shixuns.where.not(fork_from: nil)
+      case params[:fork_status]
+      when 'Shixun', 'Course', 'Subject'
+        all_shixuns = all_shixuns.joins(:shixun_info).where(shixun_infos: {fork_reason: params[:fork_status]})
+      when 'Other'
+        all_shixuns = all_shixuns.joins(:shixun_info).where("fork_reason is null or fork_reason not in ('Shixun', 'Course', 'Subject')")
+      end
+    end
+
     if params[:tag].present?
       all_shixuns = all_shixuns.joins(:mirror_repositories).where("mirror_repositories.id = ?",params[:tag].to_i)
     end

app/services/shixun_search_service.rb

@@ -49,12 +49,16 @@ class ShixunSearchService < ApplicationService
       includes: [ :shixun_info, :challenges, :subjects, user: { user_extension: :school } ]
     }
     model_options.merge!(where: { id: @shixuns.pluck(:id) })
-    model_options.merge!(order: {"myshixuns_count" => sort_str})
+    model_options.merge!(order: {sort_str => order_str})
     model_options.merge!(default_options)
     model_options
   end
 
-  def sort_str
+  def order_str
     params[:order] || "desc"
   end
+
+  def sort_str
+    params[:sort] || "myshixuns_count"
+  end
 end

app/services/users/shixun_service.rb

@@ -65,13 +65,18 @@ class Users::ShixunService
   end
 
   def manage_shixun_status_filter(relations)
-    status = case params[:status]
-             when 'editing'   then 0
-             when 'applying'  then 1
-             when 'published' then 2
-             when 'closed'    then 3
-             end
-    relations = relations.where(status: status) if status
+    if params[:status] == "publiced"
+      relations = relations.where(public: 2)
+    elsif params[:status] == "applying"
+      relations = relations.where(public: 1)
+    else
+      status = case params[:status]
+               when 'editing'   then 0
+               when 'published' then 2
+               when 'closed'    then 3
+               end
+      relations = relations.where(status: status) if status
+    end
     relations
   end
 

app/views/admins/shixuns/index.html.erb

@@ -4,33 +4,48 @@
 
 <div class="box search-form-container shixuns-list-form">
   <%= form_tag(admins_shixuns_path, method: :get, class: 'form-inline search-form',id:"shixuns-search-form",remote:true) do %>
-    <div class="form-group">
-      <label for="status">状态：</label>
-      <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %>
-      <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
-    </div>
+    <div class="d-flex flex-column w-100">
+      <div class="d-flex position-r">
+        <div class="form-group">
+          <label for="status">状态：</label>
+          <% status_options = [['全部', ''], ["编辑中(#{@editing_shixuns})", "editing"], ["待审核(#{@pending_shixuns})", 'pending'], ["已发布(#{@processed_shixuns})", 'processed'],["已关闭(#{@closed_shixuns})",'closed']] %>
+          <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
+        </div>
 
-    <div class="form-group">
-      <label for="status">公开：</label>
-      <% public_options = [['全部', ''], ["未公开(#{@none_public_shixuns})", "editing"], ["待审核(#{@pending_public_shixuns})", 'pending'], ["已公开(#{@processed_pubic_shixuns})", 'processed']] %>
-      <%= select_tag(:public, options_for_select(public_options), class: 'form-control') %>
-    </div>
+        <div class="form-group mr-2">
+          <label for="status">公开：</label>
+          <% public_options = [['全部', ''], ["未公开(#{@none_public_shixuns})", "editing"], ["待审核(#{@pending_public_shixuns})", 'pending'], ["已公开(#{@processed_pubic_shixuns})", 'processed']] %>
+          <%= select_tag(:public, options_for_select(public_options), class: 'form-control') %>
+        </div>
 
-    <div class="form-group mr-2">
-      <label for="tag-choosed">技术平台：</label>
-      <%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"tag-choosed") %>
-    </div>
+        <div class="form-group mr-2">
+          <label for="tag-choosed">技术平台：</label>
+          <%= select_tag(:tag, options_for_select(@shixuns_type_check.unshift(["",nil])), class: 'form-control',id:"tag-choosed") %>
+        </div>
+
+        <div class="form-group mr-2">
+          <label>搜索类型：</label>
+          <% auto_trial_options = [['创建者姓名', 0], ['实训名称', 1], ['学校名称', 2]] %>
+          <%= select_tag(:search_type, options_for_select(auto_trial_options), class: 'form-control') %>
+        </div>
+        <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '输入关键字搜索') %>
+        <div class="">
+          <a href="javascript:void(0)" class="btn btn-primary" id="shixuns-export" data-disable-with = '导出中...'>导出</a>
+        </div>
+      </div>
+
+      <div class="d-flex mt-3">
+        <div class="form-group">
+          <label for="status">fork原因：</label>
+          <% fork_status_options = [['全部', ''], ["全部fork实训", "Fork"], ["实训内容升级", 'Shixun'], ["课堂教学使用", 'Course'],["实践课程使用",'Subject'],["其他原因",'Other']] %>
+          <%= select_tag(:fork_status, options_for_select(fork_status_options), class: 'form-control') %>
+        </div>
 
-    <div class="form-group">
-      <label>搜索类型：</label>
-      <% auto_trial_options = [['创建者姓名', 0], ['实训名称', 1], ['学校名称', 2]] %>
-      <%= select_tag(:search_type, options_for_select(auto_trial_options), class: 'form-control') %>
+        <%= submit_tag('搜索', class: 'btn btn-primary ml-3','data-disable-with': '搜索中...') %>
+        <%= link_to "清除", admins_shixuns_path,class: "btn btn-default",id:"shixuns-clear-search",'data-disable-with': '清除中...' %>
+      </div>
     </div>
-    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2', placeholder: '输入关键字搜索') %>
-    <%= submit_tag('搜索', class: 'btn btn-primary','data-disable-with': '搜索中...') %>
-    <%= link_to "清除", admins_shixuns_path,class: "btn btn-default",id:"shixuns-clear-search",'data-disable-with': '清除中...' %>
 <% end %>
-  <a href="javascript:void(0)" class="btn btn-primary" id="shixuns-export" data-disable-with = '导出中...'>导出</a>
 </div>
 
 <div class="box admin-list-container shixuns-list-container">

app/views/admins/shixuns/shared/_list.html.erb

@@ -2,17 +2,18 @@
   <thead class="thead-light">
   <th width="4%">序号</th>
   <th width="8%">ID</th>
-  <th width="24%" class="text-left">实训名称</th>
+  <th width="22%" class="text-left">实训名称</th>
   <th width="8%">技术平台</th>
   <th width="5%">Fork源</th>
+  <th width="10%">Fork原因</th>
   <th width="5%">实践</th>
-  <th width="5%">选择</th>
+  <th width="4%">选择</th>
   <th width="6%">状态</th>
   <th width="6%">公开</th>
-  <th width="7%">创建者</th>
-  <th width="11%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %></th>
-  <th width="5%">单测</th>
-  <th width="6%">操作</th>
+  <th width="6%">创建者</th>
+  <th width="8%"><%= sort_tag('创建于', name: 'created_at', path: admins_shixuns_path) %></th>
+  <th width="4%">单测</th>
+  <th width="4%">操作</th>
   </thead>
   <tbody>
   <% if shixuns.present? %>
@@ -31,6 +32,7 @@
             <%= link_to shixun.try(:identifier), shixun_path(shixun.try(:identifier)), target: '_blank'%>
           <% end%>
         </td>
+        <td><%= overflow_hidden_span(shixun&.fork_reason) %></td>
         <td><%= shixun.challenges.where(:st => 0).size %></td>
         <td><%= shixun.challenges.where(:st => 1).size %></td>
         <td class="shixuns-status-<%= shixun.status %>"><%= shixun_authentication_status shixun %></td>

db/migrate/20191219060435_add_fork_reason_to_shixun_info.rb

@@ -0,0 +1,5 @@
+class AddForkReasonToShixunInfo < ActiveRecord::Migration[5.2]
+  def change
+    add_column :shixun_infos, :fork_reason, :string
+  end
+end