Merge branch 'dev_aliyun' into develop

app/controllers/student_works_controller.rb

@@ -4,7 +4,7 @@ class StudentWorksController < ApplicationController
 
   before_action :require_login, :check_auth
   before_action :find_homework, only: [:new, :create, :search_member_list, :check_project, :relate_project,
-                                       :cancel_relate_project]
+                                       :cancel_relate_project, :delete_work]
   before_action :find_work, only: [:shixun_work_report, :adjust_review_score, :shixun_work, :commit_des, :update_des,
                                    :adjust_score, :show, :adjust_score, :supply_attachments, :revise_attachment,
                                    :comment_list, :add_score, :add_score_reply, :destroy_score, :appeal_anonymous_score,
@@ -15,12 +15,12 @@ class StudentWorksController < ApplicationController
 
   before_action :teacher_allowed, only: [:adjust_score, :adjust_review_score, :deal_appeal_score]
   before_action :course_student, only: [:new, :commit_des, :update_des, :create, :edit, :update, :search_member_list, :relate_project,
-                                        :cancel_relate_project, :relate_project]
+                                        :cancel_relate_project, :relate_project, :delete_work]
 
   before_action :my_work, only: [:commit_des, :update_des, :edit, :update, :revise_attachment, :appeal_anonymous_score,
                                  :cancel_appeal]
 
-  before_action :edit_duration, only: [:edit, :update]
+  before_action :edit_duration, only: [:edit, :update, :delete_work]
   before_action :end_or_late, only: [:new, :create, :search_member_list, :commit_des, :update_des]
 
   before_action :require_score_id, only: [:destroy_score, :add_score_reply, :appeal_anonymous_score, :deal_appeal_score, :cancel_appeal]
@@ -60,6 +60,20 @@ class StudentWorksController < ApplicationController
     @members = @members.page(page).per(limit).includes(:course_group, user: :user_extension)
   end
 
+  def delete_work
+    begin
+      work = @homework.student_works.find_by!(user_id: params[:user_id])
+      work.update_attributes(description: nil, project_id: 0,
+                                 late_penalty: 0, work_status: 0,
+                                 commit_time: nil, update_time: nil, group_id: 0,
+                                 commit_user_id: nil, final_score: nil, work_score: nil, teacher_score: nil, teaching_asistant_score: nil)
+      normal_status("删除成功")
+    rescue Exception => e
+      uid_logger(e.message)
+      tip_exception(e.message)
+    end
+  end
+
   def create
     student_work = @homework.student_works.find_or_create_by(user_id: current_user.id)
 

app/helpers/export_helper.rb

@@ -146,8 +146,8 @@ module ExportHelper
           w_6 = "--"
         end
         w_7 = w.work_status == 0 ? '--' : myshixun.try(:passed_count).to_s+"/"+shixun.challenges_count.to_s
-        w_8 = myshixun ? myshixun.try(:passed_time) == "--" ? "--" : format_time(myshixun.try(:passed_time)) : "--"  # 通关时间
-        w_9 = myshixun ? (myshixun.try(:passed_count) > 0 ? myshixun.total_spend_time : '--') : "--"  #总耗时
+        w_8 = myshixun ? myshixun.try(:passed_time).to_s == "--" ? "--" : format_time(myshixun.try(:passed_time)) : "--"  # 通关时间
+        w_9 = myshixun ? (myshixun.try(:passed_count).to_i > 0 ? myshixun.total_spend_time : '--') : "--"  #总耗时
         w_10 = myshixun ? myshixun.output_times : 0  #评测次数
         w_11 = myshixun ? myshixun.total_score : "--"  #获得经验值
         w_12 = w.final_score.present? ? w.final_score : 0
@@ -543,7 +543,7 @@ module ExportHelper
   end
 
   def format_sheet_name name
-    name = name.gsub(":", "-")
+    name = name.gsub(":", "-").gsub("/", "_")
   end
 
   def rename_same_file(name, index)

app/models/myshixun.rb

@@ -82,7 +82,7 @@ class Myshixun < ApplicationRecord
 
   # 通关时间
   def passed_time
-    self.status == 1 ? self.games.map(&:end_time).max : "--"
+    self.status == 1 ? self.games.select{|game| game.status == 2}.map(&:end_time).max : "--"
   end
 
   # 耗时

config/routes.rb

@@ -436,6 +436,7 @@ Rails.application.routes.draw do
             get :check_project
             get :cancel_relate_project
             post :relate_project
+            delete :delete_work
           end
         end
       end

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

@@ -218,9 +218,9 @@ class studentsList extends Component{
     })
     this.fetchAll()
     const isAdmin = this.props.isAdmin()
-    if (isAdmin) {
-      this.fetchCourseGroups()
-    }
+    // if (isAdmin) {
+      this.fetchCourseGroups();
+    // }
 
     isAdmin && on('addStudentSuccess', this.addStudentSuccessListener)
     isAdmin && on('updateNavSuccess', this.updateNavSuccess)