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

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

@@ -144,7 +144,8 @@ $(document).on('turbolinks:load', function(){
             var html='<div class="row mt-2 align-items-center linkFormItem">\n' +
                 '          <div class="col-1 text-right">\n' +
                 '            <label class="checkbox checkbox-primary mt-1">\n' +
-                '              <input type="checkbox" name="navbar[][hidden]" value="0" class="font-16" checked="checked">\n' +
+                '              <input type="checkbox" name="navbar[][hidden]" value="0" hidden class="font-16" checked="checked">\n' +
+                '              <input type="checkbox" value="0" class="font-16 module_hidden" checked="checked">\n' +
                 '            </label>\n' +
                 '          </div>\n' +
                 '          <div class="col-md-label mt-1"><input type="hidden" value="md" name="navbar[][module_type]">\n' +
@@ -203,6 +204,15 @@ $(document).on('turbolinks:load', function(){
             $(this).parents(".requireForm_item").remove();
         });
 
+        $('.nav-setting-form').on('click', '.module_hidden', function(){
+            var checkEle = $(this);
+            if (checkEle.is(':checked')) {
+                checkEle.prev().val(0);
+            } else {
+                checkEle.prev().val(1);
+            }
+        });
+
         $('.competition-staff-settings').on('click', '.mutiple-limited-radio', function(){
             var radio = $(this);
             if (radio.is(':checked')) {

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

@@ -80,6 +80,21 @@ $(document).on('turbolinks:load', function(){
       })
     });
 
+    // reset user login times
+    $('.users-list-container').on('click', '.reset-login-times-action', function(){
+      var $action = $(this);
+
+      var userId = $action.data('id');
+      $.ajax({
+        url: '/admins/users/' + userId + '/reset_login_times',
+        method: 'POST',
+        dataType: 'json',
+        success: function() {
+          showSuccessNotify();
+        }
+      });
+    });
+
     // ***************** reward grade modal *****************
     var $rewardGradeModal = $('.admin-users-reward-grade-modal');
     var $form = $rewardGradeModal.find('form.admin-users-reward-grade-form');

app/controllers/admins/users_controller.rb

@@ -52,6 +52,12 @@ class Admins::UsersController < Admins::BaseController
     render_ok(grade: user.grade)
   end
 
+  def reset_login_times
+    User.find(params[:id]).reset_login_times!
+
+    render_ok
+  end
+
   private
 
   def update_params

app/controllers/competitions/competition_teams_controller.rb

@@ -78,7 +78,7 @@ class Competitions::CompetitionTeamsController < Competitions::BaseController
     end
     render_ok
 
-  rescue Competitions::CreatePersonalTeamService::Error => ex
+  rescue ApplicationService::Error => ex
     render_error(ex.message)
   end
 

app/controllers/competitions/competitions_controller.rb

@@ -31,7 +31,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
   def show
     @competition = current_competition
 
-    current_competition.increment(:visits)
+    current_competition.increment!(:visits)
   end
 
   def update
@@ -44,6 +44,8 @@ class Competitions::CompetitionsController < Competitions::BaseController
     @competition = current_competition
     @competition_modules = @competition.unhidden_competition_modules
     @user = current_user
+
+    current_competition.increment!(:visits)
   end
 
   def informs
@@ -176,7 +178,7 @@ class Competitions::CompetitionsController < Competitions::BaseController
       if personal
         row_cells_column << record_user.real_name
         row_cells_column << record_user.school_name
-        row_cells_column << record_user.student_id
+        row_cells_column << record_user.student_id.present? ? (record_user.student_id.to_s + "\t") : "--"
       else
         row_cells_column << record.name
         row_cells_column << record.teachers_name

app/controllers/homework_commons_controller.rb

@@ -440,6 +440,7 @@ class HomeworkCommonsController < ApplicationController
     @user = current_user
     @work = @homework.user_work(current_user.id) if @user_course_identity == Course::STUDENT
     @course_groups = @course.course_groups.where(id: @course.charge_group_ids(@user))
+    @shixun = @homework.shixuns.take if @homework.homework_type == "practice"
   end
 
   def update_settings

app/controllers/users/authentication_applies_controller.rb

@@ -11,6 +11,6 @@ class Users::AuthenticationAppliesController < Users::BaseAccountController
   private
 
   def create_params
-    params.permit(:name, :id_number, :upload_image)
+    params.permit(:name, :gender, :id_number, :upload_image)
   end
 end

app/helpers/competitions_helper.rb

@@ -38,8 +38,10 @@ module CompetitionsHelper
   def chart_stages competition
     stages = []
     statistic_stages = competition.competition_stages.where("score_rate > 0")
-    if competition.max_stage_end_time && competition.max_stage_end_time < Time.now && statistic_stages.size > 1
+
-      stages << {id: nil, name: "总排行榜", rate: 1.0, start_time: competition.start_time, end_time: competition.end_time}
+    end_time = competition.max_stage_end_time || competition.end_time
+    if end_time && end_time < Time.now
+      stages << {id: nil, name: statistic_stages.size > 1 ? "总排行榜" : "排行榜", rate: 1.0, start_time: competition.start_time, end_time: competition.end_time}
     end
 
     statistic_stages.each do |stage|

app/helpers/export_helper.rb

@@ -44,7 +44,7 @@ module ExportHelper
           w_2 = w_user&.login.present? ? w_user&.login : "--"
           w_3 = w_user&.real_name.present? ? w_user&.real_name : "--"
           w_3_1 = w_user&.mail.present? ? w_user.mail : "--"
-          w_4 = w_user.student_id.present? ? w_user.student_id : "--"
+          w_4 = w_user.student_id.present? ? (w_user.student_id.to_s + "\t") : "--"
         else
           w_2 = "--"
           w_3 = "--"
@@ -132,7 +132,7 @@ module ExportHelper
         w_2 = w_user&.login.present? ? w_user&.login : "--"
         w_3 = w_user&.real_name.present? ? w_user&.real_name : "--"
         w_3_1 = w_user&.mail.present? ? w_user.mail : "--"
-        w_4 = w_user.student_id.present? ? w_user.student_id : "--"
+        w_4 = w_user.student_id.present? ? (w_user.student_id.to_s + "\t") : "--"
         course_name = course.students.find_by(user_id: w.user_id).try(:course_group_name)
         w_5 = course_name.present? ? course_name : "--"
         #0： 未提交， 1 按时提交， 2 延迟提交
@@ -217,7 +217,7 @@ module ExportHelper
       w_2 = w_user&.login.present? ? w_user&.login : "--"
       w_3 = w_user&.real_name.present? ? w_user&.real_name : "--"
       w_3_1 = w_user&.mail.present? ? w_user.mail : "--"
-      w_4 = w_user.student_id.present? ? w_user.student_id : "--"
+      w_4 = w_user.student_id.present? ? (w_user.student_id.to_s + "\t") : "--"
       w_5 = work.class_grouping_name
       if task_type_boolean   #是否分组
         w_6 = work.grouping_name
@@ -311,7 +311,7 @@ module ExportHelper
       end
       user_start_time = e_user.start_at.present? ? e_user.start_at.strftime('%Y-%m-%d %H:%M') : "--"
       user_end_time = e_user.end_at.present? ? e_user.end_at.strftime('%Y-%m-%d %H:%M') : "--"
-      user_student_id = user_info.student_id.present? ? user_info.student_id : "--"
+      user_student_id = user_info.student_id.present? ? (user_info.student_id.to_s + "\t") : "--"
       user_login = user_info&.login.present? ? user_info.login : "--"
       user_real_name = user_info.real_name.present? ? user_info.real_name : "--"
       user_mail = user_info&.mail.present? ? user_info.mail : "--"
@@ -373,7 +373,7 @@ module ExportHelper
         w_2 = user&.login.present? ? user&.login : "--"
         w_3 = user&.real_name.present? ? user&.real_name : "--"
         w_3_1 = user&.mail.present? ? user.mail : "--"
-        w_4 = user.student_id.present? ? user.student_id : "--"
+        w_4 = user.student_id.present? ? (user.student_id.to_s + "\t") : "--"
         w_5 = student&.course_group_name.present? ? student.course_group_name : "--"
         w_6 = topic.present? ? topic.name : "--"
         w_7 = topic.present? ? topic.teacher.full_name : "--"

app/libs/limit_forbid_control/base.rb

@@ -32,6 +32,7 @@ class LimitForbidControl::Base
 
     # 锁定
     if value >= allow_times.to_i
+      Rails.logger.info("[LimitForbidControl] Lock #{cache_key}")
       Rails.cache.write(forbid_cache_key, true, expires_in: forbid_expires)
       Rails.cache.delete(cache_key)
     else
@@ -40,6 +41,7 @@ class LimitForbidControl::Base
   end
 
   def clear
+    Rails.logger.info("[LimitForbidControl] Clear #{cache_key}")
     Rails.cache.delete(forbid_cache_key)
     Rails.cache.delete(cache_key)
   end

app/models/challenge.rb

@@ -46,7 +46,16 @@ class Challenge < ApplicationRecord
     #self.challenge_chooses.pluck(:score).sum
   end
 
-  # 关卡总分
+  def challenge_difficulty
+    case difficulty
+    when 1 then "简单"
+    when 2 then "中等"
+    when 3 then "困难"
+    else ''
+    end
+  end
+
+    # 关卡总分
   def all_score
     self.score
     # if self.st == 1

app/models/competition.rb

@@ -47,6 +47,10 @@ class Competition < ApplicationRecord
     sponsor_schools.map{|sponsor| sponsor.school.name}
   end
 
+  def region_schools_name
+    region_schools.map{|region| region.school.name}
+  end
+
   def competition_status
     if !status
       com_status = "nearly_published"

app/models/user.rb

@@ -660,6 +660,10 @@ class User < ApplicationRecord
     end
   end
 
+  def reset_login_times!
+    LimitForbidControl::UserLogin.new(self).clear
+  end
+
   protected
   def validate_password_length
     # 管理员的初始密码是5位

app/queries/admins/user_statistic_query.rb

@@ -46,12 +46,12 @@ class Admins::UserStatisticQuery < ApplicationQuery
       finish_challenge = finish_challenge.where(updated_at: time_range)
     end
 
-    study_myshixun_map   = study_myshixun.group(:user_id).count
+    study_myshixun_map   = study_myshixun.reorder(nil).group(:user_id).count
-    finish_myshixun_map  = finish_myshixun.group(:user_id).count
+    finish_myshixun_map  = finish_myshixun.reorder(nil).group(:user_id).count
-    study_challenge_map  = study_challenge.group(:user_id).count
+    study_challenge_map  = study_challenge.reorder(nil).group(:user_id).count
-    finish_challenge_map = finish_challenge.group(:user_id).count
+    finish_challenge_map = finish_challenge.reorder(nil).group(:user_id).count
-    evaluate_count_map   = study_challenge.group(:user_id).sum(:evaluate_count)
+    evaluate_count_map   = study_challenge.reorder(nil).group(:user_id).sum(:evaluate_count)
-    cost_time_map        = study_challenge.group(:user_id).sum(:cost_time)
+    cost_time_map        = study_challenge.reorder(nil).group(:user_id).sum(:cost_time)
 
     users.each do |user|
       user._extra_data = {

app/services/admins/competition_nav_setting_service.rb

@@ -21,7 +21,7 @@ class Admins::CompetitionNavSettingService < ApplicationService
         else
           com_module = CompetitionModule.create!(competition_id: competition.id, module_type: 'md')
         end
-        com_module.update_attributes!(hidden: nav["hidden"] ? 0 : 1, position: nav["position"] ? nav["position"] : com_module.position, name: nav["name"], url: nav["url"])
+        com_module.update_attributes!(hidden: nav["hidden"] && nav["hidden"].to_i == 0 ? 0 : 1, position: nav["position"] ? nav["position"] : params[:navbar].length, name: nav["name"], url: nav["url"])
       end
 
       delete_module_ids = old_module_ids - module_ids

app/services/competitions/create_personal_team_service.rb

@@ -1,5 +1,4 @@
 class Competitions::CreatePersonalTeamService < ApplicationService
-  Error = Class.new(StandardError)
 
   attr_reader :competition, :user
 

app/services/competitions/save_team_service.rb

@@ -11,6 +11,8 @@ class Competitions::SaveTeamService < ApplicationService
   end
 
   def call
+    raise Error, '本竞赛只面向部分学校/单位开放，你暂时没有参赛资格' unless competition.open?(creator)
+
     Competitions::SaveTeamForm.new(form_params).validate!
 
     new_record = team.new_record?

app/services/users/apply_authentication_service.rb

@@ -22,6 +22,8 @@ class Users::ApplyAuthenticationService < ApplicationService
       user.authentication = false
       user.save!
 
+      user.user_extension.update!(gender: params[:gender].to_i) if params[:gender].present?
+
       user.apply_user_authentication.create!(auth_type: 1, status: 0)
 
       move_image_file! unless params[:upload_image].to_s == 'false'

app/services/users/course_service.rb

@@ -1,7 +1,7 @@
 class Users::CourseService
   include CustomSortable
 
-  sort_columns :updated_at, default_by: :updated_at, default_direction: :desc
+  sort_columns :created_at, :updated_at, default_by: :updated_at, default_direction: :desc
 
   attr_reader :user, :params
 
@@ -15,7 +15,7 @@ class Users::CourseService
 
     courses = status_filter(courses)
 
-    custom_sort(courses, :updated_at, params[:sort_direction])
+    custom_sort(courses, params[:sort_by], params[:sort_direction])
   end
 
   private

app/services/users/project_service.rb

@@ -1,7 +1,7 @@
 class Users::ProjectService
   include CustomSortable
 
-  sort_columns :updated_on, default_by: :updated_on, default_direction: :desc
+  sort_columns :created_on, :updated_on, default_by: :updated_on, default_direction: :desc
 
   attr_reader :user, :params
 
@@ -21,7 +21,7 @@ class Users::ProjectService
     projects = category_filter(projects)
     projects = status_filter(projects)
 
-    custom_sort(projects, :updated_on, params[:sort_direction])
+    custom_sort(projects, params[:sort_by], params[:sort_direction])
   end
 
   private

app/services/users/shixun_service.rb

@@ -77,6 +77,10 @@ class Users::ShixunService
     sort_by        = sort_by&.downcase
     sort_direction = sort_direction&.downcase
 
+    if sort_by.blank? || !%w(updated_at created_at).include?(sort_by)
+      sort_by = 'updated_at'
+    end
+
     if sort_direction.blank? || !%w(desc asc).include?(sort_direction)
       sort_direction = 'desc'
     end
@@ -87,11 +91,11 @@ class Users::ShixunService
 
     case params[:category]
     when 'study' then
-      relations.order("myshixuns.updated_at #{sort_direction}")
+      relations.order("myshixuns.#{sort_by} #{sort_direction}")
     when 'manage' then
-      relations.order("shixuns.updated_at #{sort_direction}")
+      relations.order("shixuns.#{sort_by} #{sort_direction}")
     else
-      relations.order("shixuns.created_at #{sort_direction}")
+      relations.order("shixuns.#{sort_by} #{sort_direction}")
     end
   end
 end

app/services/users/subject_service.rb

@@ -1,7 +1,7 @@
 class Users::SubjectService
   include CustomSortable
 
-  sort_columns :updated_at, default_by: :updated_at, default_direction: :desc
+  sort_columns :created_at, :updated_at, default_by: :updated_at, default_direction: :desc
 
   attr_reader :user, :params
 
@@ -14,7 +14,7 @@ class Users::SubjectService
     subjects = category_scope_subjects
     subjects = user_policy_filter(subjects)
 
-    custom_sort(subjects.distinct, :updated_at, params[:sort_direction])
+    custom_sort(subjects.distinct, params[:sort_by], params[:sort_direction])
   end
 
   private

app/tasks/exercise_publish_task.rb

@@ -45,12 +45,14 @@ class ExercisePublishTask
     Rails.logger.info("log--------------------------------exercise_end start")
     puts "--------------------------------exercise_end start"
     # 1。统一设置的试卷
-    exercises = Exercise.includes(:exercise_users,:exercise_questions).where("exercise_status = 2 AND unified_setting = true AND end_time <= ?",Time.now + 900)
+    exercises = Exercise.includes(:exercise_users,:exercise_questions).where("exercise_status = 2 AND
+                                                               unified_setting = true AND end_time <= ?",Time.now + 900)
     exercises&.each do |exercise|
       ex_type = exercise.exercise_questions.pluck(:question_type).uniq
       exercise.update_column('exercise_status', 3)
       exercise.exercise_users&.each do |exercise_user|
         begin
+          Rails.logger.info("true: user_id:#{exercise_user.user_id}--commit_status:#{exercise_user.commit_status}")
           if (exercise_user&.commit_status == 0) && (exercise_user&.start_at.present?)
             s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
             if ex_type.include?(4)   #是否包含主观题
@@ -60,6 +62,9 @@ class ExercisePublishTask
             end
             total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
             total_score = s_score + total_score_subjective_score
+            Rails.logger.info("true: user_id:#{exercise_user.user_id}--subjective_score:#{subjective_score}")
+            Rails.logger.info("true: user_id:#{exercise_user.user_id}--s_score:#{s_score}")
+            Rails.logger.info("true: user_id:#{exercise_user.user_id}--commit_method:#{exercise_user.commit_method}")
             commit_option = {
                 :status => 1,
                 :commit_status => 1,
@@ -94,6 +99,7 @@ class ExercisePublishTask
       exercise_users = exercise.exercise_users.where(:user_id => users.pluck(:user_id))
       exercise_users&.each do |exercise_user|
         begin
+          Rails.logger.info("false: user_id:#{exercise_user.user_id}--commit_status:#{exercise_user.commit_status}")
           if exercise_user.commit_status == 0 && !exercise_user.start_at.nil?
             if ex_types.include?(4)   #是否包含主观题
               subjective_score = exercise_user.subjective_score
@@ -103,6 +109,9 @@ class ExercisePublishTask
             s_score = calculate_student_score(exercise, exercise_user.user)[:total_score]
             total_score_subjective_score = subjective_score < 0.0 ? 0.0 : subjective_score
             total_score = s_score + total_score_subjective_score
+            Rails.logger.info("false: user_id:#{exercise_user.user_id}--s_score:#{s_score}")
+            Rails.logger.info("false: user_id:#{exercise_user.user_id}--subjective_score:#{subjective_score}")
+            Rails.logger.info("false: user_id:#{exercise_user.user_id}--commit_method:#{exercise_user.commit_method}")
             commit_option = {
                 :status => 1,
                 :commit_status => 1,

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

@@ -189,7 +189,8 @@
             <div class="row mt-2">
               <div class="col-1 text-right">
                 <label class="checkbox checkbox-primary mt-1">
-                  <%= check_box_tag('navbar[][hidden]', 0, !com_module.hidden, id: nil, class: 'font-16') %>
+                  <input type="checkbox" name="navbar[][hidden]" value="<%= com_module.hidden ? 1 : 0 %>" hidden class="font-16" checked="checked">
+                  <%= check_box_tag('', 0, !com_module.hidden, id: nil, class: 'font-16 module_hidden') %>
                 </label>
               </div>
               <div class="col-md-8 color-blue mt-1">
@@ -259,7 +260,8 @@
             <div class="row mt-2 new_module_div linkFormItem">
               <div class="col-1 text-right">
                 <label class="checkbox checkbox-primary mt-1">
-                  <%= check_box_tag('navbar[][hidden]', 0, !com_module.hidden, id: nil, class: 'font-16') %>
+                  <input type="checkbox" name="navbar[][hidden]" value="<%= com_module.hidden ? 1 : 0 %>" hidden class="font-16" checked="checked">
+                  <%= check_box_tag('', 0, !com_module.hidden, id: nil, class: 'font-16 module_hidden') %>
                 </label>
               </div>
               <div class="col-md-label mt-2">
@@ -282,7 +284,8 @@
             <div class="row mt-2 align-items-center linkFormItem">
               <div class="col-1 text-right">
                 <label class="checkbox checkbox-primary mt-1">
-                  <%= check_box_tag('navbar[][hidden]', 0, !com_module.hidden, id: nil, class: 'font-16') %>
+                  <input type="checkbox" name="navbar[][hidden]" value="<%= com_module.hidden ? 1 : 0 %>" hidden class="font-16" checked="checked">
+                  <%= check_box_tag('', 0, !com_module.hidden, id: nil, class: 'font-16 module_hidden') %>
                 </label>
               </div>
               <div class="col-md-label mt-1">
@@ -325,7 +328,7 @@
 </div>
 
 
-<% if @competition.mode == 1 %>
+<%# if @competition.mode == 1 %>
   <div class="card mb-5 competition-chart-stages">
     <div class="card-header d-flex justify-content-between align-items-center">
       <span>排行榜设置</span>
@@ -493,4 +496,4 @@
     </div>
   </div>
   <div style="margin-bottom: 8.5rem;"></div>
-<% end %>
+<%# end %>

app/views/admins/users/shared/_user_list.html.erb

@@ -2,15 +2,15 @@
   <thead class="thead-light">
     <tr>
       <th width="10%" class="text-left">真实姓名</th>
-      <th width="16%">邮件地址</th>
+      <th width="15%">邮件地址</th>
       <th width="10%">手机号码</th>
       <th width="14%">单位</th>
-      <th width="8%">角色</th>
+      <th width="7%">角色</th>
       <th width="10%"><%= sort_tag('创建于', name: 'created_on', path: admins_users_path) %></th>
       <th width="10%"><%= sort_tag('最后登录', name: 'last_login_on', path: admins_users_path) %></th>
       <th width="6%"><%= sort_tag('经验值', name: 'experience', path: admins_users_path) %></th>
       <th width="6%"><%= sort_tag('金币', name: 'grade', path: admins_users_path) %></th>
-      <th width="12%">操作</th>
+      <th width="14%">操作</th>
     </tr>
   </thead>
   <tbody>
@@ -33,8 +33,6 @@
           <td class="action-container">
             <%= link_to '编辑', edit_admins_user_path(user), class: 'action' %>
 
-            <%= javascript_void_link('奖励', class: 'action reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>
-
             <%= javascript_void_link '解锁', class: 'action unlock-action', data: { id: user.id }, style: user.locked? ? '' : 'display: none;' %>
 
             <% if user.registered? %>
@@ -45,7 +43,14 @@
               <%= javascript_void_link '加锁', class: 'action lock-action', data: { id: user.id }, style: user.locked? || user.registered? ? 'display: none;' : '' %>
             <% end %>
 
-            <%= delete_link '删除', admins_user_path(user, element: ".user-item-#{user.id}"), class: 'delete-user-action' %>
+            <%= javascript_void_link('更多', class: 'action dropdown-toggle', 'data-toggle': 'dropdown', 'aria-haspopup': true, 'aria-expanded': false) %>
+            <div class="dropdown-menu more-action-dropdown">
+              <%= javascript_void_link('奖励', class: 'dropdown-item reward-grade-action', data: { toggle: 'modal', target: '.admin-users-reward-grade-modal', id: user.id }) %>
+
+              <%= javascript_void_link '恢复禁密账号', class: 'dropdown-item reset-login-times-action', data: { id: user.id } %>
+
+              <%= delete_link '删除', admins_user_path(user, element: ".user-item-#{user.id}"), class: 'dropdown-item delete-user-action' %>
+            </div>
           </td>
         </tr>
       <% end %>

app/views/competitions/competitions/common_header.json.jbuilder

@@ -12,6 +12,8 @@ json.published @competition.published?
 json.nearly_published @competition.published_at.present?
 json.competition_status @competition.competition_status
 
+json.region_schools @competition.region_schools_name
+
 json.avatar_url url_to_avatar(@competition)
 
 json.competition_modules @competition_modules do |com_module|

app/views/courses/top_banner.json.jbuilder

@@ -24,4 +24,5 @@ json.course_identity @user_course_identity
 json.excellent @course.excellent
 if @course.is_end == 0
   json.days_remaining (@course.end_date.to_date - Time.now.to_date).to_i
-end
+end
+json.teacher_applies_count CourseMessage.unhandled_join_course_requests_by_course(@course).size if @user_course_identity < Course::ASSISTANT_PROFESSOR

app/views/homework_commons/settings.json.jbuilder

@@ -15,17 +15,19 @@ json.group_settings @course_groups do |group|
 end
 
 if @homework.homework_type == "practice"
-  json.shixun_identifier @homework.shixuns.first.try(:identifier)
+  json.shixun_identifier @shixun.try(:identifier)
+  json.task_pass @shixun&.task_pass
   json.(@homework, :work_efficiency, :eff_score)
   json.(@homework.homework_detail_manual, :answer_open_evaluation, :shixun_evaluation)
 
   total_exp = 0
-  json.challenge_settings @homework.shixuns.first.try(:challenges).each do |challenge|
+  json.challenge_settings @shixun.try(:challenges).each do |challenge|
     json.challenge_id challenge.id
     json.challenge_name challenge.subject
     json.checked challenge_setting(@homework, challenge.id).present?
     json.challenge_score challenge_setting(@homework, challenge.id).try(:score).to_f
     json.challenge_exp challenge.score
+    json.difficulty challenge.challenge_difficulty
     total_exp += challenge.score
   end
 

config/routes.rb

@@ -906,6 +906,7 @@ Rails.application.routes.draw do
         post :lock
         post :unlock
         post :active
+        post :reset_login_times
       end
     end
     resource :import_users, only: [:create]

db/migrate/20191024090740_migrate_competition_chart_rules.rb

@@ -1,14 +1,5 @@
 class MigrateCompetitionChartRules < ActiveRecord::Migration[5.2]
   def change
     add_column :competition_module_md_contents, :competition_stage_id, :integer, default: 0
-
-    ChartRule.all.each do |rule|
-      if rule.competition
-        com_module = rule.competition.competition_modules.find_by(module_type: "chart")
-        if com_module
-          CompetitionModuleMdContent.create!(content: rule.content, competition_module_id: com_module.id, competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0)
-        end
-      end
-    end
   end
 end

db/migrate/20191026110116_migrate_chart_rule.rb

@@ -0,0 +1,12 @@
+class MigrateChartRule < ActiveRecord::Migration[5.2]
+  def change
+    ChartRule.all.each do |rule|
+      if rule.competition
+        com_module = rule.competition.competition_modules.find_by(module_type: "chart")
+        if com_module && !com_module.competition_module_md_contents.exists?(competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0)
+          CompetitionModuleMdContent.create!(content: rule.content, competition_module_id: com_module.id, competition_stage_id: rule.competition_stage_id ? rule.competition_stage_id : 0)
+        end
+      end
+    end
+  end
+end

db/migrate/20191028025241_re_counter_course_groups.rb

@@ -0,0 +1,7 @@
+class ReCounterCourseGroups < ActiveRecord::Migration[5.2]
+  def change
+    CourseGroup.find_each do |group|
+      CourseGroup.reset_counters(group.id, :course_members_count)
+    end
+  end
+end

public/assets/admin-b95c48ea51f392ce7c4024d0d8b2c42dfe48528a1898ec3f7818e0cda2a4f224.js

@@ -136192,7 +136192,8 @@ $(document).on('turbolinks:load', function(){
             var html='<div class="row mt-2 align-items-center linkFormItem">\n' +
                 '          <div class="col-1 text-right">\n' +
                 '            <label class="checkbox checkbox-primary mt-1">\n' +
-                '              <input type="checkbox" name="navbar[][hidden]" value="0" class="font-16" checked="checked">\n' +
+                '              <input type="checkbox" name="navbar[][hidden]" value="0" hidden class="font-16" checked="checked">\n' +
+                '              <input type="checkbox" value="0" class="font-16 module_hidden" checked="checked">\n' +
                 '            </label>\n' +
                 '          </div>\n' +
                 '          <div class="col-md-label mt-1"><input type="hidden" value="md" name="navbar[][module_type]">\n' +
@@ -136251,6 +136252,15 @@ $(document).on('turbolinks:load', function(){
             $(this).parents(".requireForm_item").remove();
         });
 
+        $('.nav-setting-form').on('click', '.module_hidden', function(){
+            var checkEle = $(this);
+            if (checkEle.is(':checked')) {
+                checkEle.prev().val(0);
+            } else {
+                checkEle.prev().val(1);
+            }
+        });
+
         $('.competition-staff-settings').on('click', '.mutiple-limited-radio', function(){
             var radio = $(this);
             if (radio.is(':checked')) {
@@ -138752,6 +138762,21 @@ $(document).on('turbolinks:load', function(){
       })
     });
 
+    // reset user login times
+    $('.users-list-container').on('click', '.reset-login-times-action', function(){
+      var $action = $(this);
+
+      var userId = $action.data('id');
+      $.ajax({
+        url: '/admins/users/' + userId + '/reset_login_times',
+        method: 'POST',
+        dataType: 'json',
+        success: function() {
+          showSuccessNotify();
+        }
+      });
+    });
+
     // ***************** reward grade modal *****************
     var $rewardGradeModal = $('.admin-users-reward-grade-modal');
     var $form = $rewardGradeModal.find('form.admin-users-reward-grade-form');

public/react/src/AppConfig.js

@@ -150,16 +150,16 @@ export function initAxiosInterceptors(props) {
             throw new axios.Cancel('Operation canceled by the user.');
         } else {
             // hash跳转
-            var hash = window.location.hash;
+            // var hash = window.location.hash;
-			if (hash) {
+						// if (hash) {
-				hashTimeout && window.clearTimeout(hashTimeout)
+						// 	hashTimeout && window.clearTimeout(hashTimeout)
-				hashTimeout = setTimeout(() => {
+						// 	hashTimeout = setTimeout(() => {
-					var element = document.querySelector(hash);
+						// 		var element = document.querySelector(hash);
-					if (element) {
+						// 		if (element) {
-						element.scrollIntoView();
+						// 			element.scrollIntoView();
-					}
+						// 		}
-				}, 400) 
+						// 	}, 400)
-			}
+						// }
         }
         // if(response.data.status === 401){
         //   console.log("401401401")

public/react/src/modules/competition/Registration.js

@@ -68,7 +68,8 @@ class Registration extends React.Component {
 			mutiple_limited: false,
 			teamutiple_limited: false,
 			members_count: 0,
-			mode: 0
+			mode: 0,
+			region_schools: [],
 
 		}
 	}
@@ -82,8 +83,8 @@ class Registration extends React.Component {
 		//  //// //////console.log(this.props.isAdmin())
 		try {
 			const {keyword, page, per_page} = this.state;
-			this.Getdata(keyword, page, per_page, this.props.user.admin);
+			this.Getdata(keyword, page, per_page, this.props.user.admin);// 获取列表数据
-			this.GetenrollmentAPI();
+			this.GetenrollmentAPI();//获取我的报名配置
 		} catch (e) {
 			// 	const {keyword, page, per_page} = this.state;
 			// 	this.Getdata(keyword, page, per_page, this.props.isAdmin());
@@ -104,6 +105,8 @@ class Registration extends React.Component {
 			this.Getdata(keyword, page, per_page, this.props.user.admin);
 			//取报名配置
 			this.GetenrollmentAPI();
+			//取模式
+			this.Getdataheader();
 		}
 
 	}
@@ -116,6 +119,7 @@ class Registration extends React.Component {
 				if (result.data) {
 					this.setState({
 						mode: result.data.mode,
+						region_schools: result.data.region_schools
 					})
 
 				}
@@ -219,7 +223,7 @@ class Registration extends React.Component {
 								//管理员
 								try {
 									this.setState({
-										type: result.data.competition_teams.length === 0 ? 1 : 4,
+										type: 4,
 										count: result.data.count,
 										data: result.data.my_teams,
 										competition_teams: result.data.competition_teams,
@@ -454,6 +458,37 @@ class Registration extends React.Component {
 			return
 		}
 
+		let {region_schools} = this.state;
+		//判断是否是否是同一个学校，数组元素为0就不用判断
+		try {
+			if (region_schools.length > 0) {
+				let i = 0;
+				for (var r = 0; r < region_schools.length; r++) {
+					if (region_schools[r] === this.props.user.user_school) {
+						// 终止循环
+						break;
+
+					}
+					i = i + 1;
+				}
+				if (i === region_schools.length) {
+					//如果i 等于region_schools.length，说明本次循环中没有相同的学校，本人不支持报名
+					try {
+						this.props.showNotification(`本竞赛只面向部分学校/单位开放，你暂时没有参赛资格!`);
+
+					} catch (e) {
+
+					}
+					this.Getdataheader();
+					return
+				}
+
+			}
+		} catch (e) {
+
+		}
+
+
 
 		if (this.props.user.is_teacher === true) {
 			try {
@@ -541,6 +576,34 @@ class Registration extends React.Component {
 			return
 		}
 
+		let {region_schools} = this.state;
+		//判断是否是否是同一个学校，数组元素为0就不用判断
+		try {
+			if (region_schools.length > 0) {
+				let i = 0;
+				for (var r = 0; r < region_schools.length; r++) {
+					if (region_schools[r] === this.props.user.user_school) {
+						// 终止循环
+						break;
+
+					}
+					i = i + 1;
+				}
+				if (i === region_schools.length) {
+					//如果i 等于region_schools.length，说明本次循环中没有相同的学校，本人不支持报名
+					try {
+						this.props.showNotification(`本竞赛只面向部分学校/单位开放，你暂时没有参赛资格!`);
+					} catch (e) {
+
+					}
+					this.Getdataheader();
+					return
+				}
+
+			}
+		} catch (e) {
+
+		}
 
 
 		if (this.props.user.is_teacher === true) {
@@ -814,11 +877,11 @@ class Registration extends React.Component {
 
 					<div style={{marginBottom: '12px'}}>
 						<Breadcrumb separator=">">
-							<Breadcrumb.Item><Link to={"/newcompetitions"}>在线竞赛</Link></Breadcrumb.Item>
+							<Breadcrumb.Item><Link to={"/competitions"}>在线竞赛</Link></Breadcrumb.Item>
 							<Breadcrumb.Item><Link
-								to={`/newcompetitions/${this.props.match.params.identifier}/common_header`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name}</Link></Breadcrumb.Item>
+								to={`/competitions/${this.props.match.params.identifier}/common_header`}>{competition_name === undefined || competition_name === null || competition_name === "" ? "全国高校计算机大赛" : competition_name}</Link></Breadcrumb.Item>
 							{/*<Breadcrumb.Item*/}
-							{/*	href={`/newcompetitions/${this.props.match.params.identifier}/common_header`}></Breadcrumb.Item>*/}
+							{/*	href={`/competitions/${this.props.match.params.identifier}/common_header`}></Breadcrumb.Item>*/}
 							<Breadcrumb.Item>报名</Breadcrumb.Item>
 						</Breadcrumb>
 					</div>

public/react/src/modules/competition/competmodal/PersonModal.js

@@ -524,7 +524,7 @@ class PersonModal extends Component {
 	getdatacpersondiv1Items2 = (object) => {
 		//
 		try {
-			if (this.props.GetenrollmentAPI.teacher_staff.mutiple_limited === true) {
+			if (this.props.GetenrollmentAPI.member_staff.mutiple_limited === true) {
 				if (object.enrollable === false) {
 					myabool2 = false;
 					return
@@ -534,6 +534,7 @@ class PersonModal extends Component {
 		} catch (e) {
 			myabool2 = true;
 		}
+
 		myabool2 = true;
 		var datas = {
 			enrollable: object.enrollable,

public/react/src/modules/competition/personal/PersonalCompetititem.js

@@ -304,7 +304,7 @@ class PersonalCompetititem extends React.Component {
 											>
 												<div className="regitemimgs555">
 													<a
-														href={`/newcompetitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
+														href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
 														style={{
 														color: "#459be5",
 														width: "100%",
@@ -364,7 +364,7 @@ class PersonalCompetititem extends React.Component {
 											>
 												<div className="regitemimgs555">
 													<a
-														href={`/newcompetitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
+														href={`/competitions/${this.props.match.params.identifier}/competition_teams/${item.id}`}
 														style={{
 														color: "#459be5",
 														width: "100%",

public/react/src/modules/competitions/Competitimain/CompetitionsIndex.js

@@ -124,7 +124,7 @@ class CompetitionsIndex extends Component{
 									size="large"
 									dataSource={datas&&datas}
 									renderItem={(item,key) => (
-										<a href={item.competition_status==="ended"?`/newcompetitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/newcompetitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/newcompetitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/newcompetitions/${item.identifier}/common_header`:null}
+										<a target="_blank" href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
 											className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
 												this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}
 										  >
@@ -181,8 +181,8 @@ class CompetitionsIndex extends Component{
 												<List.Item.Meta
 													title={<a className={item.competition_status==="ended"?"competitionstitlesshou":item.competition_status==="nearly_published"?
 														this.props.current_user&&this.props.current_user.admin===true?"competitionstitlesshou":this.props.current_user&&this.props.current_user.business===true?"competitionstitlesshou":"endedfont":"competitionstitlesshou"}>
-														<a className={"competitionstitles"}
+														<a target="_blank"  className={"competitionstitles"}
-																					href={item.competition_status==="ended"?`/newcompetitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/newcompetitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/newcompetitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/newcompetitions/${item.identifier}/common_header`:null}
+																					href={item.competition_status==="ended"?`/competitions/${item.identifier}/common_header`:item.competition_status==="nearly_published"?	this.props.current_user&&this.props.current_user.business===true?`/competitions/${item.identifier}/common_header`:this.props.current_user&&this.props.current_user.admin===true?`/competitions/${item.identifier}/common_header`:null:item.competition_status==="progressing"?`/competitions/${item.identifier}/common_header`:null}
 													>{item.name}{item.sub_title===null?"":`——${item.sub_title}`}</a>
 														{/*<span>{item.sub_title===null?"":*/}
 															{/*<Tag className="competitionsrelative" color="#87d068">{item.sub_title}</Tag>}*/}

public/react/src/modules/competitions/Competition_teams/Competitionteams.js

@@ -241,8 +241,8 @@ class Competitionteams extends Component{
 
 				<div className={"educontent clearfix mt20 "}>
 					<Breadcrumb separator=">">
-						<Breadcrumb.Item><Link to={"/newcompetitions"}>{data&&data.name}</Link></Breadcrumb.Item>
+						<Breadcrumb.Item><Link to={"/competitions"}>{data&&data.name}</Link></Breadcrumb.Item>
-						<Breadcrumb.Item><Link to={`/newcompetitions/${this.props.match.params.identifier}/enroll`}>报名</Link></Breadcrumb.Item>
+						<Breadcrumb.Item><Link to={`/competitions/${this.props.match.params.identifier}/enroll`}>报名</Link></Breadcrumb.Item>
 						<Breadcrumb.Item>战队详情</Breadcrumb.Item>
 					</Breadcrumb>
 

public/react/src/modules/competitions/Competitioncommon/CompetitionCommon.js

@@ -31,6 +31,9 @@ class CompetitionCommon extends Component{
 		window.document.title = '竞赛';
 		if(this.props.match.params.identifier!=null){
 			this.getbannerdata();
+			// this.setState({
+			// 	thiskeys:this.props.location.search.replace('?menu=', '')
+			// })
 			// let url=`/competitions/${this.props.match.params.identifier}.json`;
 			// axios.get(url).then((response) => {
 			// 	if(response.status===200){
@@ -45,19 +48,34 @@ class CompetitionCommon extends Component{
 	}
 
 	getbannerdata=()=>{
+		let menuid=this.props.location.search.replace('?menu=', '');
 		let url=`/competitions/${this.props.match.params.identifier}/common_header.json`;
 		axios.get(url).then((response) => {
 			if(response.status===200){
 				this.setState({
-					data:response.data,
+					 data:response.data,
-					thiskeys:response.data.competition_modules[0].id
+					 thiskeys:menuid===undefined||menuid===""?response.data.competition_modules[0].id:menuid
 				})
-				this.getrightdata(
+				if(menuid===undefined||menuid===""){
-					response.data.competition_modules[0].id,
+					this.getrightdata(
-					response.data.competition_modules[0].module_type,
+						response.data.competition_modules[0].id,
-				  response.data.competition_modules[0].module_url,
+						response.data.competition_modules[0].module_type,
-					response.data.competition_modules[0].has_url
+						response.data.competition_modules[0].module_url,
-				)
+						response.data.competition_modules[0].has_url
+					)
+				}else{
+					let newlist=response.data.competition_modules;
+					newlist.map((item,key)=>{
+						if(`${item.id}`===`${menuid}`){
+							this.getrightdata(
+								item.id,
+								item.module_type,
+								item.module_url,
+								item.has_url
+							)
+						}
+					})
+				}
 			}
 		}).catch((error) => {
 			console.log(error)
@@ -83,6 +101,7 @@ class CompetitionCommon extends Component{
 	getrightdatas=(e)=>{
      let keys=parseInt(e.key);
 	   this.getlistdata(keys)
+		 this.props.history.replace(`?menu=${keys}`);
 	}
 
 	getlistdata=(keys,listkey)=>{
@@ -109,7 +128,7 @@ class CompetitionCommon extends Component{
 					if(response.status===200){
 						this.setState({
 							chart_rules:response.data,
-							tabkey:tabkey===undefined?response.data.stages[0].id===null?"0":`${response.data.stages[0].id}`:tabkey
+						  tabkey:tabkey===undefined?response.data.stages[0].id===null?"0":`${response.data.stages[0].id}`:tabkey
 						})
 
 
@@ -121,8 +140,9 @@ class CompetitionCommon extends Component{
 	}
 
 	getrightdata=(id,typeid,module_url,has_url,listkey)=>{
+
 		// if(typeid==="enroll"){
-		// 	this.props.history.replace(`/newcompetitions/${this.props.match.params.identifier}/enroll`);
+		// 	this.props.history.replace(`/competitions/${this.props.match.params.identifier}/enroll`);
     //   return
 		// }
 
@@ -234,13 +254,13 @@ class CompetitionCommon extends Component{
 	}
 
 	render() {
-		let {data,has_url,module_type,Competitionedittype,mdContentdata}=this.state;
+		let {data,thiskeys,Competitionedittype}=this.state;
 
 		return (
 			data===undefined?"":<div className={"educontent clearfix mt20 "}>
 
 					<Breadcrumb separator=">">
-						<Breadcrumb.Item><Link to={"/newcompetitions"}>在线竞赛</Link></Breadcrumb.Item>
+						<Breadcrumb.Item><Link to={"/competitions"}>在线竞赛</Link></Breadcrumb.Item>
 						<Breadcrumb.Item>{data&&data.name}</Breadcrumb.Item>
 					</Breadcrumb>
 
@@ -284,7 +304,7 @@ class CompetitionCommon extends Component{
 													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516">{data.competition_status==="nearly_published"?"--":data&&data.visits_count}</div>
 												</Col>
 												<Col className="gutter-row rankbeicenter" span={6}>
-													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div>
+													<div className="gutter-box CompetitionsIndexbottomvalue Competitioncolor516" onClick={data.competition_status==="nearly_published"?"":()=>this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>{data.competition_status==="nearly_published"?"--":data&&data.member_count}</div>
 												</Col>
 											</Row>
 									</Col>
@@ -317,7 +337,7 @@ class CompetitionCommon extends Component{
 													报名截止
 												</Button>:
 											data.competition_status==="progressing"?<Button type="primary" block className={"Competitionfontsize22"}>
-												{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/newcompetitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}
+												{data.mode===2?<a onClick={()=>this.gotocourse()}>立即报名</a>:<a onClick={()=>this.gotocourse(`/competitions/${this.props.match.params.identifier}/enroll`)}>立即报名</a>}
 										</Button>:""}
 									</Col>
 									<Col className={"mt10 Competitionfontsize16"}>{data&&data.enroll_end_time===null?"":`报名截止时间：${data&&data.enroll_end_time}`}</Col>
@@ -327,7 +347,7 @@ class CompetitionCommon extends Component{
 
 						<Layout className={'teamsLayout mt40'}>
 							<Sider>
-								<Menu mode="inline" className="CompetitionMenu" defaultSelectedKeys={[`${this.state.thiskeys}`]} onClick={(e)=>this.getrightdatas(e)}>
+								<Menu mode="inline" className="CompetitionMenu" selectedKeys={[`${this.state.thiskeys}`]} onClick={(e)=>this.getrightdatas(e)}>
 									{data&&data.competition_modules.map((item,key)=>{
 										if(item.module_type!="enroll"){
 											return(

public/react/src/modules/competitions/Competitioncommon/CompetitionContents.js

@@ -9,20 +9,19 @@ class CompetitionContents extends Component{
 	constructor(props) {
 		super(props)
 		this.state={
-
+			hash:undefined
 		}
 	}
 
 	componentDidMount(){
 		window.document.title = '竞赛';
-
+		this.props.MdifHasAnchorJustScorll();
 	}
 
-
-
 	render() {
-     let{mdContentdata}=this.props;
+    let{mdContentdata}=this.props;
-    //
+		//mdhash滚动
+		this.props.MdifHasAnchorJustScorll();
 		return (
 
 				<div className={"fr"}>

public/react/src/modules/competitions/Competitioncommon/CompetitionContentsChart.js

@@ -30,6 +30,7 @@ class CompetitionContents extends Component{
 			}).catch((error) => {
 			console.log(error)
 		})
+		this.props.MdifHasAnchorJustScorll();
 	}
 
 	derivefun=(url)=>{
@@ -65,6 +66,7 @@ class CompetitionContents extends Component{
 		});
 	}
 	render() {
+		this.props.MdifHasAnchorJustScorll();
 		const operations = <div>
 				<Button className={"fr"} type="primary" ghost onClick={()=>this.props.Competitionedit()}>编辑</Button>
 				<Button className={"fr mr20"} type="primary" ghost>
@@ -76,40 +78,40 @@ class CompetitionContents extends Component{
 				title: 'usersum',
 				dataIndex: 'usersum',
 				key: 'name',
-				render: text => <a className={"color-blue"}>{text}</a>,
+				render: text => <span className={"color-blue"}>{text}</span>,
 			},
 			{
 				title: 'userimg',
 				dataIndex: 'userimg',
 				key: 'userimg',
 				render:  (text, record) =>(
-					<a href={`/users/${record.user_login}`} className="color-dark">
+					<span href={`/users/${record.user_login}`} className="color-dark">
 						<img className={"Competitionuserimg"} src={getImageUrl(`images/${record.userimg===null?`avatars/User/0?1442652658`:record.userimg}`)}/>
-					</a>),
+					</span>),
 			},
 			{
 				title: 'username',
 				dataIndex: 'username',
 				key: 'username',
-				render: text => <a title={text}>{text}</a>,
+				render: text => <span title={text}>{text}</span>,
 			},
 			{
 				title: 'school',
 				dataIndex: 'school',
 				key: 'school',
-				render: text => <a title={text}>{text}</a>,
+				render: text => <span title={text}>{text}</span>,
 			},
 			{
 				title: 'spendtime',
 				dataIndex: 'spendtime',
 				key: 'spendtime',
-				render: text => <a>{text}</a>,
+				render: text => <span>{text}</span>,
 			},
 			{
 				title: 'score',
 				dataIndex: 'score',
 				key: 'score',
-				render: text => <a className={"color-blue"}>{text}</a>,
+				render: text => <span className={"color-blue"}>{text}</span>,
 			},
 		];
 
@@ -317,23 +319,27 @@ class CompetitionContents extends Component{
 						{
 							`
 							 .ant-table-tbody > tr > td:nth-last-child(4){
-									line-height: 63px;
+		   								//  line-height: 63px;
-									width: 300px;
+											// width: 300px;
-									height: 96px;
+											// height: 96px;
-									display: inline-block;
+											// // display: inline-flex;
-									overflow: hidden;
+											// overflow: hidden;
-									text-overflow: ellipsis;
+											// text-overflow: ellipsis;
-									white-space: nowrap;
+											// white-space: nowrap;
+											    width: 150px;
 							 }
 							.ant-table-tbody > tr > td:nth-last-child(3){
-				       	 line-height: 63px;
+											// line-height: 63px;
-									width: 305px;
+											// width: 290px;
-									height: 96px;
+											// height: 96px;
-									display: inline-block;
+											// display: inline-block;
-									overflow: hidden;
+											// overflow: hidden;
-									text-overflow: ellipsis;
+											// text-overflow: ellipsis;
-									white-space: nowrap;
+											// white-space: nowrap;
-							 }
+								}
+								.ant-table-tbody>tr>td, .ant-table-thead>tr>th {
+										padding: 5px;
+								}
 							`
 						}
 					</style>

public/react/src/modules/competitions/Competitions.js

@@ -53,7 +53,7 @@ class Competitions extends Component {
 				<Switch>
 
 					{/*新版竞赛战队详情*/}
-					<Route path="/newcompetitions/:identifier/competition_teams/:competition_team_id"
+					<Route path="/competitions/:identifier/competition_teams/:competition_team_id"
 								 render={
 									 (props) => (<CompetitionTeams {...this.props} {...props} {...this.state} />)
 								 }
@@ -62,21 +62,21 @@ class Competitions extends Component {
 
 					{/*新版竞赛报名*/}
 					<Route
-						path="/newcompetitions/:identifier/enroll"
+						path="/competitions/:identifier/enroll"
 						render={
 							(props) => (<Registration {...this.props} {...props} {...this.state}/>)
 						}
 					/>
 
 					{/*新版竞赛详情页面*/}
-					<Route path="/newcompetitions/:identifier/common_header"
+					<Route path="/competitions/:identifier/common_header"
 								 render={
 									 (props) => (<CompetitionCommon {...this.props} {...props} {...this.state} />)
 								 }
 					></Route>
 
 					{/*新版竞赛首页*/}
-					<Route path="/newcompetitions"
+					<Route path="/competitions"
 								 render={
 									 (props) => (<CompetitionsIndex {...this.props} {...props} {...this.state} />)
 								 }

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

@@ -477,8 +477,9 @@ class CoursesBanner extends Component {
 
     render() {
         let { Addcoursestypes, coursedata,excellent, modalsType, modalsTopval, loadtype,modalsBottomval,antIcon,is_guide,AccountProfiletype,modalstrsvalue} = this.state;
-        const isCourseEnd = this.props.isCourseEnd()
+
-			 document.title=coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":coursedata.name;
+        const isCourseEnd = this.props.isCourseEnd();
+			  document.title=coursedata===undefined || coursedata.status===401 || coursedata.status===407?"":coursedata.name;
         return (
           <div>
 						{/*{*/}
@@ -705,18 +706,29 @@ class CoursesBanner extends Component {
 													`}
 												</style>
 												<Breadcrumb separator="|" className={"mt5"}>
-													<Breadcrumb.Item onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")} className={"pointer"}>
+
-														<span className="color-grey-c font-16"><span className={"mr10"}>教师</span>  <span className={"mr10"}>{coursedata.teacher_count}</span></span>
+													<Breadcrumb.Item className={"pointer"}>
+														<Tooltip visible={coursedata.teacher_applies_count===undefined?false:coursedata.teacher_applies_count>0?true:false}
+																		 placement="topLeft"
+																		 title={<pre>{coursedata.teacher_applies_count===undefined?"":coursedata.teacher_applies_count>0?<span>您有{coursedata.teacher_applies_count}条新的加入申请<a className={"daishenp"} onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers?tab=2")}>待审批</a></span>:""}</pre>}>
+																<span className="color-grey-c font-16" onClick={()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/teachers")}>
+																	<span className={"mr10"}>教师</span>
+																	<span className={"mr10"}>{coursedata.teacher_count}</span>
+																</span>
+														</Tooltip>
 													</Breadcrumb.Item>
+
 													<Breadcrumb.Item
 														className={excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?"pointer":"":"pointer"}
 														onClick={excellent===true&&coursedata.course_end === true?this.props.isAdminOrTeacher()===true?()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students"):"":()=>this.setHistoryFun("/courses/"+this.props.match.params.coursesId+"/students")}
 													>
 														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学生</span>  <span className={"mr10"}>{coursedata.student_count}</span></span>
 													</Breadcrumb.Item>
+
 													<Breadcrumb.Item>{coursedata.credit===null?"":
 														<span className="color-grey-c font-16"><span className={"mr10 ml10"}>学分</span> <span className={"mr10"}>{coursedata.credit}</span></span>
 													}</Breadcrumb.Item>
+
 												</Breadcrumb>
 
                         {/*<li className={"mt7 teachersbox"}  >*/}

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

@@ -391,9 +391,8 @@ class OneSelfOrderModal extends Component{
 							{this.props.modaltype===undefined||this.props.modaltype===2
 							|| this.props.usingCheckBeforePost ?"":<div className="clearfix edu-txt-center lineh-40 F4FAFF">
 								<li style={{ width: '100%',padding: "0px 10px"}} className={"mb10"}>
-									<span style={{"float":"left","color":"#05101A"}} className="task-hide color-grey-name ml50">分班名称</span>
+									<span style={{"float":"left","color":"#05101A"}} className="task-hide color-grey-name color-grey-9">分班名称</span>
-
+									<span style={{"float":"right","color":"#05101A","margin-right": "145px"}} className="task-hide color-grey-name color-grey-9">截止时间</span>
-									<span style={{"float":"right","color":"#05101A"}} className="task-hide color-grey-name mr70">截止时间</span>
 								</li>
 							</div>}
 							{this.props.modaltype===undefined||this.props.modaltype===2

public/react/src/modules/courses/css/Courses.css

@@ -1744,4 +1744,9 @@ input.ant-input-number-input:focus {
     line-height: 62px;
     color: #fff;
     margin: 0 auto;
+}
+
+.daishenp{
+    color: #F79946 !important;
+    text-decoration: underline !important;
 }

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

@@ -542,6 +542,7 @@ class Exercise extends Component{
                                                 {...this.props}
                                                 {...this.state}
                                                 style="grey"
+																								single={true}
                                                 checkBoxValues={this.state.checkBoxValues}
                                                 action={this.reloadList}
                                             ></ImmediatelyEnd>

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

@@ -421,8 +421,8 @@ class Testpapersettinghomepage extends Component{
                                     className={"btn fr color-blue font-16 mt20 mr20"}
                                     checkBoxValues={[parseInt(this.props.match.params.Id)]}
                                     Exercisetype={"exercise"}
+																	  // single={true}
                                     action={this.Commonheadofthetestpaper}
-                                    single={true}
                                 ></ImmediatelyEnd>:"":""}
                                 {isAdmin  === true?Commonheadofthetestpaper!==undefined&&Commonheadofthetestpaper.user_permission.exercise_unpublish_count>0?   <ImmediatelyPublish
                                     {...this.props}

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

@@ -50,10 +50,14 @@ function CourseGroupChooserModal({ course_groups = [], isAdminOrCreator, item, i
             application_id: record.application_id,
             approval: approval,
             group_id: arg_course_groups
-        })
+        }).then((result) => {
-        props.showNotification(`已${approval == 1? '同意' : '拒绝'}`)
+					if (result.data.status === 0) {
-        fetchAll(1)
+						props.showNotification(`已${approval == 1? '同意' : '拒绝'}`)
-        modalEl.current.setVisible(false)
+						fetchAll(1)
+						modalEl.current.setVisible(false)
+						window.location.reload();
+					}})
+
     }
     return (
         <ModalWrapper

public/react/src/modules/courses/members/teacherList.js

@@ -258,7 +258,7 @@ class studentsList extends Component{
   // approval 2 - 拒绝
   onAgree = (record, approval = 1) => {
     const isAdminOrCreator = this.props.isAdminOrCreator()
-    const { course_groups } = this.state 
+    const { course_groups ,filterKey} = this.state
     if (approval == 1 && isAdminOrCreator && course_groups && course_groups.length) {
       this.setState({ clickRecord: record}, () => {
         this.setGroupChooserModalVisible(true)
@@ -280,7 +280,7 @@ class studentsList extends Component{
         .then((response) => {
           if (response.data.status == 0) {
             this.props.showNotification(`已${approval == 1? '同意' : '拒绝'}`)
-            this.fetchAll(1)
+            this.fetchAll(1,filterKey)
           }
         })
         .catch(function (error) {
@@ -299,7 +299,20 @@ class studentsList extends Component{
     this.setState({
       isSpin:true
     })
-    this.fetchAll(1);
+		let newmenuid=this.props.location.search.replace('?tab=', '');
+		if(newmenuid===undefined||newmenuid===""||newmenuid==="1"||newmenuid===1){
+			this.setState({
+				filterKey:'1'
+			})
+			this.fetchAll(1,'1');
+		}else{
+			this.setState({
+				filterKey:'2'
+			})
+			this.fetchAll(1,'2');
+		}
+
+
     const isAdminOrTeacher = this.props.isAdminOrTeacher()
     const isAdmin = this.props.isAdmin()
 
@@ -319,10 +332,11 @@ class studentsList extends Component{
     this.getCourseGroups()
   }
   addTeacherSuccessListener = (e, data) => {
+
     // const params = JSON.parse(data)
     // const coursesId = this.props.match.params.coursesId
     if (window.location.pathname.endsWith('teachers')) {
-      this.fetchAll(1)
+      this.fetchAll(1,this.state.filterKey)
     } else {
       // this.props.history.push(`/courses/${coursesId}/teachers`)
     }
@@ -382,9 +396,11 @@ class studentsList extends Component{
     });
   }
   onChangeRoleSuccess = () => {
-    this.fetchAll()
+    this.fetchAll(undefined,this.state.filterKey)
   } 
-  fetchAll = async (argPage) => {
+  fetchAll = async (argPage,filterKey) => {
+		let { searchValue }=this.state
+
     this.setState({
       isSpin:true
     })
@@ -395,7 +411,7 @@ class studentsList extends Component{
     
     const sortedInfo = this.state.sortedInfo;
     let page = argPage || this.state.page
-    let { searchValue, filterKey }=this.state
+
     let order = 1;
     if (sortedInfo.columnKey == 'role') {
       order = 1;
@@ -463,8 +479,8 @@ class studentsList extends Component{
 
   // join_graduation_group
   joinGraduationGroup = (graduation_group_id) => {
-    const courseId = this.props.match.params.coursesId    
+    const courseId = this.props.match.params.coursesId
-
+		let { filterKey }=this.state
     let url= `/courses/${courseId}/join_graduation_group.json`;
     axios.post(url, {
       course_member_list: this.state.checkBoxValues.map (item => { return { course_member_id: item } }),
@@ -472,7 +488,7 @@ class studentsList extends Component{
     }).then((result)=>{
       if(result.data.status==0){
         this.props.showNotification('操作成功。')
-        this.fetchAll()
+        this.fetchAll(undefined,filterKey)
       }
     }).catch((error)=>{
       console.log(error);
@@ -480,6 +496,7 @@ class studentsList extends Component{
   }
 
   onInputSearchChange = (e) => {
+  	let {filterKey}=this.state;
     this.setState({
       searchValue: e.target.value
     })
@@ -488,12 +505,12 @@ class studentsList extends Component{
       clearTimeout(this.timeoutHandler)
     }
     this.timeoutHandler = setTimeout(() => {
-      this.fetchAll(1)
+      this.fetchAll(1,filterKey)
     }, 1200)
   }
 
   onPressEnter = (e) => {
-    this.fetchAll(1)
+    this.fetchAll(1,this.state.filterKey)
   }
 
 
@@ -530,7 +547,7 @@ class studentsList extends Component{
   changeRole = (member, role) => {
     
     const courseId = this.props.match.params.coursesId    
-
+    let {filterKey}=this.state;
     let url= `/courses/${courseId}/change_course_teacher.json`;
     axios.post(url, {
       course_member_id: member.course_member_id
@@ -543,7 +560,7 @@ class studentsList extends Component{
     }).then((result)=>{
       if(result.data.status==0){
         this.props.showNotification('操作成功。')
-        this.fetchAll()
+        this.fetchAll(undefined,filterKey)
       }
     }).catch((error)=>{
       console.log(error);
@@ -559,9 +576,11 @@ class studentsList extends Component{
     this.refs.addAdminModal.setVisible(true)
   }
   changeAdminSuccess = () => {
-    this.fetchAll()    
+  	let {filterKey}=this.state;
+    this.fetchAll(undefined,filterKey)
   }
   onDelete = (member) => {
+  	let {filterKey}=this.state;
     this.props.confirm({
       content: `确认要将“${member.name}”从教师列表中移除吗？`,
       onOk: () => {
@@ -577,7 +596,7 @@ class studentsList extends Component{
             // {"status":1,"message":"删除成功"}
             this.props.showNotification('删除成功')
             trigger('updatabanner')
-            this.fetchAll()
+            this.fetchAll(undefined,filterKey)
           }
         })
         .catch(function (error) {
@@ -602,12 +621,13 @@ class studentsList extends Component{
   }
   
   onTableChange = (pagination, filters, sorter) => {
+  	let {filterKey}=this.state;
     console.log('Various parameters', pagination, filters, sorter);
     this.setState({
       page: pagination.current,
       sortedInfo: sorter,
     }, () => {
-      this.fetchAll()
+      this.fetchAll(undefined,filterKey)
     });
   };
   clearSelection = () => {
@@ -620,7 +640,7 @@ class studentsList extends Component{
       page:1,
       isSpin:true
     }, () => {
-      this.fetchAll();
+      this.fetchAll(undefined,e.key);
     })
   }
   setGroupChooserModalVisible = (visible) => {
@@ -654,7 +674,9 @@ class studentsList extends Component{
     const isSuperAdmin = this.props.isSuperAdmin()
     const hasGraduationModule = this.hasGraduationModule()
     const coursesId = this.props.match.params.coursesId
-    
+
+
+
     return(
       <React.Fragment>
         {/* <AddTeacherModal ref="addTeacherModal" 
@@ -693,7 +715,7 @@ class studentsList extends Component{
           }
           secondRowLeft={
             isAdminOrTeacher ? <div className="fl mt6 task_menu_ul " style={{ width: '600px' }}>
-                <Menu mode="horizontal" defaultSelectedKeys="1" onClick={this.selectedStatus}>
+                <Menu mode="horizontal" selectedKeys={[`${this.state.filterKey}`]} onClick={this.selectedStatus}>
                   <Menu.Item key="1">已审批({total_count})</Menu.Item>
                   <Menu.Item key="2">待审批({apply_size})</Menu.Item>
                 </Menu>
@@ -740,9 +762,11 @@ class studentsList extends Component{
         <div className="mt20 edu-back-white padding20 teacherList">
 
           { course_groups && !!course_groups.length && <CourseGroupChooserModal
+						{...this.state}
+						{...this.props}
             props={{match: this.props.match, showNotification: this.props.showNotification}}
             record={this.state.clickRecord}
-            fetchAll={this.fetchAll}
+            fetchAll={(e)=>this.fetchAll(e,this.state.filterKey)}
             course_groups={course_groups}
             visible={this.state.groupChooserModalVisible}
             setVisible={this.setGroupChooserModalVisible}

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

@@ -563,6 +563,7 @@ class Poll extends Component{
                     {...this.props} 
                     {...this.state}
                     style="grey"
+										single={true}
                     checkBoxValues={this.state.checkBoxValues}
                     action={this.successFun}
                   ></ImmediatelyEnd>

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

@@ -202,7 +202,7 @@ class PollDetailIndex extends Component{
 													className={"font-16"}
 													checkBoxValues={[this.props.match.params.pollId]}
 													action={this.getPollInfo}
-													single={true}
+													// single={true}
 												></ImmediatelyEnd>
 											</li>
 											:""

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

@@ -14,6 +14,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
           imageSrc: ''
         }
       }
+
       onDelegateClick = (event) => {
         const imageSrc = event.target.src || event.target.getAttribute('src') || event.target.getAttribute('href')
         // 判断imageSrc是否是图片
@@ -35,6 +36,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
           return false;
         }
       }
+
       // jQuery._data( $('.newMain')[0], "events" )
       componentDidMount() {	
         this.props.wrappedComponentRef && this.props.wrappedComponentRef(this.refs['wrappedComponentRef'])
@@ -45,6 +47,7 @@ export function ImageLayerOfCommentHOC(options = {}) {
             .delegate(options.imgSelector || ".J_Comment_Reply .comment_content img, .J_Comment_Reply .childrenCommentsView img","click",  this.onDelegateClick);
         }, 1200)
       }
+
       componentWillUnmount() {
         $(options.parentSelector || ".commentsDelegateParent", 'click', this.onDelegateClick)
       }
@@ -55,9 +58,24 @@ export function ImageLayerOfCommentHOC(options = {}) {
           imageSrc: '',
         })
       }
-		
+
+			MdifHasAnchorJustScorll=()=>{
+				//mdhash滚动
+				let anchor = decodeURI(this.props.location.hash).replace('#', '');
+				// 对应id的话, 滚动到相应位置
+				if (!!anchor) {
+					let anchorElement = document.getElementsByName(anchor);
+					if (anchorElement) {
+						if (anchorElement.length!=0) {
+							anchorElement[anchorElement.length-1].scrollIntoView();
+						}
+					}
+				}
+			}
+
+
       render() {
-        
+				this.MdifHasAnchorJustScorll();
         return (
           <React.Fragment>
             <ImageLayer {...this.state} onImageLayerClose={this.onImageLayerClose}></ImageLayer>

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

@@ -609,6 +609,21 @@ export function TPMIndexHOC(WrappedComponent) {
       hideGlobalLoading = () => {
         this.setState({ globalLoading: false })
       }
+
+			MdifHasAnchorJustScorll=()=>{
+				//mdhash滚动
+				let anchor = decodeURI(this.props.location.hash).replace('#', '');
+				// 对应id的话, 滚动到相应位置
+				if (!!anchor) {
+					let anchorElement = document.getElementsByName(anchor);
+					if (anchorElement) {
+						if (anchorElement.length>0){
+							anchorElement[anchorElement.length-1].scrollIntoView();
+						}
+					}
+				}
+			}
+
 	  	render() {
           let{Headertop,Footerdown, isRender, AccountProfiletype,mygetHelmetapi}=this.state;
           const common = {
@@ -643,6 +658,7 @@ export function TPMIndexHOC(WrappedComponent) {
             hideGlobalLoading: this.hideGlobalLoading,
 						yslslowCheckresults:this.yslslowCheckresults,
 						yslslowCheckresultsNo:this.yslslowCheckresultsNo,
+						MdifHasAnchorJustScorll:this.MdifHasAnchorJustScorll
             
           };
           // console.log("this.props.mygetHelmetapi");