admins: shixun publish and subject publish feature

app/assets/javascripts/admins/shixun_authorizations/index.js

@@ -0,0 +1,18 @@
+$(document).on('turbolinks:load', function() {
+  if ($('body.admins-shixun-authorizations-index-page').length > 0) {
+    var $searchFrom = $('.shixun-authorization-list-form');
+
+    $searchFrom.on('click', '.search-form-tab', function(){
+      var $link = $(this);
+
+      $searchFrom.find('input[name="keyword"]').val('');
+      $searchFrom.find('select[name="status"]').val('processed');
+
+      if($link.data('value') === 'processed'){
+        $searchFrom.find('.status-filter').show();
+      } else {
+        $searchFrom.find('.status-filter').hide();
+      }
+    });
+  }
+})

app/assets/javascripts/admins/subject_authorizations/index.js

@@ -0,0 +1,18 @@
+$(document).on('turbolinks:load', function() {
+  if ($('body.admins-subject-authorizations-index-page').length > 0) {
+    var $searchFrom = $('.subject-authorization-list-form');
+
+    $searchFrom.on('click', '.search-form-tab', function(){
+      var $link = $(this);
+
+      $searchFrom.find('input[name="keyword"]').val('');
+      $searchFrom.find('select[name="status"]').val('processed');
+
+      if($link.data('value') === 'processed'){
+        $searchFrom.find('.status-filter').show();
+      } else {
+        $searchFrom.find('.status-filter').hide();
+      }
+    });
+  }
+})

app/assets/stylesheets/admins/shixun_authorizations.scss

