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

app/assets/javascripts/admin.js

@@ -13,6 +13,7 @@
 //= require bootstrap-datepicker
 //= require bootstrap.viewer
 //= require jquery.mloading
+//= require jquery-confirm.min
 //= require common
 
 //= require echarts

app/assets/javascripts/admins/batch-check-box.js

@@ -0,0 +1,12 @@
+$(document).on('turbolinks:load', function(){
+  $(document).on('click', '.batch-all-check-box', function(){
+    var $checkAll = $(this);
+
+    $('.batch-check-box').prop('checked', $checkAll.is(':checked'));
+  })
+
+  $(document).on('click', '.batch-check-box', function(){
+    var allChecked = $('.batch-check-box:checked').length === $('.batch-check-box').length
+    $('.batch-all-check-box').prop('checked', allChecked);
+  })
+});

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

@@ -10,11 +10,41 @@ $(document).on('turbolinks:load', function() {
       $searchFrom.find('select[name="status"]').val('processed');
 
       if($link.data('value') === 'processed'){
+        $('.batch-action-container').hide();
         $searchFrom.find('.status-filter').show();
       } else {
+        $('.batch-action-container').show();
         $searchFrom.find('.status-filter').hide();
         $searchFrom.find('select[name="status"]').val('pending');
       }
     });
+
+    $('.batch-agree-btn').on('click', function(){
+      if($('.batch-check-box:checked').length === 0){
+        $.notify({ message: '请先选择数据' }, { type: 'info' });
+        return;
+      }
+
+      customConfirm({
+        content: '确认审核通过？',
+        ok: function(){
+          var ids = $('.batch-check-box:checked').map(function(_, e){ return $(e).val() }).get();
+
+          $.ajax({
+            url: '/admins/identity_authentications/batch_agree',
+            method: 'POST',
+            dataType: 'json',
+            data: { ids: ids },
+            success: function(data){
+              $.notify({ message: '操作成功' });
+              window.location.reload();
+            },
+            error: function(res){
+              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
+            }
+          })
+        }
+      })
+    })
   }
 })

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

@@ -10,11 +10,41 @@ $(document).on('turbolinks:load', function() {
       $searchFrom.find('select[name="status"]').val('processed');
 
       if($link.data('value') === 'processed'){
+        $('.batch-action-container').hide();
         $searchFrom.find('.status-filter').show();
       } else {
+        $('.batch-action-container').show();
         $searchFrom.find('.status-filter').hide();
         $searchFrom.find('select[name="status"]').val('pending');
       }
     });
+
+    $('.batch-agree-btn').on('click', function(){
+      if($('.batch-check-box:checked').length === 0){
+        $.notify({ message: '请先选择数据' }, { type: 'info' });
+        return;
+      }
+
+      customConfirm({
+        content: '确认审核通过？',
+        ok: function(){
+          var ids = $('.batch-check-box:checked').map(function(_, e){ return $(e).val() }).get();
+
+          $.ajax({
+            url: '/admins/professional_authentications/batch_agree',
+            method: 'POST',
+            dataType: 'json',
+            data: { ids: ids },
+            success: function(data){
+              $.notify({ message: '操作成功' });
+              window.location.reload();
+            },
+            error: function(res){
+              $.notify({ message: res.responseJSON.message }, { type: 'danger' });
+            }
+          })
+        }
+      })
+    })
   }
 })

app/assets/javascripts/common.js

@@ -43,3 +43,25 @@ function resetFileInputFunc(file){
   file.after(file.clone().val(""));
   file.remove();
 }
+
+function customConfirm(opts){
+  var okCallback = opts.ok;
+  var cancelCallback = opts.cancel;
+
+  var defaultOpts = {
+    title: '提示',
+    buttons: {
+      ok: {
+        text: '确认',
+        btnClass: 'btn btn-primary',
+        action: okCallback
+      },
+      cancel: {
+        text: '取消',
+        btnClass: 'btn btn-secondary',
+        action: cancelCallback
+      },
+    }
+  }
+  return $.confirm($.extend({}, defaultOpts, opts))
+}

app/assets/stylesheets/admin.scss

@@ -6,6 +6,7 @@
 @import "bootstrap-datepicker";
 @import "bootstrap-datepicker.standalone";
 @import "jquery.mloading";
+@import "jquery-confirm.min";
 
 @import "codemirror/lib/codemirror";
 @import "editormd/css/editormd.min";

app/assets/stylesheets/admins/common.scss

@@ -110,5 +110,11 @@
   .CodeMirror {
     border: 1px solid #ced4da;
   }
+
+  .batch-action-container {
+    margin-bottom: -15px;
+    padding: 10px 20px 0;
+    background: #fff;
+  }
 }
 

app/controllers/accounts_controller.rb

@@ -127,21 +127,21 @@ class AccountsController < ApplicationController
     # UserDayCertification.create(user_id: user.id, status: 1)
   end
 
-  def set_autologin_cookie(user)
-    token = Token.get_or_create_permanent_login_token(user, "autologin")
-    cookie_options = {
-                      :value => token.value,
-                      :expires => 1.month.from_now,
-                      :path => '/',
-                      :secure => false,
-                      :httponly => true
-                     }
-    if edu_setting('cookie_domain').present?
-      cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
-    end
-    cookies[autologin_cookie_name] = cookie_options
-    logger.info("cookies is #{cookies}")
-  end
+  # def set_autologin_cookie(user)
+  #   token = Token.get_or_create_permanent_login_token(user, "autologin")
+  #   cookie_options = {
+  #                     :value => token.value,
+  #                     :expires => 1.month.from_now,
+  #                     :path => '/',
+  #                     :secure => false,
+  #                     :httponly => true
+  #                    }
+  #   if edu_setting('cookie_domain').present?
+  #     cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+  #   end
+  #   cookies[autologin_cookie_name] = cookie_options
+  #   logger.info("cookies is #{cookies}")
+  # end
 
   def logout
     UserAction.create(action_id: User.current.id, action_type: "Logout", user_id: User.current.id, :ip => request.remote_ip)

app/controllers/admins/identity_authentications_controller.rb

@@ -1,6 +1,7 @@
 class Admins::IdentityAuthenticationsController < Admins::BaseController
   def index
     params[:status] ||= 'pending'
+    params[:sort_direction] = params[:status] == 'pending' ? 'asc' : 'desc'
 
     applies = Admins::ApplyUserAuthenticationQuery.call(params.merge(type: 1))
 
@@ -18,6 +19,24 @@ class Admins::IdentityAuthenticationsController < Admins::BaseController
     render_success_js
   end
 
+  def batch_agree
+    ApplyUserAuthentication.real_name_auth.where(id: params[:ids]).each do |apply|
+      begin
+        Admins::IdentityAuths::AgreeApplyService.call(apply)
+      rescue => e
+        Util.logger_error(e)
+      end
+    end
+
+    render_ok
+  end
+
+  def revoke
+    Admins::IdentityAuths::RevokeApplyService.call(current_apply)
+
+    render_success_js
+  end
+
   private
 
   def current_apply

app/controllers/admins/professional_authentications_controller.rb

@@ -1,6 +1,7 @@
 class Admins::ProfessionalAuthenticationsController < Admins::BaseController
   def index
     params[:status] ||= 'pending'
+    params[:sort_direction] = params[:status] == 'pending' ? 'asc' : 'desc'
 
     applies = Admins::ApplyUserAuthenticationQuery.call(params.merge(type: 2))
 
@@ -18,6 +19,23 @@ class Admins::ProfessionalAuthenticationsController < Admins::BaseController
     render_success_js
   end
 
