Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

# Conflicts:
#	public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

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

@@ -19,7 +19,7 @@ $(document).on('turbolinks:load', function() {
      var json = {};
      json[s_name] = s_value;
      $.ajax({
-       url: "/admins/courses/" + s_id,
+       url: "/admins/classrooms/" + s_id,
        type: "PUT",
        dataType:'script',
        data: json

app/controllers/course_second_categories_controller.rb

@@ -36,10 +36,13 @@ class CourseSecondCategoriesController < ApplicationController
         # 更新相应对象的子目录id
         if @course_module.module_type == "shixun_homework"
           @category.homework_commons.update_all(course_second_category_id: 0)
-          @right_url = "/courses/#{@course.id}/shixun_homeworks/#{@course_module.id}"
+          @right_url = "/classrooms/#{@course.id}/shixun_homeworks/#{@course_module.id}"
         elsif @course_module.module_type == "attachment"
           Attachment.where(course_second_category_id: @category.id).update_all(course_second_category_id: 0)
-          @right_url = "/courses/#{@course.id}/files/#{@course_module.id}"
+          @right_url = "/classrooms/#{@course.id}/files/#{@course_module.id}"
+        elsif @course_module.module_type == "video"
+          @course.course_videos.where(course_second_category_id: @category.id).update_all(course_second_category_id: 0)
+          @right_url = "/classrooms/#{@course.id}/course_videos"
         end
 
         @category.destroy

app/controllers/weapps/attendances_controller.rb

@@ -130,8 +130,14 @@ class Weapps::AttendancesController < ApplicationController
 
   def end
     a_end_time = "#{@attendance.attendance_date} #{@attendance.end_time}".to_time
-    tip_exception("该签到已截止") unless @attendance.current_attendance?
+    tip_exception("该签到已截止") if a_end_time < Time.now
-    @attendance.update!(end_time: Time.current)
+
+    a_start_time = "#{@attendance.attendance_date} #{@attendance.start_time}".to_time
+    if a_start_time > Time.now
+      @attendance.update!(end_time: Time.current, start_time: Time.current, attendance_date: Date.current)
+    else
+      @attendance.update!(end_time: Time.current)
+    end
     render_ok
   end
 

app/helpers/export_helper.rb

@@ -348,7 +348,7 @@ module ExportHelper
       normal_head_cells = %w(作品描述 教师评分 教辅评分)
       anon_boolean = homework.anonymous_comment
       if anon_boolean
-        head_cells_add = %w(匿名评分 缺评扣分 违规匿评申诉扣分)
+        head_cells_add = %w(匿名评分 已评数 缺评扣分 违规匿评申诉扣分)
       else
         head_cells_add = []
       end
@@ -395,36 +395,37 @@ module ExportHelper
         w_10 = w.teaching_asistant_score.nil? ? "未评分" : w.teaching_asistant_score.round(1)
         if anon_boolean
           w_11 = w.student_score.nil? ? "未评分" : w.student_score.round(1)
-          w_12 = (homework.teacher_priority == 1 && !w.teacher_score.nil?) ? 0 : w.absence_penalty  #缺评扣分
+          w_12 = w.user_comment_num
+          w_13 = (homework.teacher_priority == 1 && !w.teacher_score.nil?) ? 0 : w.absence_penalty  #缺评扣分
           home_work_de = homework.homework_detail_manual
-          w_13 = home_work_de.present? ? home_work_de.appeal_penalty : "--"  #违规匿评申诉扣分
+          w_14 = home_work_de.present? ? home_work_de.appeal_penalty : "--"  #违规匿评申诉扣分
         else
-          w_11,w_12,w_13 = nil
+          w_11,w_12,w_13,w_14 = nil
         end
         if allow_late_boolean  #允许迟交
-          w_14 = (homework.teacher_priority == 1 && !w.teacher_score.nil?) ? 0 : w.late_penalty  #迟交扣分
+          w_15 = (homework.teacher_priority == 1 && !w.teacher_score.nil?) ? 0 : w.late_penalty  #迟交扣分
         else
-          w_14 = nil
+          w_15 = nil
         end
-        w_15 = w.work_score.nil? ? "未评分" : w.work_score.round(1)
+        w_16 = w.work_score.nil? ? "未评分" : w.work_score.round(1)
-        w_16 = w.commit_time ? format_time(w.commit_time) : "--"
+        w_17 = w.commit_time ? format_time(w.commit_time) : "--"
-        w_17 = w.update_time ? format_time(w.update_time) : "--"
+        w_18 = w.update_time ? format_time(w.update_time) : "--"
         teacher_comments = w.student_works_scores
         if teacher_comments.present?
-          w_18 = ""
+          w_19 = ""
           teacher_comments.each do |t|
             user_name = t.user&.real_name
             user_time = format_time(t.updated_at)
             user_score = t&.score
             user_comment = t.comment.present? ? t.comment : "--"
             comment_title = "#{user_name}： #{user_time.to_s}  #{user_score.to_s}分\n#{user_comment}\n\n"
-            w_18 = w_18 + comment_title
+            w_19 = w_19 + comment_title
           end
         else
-          w_18 = "--"
+          w_19 = "--"
         end
 
-        row_cells_column = [w_1,w_2,w_3,w_3_1,w_4,w_5,w_6,w_7,w_8,w_9,w_10,w_11,w_12,w_13,w_14,w_15,w_16,w_17,w_18]
+        row_cells_column = [w_1,w_2,w_3,w_3_1,w_4,w_5,w_6,w_7,w_8,w_9,w_10,w_11,w_12,w_13,w_14,w_15,w_16,w_17,w_18,w_19]
         row_cells_column = row_cells_column.reject(&:blank?)
         @work_cells_column.push(row_cells_column)
       end

app/models/student_work.rb

@@ -46,13 +46,13 @@ class StudentWork < ApplicationRecord
 
   # 匿评次数
   def student_comment_num
-    homework_common.homework_detail_manual.comment_status > 2 && work_status > 0 ? self.student_works_scores.select{|score| score.reviewer_role == 3}.group_by(&:user_id).count : 0
+    homework_common.homework_detail_manual.comment_status > 2 && work_status > 0 ? self.student_works_scores.select{|score| score.reviewer_role == 3}.group_by(&:user_id).size : 0
   end
 
   # 学生评阅作品数
   def user_comment_num
     if homework_common.homework_detail_manual.comment_status > 2 && work_status > 0
-      count = homework_common.student_works_scores.select{|score| score.reviewer_role == 3 && score.user_id == user_id}.group_by(&:student_work_id).count
+      count = homework_common.student_works_scores.select{|score| score.reviewer_role == 3 && score.user_id == user_id}.group_by(&:student_work_id).size
     else
      count = 0
     end

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

@@ -1,7 +1,7 @@
 <td><%= list_index_no((params[:page] || 1).to_i, no) %></td>
 <td><%= course.id %></td>
 <td class="text-left">
-  <%= link_to(course.name, "/courses/#{course.id}", target: '_blank') %>
+  <%= link_to(course.name, "/classrooms/#{course.id}", target: '_blank') %>
 </td>
 <td><%= course.course_members_count %></td>
 <td><%= get_attachment_count(course, 0) %></td>

app/views/colleges/_course_statistics.html.erb

@@ -17,7 +17,7 @@
     <% if @courses.present? %>
       <% @courses.each do |course| %>
         <tr>
-          <td class="text-left"><a href="/courses/<%= course.id %>/students" target="_blank" class="d-inline-block text-truncate" style="max-width: 220px"><%= course.name %></a></td>
+          <td class="text-left"><a href="/classrooms/<%= course.id %>/students" target="_blank" class="d-inline-block text-truncate" style="max-width: 220px"><%= course.name %></a></td>
           <% teacher_names = course.teacher_users.map(&:real_name).join('、') %>
           <td class="text-left">
             <span class="d-inline-block text-truncate" style="max-width: 150px" data-toggle="tooltip" title="<%= teacher_names %>">

app/views/course_groups/destroy.json.jbuilder

@@ -1,3 +1,3 @@
 json.status 0
 json.message "删除成功"
-json.right_url "/courses/#{@course.id}/students"
+json.right_url "/classrooms/#{@course.id}/students"

app/views/courses/left_banner.json.jbuilder

@@ -21,7 +21,7 @@ json.course_modules @course_modules.each do |mod|
             json.position board.position
             json.category_count board.messages_count
             json.category_type "messages"
-            json.second_category_url "/courses/#{@course.id}/boards/#{board.id}"
+            json.second_category_url "/classrooms/#{@course.id}/boards/#{board.id}"
           end
         end
       else

app/views/users/get_navigation_info.json.jbuilder

@@ -4,11 +4,11 @@ json.top do
   json.course_url "/courses"
   json.competitions_url "#{@old_domain}/competitions"
   json.topic_url "/forums"
-  json.new_course_url "/courses/new"
+  json.new_course_url "/classrooms/new"
   json.new_shixun_url "/shixuns/new"
   json.new_shixun_path_url "/paths/new"
   json.new_project_url "#{@old_domain}/projects/new"
-  json.join_course_url "/courses/join_course_multi_role"
+  json.join_course_url "/classrooms/join_course_multi_role"
   json.join_project_url "#{@old_domain}/applied_project/applied_project_info"
   json.message_url "#{@user_url}/user_tidings"
   json.new_message @new_message

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

@@ -465,13 +465,14 @@ class Coursesleftnav extends Component{
 				Modalstopval:"隐藏后将不再显示此模块，",
 				ModalsBottomval:"后续可在课堂设置中重新勾选模块恢复显示",
 				ModalSave:()=>this.edithiddens(id),
+				loadtype:false
 			})
 		}else{
 			this.setState({
 				ModalsType:true,
 				Modalstopval:"您不能隐藏所有课堂模块，请至少保留",
 				ModalsBottomval:"其中一个模块。",
-				loadtype:true,
+				loadtype:false,
 				ModalSave:()=>this.cannerNavmoda(),
 			})
 		}
@@ -674,6 +675,7 @@ class Coursesleftnav extends Component{
        ModalsType:false,
        Modalstopval:"",
        loadtype:false,
+       antIcon:false
      })
      notification.open({
        message: "删除成功",
@@ -704,15 +706,13 @@ class Coursesleftnav extends Component{
     e.stopPropagation();//阻止冒泡
     if(type===1){
       let url="/course_second_categories/"+id+".json"
-
       this.setState({
-         ModalsType:true,
+        loadtype:false,
-         Modalstopval:"该目录下的内容将被移动到父目录,",
+        ModalsType:true,
-         ModalsBottomval:"是否确认删除?",
+        Modalstopval:"该目录下的内容将被移动到父目录,",
-         ModalSave:()=>this.deletenavchilds(url,mainurl),
+        ModalsBottomval:"是否确认删除?",
-         loadtype:false
+        ModalSave:()=>this.deletenavchilds(url,mainurl)
       })
-
     }else if(type===2){
       let url="/course_groups/"+id+".json"
       this.setState({

public/react/src/modules/question/component/QuestionModal.js

@@ -41,7 +41,13 @@ class QuestionModal extends Component {
 							""
 					}
 					<div className="clearfix mt30 edu-txt-center">
-						<a className="task-btn mr30 w80" onClick={()=>this.props.modalCancel()}>取消</a>
+						{
+							this.props.titilesm&&this.props.titilesm==="功能正在内测中，敬请期待"?
+								""
+								:
+								<a className="task-btn mr30 w80" onClick={()=>this.props.modalCancel()}>取消</a>
+						}
+
 						<a className="task-btn task-btn-orange w80" onClick={()=>this.props.setDownload()}>{this.props.boolok?this.props.boolok:"确定"}</a>
 					</div>
 				</div>

public/react/src/modules/user/usersInfo/video/InfosVideo.css

@@ -14,6 +14,7 @@
     margin-right: 26px;
     margin-bottom: 26px;
     position: relative;
+    max-height: 258px;
 }
 .videoItem:nth-child(4n+0) {
     margin-right: 0px;
@@ -65,7 +66,7 @@
 .videoItem .square-main .title{
     max-width: 256px;
     line-height: 18px;
-
+    
 }
 
 .videoItem .time {