@@ -0,0 +1,9 @@
+.admins-shixun-authorizations-index-page {
+  .shixun-authorization-list-container {
+    span {
+      &.apply-status-1 { color: #28a745; }
+      &.apply-status-2 { color: #dc3545; }
+      &.apply-status-3 { color: #6c757d; }
+    }
+  }
+}

app/assets/stylesheets/admins/subject_authorizations.scss

@@ -0,0 +1,9 @@
+.admins-subject-authorizations-index-page {
+  .subject-authorization-list-container {
+    span {
+      &.apply-status-1 { color: #28a745; }
+      &.apply-status-2 { color: #dc3545; }
+      &.apply-status-3 { color: #6c757d; }
+    }
+  }
+}

app/controllers/admins/shixun_authorizations_controller.rb

@@ -0,0 +1,48 @@
+class Admins::ShixunAuthorizationsController < Admins::BaseController
+  def index
+    params[:status] ||= 'pending'
+
+    applies = ApplyAction.where(container_type: 'ApplyShixun')
+
+    status =
+      case params[:status]
+      when 'pending'   then 0
+      when 'processed' then [1, 2]
+      when 'agreed'    then 1
+      when 'refused'   then 2
+      else 0
+      end
+    applies = applies.where(status: status) if status.present?
+
+    # 关键字模糊查询
+    keyword = params[:keyword].to_s.strip
+    if keyword.present?
+      applies = applies.joins('JOIN shixuns ON shixuns.id = apply_actions.container_id')
+                  .where('shixuns.name LIKE :keyword', keyword: "%#{keyword}%")
+    end
+
+    applies = applies.order(updated_at: :desc)
+
+    @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 }
+  end
+
+  def agree
+    Admins::ShixunAuths::AgreeApplyService.call(current_apply, current_user)
+    render_success_js
+  end
+
+  def refuse
+    Admins::ShixunAuths::RefuseApplyService.call(current_apply, current_user, params)
+
+    render_success_js
+  end
+
+  private
+
+  def current_apply
+    @_current_apply ||= ApplyAction.where(container_type: 'ApplyShixun').find(params[:id])
+  end
+end

app/controllers/admins/subject_authorizations_controller.rb

@@ -0,0 +1,49 @@
+class Admins::SubjectAuthorizationsController < Admins::BaseController
+  def index
+    params[:status] ||= 'pending'
+
+    applies = ApplyAction.where(container_type: 'ApplySubject')
+
+    status =
+      case params[:status]
+      when 'pending'   then 0
+      when 'processed' then [1, 2]
+      when 'agreed'    then 1
+      when 'refused'   then 2
+      else 0
+      end
+    applies = applies.where(status: status) if status.present?
+
+    # 关键字模糊查询
+    keyword = params[:keyword].to_s.strip
+    if keyword.present?
+      applies = applies.joins('JOIN subjects ON subjects.id = apply_actions.container_id')
+                  .where('subjects.name LIKE :keyword', keyword: "%#{keyword}%")
+    end
+
+    applies = applies.order(updated_at: :desc)
+
+    @applies = paginate applies.includes(user: :user_extension)
+
+    subject_ids = @applies.map(&:container_id)
+    @subject_map = Subject.where(id: subject_ids).each_with_object({}) { |s, h| h[s.id] = s }
+    @challenge_count_map = Challenge.joins(shixun: :stage_shixuns).where(st: 0, stage_shixuns: { subject_id: subject_ids}).group('subject_id').count
+  end
+
+  def agree
+    Admins::SubjectAuths::AgreeApplyService.call(current_apply, current_user)
+    render_success_js
+  end
+
+  def refuse
+    Admins::SubjectAuths::RefuseApplyService.call(current_apply, current_user, params)
+
+    render_success_js
+  end
+
+  private
+
+  def current_apply
+    @_current_apply ||= ApplyAction.where(container_type: 'ApplySubject').find(params[:id])
+  end
+end

app/controllers/concerns/admins/error_rescue_handler.rb

@@ -2,7 +2,7 @@ module Admins::ErrorRescueHandler
   extend ActiveSupport::Concern
 
   included do
-    rescue_from Exception, Educoder::TipException do |e|
+    rescue_from Exception do |e|
       raise e if Rails.env.development?
 
       Util.logger_error e

app/controllers/concerns/admins/render_helper.rb

@@ -28,7 +28,7 @@ module Admins::RenderHelper
   def internal_server_error
     respond_to do |format|
       format.html { render 'admins/shared/500' }
-      format.js { render_js_error(message) }
+      format.js { render_js_error('系统错误') }
       format.json { render status: 500, json: { message: '系统错误' } }
     end
   end

app/models/apply_action.rb

@@ -1,8 +1,16 @@
 # 申请消息
 class ApplyAction < ApplicationRecord
+  belongs_to :user
+
   has_many :tidings, :as => :container, :dependent => :destroy
   after_create :send_tiding
 
+  def status_text
+    I18n.t!("apply_action.status.#{status}")
+  rescue I18n::MissingTranslationData
+    nil
+  end
+
   def send_tiding
     if container_type == 'TrialAuthorization' && status == 1
       tidings.create(user_id: user_id, trigger_user_id: 0, status: 1, viewed: 0, tiding_type: 'System',

app/services/admins/shixun_auths/agree_apply_service.rb

@@ -0,0 +1,43 @@
+class Admins::ShixunAuths::AgreeApplyService < ApplicationService
+  attr_reader :apply, :user, :shixun
+
+  def initialize(apply, user)
+    @apply  = apply
+    @user   = user
+    @shixun = Shixun.find(apply.container_id)
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.update!(status: 1, dealer_id: user.id)
+      shixun.update!(status: 2, publish_time: Time.now)
+
+      # 奖励金币、经验
+      reward_grade_and_experience!
+
+      deal_tiding!
+    end
+  end
+
+  private
+
+  def reward_grade_and_experience!
+    score = shixun.all_score
+    shixun_creator = shixun.user
+
+    RewardGradeService.call(shixun_creator, container_id: shixun.id, container_type: 'shixunPublish', score: score)
+
+    Experience.create!(user_id: shixun_creator.id, container_id: shixun.id, container_type: 'shixunPublish', score: score)
+    shixun_creator.update_column(:experience, shixun_creator.experience.to_i + score)
+  end
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyAction',
+                   parent_container_id: apply.container_id, parent_container_type: apply.container_type,
+                   belong_container_id: apply.container_id, belong_container_type: 'Shixun',
+                   status: 1, tiding_type: 'System')
+  end
+end

app/services/admins/shixun_auths/refuse_apply_service.rb

@@ -0,0 +1,35 @@
+class Admins::ShixunAuths::RefuseApplyService < ApplicationService
+  attr_reader :apply, :user, :shixun, :params
+
+  def initialize(apply, user, params)
+    @apply  = apply
+    @user   = user
+    @shixun = Shixun.find(apply.container_id)
+    @params = params
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      shixun.update!(status: 0)
+      apply.update!(status: 2, reason: reason, dealer_id: user.id)
+
+      deal_tiding!
+    end
+  end
+
+  private
+
+  def reason
+    params[:reason].to_s.strip
+  end
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyAction',
+                   parent_container_id: apply.container_id, parent_container_type: apply.container_type,
+                   belong_container_id: apply.container_id, belong_container_type: 'Shixun',
+                   status: 2, tiding_type: 'System')
+  end
+end

app/services/admins/subject_auths/agree_apply_service.rb

@@ -0,0 +1,30 @@
+class Admins::SubjectAuths::AgreeApplyService < ApplicationService
+  attr_reader :apply, :user, :subject
+
+  def initialize(apply, user)
+    @apply   = apply
+    @user    = user
+    @subject = Subject.find(apply.container_id)
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.update!(status: 1, dealer_id: user.id)
+      subject.update!(status: 2, publish_time: Time.now)
+
+      deal_tiding!
+    end
+  end
+
+  private
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyAction',
+                   parent_container_id: apply.container_id, parent_container_type: apply.container_type,
+                   belong_container_id: apply.container_id, belong_container_type: 'Subject',
+                   status: 1, tiding_type: 'System')
+  end
+end

app/services/admins/subject_auths/refuse_apply_service.rb

@@ -0,0 +1,35 @@
+class Admins::SubjectAuths::RefuseApplyService < ApplicationService
+  attr_reader :apply, :user, :subject, :params
+
+  def initialize(apply, user, params)
+    @apply   = apply
+    @user    = user
+    @subject = Subject.find(apply.container_id)
+    @params  = params
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      subject.update!(status: 0)
+      apply.update!(status: 2, reason: reason, dealer_id: user.id)
+
+      deal_tiding!
+    end
+  end
+
+  private
+
+  def reason
+    params[:reason].to_s.strip
+  end
+
+  def deal_tiding!
+    apply.tidings.where(tiding_type: 'Apply', status: 0).update_all(status: 1)
+
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'ApplyAction',
+                   parent_container_id: apply.container_id, parent_container_type: apply.container_type,
+                   belong_container_id: apply.container_id, belong_container_type: 'Subject',
+                   status: 2, tiding_type: 'System')
+  end
+end

app/views/admins/shared/_sidebar.html.erb

@@ -41,6 +41,8 @@
       <%= sidebar_item_group('#apply-review-submenu', '审核', icon: 'gavel') do %>
         <li><%= sidebar_item(admins_identity_authentications_path, '实名认证', icon: 'id-card-o', controller: 'admins-identity_authentications') %></li>
         <li><%= sidebar_item(admins_professional_authentications_path, '职业认证', icon: 'drivers-license', controller: 'admins-professional_authentications') %></li>
+        <li><%= sidebar_item(admins_shixun_authorizations_path, '实训发布', icon: 'object-ungroup', controller: 'admins-shixun_authorizations') %></li>
+        <li><%= sidebar_item(admins_subject_authorizations_path, '实践课程发布', icon: 'object-group', controller: 'admins-subject_authorizations') %></li>
       <% end %>
     </li>
 

app/views/admins/shared/error.js.erb

@@ -4,4 +4,7 @@ setTimeout(function() {
   if ($('.admin-alert-container button.close').length > 0) {
     $('.admin-alert-container button.close').trigger('click');
   }
-}, 2000)
+}, 5000)
+$(".admin-body-container").animate({
+  scrollTop: 0
+}, 200);

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