+  def batch_agree
+    ApplyUserAuthentication.professional_auth.where(id: params[:ids]).each do |apply|
+      begin
+        Admins::ProfessionalAuths::AgreeApplyService.call(apply)
+      rescue => e
+        Util.logger_error(e)
+      end
+    end
+
+    render_ok
+  end
+
+  def revoke
+    Admins::ProfessionalAuths::RevokeApplyService.call(current_apply)
+    render_success_js
+  end
+
   private
 
   def current_apply

app/controllers/application_controller.rb

@@ -253,7 +253,10 @@ class ApplicationController < ActionController::Base
 
 			if Digest::MD5.hexdigest(content) == params[:chinaoocKey]
 				user = open_class_user
-				start_user_session(user) if user
+				if user
+					start_user_session(user)
+					set_autologin_cookie(user)
+				end
 				User.current = user
 			end
 		end
@@ -617,6 +620,22 @@ class ApplicationController < ActionController::Base
 		cookies[:fileDownload] = true
 	end
 
+	def set_autologin_cookie(user)
+		token = Token.get_or_create_permanent_login_token(user, "autologin")
+		cookie_options = {
+			:value => token.value,
+			:expires => 1.month.from_now,
+			:path => '/',
+			:secure => false,
+			:httponly => true
+		}
+		if edu_setting('cookie_domain').present?
+			cookie_options = cookie_options.merge(domain: edu_setting('cookie_domain'))
+		end
+		cookies[autologin_cookie_name] = cookie_options
+		logger.info("cookies is #{cookies}")
+	end
+
 	# 149课程的评审用户数据创建（包含创建课堂学生）
 	def open_class_user
 		user = User.find_by(login: "OpenClassUser")

app/controllers/commons_controller.rb

@@ -51,7 +51,7 @@ class CommonsController < ApplicationController
           200
         end
       when 'journals_for_message'
-        course = @object.jour&.course || @object.jour&.student_work&.homework_common&.course
+        course = @object&.jour_type.to_s == "StudentWorksScore" ? @object.jour&.student_work&.homework_common&.course : @object.jour&.course
         if current_user.course_identity(course)  >= Course::STUDENT && @object.user != current_user
           403
         else

app/controllers/courses_controller.rb

@@ -128,8 +128,8 @@ class CoursesController < ApplicationController
   # POST /courses
   # POST /courses.json
   def create
-    ActiveRecord::Base.transaction do
     begin
+      ActiveRecord::Base.transaction do
         @course = Course.new(name: params[:name], class_period: params[:class_period], credit: params[:credit],
                              end_date: params[:end_date], is_public: params[:is_public], school_id: @school.id,
                              authentication: params[:authentication], professional_certification: params[:professional_certification])
@@ -174,13 +174,14 @@ class CoursesController < ApplicationController
           course_module_types = params[:course_module_types]
           @course.create_course_modules(course_module_types)
         end
+      end
+      CreateSubjectCourseStudentJob.perform_later(@course.id) if @course.subject && @course.subject.subject_appointments.count > 0
     rescue => e
       uid_logger_error(e.message)
       tip_exception(e.message)
       raise ActiveRecord::Rollback
     end
   end
-  end
 
   # PATCH/PUT /courses/1
   # PATCH/PUT /courses/1.json

app/controllers/games_controller.rb

@@ -476,10 +476,13 @@ class GamesController < ApplicationController
         if @myshixun.shixun.try(:status) < 2
           tip_exception("代码获取异常，请检查实训模板的评测设置是否正确")
         else
-          # 报错继续retry
           tip_exception(-3, "#{e.message}")
         end
       end
+      # 如果报错了，并且retry 为1的时候，则fork一个新的仓库
+      if params[:retry].to_i == 1
+        project_fork(@myshixun, @shixun.repo_path, current_user.login)
+      end
       tip_exception(0, e.message)
     end
   end

app/controllers/gits_controller.rb

@@ -19,6 +19,10 @@ class GitsController < ApplicationController
     result = false
     if request.env["HTTP_AUTHORIZATION"] && request.env["HTTP_AUTHORIZATION"].split(" ").length == 2
       username_password = Base64.decode64(request.env["HTTP_AUTHORIZATION"].split(" ")[1])
+
+      if username_password.split(":")[0].nil? || username_password.split(":")[1].nil?
+        result = false
+      else
         input_username = username_password.split(":")[0].strip()
         input_password = username_password.split(":")[1].strip()
         uid_logger("git start auth: input_username is #{input_username}")
@@ -60,6 +64,7 @@ class GitsController < ApplicationController
           end
         end
       end
+    end
 
     authenticate_or_request_with_http_basic do |username, password|
       result

app/controllers/subjects_controller.rb

@@ -415,6 +415,20 @@ class SubjectsController < ApplicationController
                                   order by ue_count desc limit 10")
   end
 
+  # 预约报名
+  def appointment
+    tip_exception("还存在未结束的课堂") unless @subject.max_course_end_date.nil? || @subject.max_course_end_date < Date.today
+    tip_exception("无需重复报名") if @subject.subject_appointments.exists?(user_id: current_user.id)
+    ActiveRecord::Base.transaction do
+      @subject.subject_appointments << SubjectAppointment.new(user_id: current_user.id)
+      @subject.increment!(:participant_count)
+      if @subject.participant_count == @subject.student_count
+        @subject.start_course_notify
+      end
+      normal_status("预约成功")
+    end
+  end
+
   private
   def subject_params
     tip_exception("实训路径名称不能为空") if params[:name].blank?

app/decorators/tiding_decorator.rb

@@ -384,4 +384,8 @@ module TidingDecorator
   def public_course_start_content
     I18n.t(locale_format) % [belong_container&.name, belong_container&.start_date&.strftime("%Y-%m-%d")]
   end
+
+  def subject_start_course_content
+    I18n.t(locale_format) % belong_container&.name
+  end
 end

app/jobs/create_subject_course_student_job.rb

@@ -0,0 +1,22 @@
+class CreateSubjectCourseStudentJob < ApplicationJob
+  queue_as :default
+
+  def perform(course_id)
+    course = Course.find_by(id: course_id)
+    return if course.blank? || course.subject.blank?
+
+    attrs = %i[course_id user_id role created_at updated_at]
+    same_attrs = {course_id: course.id, role: 4}
+
+    Rails.logger.info("1:course.students.count:##{course.students.count}")
+    CourseMember.bulk_insert(*attrs) do |worker|
+      course.subject.subject_appointments.each do |app|
+        Rails.logger.info("##{course.students.where(user_id: app.user_id)}")
+        next if course.students.where(user_id: app.user_id).any?
+        worker.add same_attrs.merge(user_id: app.user_id)
+      end
+    end
+    Rails.logger.info("2:course.students.count:##{course.students.count}")
+    course.subject.subject_appointments.destroy_all
+  end
+end

app/models/apply_user_authentication.rb

@@ -18,6 +18,10 @@ class ApplyUserAuthentication < ApplicationRecord
     nil
   end
 
+  def revoke!
+    update!(status: 3)
+  end
+
   private
 
   def send_tiding

app/models/subject.rb

@@ -13,6 +13,8 @@ class Subject < ApplicationRecord
   has_many :stage_shixuns, dependent: :destroy
   has_many :shixuns, through: :stage_shixuns
 
+  has_many :subject_appointments, dependent: :destroy
+
   has_many :subject_members, ->{ order("subject_members.position asc")}, dependent: :destroy
   has_many :users, through: :subject_members
   has_many :tidings, as: :container, dependent: :destroy
