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

app/controllers/homework_commons_controller.rb

@@ -246,13 +246,15 @@ class HomeworkCommonsController < ApplicationController
         student_works = @homework.student_works.where(user_id: user_ids)
       end
 
-      myshixuns = Myshixun.where(shixun_id: @homework.homework_commons_shixun&.shixun_id, user_id: user_ids).
-          includes(:games).where(games: {challenge_id: @homework.homework_challenge_settings.pluck(:challenge_id)})
+      student_works = student_works.includes(:challenge_work_scores)
+
       challenge_settings = @homework.homework_challenge_settings
+      challenge_setting_ids = challenge_settings.pluck(:challenge_id)
+      myshixuns = Myshixun.where(shixun_id: @homework.homework_commons_shixun&.shixun_id, user_id: user_ids).includes(:games)
       myshixuns.find_each(batch_size: 100) do |myshixun|
         work = student_works.select{|work| work.user_id == myshixun.user_id}.first
         if work && myshixun
-          games = myshixun.games.where(challenge_id: challenge_settings.pluck(:challenge_id))
+          games = myshixun.games.select{|game| challenge_setting_ids.include?(game.challenge_id)}
           HomeworksService.new.update_myshixun_work_score work, myshixun, games, @homework, challenge_settings
         end
       end

app/services/homeworks_service.rb

@@ -286,7 +286,7 @@ class HomeworksService
         challenge_setting = challenge_settings.select{|setting| setting.challenge_id == game.challenge_id}.first
         pass_consume_time += (game.cost_time / 60.0).to_f
         user_total_score += game.final_score.to_i < 0 ? 0 : game.challenge.score.to_i
-        adjust_score = work.challenge_work_scores.where(:challenge_id => game.challenge_id).last
+        adjust_score = work.challenge_work_scores.select{|work_score| work_score.challenge_id == game.challenge_id}.last
         final_score += if adjust_score.present?
                          adjust_score.score
                        elsif homework.homework_detail_manual.answer_open_evaluation
@@ -300,6 +300,17 @@ class HomeworksService
     end
 
     myshixun_endtime = games.select{|game| game.status == 2}.size == games.size ? games.map(&:end_time).max : nil
+
+    if work.work_status == 0
+      is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time)
+      if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now))
+        work.work_status = 1
+      elsif homework.allow_late && myshixun.created_at < homework.late_time
+        work.work_status = 2
+      end
+    end
+
+    if work.work_status != 0
       if myshixun_endtime.present?
         work.cost_time = myshixun_endtime.to_i - setting_time.publish_time.to_i
 
@@ -314,18 +325,9 @@ class HomeworksService
         end
       end
 
-    if work.work_status == 0
-      is_complete = myshixun_endtime && (myshixun_endtime < setting_time.end_time)
-      if is_complete || (myshixun.created_at < setting_time.end_time && (!homework.allow_late || setting_time.end_time >= Time.now))
-        work.work_status = 1
-      elsif homework.allow_late && myshixun.created_at < homework.late_time
-        work.work_status = 2
-      end
       work.late_penalty = work.work_status == 2 ? homework.late_penalty : 0
       work.commit_time = myshixun.created_at > setting_time.publish_time ? setting_time.publish_time : myshixun.created_at
       work.myshixun_id = myshixun.id
-    end
-
       work.update_time = myshixun.updated_at
 
       work.final_score = final_score
@@ -335,4 +337,5 @@ class HomeworksService
       work.calculation_time = Time.now
       work.save!
     end
+  end
 end

public/react/src/AppConfig.js

@@ -10,6 +10,7 @@ broadcastChannelOnmessage('refreshPage', () => {
 })
 
 function locationurl(list){
+	debugger
   if (window.location.port === "3007") {
 
   } else {
@@ -141,10 +142,7 @@ export function initAxiosInterceptors(props) {
         // if(response.data.status === 401){
         //   console.log("401401401")
         // }
-        if (response.data.status === 403) {
-            // props.history.replace('/403')
-            // 这里会分2个情况，1、刚进入页面发请求返回的403；2、进入页面后，其他用户操作触发请求返回的403；
-            // TODO 这里做一个403弹框比较好？
+        if (response.data.status === 403||response.data.status === "403") {
             locationurl('/403');
         }
 

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

@@ -120,35 +120,35 @@ class ExerciseDisplay extends Component{
               
               
                 return <SingleDisplay {...this.props} {...item} index={index} {...commonHandler}
-                    displayCount={exercise_questions.length} showActionButton={false}
+                    displayCount={exercise_questions.length} showActionButton={false} key={index}
                 ></SingleDisplay>
               
             } else if (item.question_type == 2) {
               
               
                 return <JudgeDisplay 
-                      showActionButton={false}
+                      showActionButton={false} key={index}
                       {...this.props} {...item} index={index} {...commonHandler} ></JudgeDisplay>
               
             } else if (item.question_type == 3) {
               
               
                 return <NullDisplay 
-                      showActionButton={false}
+                      showActionButton={false} key={index}
                       {...this.props} {...item} index={index} {...commonHandler} ></NullDisplay>
               
             } else if (item.question_type == 4) {
               
               
                 return <MainDisplay 
-                      showActionButton={false}
+                      showActionButton={false} key={index}
                       {...this.props} {...item} index={index} {...commonHandler} ></MainDisplay>
               
             } else if (item.question_type == 5) {
               
               
                 return <ShixunDisplay Testpapersettinghomepage
-                      showActionButton={false}
+                      showActionButton={false} key={index}
                       {...this.props} {...item} index={index} {...commonHandler} ></ShixunDisplay>
               
             }

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

@@ -407,11 +407,11 @@ class ExerciceNew extends Component{
             }
           `}</style>
           <div className="edu-class-container edu-position courseForm">
-            <CBreadcrumb items={[
+            { current_user && <CBreadcrumb items={[
               { to: current_user.first_category_url, name: this.props.coursedata ? this.props.coursedata.name : ''},
               { to: `/courses/${courseId}/exercises/${left_banner_id}`, name: '试卷列表' },
               { name: this.isEdit ? '编辑试卷' : '新建试卷'}
-            ]}></CBreadcrumb>
+            ]}></CBreadcrumb> }
 
             <p className="clearfix mt20 mb20">
               <span className="fl font-24 color-grey-3">{this.isEdit ? "编辑" : "新建"}试卷</span>

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

@@ -146,7 +146,7 @@ class PathDetailIndex extends Component{
 
 				if (result.data.status === 403) {
 					debugger
-					window.location.href = "/403";
+					// window.location.href = "/403";
 					return;
 				}
 
@@ -173,7 +173,7 @@ class PathDetailIndex extends Component{
       }
 			if (result.data.status === 403 ) {
 				debugger
-				window.location.href = "/403";
+				// window.location.href = "/403";
 				return;
 			}
 

public/react/src/modules/tpm/newshixuns/Newshixuns.js

@@ -16,6 +16,7 @@ import './css/Newshixuns.css';
 
 import {getUrl} from 'educoder'
 
+import moment from 'moment';
 
 let path = getUrl("/editormd/lib/")