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

app/controllers/exercises_controller.rb

@@ -514,6 +514,9 @@ class ExercisesController < ApplicationController
             if exercise_group.present? && (exercise_group.first.publish_time < Time.now) && (exercise_publish_time != exercise_group.first.publish_time)
               error_count += 1
             end
+            if exercise_group.present? && (exercise_group.first.publish_time < Time.now && exercise_group.first.end_time > Time.now) && (exercise_end_time < Time.now)
+              error_count += 1
+            end
             if error_count == 0
               common_group = exercise_groups_ids & course_id #传入的班级与问卷已存在的班级的交集，即表示已有分班的
               new_group_ids = course_id - common_group  #新传入的班级id
@@ -529,12 +532,12 @@ class ExercisesController < ApplicationController
                   if the_group_setting_status == 2
                     ex_group_params = {
                       :publish_time => the_group_setting.publish_time,
-                      :end_time => exercise_end_time
+                      :end_time => exercise_end_time < Time.now ? the_group_setting.end_time : exercise_end_time
                     }
                   elsif the_group_setting_status == 3
                     ex_group_params = {
                       :publish_time => the_group_setting.publish_time,
-                      :end_time => the_group_setting.end_time
+                      :end_time => exercise_end_time
                     }
                   end
                   the_group_setting.update_attributes!(ex_group_params)
@@ -558,7 +561,7 @@ class ExercisesController < ApplicationController
 
           if error_count > 0
             error_count == 0
-            normal_status(-1,"已发布/已截止的试卷不允许修改时间")
+            normal_status(-1,"试卷发布/截止时间不能小于当前时间")
           else
             # 未发布的分班设置才能删除
             if old_exercise_groups.size > 0

app/models/exercise.rb

@@ -41,6 +41,14 @@ class Exercise < ApplicationRecord
     exercise_questions.pluck(:question_score).sum
   end
 
+  def subjective_score
+    exercise_questions.where(question_type: [4]).pluck(:question_score).sum
+  end
+
+  def objective_score
+    exercise_questions.where(question_type: [0, 1, 2, 3, 5]).pluck(:question_score).sum
+  end
+
   def create_exercise_list
     str = ""
     # TODO: 一次性为所有学生创建数据是否存在问题？

app/views/exercises/exercise_lists.json.jbuilder

@@ -16,6 +16,8 @@ json.exercise_types do
   json.subjective @subjective_type  #是否包含主观题，1为包括，0为不包括
   json.exercise_end_time ((@ex_user_end_time.nil? || @ex_user_end_time < Time.now) ? "--" : how_much_time(@ex_user_end_time))
   json.groups_count @c_group_counts
+  json.subjective_score @exercise.subjective_score
+  json.objective_score @exercise.objective_score
 end
 
 if @exercise_current_user_status == 0  #当为老师的时候

public/react/src/modules/tpm/NewHeader.js

@@ -698,7 +698,7 @@ submittojoinclass=(value)=>{
 		}
 		document.head.appendChild(link);
 	}
-	
+
 	getAppdata=()=>{
 		let url = "/setting.json";
 		axios.get(url).then((response) => {
@@ -1226,15 +1226,13 @@ submittojoinclass=(value)=>{
                   this.props.Headertop && this.props.Headertop.laboratory_user &&
                   <li><a href="/admins">后台管理</a></li>
                 }
-                
-                <li><a href={`/account/profile`}>账号管理</a></li>
-                {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
-                {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
-                {/*<li><Link to={`/interest`}>兴趣页</Link></li>*/}
-
-                <li className="bor-top-greyE">
-                  {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.logout_url}>退出</a>*/}
-                  {/*<a  onClick={()=>this.educoderlogin()}>退出</a>*/}
+
+								<li><a href={`/account/profile`}>账号管理</a></li>
+
+
+								<li className="bor-top-greyE">
+
+									{/*<a onClick={()=>this.educoderlogin()} >登录</a>*/}
                   <a  onClick={()=>this.educoderloginysl()}>退出</a>
 
                 </li>