@@ -0,0 +1,32 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('实训发布') %>
+<% end %>
+
+<div class="box search-form-container flex-column mb-0 pb-0 shixun-authorization-list-form">
+  <ul class="nav nav-tabs w-100 search-form-tabs">
+    <li class="nav-item">
+      <%= link_to '待审批', admins_shixun_authorizations_path(status: :pending), remote: true, 'data-value': 'pending',
+                  class: "nav-link search-form-tab #{params[:status] == 'pending' ? 'active' : ''}" %>
+    </li>
+    <li class="nav-item">
+      <%= link_to '已审批', admins_shixun_authorizations_path(status: :processed), remote: true, 'data-value': 'processed',
+                  class: "nav-link search-form-tab #{params[:status] != 'pending' ? 'active' : ''}" %>
+    </li>
+  </ul>
+
+  <%= form_tag(admins_shixun_authorizations_path(unsafe_params), method: :get, class: 'form-inline search-form justify-content-end mt-3', remote: true) do %>
+    <div class="form-group status-filter" style="<%= params[:status] != 'pending' ? '' : 'display: none;' %>">
+      <label for="status">审核状态：</label>
+      <% status_options = [['全部', 'processed'], ['已同意', 'agreed'], ['已拒绝', 'refused']] %>
+      <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
+    </div>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '实训名称检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
+  <% end %>
+</div>
+
+<div class="box shixun-authorization-list-container">
+  <%= render(partial: 'admins/shixun_authorizations/shared/list', locals: { applies: @applies, shixun_map: @shixun_map }) %>
+</div>
+
+<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>

