Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_Ysl

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/controllers/games_controller.rb

@@ -13,8 +13,8 @@ class GamesController < ApplicationController
   def show
     uid_logger("--games show start")
     # 防止评测中途ajaxE被取消;3改成0是为了处理首次进入下一关的问题
-    @game.update_attribute(:status, 0) if @game.status == 1
-    @game.update_attributes(status: 0, open_time: Time.now) if @game.status == 3
+    update_game_parameter(@game)
+
     game_challenge = Challenge.base_attrs.find(@game.challenge_id)
 
     # 选择题类型的实训关卡总分
@@ -964,4 +964,13 @@ class GamesController < ApplicationController
       nil
     end
   end
+
+  # 更新关卡状态和一些学习进度
+  def update_game_parameter game
+    game.update_attribute(:status, 0) if game.status == 1
+    game.update_attributes(status: 0, open_time: Time.now) if game.status == 3
+    # 开启实训更新myshixuns的时间，方便跟踪用于的学习进度。
+    game.myshixun.update_column(:update_at, Time.now)
+  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 认证回调

public/react/config/webpack.config.dev.js

@@ -31,6 +31,7 @@ module.exports = {
   // See the discussion in https://github.com/facebookincubator/create-react-app/issues/343.s
 	// devtool: "cheap-module-eval-source-map",
   // 开启调试
+  devtool: "source-map",  // 开启调试
   // These are the "entry points" to our application.
   // This means they will be the "root" imports that are included in JS bundle.
   // The first two entry points enable "hot" CSS and auto-refreshes for JS.

public/react/scripts/build.js

@@ -195,7 +195,30 @@ function generateNewIndexJsp() {
     let cdnHost = 'https://shixun.educoder.net'
     cdnHost = 'https://ali-cdn.educoder.net'
     cdnHost = ''
-    var result = data.replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
+    
+
+    var mainRegex = /<script type="text\/javascript" src="\/react\/build\/.\/static\/js\/main.([a-zA-Z0-9]{8,}).js"><\/script>/
+    var matchResult = data.match(mainRegex)
+    var code = `
+      <script>
+         (function() {
+            var _host = '/react/build/'
+            /*
+            if (window.location.host == 'pre-newweb.educoder.net') {
+                _host = 'https://testali-cdn.educoder.net/react/build/'
+            } else if (window.location.host == 'www.educoder.net') {
+                _host = 'https://ali-newweb.educoder.net/react/build/'
+            }*/
+            document.write('<script type="text/javascript" src="' + _host + 'js/js_min_all.js"><\\/script>');
+            document.write('<script type="text/javascript" src="' + _host + 'static/js/main.${matchResult[1]}.js"><\\/script>');
+         })()
+      </script>
+    `
+    var jsMinAllRegex = /<script type="text\/javascript" src="\/js\/js_min_all.js"><\/script>/
+    // <script type="text/javascript" src="/js/js_min_all.js"></script>
+    var result = data
+        .replace(jsMinAllRegex, code)
+        // .replace('/js/js_min_all.js', `${cdnHost}/react/build/js/js_min_all.js?v=${newVersion}`)
         // .replace('/js/js_min_all_2.js', `${cdnHost}/react/build/js/js_min_all_2.js?v=${newVersion}`)
 
         // ${cdnHost}  加了cdn后，这个文件里的字体文件加载会有跨域的报错   ../fonts/fontawesome-webfont.eot
@@ -204,10 +227,11 @@ function generateNewIndexJsp() {
 			  .replace('/css/iconfont.css', `${cdnHost}/react/build/css/iconfont.css?v=${newVersion}`)
         .replace(/\/js\/create_kindeditor.js/g, `${cdnHost}/react/build/js/create_kindeditor.js?v=${newVersion}`)
 
+        .replace(mainRegex, '')
         // .replace('/react/build/./static/css/main', `${cdnHost}/react/build/./static/css/main`)
         // .replace('/react/build/./static/js/main', `${cdnHost}/react/build/./static/js/main`)
        
-        .replace(/https:\/\/testeduplus2.educoder.net/g, '');
+        // .replace(/https:\/\/testeduplus2.educoder.net/g, '');
         // .replace(/http:\/\/testbdweb.educoder.net/g, '');
 
         // .replace('/css/css_min_all.css', '/react/build/css/css_min_all.css');

public/react/src/App.css

@@ -55,6 +55,10 @@ html, body {
 .markdown-body p {
   white-space: pre-wrap;
 }
+/* https://www.educoder.net/courses/2346/group_homeworks/34405/question */
+.renderAsHtml.markdown-body p {
+  white-space: inherit;
+}
 /* resize */
 .editormd .CodeMirror {
   border-right: none !important;

public/react/src/App.js

@@ -1,4 +1,5 @@
 import React, {Component} from 'react';
+import './public-path';
 import logo from './logo.svg';
 import './App.css';
 import {LocaleProvider} from 'antd'

public/react/src/common/TextUtil.js

@@ -9,6 +9,7 @@ export function markdownToHTML(oldContent, selector) {
     window.$('#md_div').html('')
     // markdown to html
     if (selector && oldContent && oldContent.startsWith('<p')) {  // 普通html处理
+        window.$('#' + selector).addClass('renderAsHtml')
         window.$('#' + selector).html(oldContent)
     } else {
         try {    

public/react/src/common/components/attachment/AttachmentList.js

@@ -1,4 +1,5 @@
 import React,{ Component } from "react";
+import { ConditionToolTip } from 'educoder'
 
 class AttachmentsList extends Component{
   constructor(props){
@@ -12,14 +13,18 @@ class AttachmentsList extends Component{
           attachments.map((item,key)=>{
             return(
               <p key={key}>
-                <a className="color-grey">
+                <a className="color-grey fl">
                   <i className="font-14 color-green iconfont icon-fujian mr8"></i>
                 </a>
                 {
                   item.is_pdf && item.is_pdf == true ?
-                  <a href={item.url} className="mr12" length="58" target="_blank">{item.title}</a>
+                  <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
+                    <a href={item.url} className="mr12 fl task-hide" length="58" target="_blank"  style={{"maxWidth":"432px"}}>{item.title}</a>
+                  </ConditionToolTip>
                   :
-                  <a href={item.url} className="mr12" length="58">{item.title}</a>
+                  <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
+                    <a href={item.url} className="mr12 fl task-hide" length="58"  style={{"maxWidth":"432px"}}>{item.title}</a>
+                  </ConditionToolTip>
                 }
                 <span className="color-grey mt2 color-grey-6 font-12">{item.filesize}</span>
               </p>

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -131,10 +131,14 @@ class Fileslistitem extends Component{
 			});
   }
   
+  eventStop = (event) =>{
+    event.stopPropagation()
+  }
+
 	render(){
 
         const { checkBox,
-            discussMessage,
+            discussMessage,index
         } = this.props;
 
         return(
@@ -190,9 +194,9 @@ class Fileslistitem extends Component{
                 white-space:nowrap
             }
           `}</style>
-                <div className="clearfix ds pr contentSection">
-                    <h6>
-		        	<span className="fl mr12 mt3">
+                <div className="clearfix ds pr contentSection" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.sourceitem${index} input`).click() }>
+                    <h6 onClick={(event)=>this.eventStop(event)}>
+		        	<span className={`sourceitem${index} fl mr12 mt3`}>
 								{checkBox}
 							</span>
 											{
@@ -283,8 +287,7 @@ class Fileslistitem extends Component{
                         </span>
                       </span>
 											{this.props.isAdmin?
-												<span className={"fr mrf2 mr10"}>
-
+												<span className={"fr mrf2 mr10"} onClick={(event)=>this.eventStop(event)}>
                       <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
                           <a className="btn colorblue"
                             onClick={()=>this.settingList()}>设置</a>
@@ -292,7 +295,7 @@ class Fileslistitem extends Component{
                       </span>:""}
 
 											{this.props.isStudent===true&&this.props.current_user.login===discussMessage.author.login?
-												<span className={"fr mrf2 mr10"}>
+												<span className={"fr mrf2 mr10"} onClick={(event)=>this.eventStop(event)}>
 
                       <WordsBtn style="blue" className="colorblue font-16 mr20 fr">
                         <a className="btn colorblue"

public/react/src/modules/courses/Resource/index.js

@@ -10,6 +10,8 @@ import Selectsetting from "../coursesPublic/SelectSetting";
 import HomeworkModal from "../coursesPublic/HomeworkModal";
 import Fileslistitem from './Fileslistitem';
 import Titlesearchsection from '../common/titleSearch/TitleSearchSection';
+import NoneData from "../coursesPublic/NoneData";
+import _ from 'lodash'
 import './style.css';
 import '../css/members.css';
 import moment from 'moment';
@@ -474,7 +476,16 @@ class Fileslists extends Component{
 
   }
 
-
+	onItemClick = (item) => {
+		const checkBoxValues = this.state.checkBoxValues.slice(0);
+		const index = checkBoxValues.indexOf(item.id);
+		if (index != -1) {
+			_.remove(checkBoxValues, (listItem)=> listItem === item.id)
+		} else {
+			checkBoxValues.push(item.id);
+		}
+		this.onCheckBoxChange(checkBoxValues)
+	}
   PaginationTask=(page)=>{
 
     let {search,order,selectpage,checkAllValue,checkBoxValues}=this.state;
@@ -787,7 +798,7 @@ class Fileslists extends Component{
                 showSearchInput={true}
             ></Titlesearchsection>
 
-						{this.props.isAdmin()? <div className="mt20 edu-back-white padding20-30" style={{display:this.props.isAdmin()||this.props.isStudent()?"":"none"}}>
+						{this.props.isAdmin()? files===undefined?'' :files.length===0? "":<div className="mt20 edu-back-white padding20-30" style={{display:this.props.isAdmin()||this.props.isStudent()?"":"none"}}>
               <div className="clearfix">
                 {this.props.isAdmin()? <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>:""}
                 <div className="studentList_operation_ul">
@@ -897,7 +908,7 @@ class Fileslists extends Component{
                 { files&&files.map((item, index) => {
 
                   return (
-                      <div className="mt20 edu-back-white padding02010" key={index}>
+                      <div className="mt20 edu-back-white padding02010" key={index} onClick={()=>this.onItemClick(item)}>
                         <div className="clearfix">
                           <div key={index}>
                             <Fileslistitem
@@ -910,6 +921,7 @@ class Fileslists extends Component{
                                 Settingtypes={(id)=>this.Settingtypes(id)}
                                 coursesId={this.props.match.params.coursesId}
                                 updatafiledfun={()=>this.updatafiled()}
+                                index={index}
                             ></Fileslistitem>
                           </div>
                         </div>
@@ -948,21 +960,23 @@ class Fileslists extends Component{
               />:""}
             </div>
 
-            <div className="alltask edu-back-white"
-                 style={
 					{
-                     display: files===undefined?'none' :files.length===0? 'block' : 'none'
-                   }
+						files===undefined?'' :files.length===0?<NoneData></NoneData>:""
 					}
-            >
-              <div className="edu-tab-con-box clearfix edu-txt-center">
-								<img className="edu-nodata-img mb20"  src="/images/educoder/nodata.png" />
-                <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
-            </div>
-
-
           </React.Fragment>
     )
   }
 }
 export default Fileslists;
+
+{/*<div className="alltask"*/}
+		 {/*style={*/}
+			 {/*{*/}
+				 {/*display: files===undefined?'none' :files.length===0? 'block' : 'none'*/}
+			 {/*}*/}
+		 {/*}*/}
+{/*>*/}
+	{/*<div className="edu-tab-con-box clearfix edu-txt-center">*/}
+		{/*<img className="edu-nodata-img mb20"  src="/images/educoder/nodata.png" />*/}
+		{/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/}
+{/*</div>*/}

public/react/src/modules/courses/boards/BoardsNew.js

@@ -376,10 +376,15 @@ class BoardsNew extends Component{
                       dropdownRender={menu => (
                         <div>
                           {menu}
+                          {
+                            isAdmin && 
+                            <React.Fragment>
                               <Divider style={{ margin: '4px 0' }} />
                               <div style={{ padding: '8px', cursor: 'pointer' }} onMouseDown={() => this.refs['addDirModal'].open()}>
                                 <Icon type="plus" /> 添加目录
                               </div>
+                            </React.Fragment>
+                          }
                         </div>
                       )}
                     >

public/react/src/modules/courses/boards/TopicDetail.js

@@ -24,7 +24,7 @@ import '../../forums/RightSection.css'
 import './TopicDetail.css'
 import '../common/courseMessage.css'
 import { Pagination, Tooltip } from 'antd'
-import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml } from 'educoder'
+import { bytesToSize, ConditionToolTip, markdownToHTML, MarkdownToHtml , setImagesUrl } from 'educoder'
 import SendToCourseModal from '../coursesPublic/modal/SendToCourseModal'
 import CBreadcrumb from '../common/CBreadcrumb'
 import { generateComments, generateChildComments, _findById, handleContentBeforeCreateNew, addNewComment
@@ -57,6 +57,7 @@ class TopicDetail extends Component {
         pageCount: 1,
         comments: [],
         goldRewardDialogOpen: false,
+        author:undefined
       }
     }
     componentDidMount() {
@@ -85,7 +86,8 @@ class TopicDetail extends Component {
                 memo: Object.assign({}, {
                   ...response.data.data,
                   replies_count: response.data.data.total_replies_count
-                }, {...this.state.memo})
+                }, {...this.state.memo}),
+                author:response.data.data.author
               }, () => {
               })
 
@@ -514,7 +516,7 @@ class TopicDetail extends Component {
   	render() {
   		const { match, history } = this.props
       const { recommend_shixun, current_user,author_info } = this.props;
-      const { memo, comments, hasMoreComments, goldRewardDialogOpen, pageCount, total_count } = this.state;
+      const { memo, comments, hasMoreComments, goldRewardDialogOpen, pageCount, total_count , author } = this.state;
       const messageId = match.params.topicId
       if (this.state.memoLoading || !current_user) {
         return <div className="edu-back-white" id="forum_index_list"></div>
@@ -599,11 +601,12 @@ class TopicDetail extends Component {
                             }
                             
                         </div>
-                        <div className="color-grey-9 clearfix">
-                            <span className="fl" style={{marginTop: "2px"}}>{moment(memo.created_on).fromNow()} 发布</span>
-                            <div className="fr">
-                                
-                            </div>
+                        <div className="df mt20">    
+                        <img src={setImagesUrl(`/images/${author && author.image_url}`)} className="radius mr10 mt2" width="40px" height="40px"/>
+                        <div className="flex1">
+                          <div className="color-grey-9 lineh-20">
+                            <span class="color-grey-3 mr20 fl" style={{"fontWeight":"400"}}>{author && author.name}</span>
+                            <span className="fl">{moment(memo.created_on).fromNow()} 发布</span>
                           </div>
 
                           <div className="color-grey-9 clearfix">
@@ -627,11 +630,11 @@ class TopicDetail extends Component {
                                   </a>
                                   </Tooltip>
                                   }
-                                 {!!memo.praises_count && 
+                                  {!!memo.total_praises_count && 
                                   <Tooltip title={"点赞数"}>                                 
                                     <span className={`noteDetailNum `} style={{}}>
                                       <i className="iconfont icon-dianzan-xian mr5"></i>
-                                    <span style={{ top: "2px", position: "relative" }}>{ memo.praises_count }</span>
+                                      <span style={{ top: "2px", position: "relative" }}>{ memo.total_praises_count }</span>
                                     </span>
                                   </Tooltip>
                                     }
@@ -645,6 +648,8 @@ class TopicDetail extends Component {
                               </div>
                           </div>
                         </div>
+                      </div>
+                    </div>
 
                     
                     <div className="padding30 memoContent new_li" style={{ paddingBottom: '10px'}}>

public/react/src/modules/courses/boards/index.js

@@ -363,7 +363,7 @@ class Boards extends Component{
 
           <FilesListItem></FilesListItem> */}
 
-        {isAdmin && <div className="mt20 edu-back-white padding20-30">
+				{messages&&messages.length == 0?"": isAdmin && <div className="mt20 edu-back-white padding20-30">
 				<div className="clearfix">
             {isAdmin&&<Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>}
             <div className="studentList_operation_ul">

public/react/src/modules/courses/busyWork/CommonWorkAppraise.js

@@ -15,7 +15,7 @@ import WorkDetailPageHeader from './common/WorkDetailPageHeader'
 import CommonWorkAppraiseReply from './reply/CommonWorkAppraiseReply'
 import Example from './TestHooks'
 import CommonWorkAppraiseReviseAttachments from './CommonWorkAppraiseReviseAttachments'
-
+import LeaderIcon from './common/LeaderIcon'
 const { Option} = Select;
 const CheckboxGroup = Checkbox.Group;
 const confirm = Modal.confirm;
@@ -88,6 +88,14 @@ class CommonWorkAppraise extends Component{
        console.log(error)
      })
   }
+  componentDidUpdate(prevProps, prevState) {
+    if (this.props.match.params.studentWorkId != prevProps.match.params.studentWorkId) {
+      this.getWork();
+      this.getReviseAttachments()
+      this.commonWorkAppraiseReply && this.commonWorkAppraiseReply.fetchAllComments()
+    }
+  }
+  
   componentDidMount() {
     this.getWork();
     this.getReviseAttachments()
@@ -156,12 +164,13 @@ class CommonWorkAppraise extends Component{
       attachments, homework_id, project_info, work_members, is_evaluation,
       description, update_user_name, update_time, commit_time, author_name,
       revise_attachments, revise_reason, atta_update_user, atta_update_time, atta_update_user_login,
-      Modalstype,Modalstopval,ModalCancel,ModalSave,loadtype
+      Modalstype,Modalstopval,ModalCancel,ModalSave,loadtype, is_leader_work
     } =this.state;
 
     let courseId=this.props.match.params.coursesId;
     let category_id=this.props.match.params.category_id;
     let studentWorkId=this.props.match.params.studentWorkId;
+    const isAdmin = this.props.isAdmin()
     return(
       <WorkDetailPageHeader 
         {...this.props} {...this.state}
@@ -251,13 +260,28 @@ class CommonWorkAppraise extends Component{
 
             {is_evaluation != true && work_members && !!work_members.length && <div className={"stud-class-set bor-top-greyE edu-back-white padding20-30"}>
               <div className={"color-grey-6 mb10"}>
-                其他组员
+                全部组员
               </div>
-              <div className={"ml20"}>
+              <div className={"ml20 color-grey-6"}>
+                <div className="">
+                  当前组员：{author_name} {is_leader_work && <LeaderIcon small={true} ></LeaderIcon>}
+                </div>
+                <div>
+                  其他组员：
                   {work_members.map((item, index) => {
-                  return item.user_name + '　'
+                    return <React.Fragment>
+                      {isAdmin ? 
+                      <a className={`color-blue ${index == 0 ? '' : 'ml10'}`} href="javascript:void(0)" 
+                          onClick={() => this.props.toWorkDetailPage(this.props.match.params, null, item.work_id)}
+                      >
+                        {item.user_name}
+                      </a> : <span className={`${index == 0 ? '' : 'ml10'}`} >{item.user_name}</span>}
+                      {item.is_leader && <LeaderIcon small={true} ></LeaderIcon>}
+                    </React.Fragment>
                   })}
                 </div>
+                
+              </div>
             </div>
             }
             </div>
@@ -266,6 +290,7 @@ class CommonWorkAppraise extends Component{
             {/* task_type={datalist&&datalist.task_type} */}
             <CommonWorkAppraiseReply {...this.props} task_id={studentWorkId} 
                 onReplySuccess={this.onReplySuccess} {...this.state}
+                wrappedComponentRef={(ref) => {this.commonWorkAppraiseReply = ref}}
             ></CommonWorkAppraiseReply>
 
         </div>

public/react/src/modules/courses/busyWork/CommonWorkList.js

@@ -15,7 +15,7 @@ import WorkDetailPageHeader from './common/WorkDetailPageHeader'
 import PublishRightnow from './PublishRightnow'
 import ModulationModal from "../coursesPublic/ModulationModal";
 import AccessoryModal from "../coursesPublic/AccessoryModal";
-
+import LeaderIcon from './common/LeaderIcon'
 const { Option} = Select;
 const CheckboxGroup = Checkbox.Group;
 const confirm = Modal.confirm;
@@ -97,7 +97,12 @@ function buildColumns(that, student_works, studentData) {
 					 }} title={text && text.length > 5 ? text : ''}>
 				{/* <Tooltip placement="bottom" title={text}>
 				</Tooltip> */}
-					{text}
+          {record.is_leader ? 
+          <div style={{ display: 'flex', 'flex-direction': 'column', 'align-items': 'center'}}>
+            <div >{text}</div>
+            <LeaderIcon></LeaderIcon>
+          </div>
+					: <React.Fragment>{text}</React.Fragment>}
       </div>
     ),
   }]

public/react/src/modules/courses/busyWork/UseBank.js

@@ -128,7 +128,7 @@ class UseBank extends Component{
     })
   }
   onSave = () => {
-    
+    debugger
     const { checkBoxValues } = this.state;
     const { object_type } = this.props
     if(checkBoxValues.length==0){

public/react/src/modules/courses/busyWork/common/LeaderIcon.js

@@ -0,0 +1,19 @@
+import React,{Component} from "React";
+
+export default function LeaderIcon(props = {}) {
+    let icon = null;
+    if (props.small) {
+        icon = <div className="font-8 blueFull Actionbtn" style={{ 
+            height: '14px',
+            'line-height': '14px',
+            width: '24px',
+            padding: 0,
+            'margin-top': '-2px',
+            'margin-left': '2px',
+            'vertical-align': 'middle', }}>组长</div>
+    } else {
+        icon = <div className="font-8 blueFull Actionbtn" style={{ height: '16px', 'line-height': '16px', width: '30px'}}>组长</div>
+    
+    }
+    return icon
+}

public/react/src/modules/courses/busyWork/common/WorkDetailPageHeader.js

@@ -85,8 +85,7 @@ class WorkDetailPageHeader extends Component{
                   background: #fff;
                 }
                 .workDetailPageHeader .summaryname {
-                  line-height: 20px; 
-                  margin-top: 13px;
+                  line-height:30px
                 }
               `}</style>
               <CBreadcrumb items={[
@@ -99,18 +98,18 @@ class WorkDetailPageHeader extends Component{
                 // { name: childModuleName }
               ]}></CBreadcrumb>
 
-              <div style={{ width:'100%',height:'52px'}} >
-                <span className=" fl color-black summaryname" style={{height: 'auto'}}>
+              <div className="clearfix mt20 mb20" >
+                <span className=" fl color-black summaryname">
                    {homework_name}
                   {/* <Link to={"/courses/"+courseId+"/graduation"+"/graduation_tasks/"}>{homework_name}</Link> */}
                 </span>
                 <CoursesListType
                   typelist={homework_status}
-                  typesylename={"mt12"}
+                  typesylename={"mt3"}
                 />
                
 
-                {category && <a className="color-grey-6 fr font-16 ml30 mt7 mr20" onClick={this.goback} style={{ marginRight: '26px'}}>返回</a>}
+                {category && <a className="color-grey-6 fr font-16 ml30 mr30 lineh-25" onClick={this.goback}>返回</a>}
 
                 {this.props.update_atta &&
                 <React.Fragment>

public/react/src/modules/courses/busyWork/commonWork.js

@@ -143,7 +143,9 @@ class commonWork extends Component{
     this.setState({
       order:e.key==="all"?"":e.key,
       page:1,
-      isSpin:true
+      isSpin:true,
+      checkBoxValues:[],
+      checkAll:false
     })
     let {search}=this.state;
     this.getList(1,search,e.key==="all"?"":e.key);

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -750,7 +750,8 @@ class Coursesleftnav extends Component{
       {/*分班*/}
       {item.type==="course_group"?<div onClick={e=>this.Navmodalnames(e,2,"course_group",item.id)}>添加分班</div>:""}
       {/*分班*/}
-      {item.type==="course_group"?<div onClick={e=>this.Navmodalnames(e,5,"editname",item.id,item.name)}>重命名</div>: <div onClick={e=>this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名</div>}
+      {/*{item.type==="course_group"? :""}*/}
+      <div onClick={e=>this.Navmodalnames(e,3,"editname",item.id,item.name)}>重命名</div>
 
       <div onClick={e=>this.edithidden(e,item.id)}>隐藏</div>
       <div onClick={e=>this.editSetup(e,item.id)}>置顶</div>

public/react/src/modules/courses/coursesPublic/NoneData.js

@@ -1,5 +1,5 @@
 import React, { Component } from 'react';
-import {getImageUrl} from 'educoder';
+import { getImageUrl , getUrl } from 'educoder';
 
 class NoneData extends Component{
   constructor(props) {
@@ -9,7 +9,20 @@ class NoneData extends Component{
     const { style } = this.props;
     return(
       <div className="edu-tab-con-box clearfix edu-txt-center" style={style}>
-        <img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+        <style>
+          {`
+            .edu-tab-con-box{
+              padding:100px 0px;
+            }
+            .ant-modal-body .edu-tab-con-box{
+              padding:0px!important;
+            }
+            img.edu-nodata-img{
+              margin: 40px auto 20px;
+            }
+          `}
+        </style>
+        <img className="edu-nodata-img mb20" src={getUrl("/images/educoder/nodata.png")}/>
         <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p>
       </div>
     )

public/react/src/modules/courses/coursesPublic/PathModal.js

@@ -180,11 +180,13 @@ class PathModal extends Component{
       }else{
         // this.homeworkstart
         //调用立即发布弹窗
+				// this.props.showNotification(response.data.message)
         this.props.hidecouseShixunModal();
-        this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+				this.props.updataleftNavfun()
+        // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
         // this.props.showNotification("选用成功")
         // this.props.showNotification(response.data.message)
-        // this.props.homeworkupdatalists(Coursename,page,order);
+         this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
       }
 
       // if(response.status===200) {

public/react/src/modules/courses/coursesPublic/ShixunModal.js

@@ -186,7 +186,8 @@ class ShixunModal extends Component{
         // this.props.showNotification(response.data.message)
 
       }else{
-        this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+        // this.props.courseshomeworkstart(response.data.category_id,response.data.homework_ids)
+				this.props.homeworkupdatalists(this.props.Coursename,this.props.page,this.props.order);
         this.props.hidecouseShixunModal()
       }
       this.setState({

public/react/src/modules/courses/exercise/Exercise.js

@@ -171,6 +171,19 @@ class Exercise extends Component{
             checkAllValue: checkedValues.length == exercises.length
         })
     }
+
+
+	onItemClick = (item) => {
+		const checkBoxValues = this.state.checkBoxValues.slice(0);
+		const index = checkBoxValues.indexOf(item.id);
+		if (index != -1) {
+			_.remove(checkBoxValues, (listItem)=> listItem === item.id)
+		} else {
+			checkBoxValues.push(item.id)
+		}
+		this.onCheckBoxChange(checkBoxValues)
+	}
+
 	// 全选or反选
     onCheckAll = (e) => {
         this.setState({
@@ -507,7 +520,7 @@ class Exercise extends Component{
                         </div>
                     </div>
                 <Spin size="large" spinning={this.state.isSpin}>
-                    {this.props.isAdmin()?<div className="mt20 mb20 edu-back-white padding20-30">
+                    {this.props.isAdmin()?exercises && exercises.length ===0?"":<div className="mt20 mb20 edu-back-white padding20-30">
                                 <div className="clearfix">
                                     <Checkbox className="fl" onChange={this.onCheckAll}  checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>
                                     <div className="studentList_operation_ul">
@@ -559,9 +572,9 @@ class Exercise extends Component{
                                                     {...this.props}
                                                     {...this.state}
                                                     item={item}
-                                                    key={key}
+                                                    index={key}
+																										onItemClick={this.onItemClick}
                                                     checkBox={<Checkbox value={item.id} key={item.id}
-                                                                        // onClick={() => this.onItemClick(item)}
                                                     ></Checkbox>}
                                                 ></ExerciseListItem>
                                             )

public/react/src/modules/courses/exercise/ExerciseListItem.js

@@ -52,17 +52,17 @@ class ExerciseListItem extends Component{
 			})
 	  }
     render(){
-        let{item,checkBox}=this.props;
+        let{item,checkBox,index}=this.props;
         let {coursesId,Id}=this.props.match.params
         const IsAdmin =this.props.isAdmin();
         const IsStudent =this.props.isStudent();
 
         // console.log(this.props.current_user.user_id)
         return(
-            <div className="workList_Item" style={{padding:"30px"}}>
+            <div className="workList_Item" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }} onClick={() => window.$(`.exerciseitem${index} input`).click() }>
                 {
                   IsAdmin &&
-                    <span className="fl mr12">
+                  <span className={`exerciseitem${index} fl mr12`}>
 										{checkBox}
 									</span>
                 }
@@ -96,20 +96,20 @@ class ExerciseListItem extends Component{
 
                         {/*<Link to={`/courses/${coursesId}/exercises/${item.id}/exercises/student_exercise_list?tab=0`} className="fl font-16 font-bd mt2 color-grey-3 task-hide" style={{"maxWidth":"600px"}}>{item.exercise_name}</Link>*/}
                         {
-                            this.props.isAdmin()? <a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580"
+                            this.props.isAdmin()? <Link  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580"
 																											title={item.exercise_name}
-                                                      href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
+                                                      to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
                         }
 
 												{
 													this.props.isStudent()?
-														<a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
+														<Link  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
 												}
 
                         {
                         this.props.isNotMember()? item.lock_status === 0 ?
                                 <span className="fl mt3 font-16 font-bd color-dark comnonwidth580" title={item.exercise_name}>{item.exercise_name}</span>
-                                :														<a  className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</a>:""
+                                :														<Link className="fl font-16 font-bd mt2 color-grey-3 task-hide comnonwidth580" title={item.exercise_name}  to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=0`}>{item.exercise_name}</Link>:""
                         }
 
                         {
@@ -165,8 +165,8 @@ class ExerciseListItem extends Component{
 
 
 										{ IsAdmin &&<div className="homepagePostSetting" style={{"right":"-17px","top":"51px","display":"block","width":"100px"}}>
-											<a className="btn colorblue font-16" href={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</a>
-											<a  className="btn colorblue ml20 font-16" href={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</a>
+											<Link className="btn colorblue font-16" to={`/courses/${coursesId}/exercises/${item.id}/edit`}>编辑</Link>
+											<Link  className="btn colorblue ml20 font-16" to={`/courses/${coursesId}/exercises/${item.id}/student_exercise_list?tab=3`}>设置</Link>
 										</div> }
 
 									</p>

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -541,6 +541,18 @@ class ExerciseReviewAndAnswer extends Component{
           .inputNumber30 .ant-input-number-input-wrap .ant-input-number-input{
             height: 28px;
           }
+          .setRadioStyle{
+            width:100%;
+            cursor:pointer;
+          }
+          .setRadioStyle span:last-child{
+            flex:1;
+            display:flex;
+          }
+          .setRadioStyle .ant-radio,.setRadioStyle .ant-checkbox{
+            height:16px;
+            margin-top:2px;
+          }
         `}</style>
         {/*<p style={{height:"60px"}}></p>*/}
         <Modals

public/react/src/modules/courses/exercise/question/multiple.js

@@ -44,19 +44,19 @@ class Multiple extends Component{
     console.log(questionType);
     return(
       <div className="pl30 pr30 singleDisplay">
-        <Checkbox.Group disabled={ user_exercise_status == 1 ? true : false } onChange={this.saveId} value={questionType.user_answer}>
+        <Checkbox.Group className="with100" disabled={ user_exercise_status == 1 ? true : false } onChange={this.saveId} value={questionType.user_answer}>
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
               let prefix = `${tagArray[key]}.`
 
               return(
                 <p className="clearfix mb15 df">
-                  <Checkbox className="fl lineh-15 df mr8 mt2" value={item.choice_id} key={item.choice_id}>{prefix}</Checkbox>
-                  {/* <span class="fl lineh-20 mt1"></span> */}
-                  {/* <span style={{display:"inline-block"}} className="markdown-body " dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */}
+                  <Checkbox className="lineh-15 df mr8 setRadioStyle" value={item.choice_id}>
+                    <span className="fl mr3 lineh-20">{prefix}</span>
                     <MarkdownToHtml content={item.choice_text} selector={'multiple_' + (this.props.index + 1) + (key + 1)}
-                    className="" style={{display:"inline-block"}}                              
+                      className="flex1" style={{display:"inline-block"}}                              
                     ></MarkdownToHtml>
+                  </Checkbox>
                 </p>
               )
             })

public/react/src/modules/courses/exercise/question/single.js

@@ -40,18 +40,18 @@ class single extends Component{
     let isJudge = questionType.question_type == 2
     return(
       <div className="pl30 pr30 singleDisplay">
-        <Radio.Group disabled={ user_exercise_status == 1 ? true : false } value={questionType.user_answer[0]} onChange={this.changeItem}>
+        <Radio.Group className="with100" disabled={ user_exercise_status == 1 ? true : false } value={questionType.user_answer[0]} onChange={this.changeItem}>
           {
             questionType.question_choices && questionType.question_choices.map((item,key)=>{
               let prefix = isJudge ?  undefined : `${tagArray[key]}.`
               return(
-                <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15 df" : "fl mr40 df"}>
-                  <Radio className="fl lineh-20" value={item.choice_id}>{prefix}</Radio>
-                  {/* <span className="fl lineh-20 mr3 "></span> */}
-                  {/* <span style={{display:"inline-block", 'margin-top': '-1px'}} className="markdown-body fl " dangerouslySetInnerHTML={{__html: markdownToHTML1(item.choice_text)}}></span> */}
+                <p className={parseInt(questionType.question_type) == 0 ? "clearfix mb15" : "fl mr40"}>
+                  <Radio className="df lineh-20 setRadioStyle" value={item.choice_id}>
+                    <span className="fl mr3">{prefix}</span>
                     <MarkdownToHtml content={item.choice_text} selector={'single_' + (this.props.index + 1) + (key + 1)}
-                    className="fl" style={{display:"inline-block", 'margin-top': '-1px'}}                      
+                      className="flex1" style={{display:"inline-block", 'margin-top': '-1px'}}                      
                     ></MarkdownToHtml>
+                  </Radio>
                 </p>
               )
             })

public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js

@@ -151,16 +151,12 @@ class GraduateTaskItem extends Component{
       coursesId,
       categoryid,
       taskid,
-
+      index,
+      isAdmin
     } = this.props;
 
-      // console.log(discussMessage)
-
-
-
-
     return(
-        <div className="graduateTopicList boardsList">
+        <div className="graduateTopicList boardsList" style={{cursor : isAdmin ? "pointer" : "default" }} onClick={() => window.$(`.taskitem${index} input`).click() }>
           <Modals
             modalsType={Modalstype}
             modalsTopval={Modalstopval}
@@ -193,8 +189,9 @@ class GraduateTaskItem extends Component{
               margin-right: 15px;
             }
           `}</style>
+          <span className={`taskitem${index} fl`} style={{"height":"59px"}}>
             { checkBox }
-
+          </span>
           {/*
           style={{borderTop:data===undefined?"":data.course_identity<4?'1px solid #EBEBEB':'1px solid transparent'}}
             */}

public/react/src/modules/courses/graduation/tasks/index.js

@@ -13,6 +13,7 @@ import Modals from '../../../modals/Modals';
 import UseBank from "../../busyWork/UseBank";
 import '../../css/members.css';
 import '../style.css';
+import NoneData from "../../coursesPublic/NoneData";
 
 
 class GraduationTasks extends Component{
@@ -350,8 +351,6 @@ class GraduationTasks extends Component{
       checkBoxValues: checkedValues,
       checkAllValue:type
     })
-
-
   }
 
 
@@ -384,7 +383,9 @@ class GraduationTasks extends Component{
 
     this.setState({
       order: e.key,
-      isSpin:true
+      isSpin:true,
+      checkBoxValues:[],
+      checkAllValue:false
     });
 
     let newkey=e.key;
@@ -562,6 +563,7 @@ class GraduationTasks extends Component{
       //debugger
     let {search,page,order,all_count} = this.state;
     this.fetchAll(search,page,order,all_count)
+		debugger
 
   }
   getcourse_groupslist=(id)=>{
@@ -696,7 +698,7 @@ class GraduationTasks extends Component{
 
           <FilesListItem></FilesListItem> */}
 
-        {this.props.isAdmin()? <div className="mt20 edu-back-white padding20-30">
+        {this.props.isAdmin()?all_count===undefined?'' :all_count===0?"": <div className="mt20 edu-back-white padding20-30">
           <div className="clearfix">
              <Checkbox className="fl" onChange={this.onCheckAll} checked={checkAllValue}>已选 {checkBoxValues.length} 个</Checkbox>
              <div className="studentList_operation_ul">
@@ -726,10 +728,10 @@ class GraduationTasks extends Component{
           }
         `}</style>
         <Spin size="large" spinning={this.state.isSpin}> <Checkbox.Group style={{ width: '100%' }} onChange={this.onCheckBoxChange} value={checkBoxValues}>
-              { tasks.map((item, index) => {
+              { tasks&&tasks.map((item, index) => {
                 // console.log(item)
                 return (
-                  <div className="mt20 edu-back-white padding02010" key={index}>
+                  <div className="mt20 edu-back-white pt10 pl30 pr30" key={index}>
                     <div className="clearfix">
                     <GraduateTaskItem
                       discussMessage={item}
@@ -746,6 +748,7 @@ class GraduationTasks extends Component{
                       coursesId={this.props.match.params.coursesId}
                       categoryid={this.props.match.params.Id}
                       workid={item.work_id}
+                      index={index}
                     ></GraduateTaskItem>
                   </div>
                  </div>
@@ -770,18 +773,11 @@ class GraduationTasks extends Component{
               />
             </div>
           }
-          <div className="alltask edu-back-white"
-               style={
+
+
 						{
-                   display: all_count===undefined?'none' :all_count===0? 'block' : 'none'
-                 }
+							tasks===undefined?'' :tasks.length===0? <NoneData></NoneData>:""
 						}
-          >
-          <div className="edu-tab-con-box clearfix edu-txt-center">
-            <img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />
-            <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
-          </div>
-
         <div>
 
         </div>
@@ -791,3 +787,15 @@ class GraduationTasks extends Component{
     }
 }
 export default GraduationTasks;
+
+{/*<div className="alltask"*/}
+		 {/*style={*/}
+			 {/*{*/}
+				 {/*display: all_count===undefined?'none' :all_count===0? 'block' : 'none'*/}
+			 {/*}*/}
+		 {/*}*/}
+{/*>*/}
+	{/*<div className="edu-tab-con-box clearfix edu-txt-center">*/}
+		{/*<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />*/}
+		{/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/}
+{/*</div>*/}

public/react/src/modules/courses/graduation/topics/GraduateTopicDetailInfo.js

@@ -6,7 +6,7 @@ import '../style.css'
 import axios from "axios";
 import GraduateTopicReply from './GraduateTopicReply'
 
-import { ConditionToolTip,MarkdownToHtml } from 'educoder'
+import { ConditionToolTip , MarkdownToHtml , AttachmentList } from 'educoder'
 
 const $=window.$;
 const type={1: "设计",2: "论文", 3: "创作"}
@@ -60,9 +60,10 @@ class GraduateTopicDetailTable extends Component{
             {
               topicInfo && topicInfo.attachment_list.length>0 &&
               <p className="mt30">
-                {
+                {/* {
                   topicInfo.attachment_list.map((item,key)=>{
                     return(
+                      
                       <li className="clearfix mb8" key={key}>
                         <i className="iconfont icon-fujian color-green font-16 mr8 fl"></i>
                         <ConditionToolTip title={item.title} condition={item.title && item.title.length > 30 }>
@@ -72,7 +73,8 @@ class GraduateTopicDetailTable extends Component{
                       </li>
                     )
                   })
-                }
+                } */}
+                <AttachmentList {...this.props} {...this.state} attachments = {topicInfo.attachment_list}></AttachmentList>
               </p>
             }
           </div>

public/react/src/modules/courses/graduation/topics/GraduateTopicItem.js

@@ -47,7 +47,7 @@ class GraduateTopicItem extends Component{
           }
         </style>
 
-        <div className="graduateTopicList boardsList mb20">
+        <div className="graduateTopicList boardsList mb20" style={{cursor : isAdmin ? "pointer" : "default" }} onClick={() => window.$(`.topicItem${index} input`).click() }>
           <style>{`
             
             .graduateTopicList .ant-checkbox-input {s
@@ -58,7 +58,7 @@ class GraduateTopicItem extends Component{
                   padding: 17px 30px 20px!important;
               }
           `}</style>
-          { isAdmin ? checkBox : ""}
+          { isAdmin ? <span className={`topicItem${index} fl`} style={{"height":"64px"}}>{checkBox}</span> : ""}
           <div className="clearfix ds pr flex1">
 						<style>{`
             .maxwidth580{

public/react/src/modules/courses/members/modal/CreateGroupByImportModal.js

@@ -13,12 +13,15 @@ class CreateGroupByImportModal extends Component{
   constructor(props){
     super(props);
     this.state={
-      errorTip:undefined
     }
   }
+  fetchMemberList = (arg_page) => {
+  }
+  componentDidMount() {
     
-  onSendOk = () => {
     
+  }
+  onSendOk = () => {
     const courseId = this.props.match.params.coursesId    
     
     let url = `/courses/${courseId}/create_group_by_importing_file.json`
@@ -109,7 +112,7 @@ class CreateGroupByImportModal extends Component{
 
   render(){
     const { candidates, checkBoxValues, loading, hasMore, name, school_name, school_names
-        , graduationGroup, graduation_groups, courseGroup, course_groups , fileList , errorTip } = this.state
+        , graduationGroup, graduation_groups, courseGroup, course_groups , fileList } = this.state
     const { moduleName } = this.props
     
     const props = {
@@ -138,9 +141,6 @@ class CreateGroupByImportModal extends Component{
           单个文件最大150MB
         </p>
       </Dragger>
-      <p className="color-red lineh-25 edu-txt-left" style={{height:"25px"}}>
-        <span className={ errorTip ? "" : "none" }>{errorTip}</span>
-      </p>        
       </ModalWrapper>
     )
   }

public/react/src/modules/courses/poll/Poll.js

@@ -288,6 +288,7 @@ class Poll extends Component{
             })
             let{type,StudentList_value}=this.state
             this.InitList(type,StudentList_value,1);
+            this.props.updataleftNavfun();
           }
         }).catch((error)=>{
           console.log(error);
@@ -595,7 +596,8 @@ class Poll extends Component{
                       {...this.state} 
                       courseType={course_types}
                       item={item}
-                      key={key}
+                      index={key}
+											onItemClick={this.onItemClick}
                       checkBox={<Checkbox value={item.id}   key={item.id}  onClick={() => this.onItemClick(item)}></Checkbox>}
                     ></PollListItem>
                   )

public/react/src/modules/courses/poll/PollListItem.js

@@ -16,7 +16,7 @@ class PollListItem extends Component{
     super(props);
   }
   render(){
-    let{item,checkBox,courseType}=this.props;
+    let{item,checkBox,courseType,index}=this.props;
     let {coursesId}=this.props.match.params;
     
     const IsAdmin =this.props.isAdmin();
@@ -28,10 +28,10 @@ class PollListItem extends Component{
     let canNotLink = !isAdminOrStudent && item.lock_status == 0
     return(
 
-      <div className="workList_Item polllisthover" style={{padding:"30px"}}>
+      <div className="workList_Item polllisthover" style={{cursor : IsAdmin ? "pointer" : "default",padding:"30px" }}  onClick={() => window.$(`.pollitem${index} input`).click() }>
         {
           IsAdmin && 
-          <span className="fl mr12">
+          <span className={`pollitem${index} fl mr12`}>
             {checkBox}
           </span>
         }

public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js

@@ -124,13 +124,19 @@ class ShixunhomeWorkItem extends Component{
     })
   }
 
-  editname = (name,id) => {
+  // 实训详情，阻止冒泡
+  stopPro = (event) => {
+    event.stopPropagation()
+  }
+  
+  editname = (name,id,event) => {
     this.setState({
       ModalsRenametype:true,
       NavmodalValue:name,
       Navmodalname:"重命名",
       url:`/homework_commons/${id}/alter_name.json`
     })
+    event.stopPropagation()
   }
   cannerNavmoda=()=>{
     this.setState({
@@ -157,23 +163,12 @@ class ShixunhomeWorkItem extends Component{
 
     const { checkBox,
       discussMessage,
-      taskid,
+      taskid,index
     } = this.props;
-    //
-
-    // allow_late: true  //是否开启补交
-
-    // homework_id: 9250
-
-    // shixun_identifier: "25ykhpvl"
-
-    //
-    // console.log("this.props.isAdmin");
- 
-
     return(
-        <div className="graduateTopicList boardsList">
-          {this.state.ModalsRenametype===true?
+      <React.Fragment>
+        {
+          this.state.ModalsRenametype===true?
           <ModalsRename
             {...this.props}
             Navmodalnametype={this.state.ModalsRenametype}
@@ -184,7 +179,6 @@ class ShixunhomeWorkItem extends Component{
             cannerNavmoda={()=>this.cannerNavmoda()}
           />
         :""}
-
         <Modals
           modalsType={Modalstype}
           modalsTopval={Modalstopval}
@@ -193,7 +187,6 @@ class ShixunhomeWorkItem extends Component{
           modalSave={cardsModalsavetype}
           loadtype={loadtype}
         />
-
         {visible===true?<Associationmodel
           modalname={modalname}
           visible={visible}
@@ -201,8 +194,6 @@ class ShixunhomeWorkItem extends Component{
           taskid={taskid}
           funlist={this.props.funlist}
         />:""}
-
-
         <Modal
           keyboard={false}
           title="提示"
@@ -218,6 +209,7 @@ class ShixunhomeWorkItem extends Component{
                 onClick={() => this.hidestartshixunsreplace(hidestartshixunsreplacevalue)}>知道了</a>
           </div>
         </Modal>
+
         <Modal
           keyboard={false}
           title="提示"
@@ -238,7 +230,7 @@ class ShixunhomeWorkItem extends Component{
           {/*</p>*/}
         </Modal>
 
-
+        <div className="graduateTopicList boardsList" style={{cursor : this.props.isAdmin ? "pointer" : "default"}} onClick={() => window.$(`.shixunitem${index} input`).click() } >
           <style>{`
             .boardsList .ant-checkbox-wrapper{
                margin-top: -35px;
@@ -284,7 +276,11 @@ class ShixunhomeWorkItem extends Component{
 
           `}</style>
 
-          {this.props.isAdmin?checkBox:""}
+          {this.props.isAdmin?
+            <span className={`shixunitem${index} fl`} style={{"height":"55px"}}>{checkBox}</span>
+            :
+            ""
+          }
 
           <div className="clearfix ds pr pt5 contentSection" >
 						<style>{`
@@ -299,23 +295,23 @@ class ShixunhomeWorkItem extends Component{
 
               {/*to={`/courses/${this.props.match.params.coursesId}/${discussMessage.homework_id}/jobsettings`}*/}
               {
-                this.props.isAdmin?<a href={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0"}
+                this.props.isAdmin?<Link to={"/courses/"+this.props.match.params.coursesId+"/"+this.state.shixuntypes+"/"+discussMessage.homework_id+"/list?tab=0"}
                                          title={discussMessage.name}
-                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+                                      className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
-                this.props.isStudent? <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
+                this.props.isStudent? <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
                                             title={discussMessage.name}
-                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+                                            className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
               {
                 this.props.isNotMember===true? this.props.discussMessage.private_icon===true?
 									<span className="fl mt3 font-16 font-bd color-dark maxwidth580" title={discussMessage.name}>{discussMessage.name}</span>
-                 : <a href={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
+                 : <Link to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/list?tab=0`}
                          title={discussMessage.name}
-                         className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</a>:""
+                         className="fl mt3 font-16 font-bd color-dark maxwidth580">{discussMessage.name}</Link>:""
               }
 
 
@@ -383,9 +379,9 @@ class ShixunhomeWorkItem extends Component{
 								`
 							}
 						</style>
-            {this.props.isAdmin?<div className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
-              <a className="btn colorblue font-16" href={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</a>
-								{this.props.isAdminOrCreator()?<a  onClick={()=>this.editname(discussMessage.name,discussMessage.homework_id)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
+            {this.props.isAdmin?<div onClick={(event)=>this.stopPro(event)} className={this.props.isAdminOrCreator()?"homepagePostSetting homepagePostSettingname":"homepagePostSetting homepagePostSettingbox"} style={{"right":"-2px","top":"44px","display":"block"}}>
+              <Link className="btn colorblue font-16" to={"/shixuns/"+discussMessage.shixun_identifier+"/challenges"} target={"_blank"}>实训详情</Link>
+								{this.props.isAdminOrCreator()?<a onClick={(event)=>this.editname(discussMessage.name,discussMessage.homework_id,event)} className={"btn colorblue ml20 font-16"}>重命名</a>:""}
               {/*<WordsBtn className="btn colorblue ml20 font-16"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>*/}
               <WordsBtn className="btn colorblue  font-16 ml15"  to={`/courses/${this.props.match.params.coursesId}/${this.state.shixuntypes}/${discussMessage.homework_id}/settings?tab=3`}  > 设置</WordsBtn>
             </div>:""}
@@ -408,6 +404,7 @@ class ShixunhomeWorkItem extends Component{
 
           </div>
         </div>
+      </React.Fragment>
       )
     }
 }

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -587,6 +587,8 @@ class ShixunHomework extends Component{
    let {Coursename,page}=this.state;
     this.setState({
       order: e.key,
+      checkBoxValues:[],
+      checkedtype:false,
       isSpin:true
     });
     let newkey=e.key;
@@ -655,6 +657,7 @@ class ShixunHomework extends Component{
 
   }
 
+
   savedelete=()=>{
     let {Coursename,page,order,checkBoxValues,datas}=this.state;
     let category_id=this.props.match.params.category_id;
@@ -966,7 +969,7 @@ class ShixunHomework extends Component{
           category_id={this.props.match.params.category_id}
           visible={shixunmodal}
           shixunmodallist={shixunmodallist}
-          // funshixunmodallist={(search,type,loading,page)=>this.funshixunmodallist(search,type,loading,page)}
+					homeworkupdatalists={(Coursename,page,order)=>this.homeworkupdatalist(Coursename,page,order)}
           hometypepvisible={hometypepvisible}
           hidecouseShixunModal={this.hidecouseShixunModal}
           newshixunmodallist={newshixunmodallist}
@@ -1019,8 +1022,8 @@ class ShixunHomework extends Component{
         <div className="edu-back-white">
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
-            <span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>
-            {/*  <span className="font-18 fl color-dark-21">实训作业</span>*/}
+            {/*<span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>*/}
+              <span className="font-18 fl color-dark-21">实训作业</span>
               <li className="fr">
               {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
                   <span>
@@ -1062,7 +1065,9 @@ class ShixunHomework extends Component{
           </div>
         </div>
         <Spin size="large" spinning={this.state.isSpin}>
-        {this.props.isAdmin()===true?<div className="mt20 edu-back-white padding20-30">
+        {this.props.isAdmin()===true?
+					datas===undefined?'' :datas.homeworks.length===0?"":
+					<div className="mt20 edu-back-white padding20-30">
 
           <div className="clearfix">
             <Checkbox className="fl" style={{marginTop:'0px'}}checked={checkedtype} onClick={this.funselect}>已选 {checkBoxValues&&checkBoxValues.length} 个</Checkbox>
@@ -1163,6 +1168,7 @@ class ShixunHomework extends Component{
 										isClassManagement={this.props.isClassManagement()}
                     checkBox={this.props.isAdmin()?<Checkbox value={item.homework_id} key={item.homework_id}></Checkbox>:""}
                     match={this.props.match}
+                    index={index}
                     coursedata={this.props.coursedata}
                     coursupdata={()=>this.homeworkupdatalist(Coursename,page,order)}
                     course_identity={datas.course_identity}
@@ -1203,18 +1209,10 @@ class ShixunHomework extends Component{
 
           </div>
 
-
-            <div className="alltask "
-                 style={
 					{
-                     display: datas===undefined?'none' :datas.task_count===0? 'block' : 'none'
-                   }
+						datas===undefined?'' :datas.homeworks.length===0? <NoneData></NoneData>:""
 					}
-            >
-              <div className="edu-tab-con-box clearfix edu-txt-center"><img className="edu-nodata-img mb20"
-                                                                            src="/images/educoder/nodata.png" />
-                <p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>
-            </div>
+
       </Spin>
 
       </div>
@@ -1223,3 +1221,14 @@ class ShixunHomework extends Component{
   }
 }
 export default ShixunHomework;
+// {/*<div className="alltask "*/}
+// {/*style={*/}
+// {/*{*/}
+// {/*display: datas===undefined?'none' :datas.task_count===0? 'block' : 'none'*/}
+// {/*}*/}
+// {/*}*/}
+// {/*>*/}
+// {/*<div className="edu-tab-con-box clearfix edu-txt-center">*/}
+// {/*<img className="edu-nodata-img mb20" src="/images/educoder/nodata.png" />*/}
+// {/*<p className="edu-nodata-p mb20">暂时还没有相关数据哦！</p></div>*/}
+// {/*</div>*/}

public/react/src/modules/page/MainContentContainer.js

@@ -224,12 +224,15 @@ class MainContentContainer extends Component {
     }
 
 	componentDidUpdate(prevProps, prevState, snapshot) {
-        const { game  } = this.props
+        const { game, challenge  } = this.props
         
 		if (game && prevProps.game 
 				&& prevProps.game.identifier !== game.identifier) {   
 			// 切换关卡时，停止轮训
 			this.oldGameIdentifier = prevProps.game.identifier;
+			this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
+		} else if (challenge && (challenge.pathIndex || prevProps.challenge.pathIndex) && challenge.pathIndex != prevProps.challenge.pathIndex) {
+			this.doFileUpdateRequestOnCodeMirrorBlur(prevProps)
 		}
         
     }
@@ -386,8 +389,8 @@ class MainContentContainer extends Component {
 	}
 	
 
-	doFileUpdateRequestOnCodeMirrorBlur = () => {
-		var fileUpdatePromise = this.doFileUpdateRequest(true)
+	doFileUpdateRequestOnCodeMirrorBlur = (props) => {
+		var fileUpdatePromise = this.doFileUpdateRequest(true, undefined, props)
         if (fileUpdatePromise) {
         	fileUpdatePromise.then((resData) => {
         		if (resData.status === -1) { // 保存文件出现异常
@@ -496,7 +499,8 @@ class MainContentContainer extends Component {
 	}
 
 	// forTest true  是评测时触发的file_update
-	doFileUpdateRequest(checkIfCodeChanged, forTest) {
+	doFileUpdateRequest(checkIfCodeChanged, forTest, props) {
+		const _props = props || this.props;
 		const { codeStatus } = this.state;
 		if (!forTest && codeStatus !== UPDATED) {	// 已修改状态才能保存
 			return;
@@ -521,7 +525,7 @@ class MainContentContainer extends Component {
 			})
 			return null;
 		}
-		const { challenge, output_sets, onRunCodeTestFinish, myshixun } = this.props
+		const { challenge, output_sets, onRunCodeTestFinish, myshixun } = _props
 		// var url = `${locationPath}/file_update?path=${encodeURIComponent(challenge.path)}`
 		var url = `/myshixuns/${myshixun.identifier}/update_file.json`
 

public/react/src/modules/page/layers/ImageLayerOfCommentHOC.js

@@ -37,6 +37,8 @@ export function ImageLayerOfCommentHOC(options = {}) {
       }
       // jQuery._data( $('.newMain')[0], "events" )
       componentDidMount() {	
+        this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
+
         // commentsDelegateParent #game_left_contents #tab_con_4
         setTimeout(() => {
           $(options.parentSelector || ".commentsDelegateParent")
@@ -60,7 +62,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
           <React.Fragment>
             <ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>
 
-            <WrappedComponent {...this.props} >
+            <WrappedComponent {...this.props} ref="wrappedComponentRef">
             </WrappedComponent>
           </React.Fragment>
         )

public/react/src/modules/paths/PathDetail/addCollaborators.js

@@ -14,7 +14,8 @@ class addCollaborators extends Component{
       search:'',
       partnerListid:[],
       checkAll: false,
-      optionss:[]
+      optionss:[],
+			useristrue:false
     }
   }
   addBox=()=>{
@@ -70,6 +71,13 @@ class addCollaborators extends Component{
     let {partnerListid} =this.state;
     let id=this.props.match.params.pathId;
     let url="/paths/"+id+"/add_subject_members.json"
+
+		if(partnerListid.length===0){
+			this.setState({
+				useristrue:true
+			})
+			return
+		}
     axios.post(url,{
       user_ids:partnerListid
     }).then((response) => {
@@ -87,9 +95,17 @@ class addCollaborators extends Component{
   }
 
   addCollaboratorsid=(id)=>{
+  	if(id.length===0){
   		this.setState({
-        partnerListid:id
+				partnerListid:id,
 			})
+		}else{
+			this.setState({
+				partnerListid:id,
+				useristrue:false
+			})
+		}
+
   }
 
   onCheckAllChange = (e) => {
@@ -145,7 +161,7 @@ class addCollaborators extends Component{
   }
 
   render(){
-    let {addPartner,search,partnerList,optionss,checkAll,partnerListid} = this.state;
+    let {addPartner,search,partnerList,optionss,checkAll,partnerListid,useristrue} = this.state;
 
     return(
 				this.props.detailInfoList===undefined?"":this.props.detailInfoList.allow_add_member===true?
@@ -199,6 +215,7 @@ class addCollaborators extends Component{
               }
               </CheckboxGroup>
             </ul>
+						{useristrue===true?<span className={"color-red"}>请先选择用户</span>:""}
             <div className="mt20 marginauto clearfix edu-txt-center">
                 <a onClick={this.hideAddBox} className="pop_close task-btn mr30">取消</a>
                 <a className="task-btn task-btn-orange" onClick={this.SaveAddBox}  id="submit_send_shixun">确定</a>

public/react/src/modules/tpm/SiderBar.js

@@ -115,7 +115,7 @@ class SiderBar extends Component {
 												`
 											}
 										</style>
-                    <img src={getImageUrl("images/edu_user/EWM.jpg")} width="158px" height="158px" />
+                    <img src={getImageUrl("images/educoder/EWM.jpg")} width="158px" height="158px" />
                       <p className={"WeChatstyle"}>微信扫一扫</p>
                       <p className={"WeChatstyle"}>关注公众号</p>
                       <span className="trangle_right"></span>

public/react/src/modules/tpm/shixunchild/Collaborators/Collaborators.js

@@ -45,7 +45,8 @@ class Collaborators extends Component {
             collaboratorListsumtype:true,
 					  user_name:undefined,
 					  school_name:undefined,
-						spinnings:false
+						spinnings:false,
+					  useristrue:false
         }
     }
     componentDidMount() {
@@ -217,10 +218,20 @@ class Collaborators extends Component {
         } else {
             alltype = false
         }
+
+        if(newlist.length===0){
+					this.setState({
+						Searchadmin: newlist,
+						allChangechecked: alltype,
+					})
+				}else{
 					this.setState({
 						Searchadmin: newlist,
-            allChangechecked: alltype
+						allChangechecked: alltype,
+						useristrue:false
 					})
+				}
+
 
     }
     allChange = (e) => {
@@ -260,6 +271,13 @@ class Collaborators extends Component {
                 }
             }
         }
+
+			if(user_ids.length===0){
+				this.setState({
+					useristrue:true
+				})
+				return
+			}
         let url = "/shixuns/" + id + "/shixun_members_added.json";
         axios.post(url, {
             user_ids: user_ids
@@ -405,7 +423,8 @@ class Collaborators extends Component {
             collaboratorListsum,
             collaboratorListsumtype,
 						user_name,
-						school_name
+						school_name,
+				  	useristrue
         } = this.state;
         let {loadingContent} = this.props;
         const radioStyle = {
@@ -547,7 +566,7 @@ class Collaborators extends Component {
 
 
                     </div>
-
+									{useristrue===true?<span className={"color-red"}>请先选择用户</span>:""}
                     <div className="clearfix edu-txt-center mt20">
                         <a className="pop_close task-btn mb10 mr40 colorFFF"
                            onClick={() => this.CollaboratorsshowModal("cooperation")}>取消</a>

public/react/src/modules/user/usersInfo/InfosBanner.js

@@ -8,7 +8,7 @@ import "./usersInfo.css"
 import "../../courses/css/members.css"
 import "../../courses/css/Courses.css"
 
-import banner from '../../../images/account/infobanner.png'
+import { LinkAfterLogin } from 'educoder'
 
 class InfosBanner extends Component{
   constructor(props){
@@ -69,7 +69,14 @@ class InfosBanner extends Component{
                 </span> 
                 :
                 <span className="fl mt35 ml60">
-                  <a href={`/messages/${login}/message_detail?target_ids=${id}`} className="user_default_btn user_yellow_btn fl font-18">私信</a>
+                  <LinkAfterLogin 
+                    {...this.props} 
+                    {...this.state} 
+                    className="user_default_btn user_yellow_btn fl font-18" 
+                    to={`/messages/${login}/message_detail?target_ids=${id}`}
+                  >
+                  私信
+                  </LinkAfterLogin>
                 </span>
               }
             </div>
@@ -83,7 +90,7 @@ class InfosBanner extends Component{
             <li className={`${moduleName == 'shixuns' ? 'active' : '' }`}>
               <Link
                 onClick={() => this.setState({moduleName: 'shixuns'})}
-                to={`/users/${username}/shixuns`}>实训项目</Link>
+                to={`/users/${username}/shixuns`}>开发社区</Link>
             </li>
             <li className={`${moduleName == 'paths' ? 'active' : '' }`}>
               <Link 
@@ -93,7 +100,7 @@ class InfosBanner extends Component{
             <li className={`${moduleName == 'projects' ? 'active' : '' }`}>
               <Link
                 onClick={() => this.setState({moduleName: 'projects'})}
-                to={`/users/${username}/projects`}>开发项目</Link>
+                to={`/users/${username}/projects`}>项目</Link>
             </li>
             <li className={`${moduleName == 'package' ? 'active' : '' }`}>
               <Link

public/react/src/modules/user/usersInfo/InfosCourse.js

@@ -130,7 +130,7 @@ class InfosCourse extends Component{
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/courses/new"} name={"新建课堂"} index="1"></Create> : ""
           }
           {
-            (!data || data.courses.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.courses.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.courses && data.courses.map((item,key)=>{

public/react/src/modules/user/usersInfo/InfosPath.js

@@ -152,7 +152,7 @@ class InfosPath extends Component{
 						this.props.current_user && this.props.current_user.user_identity != "学生" ? <Create href={"/paths/new"} name={"新建实践课程"} index="3"></Create>:""
           }
           {
-            (!data || data.subjects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.subjects.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.subjects && data.subjects.map((item,key)=>{

public/react/src/modules/user/usersInfo/InfosProject.js

@@ -125,7 +125,7 @@ class InfosProject extends Component{
             <Create href={`${this.props.Headertop && this.props.Headertop.old_url}/projects/new`} name={"新建开发项目"} index="4"></Create>:""
           }
           {
-           (!data || data.projects.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.projects.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.projects && data.projects.map((item,key)=>{

public/react/src/modules/user/usersInfo/InfosShixun.js

@@ -1,14 +1,11 @@
 import React, { Component } from 'react';
-import { SnackbarHOC } from 'educoder';
-import {BrowserRouter as Router,Route,Switch} from 'react-router-dom';
-import {Tooltip,Menu,Pagination,Spin} from 'antd';
-import Loadable from 'react-loadable';
-import Loading from '../../../Loading';
+
+import { Pagination , Spin } from 'antd';
+
 import NoneData from '../../courses/coursesPublic/NoneData'
 import axios from 'axios';
-import {getImageUrl,setImagesUrl} from 'educoder';
-import { TPMIndexHOC } from '../../tpm/TPMIndexHOC';
-import { CNotificationHOC } from '../../courses/common/CNotificationHOC'
+import { setImagesUrl } from 'educoder';
+
 import "./usersInfo.css"
 
 import Create from './publicCreatNew'
@@ -115,7 +112,7 @@ class InfosShixun extends Component{
       totalCount,
       isSpin
     } = this.state;
-    let isStudent = this.props.isStudent();
+    
     let  is_current=this.props.is_current;
     return(
       <div className="educontent">
@@ -161,16 +158,14 @@ class InfosShixun extends Component{
             <Create href={"/shixuns/new"} name={"新建实训"} index="2"></Create>:""
           }
           {
-            (!data || data.shixuns.length==0) && (!is_current || (this.props.current_user && this.props.current_user.user_identity === "学生" )) && <NoneData></NoneData>
+            (!data || (data && data.shixuns.length==0)) && category && <NoneData></NoneData>
           }
           {
             data && data.shixuns && data.shixuns.map((item,key)=>{
               return(
                 <div className="square-Item" onClick={()=>this.turnToCourses(`/shixuns/${item.identifier}/challenges`)}>
                   {
-                    item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span>
-											{/*<img className="fl" src={setImagesUrl("images/educoder/tag2.png")}/>*/}
-                    </div>
+                    item.tag && <div className="tag-green"><span className="tag-name">{item.tag}</span><img className="fl" src={setImagesUrl("images/educoder/tag2.png")}/></div>
                   }
                   <a href="javascript:void(0)" className="square-img">
                     <img src={setImagesUrl(`${item.image_url}`)}/>

public/react/src/public-path.js

@@ -0,0 +1,6 @@
+/*global __webpack_public_path__ */
+if (window._enableCDN && window.location.host == 'pre-newweb.educoder.net') {
+    __webpack_public_path__ = 'http://testali-cdn.educoder.net/react/build/'
+} else if (window._enableCDN && window.location.host == 'www.educoder.net') {
+    __webpack_public_path__ = 'https://ali-newweb.educoder.net/react/build/'
+}