Merge branches 'dev_aliyun' and 'jupyter' of https://bdgit.educoder.net/Hjqreturn/educoder into jupyter

app/controllers/accounts_controller.rb

@@ -38,6 +38,8 @@ class AccountsController < ApplicationController
         return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
       end
 
+      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:password] =~ CustomRegexp::PASSWORD
+
       code = generate_identifier User, 8, pre
       login = pre + code
       @user = User.new(admin: false, login: login, mail: email, phone: phone, type: "User")
@@ -114,6 +116,7 @@ class AccountsController < ApplicationController
       end
       return normal_status(-2, "验证码不正确") if verifi_code.try(:code) != code.strip
       return normal_status(-2, "验证码已失效") if !verifi_code&.effective?
+      return normal_status(-1, "8~16位密码，支持字母数字和符号") unless params[:new_password] =~ CustomRegexp::PASSWORD
 
       user.password, user.password_confirmation = params[:new_password], params[:new_password_confirmation]
       ActiveRecord::Base.transaction do

app/controllers/admins/daily_school_statistics_controller.rb

@@ -6,6 +6,7 @@ class Admins::DailySchoolStatisticsController < Admins::BaseController
     total_count, statistics = Admins::SchoolDailyStatisticService.call(params)
 
     @statistics = paginate statistics, total_count: total_count
+    @params_page = params[:page] || 1
 
     respond_to do |format|
       format.html { load_statistic_total }

app/controllers/admins/school_statistics_controller.rb

@@ -10,6 +10,7 @@ class Admins::SchoolStatisticsController < Admins::BaseController
     @grow_summary = service.grow_summary
 
     total_count, statistics = service.call
+    @params_page = params[:page] || 1
 
     @statistics = paginate statistics, total_count: total_count
   end

app/controllers/courses_controller.rb

@@ -1299,8 +1299,10 @@ class CoursesController < ApplicationController
       begin
         @all_members = @course.students
         search = params[:search] ? "#{params[:search].strip}" : ""   #用户名或学生学号id搜索
-        group_id = params[:group_id]  #分班的班级id
-        @all_members = @all_members.where(course_group_id: group_id.map(&:to_i)) unless group_id.blank?
+        if params[:group_id].present?
+          group_ids = params[:group_id].is_a?(String) ? [params[:group_id].to_i] : params[:group_id].map(&:to_i)
+          @all_members = @all_members.where(course_group_id: group_ids)
+        end
         unless search.blank?
           @all_members = @all_members.joins(user: [:user_extension]).where('concat(users.lastname, users.firstname) like ? or user_extensions.student_id like ?',"%#{search}%","%#{search}%")
         end

app/controllers/files_controller.rb

@@ -140,7 +140,7 @@ class FilesController < ApplicationController
   def public_with_course_and_project
     @attachments = Attachment.publiced.simple_columns
                        .contains_course_and_project
-                       .includes(:author => :user_extension)
+                       .includes(:container, author: :user_extension)
                        .by_filename_or_user_name(params[:search])
                        .ordered(sort: 0, sort_type: 'created_on')
 
@@ -361,15 +361,16 @@ class FilesController < ApplicationController
   def publish_params
     tip_exception("缺少发布参数") if params[:delay_publish].blank?
     @unified_setting = 1
-    if params[:delay_publish].to_i == 1 && @course.course_group_module? && @course.course_groups_count != 0
-      tip_exception("分班发布设置不能为空") if params[:group_settings].blank?
-      min_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).min
-      max_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).max
-      tip_exception("分班发布设置不能为空") if min_publish_time.blank?
-
-      # 分班设置中的时间一样且包含所有分班 则按统一设置处理，否则是非统一设置
-      @unified_setting = 0 unless min_publish_time == max_publish_time && params[:group_settings].pluck(:group_id).flatten.sort == @course.course_groups.pluck(:id).sort
-    elsif params[:delay_publish].to_i == 1
+    # if params[:delay_publish].to_i == 1 && @course.course_group_module? && @course.course_groups_count != 0
+    #   tip_exception("分班发布设置不能为空") if params[:group_settings].blank?
+    #   min_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).min
+    #   max_publish_time = params[:group_settings].pluck(:publish_time).reject(&:blank?).max
+    #   tip_exception("分班发布设置不能为空") if min_publish_time.blank?
+    #
+    #   # 分班设置中的时间一样且包含所有分班 则按统一设置处理，否则是非统一设置
+    #   @unified_setting = 0 unless min_publish_time == max_publish_time && params[:group_settings].pluck(:group_id).flatten.sort == @course.course_groups.pluck(:id).sort
+    # els
+    if params[:delay_publish].to_i == 1
       tip_exception("缺少延期发布的时间参数") if params[:publish_time].blank?
       min_publish_time = params[:publish_time]
     end

app/controllers/hack_user_lastest_codes_controller.rb