app/views/admins/shixun_authorizations/index.js.erb

@@ -0,0 +1 @@
+$('.shixun-authorization-list-container').html("<%= j( render partial: 'admins/shixun_authorizations/shared/list', locals: { applies: @applies, shixun_map: @shixun_map } ) %>");

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

@@ -0,0 +1,60 @@
+<% is_processed = params[:status].to_s != 'pending' %>
+
+<table class="table table-hover text-center shixun-authorization-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="8%">头像</th>
+    <th width="14%">创建者</th>
+    <th width="28%" class="text-left">实训名称</th>
+    <th width="12%">任务数</th>
+    <th width="16%">时间</th>
+    <% if is_processed %>
+      <th width="14%">拒绝原因</th>
+      <th width="8%">状态</th>
+    <% else %>
+      <th width="22%">操作</th>
+    <% end %>
+  </tr>
+  </thead>
+  <tbody>
+  <% if applies.present? %>
+    <% applies.each do |apply| %>
+      <% user = apply.user %>
+      <% shixun = shixun_map[apply.container_id] %>
+      <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 %>
+            <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
+          <% end %>
+        </td>
+        <td><%= user.real_name %></td>
+        <td class="text-left">
+          <%= link_to "/shixuns/#{shixun.identifier}", target: '_blank' do %>
+            <%= overflow_hidden_span shixun.name, width: 300 %>
+          <% end %>
+        </td>
+        <td><%= shixun.challenges_count %></td>
+        <td><%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %></td>
+
+        <% if is_processed %>
+          <td class="text-secondary"><%= overflow_hidden_span apply.reason, width: 140 %></td>
+          <td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
+        <% else %>
+          <td class="action-container">
+            <%= agree_link '同意', agree_admins_shixun_authorization_path(apply, element: ".shixun-authorization-#{apply.id}"), 'data-confirm': '确认审核通过？' %>
+            <%= javascript_void_link('拒绝', class: 'action refuse-action',
+                                     data: {
+                                         toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id,
+                                         url: refuse_admins_shixun_authorization_path(apply, element: ".shixun-authorization-#{apply.id}")
+                                     }) %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>

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

@@ -0,0 +1,33 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('实践课程发布') %>
+<% end %>
+
+<div class="box search-form-container flex-column mb-0 pb-0 subject-authorization-list-form">
+  <ul class="nav nav-tabs w-100 search-form-tabs">
+    <li class="nav-item">
+      <%= link_to '待审批', admins_subject_authorizations_path(status: :pending), remote: true, 'data-value': 'pending',
+                  class: "nav-link search-form-tab #{params[:status] == 'pending' ? 'active' : ''}" %>
+    </li>
+    <li class="nav-item">
+      <%= link_to '已审批', admins_subject_authorizations_path(status: :processed), remote: true, 'data-value': 'processed',
+                  class: "nav-link search-form-tab #{params[:status] != 'pending' ? 'active' : ''}" %>
+    </li>
+  </ul>
+
+  <%= form_tag(admins_subject_authorizations_path(unsafe_params), method: :get, class: 'form-inline search-form justify-content-end mt-3', remote: true) do %>
+    <div class="form-group status-filter" style="<%= params[:status] != 'pending' ? '' : 'display: none;' %>">
+      <label for="status">审核状态：</label>
+      <% status_options = [['全部', 'processed'], ['已同意', 'agreed'], ['已拒绝', 'refused']] %>
+      <%= select_tag(:status, options_for_select(status_options), class: 'form-control') %>
+    </div>
+    <%= text_field_tag(:keyword, params[:keyword], class: 'form-control col-sm-2 ml-3', placeholder: '实训课程名称检索') %>
+    <%= submit_tag('搜索', class: 'btn btn-primary ml-3') %>
+  <% end %>
+</div>
+
+<div class="box subject-authorization-list-container">
+  <%= render(partial: 'admins/subject_authorizations/shared/list',
+             locals: { applies: @applies, subject_map: @subject_map, challenge_count_map: @challenge_count_map }) %>
+</div>
+
+<%= render(partial: 'admins/shared/admin_common_refuse_modal') %>