@@ -44,6 +46,10 @@ class Subject < ApplicationRecord
     courses.where("start_date <= '#{Date.today}' and end_date >= '#{Date.today}'").count > 0
   end
 
+  def has_participate?
+    subject_appointments.exists?(user_id: User.current.id)
+  end
+
   # 挑战过路径的成员数(金课统计去重后的报名人数)
   def member_count
     excellent ? CourseMember.where(role: 4, course_id: courses.pluck(:id)).pluck(:user_id).length : shixuns.pluck(:myshixuns_count).sum
@@ -109,4 +115,10 @@ class Subject < ApplicationRecord
   def learning? user_id
     Myshixun.where(user_id: user_id, shixun_id: shixuns).exists?
   end
+
+  def start_course_notify
+    Tiding.create(user_id: user_id, trigger_user_id: 0, container_id: id,
+                   container_type: 'SubjectStartCourse', belong_container_id: id,
+                   belong_container_type: 'Subject', tiding_type: 'System')
+  end
 end

app/models/subject_appointment.rb

@@ -0,0 +1,4 @@
+class SubjectAppointment < ApplicationRecord
+  belongs_to :subject
+  belongs_to :user
+end

app/services/admins/identity_auths/revoke_apply_service.rb

@@ -0,0 +1,26 @@
+class Admins::IdentityAuths::RevokeApplyService < ApplicationService
+  attr_reader :apply, :user
+
+  def initialize(apply)
+    @apply = apply
+    @user  = apply.user
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.revoke!
+      user.update!(authentication: false)
+
+      deal_tiding!
+    end
+  end
+
+  private
+
+  def deal_tiding!
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'CancelUserAuthentication',
+                   belong_container_id: apply.user_id, belong_container_type: 'User',
+                   status: 1, tiding_type: 'System')
+  end
+end

app/services/admins/professional_auths/revoke_apply_service.rb

@@ -0,0 +1,26 @@
+class Admins::ProfessionalAuths::RevokeApplyService < ApplicationService
+  attr_reader :apply, :user
+
+  def initialize(apply)
+    @apply = apply
+    @user  = apply.user
+  end
+
+  def call
+    ActiveRecord::Base.transaction do
+      apply.revoke!
+      user.update!(professional_certification: false)
+
+      deal_tiding!
+    end
+  end
+
+  private
+
+  def deal_tiding!
+    Tiding.create!(user_id: apply.user_id, trigger_user_id: 0,
+                   container_id: apply.id, container_type: 'CancelUserProCertification',
+                   belong_container_id: apply.user_id, belong_container_type: 'User',
+                   status: 1, tiding_type: 'System')
+  end
+end

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

@@ -25,6 +25,10 @@
   <% end %>
 </div>
 
+<div class="batch-action-container">
+  <%= javascript_void_link '批量同意', class: 'btn btn-outline-primary btn-sm batch-agree-btn' %>
+</div>
+
 <div class="box identity-authentication-list-container">
   <%= render(partial: 'admins/identity_authentications/shared/list', locals: { applies: @applies }) %>
 </div>

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

@@ -3,6 +3,12 @@
 <table class="table table-hover text-center identity-authentication-list-table">
   <thead class="thead-light">
   <tr>
+    <% unless is_processed %>
+      <th width="4%">
+        <%= check_box_tag('all-check', 1, false, id: nil, class: 'batch-all-check-box',
+                          data: { toggle: 'tooltip', title: '全选' }) %>
+      </th>
+    <% end %>
     <th width="8%">头像</th>
     <th width="10%">姓名</th>
     <th width="14%">身份证号</th>
@@ -14,12 +20,14 @@
         <i class="fa fa-question-circle" data-toggle="tooltip" data-html="true" data-placement="top" title="审核完成后自动删除图片"></i>
       </th>
     <% end %>
-    <th width="16%">时间</th>
     <% if is_processed %>
-      <th width="14%">拒绝原因</th>
+      <th width="10%">时间</th>
+      <th width="12%">拒绝原因</th>
       <th width="8%">状态</th>
+      <th width="8%">操作</th>
     <% else %>
-      <th width="20%">操作</th>
+      <th width="16%">时间</th>
+      <th width="16%">操作</th>
     <% end %>
   </tr>
   </thead>
@@ -28,6 +36,9 @@
     <% applies.each do |apply| %>
       <% user = apply.user %>
       <tr class="identity-authentication-item identity-authentication-<%= apply.id %>">
+        <% unless is_processed %>
+          <td><%= check_box_tag('ids[]', apply.id, false, id: nil, class: 'batch-check-box') %></td>
+        <% end %>
         <td>
           <%= link_to "/users/#{user.login}", class: 'identity-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
             <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
@@ -53,6 +64,11 @@
         <% if is_processed %>
           <td class="text-secondary"><%= overflow_hidden_span apply.remarks, width: 140 %></td>
           <td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
+          <td>
+            <% if apply.status == 1 %>
+              <%= agree_link '撤销', revoke_admins_identity_authentication_path(apply, element: ".identity-authentication-#{apply.id}"), 'data-confirm': '是否确认撤销认证？？' %>
+            <% end %>
+          </td>
         <% else %>
           <td class="action-container">
             <%= agree_link '同意', agree_admins_identity_authentication_path(apply, element: ".identity-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？' %>

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

@@ -25,6 +25,10 @@
   <% end %>
 </div>
 
+<div class="batch-action-container">
+  <%= javascript_void_link '批量同意', class: 'btn btn-outline-primary btn-sm batch-agree-btn' %>
+</div>
+
 <div class="box professional-authentication-list-container">
   <%= render(partial: 'admins/professional_authentications/shared/list', locals: { applies: @applies }) %>
 </div>

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

@@ -3,12 +3,18 @@
 <table class="table table-hover text-center professional-authentication-list-table">
   <thead class="thead-light">
   <tr>
+    <% unless is_processed %>
+      <th width="4%">
+        <%= check_box_tag('all-check', 1, false, id: nil, class: 'batch-all-check-box',
+                          data: { toggle: 'tooltip', title: '全选' }) %>
+      </th>
+    <% end %>
     <th width="8%">头像</th>
     <th width="14%">姓名</th>
-    <th width="28%">学校/单位</th>
+    <th width="20%">学校/单位</th>
     <th width="12%">职称</th>
     <% unless is_processed %>
-      <th width="10%">
+      <th width="14%">
         照片
         <i class="fa fa-question-circle" data-toggle="tooltip" data-html="true" data-placement="top" title="审核完成后自动删除图片"></i>
       </th>
@@ -17,8 +23,9 @@
     <% if is_processed %>
       <th width="14%">拒绝原因</th>
       <th width="8%">状态</th>
+      <th width="8%">操作</th>
     <% else %>
-      <th width="18%">操作</th>
+      <th width="22%">操作</th>
     <% end %>
   </tr>
   </thead>
@@ -27,6 +34,9 @@
     <% applies.each do |apply| %>
       <% user = apply.user %>
       <tr class="professional-authentication-item professional-authentication-<%= apply.id %>">
+        <% unless is_processed %>
+          <td><%= check_box_tag('ids[]', apply.id, false, id: nil, class: 'batch-check-box') %></td>
+        <% end %>
         <td>
           <%= link_to "/users/#{user.login}", class: 'professional-authentication-avatar', target: '_blank', data: { toggle: 'tooltip', title: '个人主页' } do %>
             <img src="/images/<%= url_to_avatar(user) %>" class="rounded-circle" width="40" height="40" />
@@ -51,6 +61,11 @@
         <% if is_processed %>
           <td class="text-secondary"><%= overflow_hidden_span apply.remarks, width: 140 %></td>
           <td><span class="apply-status-<%= apply.status %>"><%= apply.status_text %></span></td>
+          <td>
+            <% if apply.status == 1 %>
+              <%= agree_link '撤销', revoke_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}"), 'data-confirm': '是否确认撤销认证？？' %>
+            <% end %>
+          </td>
         <% else %>
           <td class="action-container">
             <%= agree_link '同意', agree_admins_professional_authentication_path(apply, element: ".professional-authentication-#{apply.id}"), 'data-confirm': '确认审核通过？', 'data-disable-with': "提交中..." %>