@@ -68,6 +68,7 @@ class HackUserLastestCodesController < ApplicationController
   # 提交记录详情
   def record_detail
     @hack_user = HackUserCode.find params[:id]
+    @my_hack = @hack_user.hack_user_lastest_code
   end
 
   # 接收中间件返回结果接口

app/controllers/hacks_controller.rb

@@ -48,7 +48,9 @@ class HacksController < ApplicationController
         hack.save!
         # 创建测试集与代码
         hack.hack_sets.create!(hack_sets_params)
-        hack.hack_codes.create!(hack_code_params.merge(modify_time: Time.now))
+        hack_codes = hack.hack_codes.new(hack_code_params)
+        hack_codes.modify_time = Time.now
+        hack_codes.save!
       end
       render_ok({identifier: hack.identifier})
     rescue Exception => e
@@ -67,10 +69,8 @@ class HacksController < ApplicationController
         # 新建
         @hack.hack_sets.create!(hack_sets_params)
         # 更新代码
-        if params[:hack_codes][:code] != @hack.code
-          hack_code_params = hack_code_params.merge(modify_time: Time.now)
-        end
-        @hack.hack_codes.create!(hack_code_params)
+        code_params = params[:hack_codes][:code] != @hack.code ? hack_code_params.merge(modify_time: Time.now) : hack_code_params
+        @hack.hack_codes.first.update_attributes!(code_params)
       end
       render_ok
     rescue Exception => e

app/libs/custom_regexp.rb

@@ -3,5 +3,5 @@ module CustomRegexp
   EMAIL = /\A[a-zA-Z0-9]+([._\\]*[a-zA-Z0-9])*@([a-z0-9]+[-a-z0-9]*[a-z0-9]+.){1,63}[a-z0-9]+\z/
   LASTNAME = /\A[a-zA-Z0-9\u4e00-\u9fa5]+\z/
   NICKNAME = /\A[\u4e00-\u9fa5_a-zA-Z0-9]+\z/
-  PASSWORD = /\A[a-z_A-Z0-9-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'<>~\·`\?:;|]{8,16}\z/
+  PASSWORD = /\A[a-z_A-Z0-9\-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'_<>~\·`\?:;|]{8,16}\z/
 end

app/models/attachment.rb

@@ -21,7 +21,7 @@ class Attachment < ApplicationRecord
   scope :contains_only_project,         -> { where(container_type: 'Project') }
   scope :contains_course_and_project,   -> { contains_only_course.or(contains_only_project) }
   scope :mine,                          -> (author_id) { where(author_id: author_id) }
-  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type) }
+  scope :simple_columns,                -> { select(:id, :filename, :filesize, :created_on, :cloud_url, :author_id, :content_type, :container_type, :container_id) }
   scope :search_by_container,           -> (ids) {where(container_id: ids)}
   scope :unified_setting, -> {where("unified_setting = ? ", 1)}
 
@@ -35,7 +35,7 @@ class Attachment < ApplicationRecord
 
   def title
     title = filename
-    if container.is_a?(StudentWork) && author_id != User.current.id
+    if container && container.is_a?(StudentWork) && author_id != User.current.id
       course = container&.homework_common&.course
       unless User.current.teacher_of_course?(course)
         title = "#{Time.now.strftime('%Y%m%d%H%M%S')}_#{DCODES.sample(8).join}" + File.extname(filename)

app/models/hack_user_code.rb

@@ -1,6 +1,7 @@
 class HackUserCode < ApplicationRecord
   # 用户编程题的信息
   belongs_to :hack
+  belongs_to :hack_user_lastest_code
 
   scope :created_order, ->{ order("created_at desc")}
 end

app/models/user.rb

@@ -23,8 +23,6 @@ class User < ApplicationRecord
   # 身份证
   VALID_NUMBER_REGEX = /(^[1-9]\d{5}(18|19|20|(3\d))\d{2}((0[1-9])|(1[0-2]))(([0-2][1-9])|10|20|30|31)\d{3}[0-9Xx]$)|(^([A-Z]\d{6,10}(\(\w{1}\))?)$)/
 