app/views/admins/subject_authorizations/index.js.erb

@@ -0,0 +1 @@
+$('.subject-authorization-list-container').html("<%= j( render partial: 'admins/subject_authorizations/shared/list', locals: { applies: @applies, subject_map: @subject_map, challenge_count_map: @challenge_count_map } ) %>");

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

@@ -0,0 +1,64 @@
+<% is_processed = params[:status].to_s != 'pending' %>
+
+<table class="table table-hover text-center subject-authorization-list-table">
+  <thead class="thead-light">
+  <tr>
+    <th width="8%">头像</th>
+    <th width="10%">创建者</th>
+    <th width="28%" class="text-left">实践课程名称</th>
+    <th width="6%">阶段数</th>
+    <th width="6%">实训数</th>
+    <th width="6%">关卡数</th>
+    <th width="14%">时间</th>
+    <% if is_processed %>
+      <th width="14%">拒绝原因</th>
+      <th width="8%">状态</th>
+    <% else %>
+      <th width="22%">操作</th>
+    <% end %>
+  </tr>
+  </thead>
+  <tbody>
+  <% if applies.present? %>
+    <% applies.each do |apply| %>
+      <% user = apply.user %>
+      <% subject = subject_map[apply.container_id] %>
+      <tr class="subject-authorization-item subject-authorization-<%= apply.id %>">
+        <td>
+          <%= link_to "/users/#{user.login}", class: 'subject-authorization-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
+            <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
+          <% end %>
+        </td>
+        <td><%= user.real_name %></td>
+        <td class="text-left">
+          <%= link_to "/paths/#{subject.id}", target: '_blank' do %>
+            <%= overflow_hidden_span subject.name, width: 300 %>
+          <% end %>
+        </td>
+        <td><%= subject.stages_count %></td>
+        <td><%= subject.shixuns_count %></td>
+        <td><%= challenge_count_map.fetch(subject.id, 0) %></td>
+        <td><%= apply.updated_at.strftime('%Y-%m-%d %H:%M') %></td>
+
+        <% if is_processed %>
+          <td class="text-secondary"><%= overflow_hidden_span apply.reason, width: 140 %></td>
+          <td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
+        <% else %>
+          <td class="action-container">
+            <%= agree_link '同意', agree_admins_subject_authorization_path(apply, element: ".subject-authorization-#{apply.id}"), 'data-confirm': '确认审核通过？' %>
+            <%= javascript_void_link('拒绝', class: 'action refuse-action',
+                                     data: {
+                                         toggle: 'modal', target: '.admin-common-refuse-modal', id: apply.id,
+                                         url: refuse_admins_subject_authorization_path(apply, element: ".subject-authorization-#{apply.id}")
+                                     }) %>
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  <% else %>
+    <%= render 'admins/shared/no_data_for_table' %>
+  <% end %>
+  </tbody>
+</table>
+
+<%= render partial: 'admins/shared/paginate', locals: { objects: applies } %>

config/locales/apply_actions/zh-CN.yml

@@ -0,0 +1,7 @@
+zh-CN:
+  apply_action:
+    status:
+      '0': '待处理'
+      '1': '已同意'
+      '2': '已拒绝'
+      '3': '已撤销'

config/routes.rb

@@ -774,6 +774,18 @@ Rails.application.routes.draw do
         post :refuse
       end
     end
+    resources :shixun_authorizations, only: [:index] do
+      member do
+        post :agree
+        post :refuse
+      end
+    end
+    resources :subject_authorizations, only: [:index] do
+      member do
+        post :agree
+        post :refuse
+      end
+    end
   end
 
   #git 认证回调