app/views/searchs/index.json.jbuilder

@@ -9,8 +9,12 @@ json.results do
 
     # 去除开头标点符号
     reg = /^[，。？：；‘’！“”—……、]/
+    # 附件的替换
+    atta_reg = /!\[.*]\(\/api\/attachments\/\d+\)/
     highlights[:description]&.first&.sub!(reg, '')
+    highlights[:description]&.map{|des| des.gsub!(atta_reg, '')}
     highlights[:content]&.first&.sub!(reg, '')
+    highlights[:content]&.map{|des| des.gsub!(atta_reg, '')}
 
     json.content highlights
   end

app/views/shixun_lists/index.json.jbuilder

@@ -7,11 +7,16 @@ json.shixun_list do
 
     # 去除开头标点符号
     reg = /^[，。？：；‘’！“”—……、]/
+    # 附件的替换
+    atta_reg = /!\[.*]\(\/api\/attachments\/\d+\)/
+
     highlights[:description]&.first&.sub!(reg, '')
+    highlights[:description]&.map{|des| des.gsub!(atta_reg, '')}
     highlights[:content]&.first&.sub!(reg, '')
+    highlights[:content]&.map{|des| des.gsub!(atta_reg, '')}
 
     json.title highlights.delete(:name)&.join('...') || obj.searchable_title
-    json.description highlights[:description]&.join('...') || Util.extract_content(obj.description)[0..300]
+    json.description highlights[:description]&.join('...') || Util.extract_content(obj.description)[0..300]&.sub!(atta_reg, '')
 
     json.content highlights
     json.level level_to_s(obj.trainee)

app/views/subjects/show.json.jbuilder

@@ -24,4 +24,10 @@ if @subject.excellent
     json.course_identity @user.course_identity(course)
     json.course_status subject_course_status course
   end
+
+  if @subject.max_course_end_date.nil? || @subject.max_course_end_date < Date.today
+    json.student_count @subject.student_count
+    json.participant_count @subject.participant_count
+    json.has_participate @subject.has_participate?
+  end
 end

config/locales/tidings/zh-CN.yml

@@ -10,7 +10,7 @@
         "2_1_end": "你提交的职业认证申请，审核已通过"
         "2_2_end": "你提交的职业认证申请，审核未通过<br/><span>原因：%{reason}</span>"
     CancelUserAuthentication_end: "取消了你的实名认证：%s %s"
-    CancelUserProCertification_end: "取消了你的实名认证：%s %s"
+    CancelUserProCertification_end: "取消了你的职业认证：%s %s"
     JoinCourse:
       "9_end": "申请加入课堂：%s（教师）"
       "7_end": "申请加入课堂：%s（助教）"
@@ -227,3 +227,4 @@
         1_end: "你提交的发布视频申请：%s，审核已通过"
         2_end: "你提交的发布视频申请：%s，审核未通过<br/><span>原因：%{reason}</span>"
     PublicCourseStart_end: "你报名参与的开放课程：%s，将于%s正式开课"
+    SubjectStartCourse_end: "您创建的开放课程：%s 已达到开课人数要求。您可以在24小时内自主开设新一期课程。如果超过24小时未开课，平台将自动开课并复制您上一期的课程内容。"

config/routes.rb

@@ -284,6 +284,7 @@ Rails.application.routes.draw do
         post :up_member_position
         post :down_member_position
         get :right_banner
+        post :appointment
       end
 
       collection do
@@ -879,12 +880,22 @@ Rails.application.routes.draw do
       member do
         post :agree
         post :refuse
+        post :revoke
+      end
+
+      collection do
+        post :batch_agree
       end
     end
     resources :professional_authentications, only: [:index] do
       member do
         post :agree
         post :refuse
+        post :revoke
+      end
+
+      collection do
+        post :batch_agree
       end
     end
     resources :shixun_authorizations, only: [:index] do

db/migrate/20190921010411_add_course_member_to_subjects.rb

@@ -0,0 +1,6 @@
+class AddCourseMemberToSubjects < ActiveRecord::Migration[5.2]
+  def change
+    add_column :subjects, :student_count, :integer, :default => 0
+    add_column :subjects, :participant_count, :integer, :default => 0
+  end
+end

db/migrate/20190921015840_create_subject_appointments.rb

@@ -0,0 +1,10 @@
+class CreateSubjectAppointments < ActiveRecord::Migration[5.2]
+  def change
+    create_table :subject_appointments do |t|
+      t.references :subject, index: true
+      t.references :user, index: true
+
+      t.timestamps
+    end
+  end
+end

public/editormd/plugins/image-dialog/image-dialog.js

@@ -65,8 +65,8 @@
                                         "<label>" + imageLang.alt + "</label>" +
                                         "<input type=\"text\" value=\"" + selection + "\" data-alt />" +
                                         "<br/>" +
-                                        "<label>" + imageLang.link + "</label>" +
-                                        "<input type=\"text\" value=\"http://\" data-link />" +
+                                        "<label class=\"image-link\">" + imageLang.link + "</label>" +
+                                        "<input class=\"image-link\" type=\"text\" value=\"http://\" data-link />" +
                                         "<br/>" +
                                     ( (settings.imageUpload) ? "</form>" : "</div>");
 

public/javascripts/educoder/edu_application.js

@@ -1,4 +1,4 @@
-document.write("<link href='//at.alicdn.com/t/font_653600_qa9lwwv74z.css' rel='stylesheet' type='text/css'/>");
+document.write("<link href='https://at.alicdn.com/t/font_653600_qa9lwwv74z.css' rel='stylesheet' type='text/css'/>");
 
 /*!
  * JavaScript Cookie v2.2.0

public/react/public/index.html

@@ -1,7 +1,10 @@
 <!DOCTYPE html>
 <html lang="en">
   <head>
+
     <meta charset="utf-8">
+    <!--<meta http-equiv="Content-Security-Policy" content="upgrade-insecure-requests" />-->
+
       <!-- width=device-width, initial-scale=1 , shrink-to-fit=no -->
     <!-- <meta name="viewport" content=""> -->
     <meta name="theme-color" content="#000000">

public/react/src/App.css

@@ -72,6 +72,13 @@ html, body {
   /* 某些情况下，被cm盖住了 */
   z-index: 99;
 }