-  VALID_PASSWORD_REGEX = /\A[a-z_A-Z0-9-\.!@#\$%\\\^&\*\)\(\+=\{\}\[\]\/",'<>~\·`\?:;|]{8,16}\z/
-
   LOGIN_LENGTH_LIMIT = 30
   MAIL_LENGTH_LMIT = 60
 
@@ -183,7 +181,6 @@ class User < ApplicationRecord
   #validates_format_of :ID_number, with: VALID_NUMBER_REGEX, multiline: true, message: "身份证号格式不对"
   # validates :nickname, presence: true, length: { maximum: 10 }
   # validates :lastname, presence: true
-  validates_format_of :password, with: VALID_PASSWORD_REGEX, multiline: true, message: "8~16位密码，支持字母数字和符号"
 
   # 删除自动登录的token，一旦退出下次会提示需要登录
   def delete_autologin_token(value)

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

@@ -1,8 +1,8 @@
 <table class="table table-hover daily-school-statistic-list-table">
   <thead class="thead-light">
   <tr>
+    <th width="4%">序号</th>
     <th width="12%" class="text-left">单位名称</th>
-
     <th width="10%"><%= sort_tag('教师总数', name: 'teacher_count', path: admins_daily_school_statistics_path) %></th>
     <th width="10%"><%= sort_tag('学生总数', name: 'student_count', path: admins_daily_school_statistics_path) %></th>
     <th width="10%"><%= sort_tag('课堂总数', name: 'course_count', path: admins_daily_school_statistics_path) %></th>
@@ -16,13 +16,14 @@
     </th>
     <th width="11%"><%= sort_tag('实训作业总数', name: 'homework_count', path: admins_daily_school_statistics_path) %></th>
     <th width="11%"><%= sort_tag('其它作业总数', name: 'other_homework_count', path: admins_daily_school_statistics_path) %></th>
-    <th width="13%"><%= sort_tag('动态时间', name: 'nearly_course_time', path: admins_daily_school_statistics_path) %></th>
+    <th width="9%"><%= sort_tag('动态时间', name: 'nearly_course_time', path: admins_daily_school_statistics_path) %></th>
   </tr>
   </thead>
   <tbody>
   <% if statistics.present? %>
-    <% statistics.each do |statistic| %>
+    <% statistics.each_with_index do |statistic, index| %>
       <tr>
+        <td><%= list_index_no(@params_page.to_i, index) %></td>
         <td class="text-left">
           <%= link_to statistic[:name], "/colleges/#{statistic[:id]}/statistics",
                       target: '_blank', data: { toggle: 'tooltip', title: '点击查看学校统计概况' } %>

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

@@ -20,7 +20,8 @@
 <table class="table table-hover text-center daily-school-statistic-list-table">
   <thead class="thead-light">
   <tr>
-    <th width="24%" class="text-left">单位名称</th>
+    <th width="4%">序号</th>
+    <th width="20%" class="text-left">单位名称</th>
     <th width="12%"><%= sort_tag('新增教师', name: 'teacher_increase_count', path: admins_school_statistics_path) %></th>
     <th width="12%"><%= sort_tag('新增学生', name: 'student_increase_count', path: admins_school_statistics_path) %></th>
     <th width="12%"><%= sort_tag('新增课堂', name: 'course_increase_count', path: admins_school_statistics_path) %></th>
@@ -32,8 +33,9 @@
   </thead>
   <tbody>
   <% if statistics.present? %>
-    <% statistics.each do |statistic| %>
+    <% statistics.each_with_index do |statistic, index| %>
       <tr>
+        <td><%= list_index_no(@params_page.to_i, index) %></td>
         <td class="text-left">
           <%= link_to statistic.school_name, "/colleges/#{statistic.school_id}/statistics",
                       target: '_blank', data: { toggle: 'tooltip', title: '点击查看学校统计概况' } %>

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

@@ -1,12 +1,13 @@
 <table class="table text-center shixun-settings-list-table">
   <thead class="thead-light">
-  <th width="8%">ID</th>
+  <th width="4%">序号</th>
+  <th width="7%">ID</th>
   <th width="12%" class="text-left">实训名称</th>
   <th width="8%">技术平台</th>
   <th width="8%">权限</th>
-  <th width="15%">技术体系</th>
-  <th width="8%">上传图片</th>
-  <th width="8%">小程序封面</th>
+  <th width="13%">技术体系</th>
+  <th width="7%">上传图片</th>
+  <th width="7%">小程序封面</th>
   <th width="5%">创建者</th>
   <th width="5%">关闭</th>
   <th width="4%">复制</th>

app/views/admins/shixun_settings/shared/_td.html.erb

@@ -1,3 +1,4 @@
+<td class="shixun-line-no"><%= page_no %></td>
 <td><%= shixun.identifier %></td>
 <td class="text-left">
   <span>

app/views/hack_user_lastest_codes/record_detail.json.jbuilder

@@ -1,4 +1,8 @@
 json.(@hack_user, :id, :status, :error_line, :error_msg, :expected_output,
     :input, :output, :execute_time, :execute_memory, :created_at, :code)
 json.language @hack_user.hack.language
-json.name @hack_user.hack.name
+json.name @hack_user.hack.name
+json.myproblem_identifier @my_hack.identifier
+json.user do
+  json.partial! 'users/user', user: current_user
+end

db/migrate/20191209111347_add_index_for_hack_codes.rb

@@ -0,0 +1,6 @@
+class AddIndexForHackCodes < ActiveRecord::Migration[5.2]
+  def change
+    HackCode.destroy_all
+    add_index :hack_codes, [:hack_id, :language], unique: true
+  end
+end