+/* 图片点击放大的场景，隐藏图片链接 */
+.editormd-image-click-expand .editormd-image-dialog {
+  height: 234px !important;
+}
+  .editormd-image-click-expand .editormd-image-dialog .image-link {
+    display: none;
+  }
 /* 解决鼠标框选时，左边第一列没高亮的问题 */
 .CodeMirror .CodeMirror-lines pre.CodeMirror-line, .CodeMirror .CodeMirror-lines pre.CodeMirror-line-like {
   padding: 0 12px ;

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

@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd";
 import {Link} from 'react-router-dom';
 import locale from 'antd/lib/date-picker/locale/zh_CN';
-import { WordsBtn, ConditionToolTip, queryString,getImageUrl, on, off} from 'educoder';
+import { WordsBtn, ConditionToolTip, queryString,getImageUrl, on, off, NoneData} from 'educoder';
 import axios from 'axios';
 import Modals from '../../modals/Modals';
 import CoursesListType from '../coursesPublic/CoursesListType';
@@ -817,10 +817,8 @@ class CommonWorkList extends Component{
 								<Spin size="large" spinning={this.state.isSpin}>
 									<div id="forum_list" className="forum_table">
 										<div className="mh650 edu-back-white">
-											<div className="edu-tab-con-box clearfix edu-txt-center">
-												<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
-												<p className="edu-nodata-p mb30">暂时还没有相关数据哦！</p>
-											</div>
+										
+                      <NoneData></NoneData>
 										</div>
 									</div>
 								</Spin>

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

@@ -86,7 +86,7 @@ class WorkDetailPageHeader extends Component{
                   background: #fff;
                 }
                 .workDetailPageHeader .summaryname {
-                  line-height:30px
+                  line-height:28px
                 }
               `}</style>
               <CBreadcrumb items={[

public/react/src/modules/courses/common/comments/CommonReply.js

@@ -250,7 +250,7 @@ class CommonReply extends Component{
           }
         `}</style>
         <MemoDetailMDEditor ref="editor" memo={memo} usingMockInput={true} placeholder="说点什么" 
-            height={160} showError={true}
+            height={160} showError={true} imageExpand={true}
             replyComment={this.replyComment}
             commentsLength={comments ? comments.length : 0}
         ></MemoDetailMDEditor>

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

@@ -80,7 +80,10 @@ class AddStudentModal extends Component{
   }
   setVisible = (visible) => {
     if (visible) {
-      this.setState({school_name: this.props.user.user_school},()=>{
+      this.setState({
+        school_name: this.props.user.user_school,
+        name: undefined
+      },()=>{
         this.fetchMemberList();
       })
       this.fetchOptions()
@@ -88,7 +91,7 @@ class AddStudentModal extends Component{
     this.refs.modalWrapper.setVisible(visible)
     if (visible == false) {
       this.setState({
-        checkBoxValues: []
+        checkBoxValues: [],
       })
     }
   }

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

@@ -86,13 +86,13 @@ class Trainingjobsetting extends Component {
             latepenaltytype: false,
             unifiedsetting: true,
             allowreplenishment: undefined,
-            completionefficiencyscore: true,
+            completionefficiencyscore: false,
             whethertopay: false,
             proportion: undefined,
             level: undefined,
             ealuation: false,
             latededuction: undefined,
-            latedeductiontwo: "20",
+            latedeductiontwo: "0",
             database: false,
             datasheet: false,
             databasetwo: undefined,
@@ -120,8 +120,10 @@ class Trainingjobsetting extends Component {
             showmodel:false,
 					  code_review:false,
             testscripttiptype:false,
+
             end_timebool:false,
             late_timesbool:false,
+            work_efficiencys:false,
         }
         // console.log("获取到的值")
         // console.log("Trainingjobsetting")
@@ -283,7 +285,7 @@ class Trainingjobsetting extends Component {
                     allowreplenishment: result.data.allow_late,
                     latededuction: result.data.late_penalty,
                     level: result.data.answer_open_evaluation === true ? "满分" : "扣分",
-                    completionefficiencyscore: result.data.work_efficiency,
+                    work_efficiencys: result.data.work_efficiency,
                     latedeductiontwo: result.data.eff_score,
                     proportion: result.data.shixun_evaluation === 0 ? "均分比例" : result.data.shixun_evaluation === 1 ? "经验值比例" : result.data.shixun_evaluation === 2 ? "自定义分值" : "",
                     publicwork: result.data.work_public,
@@ -634,7 +636,7 @@ class Trainingjobsetting extends Component {
                 late_penalty: parseInt(this.state.latededuction), //迟交扣分
                 late_time: moment(this.state.late_time).format('YYYY-MM-DD HH:mm'), //结束时间
                 answer_open_evaluation: this.state.level === "满分" ? true : false, //扣分项
-                work_efficiency: this.state.completionefficiencyscore, //完成效率评分占比
+                work_efficiency: this.state.work_efficiencys, //完成效率评分占比
                 eff_score: this.state.completionefficiencyscore === true ? this.state.latedeductiontwo : undefined,//占比分
                 shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0,
                 challenge_settings: array,
@@ -659,6 +661,7 @@ class Trainingjobsetting extends Component {
                         flagPageEditsthrees:false,
                         flagPageEditsfor:false,
                         whethertopay:false,
+                        completionefficiencyscore:false,
                     })
                     this.refs.targetElementTrainingjobsetting.scrollIntoView()
 
@@ -1003,6 +1006,7 @@ class Trainingjobsetting extends Component {
             this.state.latedeductiontwo=20;
             this.setState({
                 completionefficiencyscore: e.target.checked,
+                work_efficiencys:e.target.checked,
                 latedeductiontwo: 20,
             })
             //均分比例
@@ -1019,6 +1023,7 @@ class Trainingjobsetting extends Component {
             this.state.latedeductiontwo=0;
             this.setState({
                 completionefficiencyscore: e.target.checked,
+                work_efficiencys:e.target.checked,
                 latedeductiontwo: 0,
             })
             //均分比例
@@ -1067,7 +1072,7 @@ class Trainingjobsetting extends Component {
 
     // //占比分
     changeTopicNametwo = (value) => {
-        // console.log("2e.target.value", value)
+        // console.log("TrainingjobsettingTrainingjobsetting", value)
         if (value === "" || value === undefined) {
             return
         }
@@ -1701,6 +1706,7 @@ class Trainingjobsetting extends Component {
                     flagPageEditstwo:releasetime,
                     flagPageEditsthrees:deadline,
                     flagPageEditsfor:endtime,
+                    completionefficiencyscore:true,
                     unifiedsetting:this.state.unifiedsetting,
                 })
                if(this.state.proportion === "自定义分值"){
@@ -1733,6 +1739,8 @@ class Trainingjobsetting extends Component {
             hand__e_tip: "",
             hand_flags: false,
             handclass: undefined,
+            completionefficiencyscore:false,
+            latedeductiontwo:0,
             unit_e_tip: "",
         })
         this.refs.targetElementTrainingjobsetting.scrollIntoView();
@@ -1847,7 +1855,7 @@ class Trainingjobsetting extends Component {
 
 
         const dataformat = 'YYYY-MM-DD HH:mm';
-        let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state;
+        let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,work_efficiencys,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state;
         console.log(publish_timebool);
         console.log(!flagPageEditstwo);
         const radioStyle = {
@@ -1875,6 +1883,8 @@ class Trainingjobsetting extends Component {
         // }
         // console.log(this.props.isAdmin())
         // console.log(this.state.code_review===false)
+        // console.log("引入的分值");
+        // console.log(this.state.work_efficiencys);
         return (
             <div className=" clearfix "  ref='targetElementTrainingjobsetting' style={{margin:  "auto", minWidth:"1200px"}}>
                 {this.state.showmodel===true?<ShixunWorkModal
@@ -2129,7 +2139,7 @@ class Trainingjobsetting extends Component {
                             <div className=" clearfix edu-back-white poll_list mt10" style={{marginLeft:" 40px"}}>
                                     <Checkbox disabled={!flagPageEdit} className=" font-13 mt10"
                                               onChange={this.onChangeeffectiveness}
-                                              checked={this.state.completionefficiencyscore} style={{"color":"#666666"}}>效率分<span
+                                              checked={this.state.work_efficiencys} style={{"color":"#666666"}}>效率分<span
                                       className={"font-14 color-grey-c font-14 ml15"} style={{"text-align":"left"}}>(选中，则学生最终成绩包含效率分)</span>
                                     </Checkbox>
                                 <div>
@@ -2139,7 +2149,7 @@ class Trainingjobsetting extends Component {
                             </div>
                             <div className=" mt20" style={{marginLeft:"75px"}}>
                                 <span className="c_grey mr10" style={{"color":"#999999"}}>分值</span>
-                                <InputNumber min={0} disabled={!flagPageEdit} max={100} className="ml10 h40 mr10  color-grey-9"
+                                <InputNumber min={0} disabled={!this.state.completionefficiencyscore} max={100} className="ml10 h40 mr10  color-grey-9"
                                              style={{width: "100px","color":"#999999"}}
                                              onChange={this.changeTopicNametwo}
                                              value={this.state.latedeductiontwo}/>

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

@@ -1064,8 +1064,7 @@ 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>
               <li className="fr">
 								{datas===undefined?"":datas.homeworks && datas.homeworks.length>1?this.props.isAdminOrCreator()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
 									<span>

public/react/src/modules/forums/MemoDetailMDEditor.js

@@ -130,7 +130,7 @@ class MemoDetailMDEditor extends Component {
 		}
 	}
 	render() {
-		const { match, history, memo, placeholder, className } = this.props
+		const { match, history, memo, placeholder, className, imageExpand } = this.props
 		const { isInited, errorMsg } = this.state
 		if (!memo) {
 			return <div></div>
@@ -185,7 +185,8 @@ class MemoDetailMDEditor extends Component {
 							`
 						} */}
 					</style>
-					<div nhname={`new_message_${memo.id}`} className={`commentInput  commentInputs ${className}`}
+					<div nhname={`new_message_${memo.id}`} 
+						className={`commentInput  commentInputs ${className} ${imageExpand && 'editormd-image-click-expand' }`}
 							style={{ padding: '30px',boxSizing:"border-box", display: isInited ? '' : 'none', paddingBottom: '40px' }} >
 						<div id="memo_comment_editorMd" className="editorMD" style={{ marginBottom: '0px'
 								, border: errorMsg ? '1px solid red' : '1px solid #ddd'}}>

public/react/src/modules/message/js/MessagSub.js

@@ -479,6 +479,8 @@ class MessagSub extends Component{
 				return '';
 				case "PublicCourseStart":
 					return window.open(`/courses/${item.container_id}/informs`);
+			  case "SubjectStartCourse":
+				return window.open(`/paths/${item.container_id}`);
 			default :
 				return 	window.open("/")
 		}

public/react/src/modules/modals/Modals.js

@@ -23,6 +23,15 @@ render() {
           centered={true}
           width="530px"
         >
+					 {this.props.modalsType===true?<style>
+						 {
+						 	`
+						 	body{
+						 	     overflow: hidden !important;
+						 	 }
+						 	`
+						 }
+					 </style>:""}
             <Spin indicator={antIcons} spinning={this.props.antIcon===undefined?false:this.props.antIcon} >
               <div className="task-popup-content">
                 <p className="task-popup-text-center font-16">{this.props.modalsTopval}</p>

public/react/src/modules/page/main/CodeRepositoryView.js

@@ -40,8 +40,9 @@ class CodeRepositoryView extends Component {
 
     constructor(props) {
         super(props);
+        this.treeExpanded = false;
         this.state = {
-            autoExpandParent: true,
+            autoExpandParent: false,
             expandedKeys: [],
 
             addtionalSSHArray: [],
@@ -52,9 +53,12 @@ class CodeRepositoryView extends Component {
         const { game, challenge, hide_code, tabIndex,  } = this.props
         
         if (     // 初始化 或者 game切换
-                challenge.path && challenge.path.length && this.state.expandedKeys.length === 0 || 
+                !this.treeExpanded && challenge.path && challenge.path.length && this.state.expandedKeys.length === 0 || 
                 game && (!prevProps.game 
                 || prevProps.game.identifier !== this.props.game.identifier) ) {
+            
+            if (!this.treeExpanded) {
+                this.treeExpanded = true
                 const _path = challenge.multiPath ? challenge.path[0] : challenge.path;
                 let _ar = [];
                 const expandedKeys = [];
@@ -65,11 +69,12 @@ class CodeRepositoryView extends Component {
                         expandedKeys.push( index === 0 ? item : expandedKeys[index - 1] + '/' + item)
                     })
                 }
-            expandedKeys.length = 1 // 没办法做到多级初始化
+                expandedKeys.length = 1 // 没办法做到多级初始化，而且会引起点击其他子目录，加载当前文件目录的问题
                 // 初始化时无法展开到根节点 https://github.com/fis-components/rc-tree/issues/3
                 expandedKeys.length && this.setState({
                     expandedKeys,
                 })
+            }
 
             if (game && (!prevProps.game 
                 || prevProps.game.identifier !== this.props.game.identifier)) {       

public/react/src/modules/page/main/CodeRepositoryViewContainer.js

@@ -191,6 +191,10 @@ class CodeRepositoryViewContainer extends Component {
 				// withCredentials: true,
 			})
 		  	.then((response) => {
+				// if (!response) {
+				// 	resolve && resolve();
+				// 	return;
+				// }
 		  		const repoFilesData = this.map2OldData(response.data.trees)
 			    if (!this.state.fileTreeData || this.state.fileTreeData.length === 0) {  	// 还没树节点，没加载过
 			 

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

@@ -336,7 +336,7 @@ class DetailCards extends Component{
       showparagraphindex
     }=this.state;
 		const antIcon = <Icon type="loading" style={{ fontSize: 24 }} spin />;
-
+   // console.log("zzz"+this.props.MenuItemsindextype)
     return(
       <div>
 				{AccountProfiletype===true?<AccountProfile
@@ -495,7 +495,7 @@ class DetailCards extends Component{
                                       :
                                       <li className={showparagraph===false?"none":"fr status_li"}>
                                         {
-                                          showparagraphkey===key&&showparagraphindex===index?<div>
+                                          showparagraphkey===key&&showparagraphindex===index?this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===false&&this.props.MenuItemsindextype===2?"":<div>
                                             <Link to={'/shixuns/'+line.identifier+'/challenges'} className="mr30 color-blue_4C shixun_detail pointer fl" target="_blank">查看详情</Link>
 																						{line.shixun_status==="暂未公开"?"":<a  onClick={()=>this.startgameid(line.identifier)} className="btn_auto user_bluebg_btn fl" id="shixun_operation" >开始实战</a>}
                                           </div>:""

public/react/src/modules/paths/PathDetail/DetailTop.css

@@ -67,3 +67,15 @@
     white-space: nowrap;
     height: 40px;
 }
+
+.mb100{
+    margin-bottom: 100px !important;
+}
+.task-btn-28BE6C{
+    background: #28BE6C !important;
+    color: #fff!important;
+}
+.mt43{
+    margin-top: 43px;
+}
+

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

@@ -26,7 +26,9 @@ class DetailTop extends Component{
 			MenuItemskey:1,
 			courseslist:[],
 			Pathcourseid:undefined,
-			OpenCourseTypes:false
+			OpenCourseTypes:false,
+			putappointmenttype:false,
+			getappointmenttype:false
     }
   }
 	componentDidMount(){
@@ -48,33 +50,43 @@ class DetailTop extends Component{
 				})
 
 			}else{
+				let type=undefined;
+
+
+
 					this.props.courses.map((item,key)=>{
-							if(listtype===false){
+						let arr=[]
 							keys=key+1
-								if(item.course_status.status===0) {
-									listtype=true
-									return (
-										courseslist.push(item)
-									)
-								}
+							if(item.course_status.status===2) {
+								type=key+1
+									arr.push(item)
 							}
+						courseslist=arr;
 					})
 
-
 					this.props.courses.map((item,key)=>{
+						let arr=[]
 						if(listtype===false){
 							keys=key+1
-							if(item.course_status.status===2) {
+							if(item.course_status.status===0) {
 								listtype=true
-								return (
-									courseslist.push(item)
-								)
+									// courseslist.push(item)
+								arr.push(item)
+								courseslist=arr
 							}
 						}
 					})
 
+				console.log(courseslist)
+
+
+			}
+			if(courseslist.length!=0){
+				this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
 			}
+
 		}
+
 		this.setState({
 			courseslist:courseslist,
 			MenuItemskey:keys,
@@ -156,7 +168,8 @@ class DetailTop extends Component{
        Modalstype:false,
        Modalsbottomval:'',
        loadtype:false,
-       deletepathtype:false
+       deletepathtype:false,
+			 putappointmenttype:false
      })
   }
 
@@ -219,6 +232,8 @@ class DetailTop extends Component{
 				)
 			}
 		})
+
+		this.props.getMenuItemsindex(keys,courseslist[0].course_status.status)
    this.setState({
 		 MenuItemskey:keys,
 		 courseslist:courseslist,
@@ -245,6 +260,20 @@ class DetailTop extends Component{
 			pathcousestypeid:typeid
 		})
 	}
+
+	putappointment=()=>{
+		this.setState({
+			Modalstype:true,
+			Modalstopval:"是否确认立即预约？",
+			Modalsbottomval:"",
+			cardsModalcancel:()=>this.cardsModalcancel(),
+			putappointmenttype:true,
+			loadtype:false
+		})
+	}
+
+
+
 	ysljoinmodalCancel=()=>{
 		this.setState({
 			yslJointhe:false
@@ -267,9 +296,34 @@ class DetailTop extends Component{
 			OpenCourseTypes:false
 		})
 	}
+
+	getappointment=()=>{
+		let pathid=this.props.match.params.pathId;
+		let url=`/paths/${pathid}/appointment.json`
+		axios.post(url).then((response) => {
+
+			if (response.status === 200) {
+
+				if(response.data.status===0){
+					this.setState({
+						getappointmenttype:true
+					})
+					this.cardsModalcancel()
+					// this.props.getlistdatas()
+					this.props.showNotification(response.data.message)
+				}else{
+					this.props.showNotification(response.data.message)
+				}
+
+			}
+		}).catch((error) => {
+			console.log(error)
+			this.cardsModalcancel()
+		})
+	}
 	render(){
     let{detailInfoList}=this.props;
-    let{Modalstype,Modalstopval,cardsModalcancel,OpenCourseTypes,Modalsbottomval,cardsModalsavetype,loadtype}=this.state;
+    let{Modalstype,Modalstopval,cardsModalcancel,putappointmenttype,Modalsbottomval,cardsModalsavetype,loadtype,getappointmenttype}=this.state;
     const radioStyle = {
       display: 'block',
       height: '30px',
@@ -292,15 +346,19 @@ class DetailTop extends Component{
 
 
 
+		let applypath=this.props.detailInfoList&&this.props.detailInfoList.participant_count!=undefined&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===false;
+    let coursestypes=this.props.courses!=undefined&&this.props.courses.length===0;
+    let isadminallow_statistics=this.props.courses&&this.props.courses.length===0&&this.props.detailInfoList&&this.props.detailInfoList.allow_statistics===true;
+
 		return(
 
-			<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":"subhead mb70"}>
+			<div className={this.props.courses===undefined||this.props.courses.length===0?"subhead":applypath===false?"subhead mb70":this.state.MenuItemskey===this.props.courses.length?"subhead mb100":"subhead mb70"}>
         <Modals
           modalsType={Modalstype}
           modalsTopval={Modalstopval}
           modalsBottomval={Modalsbottomval}
           modalCancel={cardsModalcancel}
-          modalSave={cardsModalsavetype===true?this.reovkissuePaths:this.cardsModalsave}
+          modalSave={cardsModalsavetype===true?()=>this.reovkissuePaths():putappointmenttype===true?()=>this.getappointment():()=>this.cardsModalsave()}
           loadtype={loadtype}
         >
         </Modals>
@@ -309,7 +367,7 @@ class DetailTop extends Component{
 
         {
           detailInfoList &&
-					<div  className={this.props.courses===undefined||this.props.courses.length===0?"subhead_content":"subhead_content pt100"}>
+					<div  className={this.props.courses===undefined?"subhead_content":this.props.courses.length===0?"subhead_content pt40":"subhead_content pt100"}>
             <div className="font-28 color-white clearfix">
 							{/*<Tooltip placement="bottom" title={detailInfoList.name.length>27?detailInfoList.name:""}>*/}
 
@@ -428,9 +486,7 @@ class DetailTop extends Component{
 
             </div>
 
-							{this.props.courses===undefined||this.props.courses.length===0?"":<div className="userNavs mt20">
-
-							<li className={"fl pd4020"}>
+							{this.props.courses===undefined||isadminallow_statistics===true?"":<div className="userNavs mt20" style={applypath===false?{}:this.state.MenuItemskey===this.props.courses.length?{height:'158px'}:{}}>
 								<style>
 									{
 										`
@@ -453,9 +509,9 @@ class DetailTop extends Component{
 										`
 									}
 								</style>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fl pd4020"}>
 
-
-								{this.props.courses===undefined?"":this.state.courseslist.map((item,key)=>{
+										{this.state.courseslist.map((item,key)=>{
 											if(item.course_identity<4){
 												return(
 													<Tooltip placement="bottom" title={"编辑课堂"} key={key}>
@@ -475,7 +531,7 @@ class DetailTop extends Component{
 												第<span className={"color-orange"}>  {this.state.MenuItemskey}  </span>次开课 <Icon className="aIcons" type={!this.state.onVisibleChangestype?"down":"up"} />
 											</a>
 										</Dropdown>
-							</li>
+									</li>}
 									<style>
 										{
 											`
@@ -496,7 +552,7 @@ class DetailTop extends Component{
 										`
 										}
 									</style>
-							<li className={"ml20"}>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"ml20"}>
 										{this.state.courseslist.map((item,key)=>{
 											return(
 												<div className={"ant-breadcrumb pdt28"} key={key}>
@@ -539,9 +595,7 @@ class DetailTop extends Component{
 										})
 										}
 
-							</li>
-
-								<li className={"fr mr25"}>
+									</li>}
 								<style>
 									{
 										`
@@ -565,40 +619,107 @@ class DetailTop extends Component{
 											.courseslistsa{
 											  color:#fff !important;
 											}
+											.pathbtensbox{
+											width: 215px !important;
+											height: 46px !important;
+											background: rgba(76,172,255,1);
+											border-radius: 4px;
+											line-height: 46px !important;
+											}
+											.lineHeight1{
+											line-height: 1px;
+											}
+											.font153{
+											    font-size: 14px;
+													font-weight: 400;
+													color: rgba(153,153,153,1);
+													margin-left: 30px;
+											}
+
+											.absolutewidth{
+											    position: absolute;
+													top: 19px;
+													right: 71px;
+											}
+											.relativewidth{
+											    position: relative;
+    											width: 100%;
+											}
+											.padding040{
+    											padding: 0 43px;
+											}
+											.mt26{
+											  margin-top:26px;
+											}
+
 											`
 									}
 								</style>
+								{this.props.courses===undefined||this.props.courses.length===0?"":<li className={"fr padding040"}>
+
+
+										{/*
+										height: 158px;
+										}*/}
 										{this.state.courseslist.map((item,key)=>{
 
 											return(
 												<div key={key}>
-														{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green pathdefault">即将开课</div>:""}
-														{item.course_status.status===1?<div className="mr51 shixun_detail pointer fl color-orange pathdefault">{item.course_status.time}</div>:""}
-														{item.course_status.status===2&&item.course_identity<6?<div className="mr51 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
+													{applypath===false?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?
+														this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
+															getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox  mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox mt26"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
+															<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox  mt5":"fr user_default_btn background191 font-18 pathbtensbox mt26"}>预约报名成功</span>:""}
 
+													{/*{item.course_status.status===0?<div className="mr51 shixun_detail pointer fl user-colorgrey-green pathdefault">即将开课</div>:""}*/}
+													{item.course_status.status===1?<div className="mr51 shixun_detail pointer fl color-orange pathdefault">{item.course_status.time}</div>:""}
+													{item.course_status.status===2&&item.course_identity<6?<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
+													{/*<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>*/}
 													{item.course_status.status===0?
-															item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa" href={item.first_category_url} target="_blank">
+														item.course_identity<5?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-															</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">报名成功</div>
-																:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
+														</a>:item.course_identity<6?<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault mr20">报名成功</div>
+															:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id)}>立即报名</a>:""}
 
 													{item.course_status.status===1?
-															item.course_identity<5?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+														item.course_identity<5?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-															</a>:item.course_identity<6?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens" href={item.first_category_url} target="_blank">
+														</a>:item.course_identity<6?<a className="courseslistsa fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20" href={item.first_category_url} target="_blank">
 															立即学习
-																</a>:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens"  onClick={()=>this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入</a>:""}
+														</a>:<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens mr20"  onClick={()=>this.JoinnowCourse(item.course_id,item.course_status.status)}>立即加入</a>:""}
 
 													{item.course_status.status===2?
-													     item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa" href={item.first_category_url} target="_blank">
+														item.course_identity<6?<a className="fr user_default_btn task-btn-orange font-18 mt28 pathbtens courseslistsa mr20" href={item.first_category_url} target="_blank">
 															进入课堂
-															</a>:<div className="fr user_default_btn background191 font-18 mt28 pathbtens pathdefault">已结束</div>:""}
+														</a>:<div className="mr20 shixun_detail pointer fl user-colorgrey-9b pathdefault">已结束</div>:""}
 
 												</div>
 											)})}
 
 
-								</li>
+									</li>}
+
+
+
+								{applypath===false?"":this.state.MenuItemskey===this.props.courses.length?<div className={"clear"}></div>:""}
+
+								{applypath===false?"":this.props.courses.length===0?"":this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fr lineHeight1 relativewidth mt43":"fl lineHeight1 relativewidth"}>
+									<span className={"fr mr30"}>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
+										<span className={"font153 fr mr12"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
+										{/*{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?*/}
+										{/*getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:*/}
+										{/*<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}*/}
+								</span>
+									:""}
+
+								{applypath===true&&this.props.courses.length===0?this.state.MenuItemskey===this.props.courses.length||coursestypes===true?<span className={coursestypes===true?"fl ml20 lineHeight0 relativewidth":"fl ml20 lineHeight0 relativewidth"}>
+									<span>当前预约报名人数：<span className={"color-red mr5"}>{getappointmenttype===true?this.props.detailInfoList&&this.props.detailInfoList.participant_count+1:this.props.detailInfoList&&this.props.detailInfoList.participant_count}</span>人</span>
+									<span className={"font153"}>当预约报名人数达到   {this.props.detailInfoList&&this.props.detailInfoList.student_count}    人时即将开课</span>
+									{this.props.detailInfoList&&this.props.detailInfoList.has_participate===false?
+										getappointmenttype===true?<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>:<a className={coursestypes===true?"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn task-btn-28BE6C font-18 pathbtensbox absolutewidth"}  onClick={()=>this.putappointment()}>期待开课并预约报名</a>:
+										<span className={coursestypes===true?"fr user_default_btn background191 font-18 pathbtensbox absolutewidth mt5":"fr user_default_btn background191 font-18 pathbtensbox absolutewidth"}>预约报名成功</span>}
+									</span>:"":""}
+
+
 						</div>}
 
           </div>

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

@@ -85,6 +85,8 @@ class PathDetailIndex extends Component{
 			items: getItems(10),
 			pathtopskey:1,
 			dataquerys:{},
+			MenuItemsindex:1,
+			MenuItemsindextype:0
 		}
 		this.onDragEnd = this.onDragEnd.bind(this);
 
@@ -147,7 +149,10 @@ class PathDetailIndex extends Component{
 	}
 
 	componentDidMount(){
+		this.getlistdatas()
+	}
 
+	getlistdatas=()=>{
 		const query = this.props.location.search;
 		// const type = query.split('?chinaoocTimestamp=');
 		// console.log("Eduinforms12345");
@@ -254,7 +259,13 @@ class PathDetailIndex extends Component{
 			console.log(error);
 		})
 	};
+	getMenuItemsindex=(key,status)=>{
 
+		this.setState({
+			MenuItemsindex:key,
+			MenuItemsindextype:status
+		})
+	}
 	getdatasindex=(key)=>{
 		// yslwebobject 后端需要的接口
 		let pathid=this.props.match.params.pathId;
@@ -460,9 +471,13 @@ class PathDetailIndex extends Component{
 			members,
 			tags,
 			courses,
+			MenuItemsindex,
+			MenuItemsindextype
 		} = this.state
 
 
+		// console.log(MenuItemsindex)
+		// console.log(MenuItemsindextype===2&&detailInfoList&&detailInfoList.allow_statistics===false)
 		return(
 			<div className="newContainer">
 				<style>
@@ -487,7 +502,7 @@ class PathDetailIndex extends Component{
 				>
 				</Modals>
 				<div className="newMain clearfix">
-					<DetailTop {...this.state} {...this.props} getdatasindex={(key)=>this.getdatasindex(key)}></DetailTop>
+					<DetailTop {...this.state} {...this.props} getdatasindex={(key)=>this.getdatasindex(key)} getMenuItemsindex={(key,status)=>this.getMenuItemsindex(key,status)} getlistdatas={()=>this.getlistdatas()}></DetailTop>
 					<div className="educontent clearfix mb80">
 						<div className="with65 fl">
 							<div className="produce-content mb10">

public/react/src/modules/tpm/challengesnew/TPMMDEditor.js

@@ -317,14 +317,14 @@ export default class TPMMDEditor extends Component {
         let {
             showError
         } = this.state;
-        let { mdID, className, noStorage } = this.props;
+        let { mdID, className, noStorage, imageExpand } = this.props;
         let _style = {}
         if (showError) {
             _style.border = '1px solid red'
         }
         return (
             <React.Fragment>
-                <div className={`df ${className}`} >
+                <div className={`df ${className} ${imageExpand && 'editormd-image-click-expand' }`} >
                 {/* padding10-20  */}
                     <div className="edu-back-greyf5 radius4" id={`mdEditor_${mdID}`} style={{..._style}}>
                         <textarea style={{display: 'none'}}   id={`mdEditors_${mdID}`} name="content"></textarea>

spec/jobs/create_subject_course_student_job_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CreateSubjectCourseStudentJob, type: :job do
+  pending "add some examples to (or delete) #{__FILE__}"
+end

spec/models/subject_appointment_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe SubjectAppointment, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end