Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/exercises_controller.rb

@@ -605,6 +605,21 @@ class ExercisesController < ApplicationController
     end
   end
 
+  # 对未提交的用户进行调分
+  def adjust_score
+    exercise_user = @exercise.exercise_users.find_by!(user_id: params[:user_id])
+    tip_exception("已提交的作品请去评阅页进行调分") if exercise_user.commit_status == 1
+    tip_exception("分数不能为空") if params[:score].blank?
+    tip_exception("分数不能超过0-#{@exercise.question_scores}") if params[:score].to_f < 0 || params[:score].to_f.round(1) > @exercise.question_scores.round(1)
+
+    ActiveRecord::Base.transaction do
+      start_at_time = exercise_user.start_at || Time.now
+      exercise_user.update_attributes!(start_at: start_at_time, end_at: Time.now, status: 1, commit_status: 1, score: params[:score].to_f.round(2), commit_method: 5)
+      ExerciseUserScore.create!(exercise_id: @exercise.id, exercise_user_id: exercise_user.id, score: params[:score], comment: params[:comment])
+      normal_status("操作成功")
+    end
+  end
+
   #我的题库
   def my_exercises
     ActiveRecord::Base.transaction do

app/controllers/homework_commons_controller.rb

@@ -572,10 +572,13 @@ class HomeworkCommonsController < ApplicationController
         if @homework.homework_type == "practice"
 
           # 实训作业的评分设置
+          tip_exception("总分值不能为空") if params[:total_score].blank?
+          tip_exception("总分值不能小于0") if params[:total_score].to_i < 0
           tip_exception("缺少answer_open_evaluation参数") if params[:answer_open_evaluation].nil?
           tip_exception("缺少work_efficiency参数") if params[:work_efficiency].nil?
           tip_exception("缺少eff_score参数") if params[:work_efficiency] && params[:eff_score].blank?
           tip_exception("效率分不能小于等于0") if params[:eff_score] && params[:eff_score].to_i <= 0
+          tip_exception("效率分不能大于总分值") if params[:eff_score] && params[:eff_score].to_i > params[:total_score].to_i
           tip_exception("缺少shixun_evaluation参数") if params[:shixun_evaluation].blank?
           tip_exception("缺少challenge_settings参数") if params[:challenge_settings].blank?
           # tip_exception("缺少challenge_id参数") if params[:challenge_settings][:challenge_id].blank?
@@ -584,6 +587,7 @@ class HomeworkCommonsController < ApplicationController
           #     params[:challenge_settings][:challenge_score].length != params[:challenge_settings][:challenge_id].length
 
           current_eff_score = @homework.eff_score
+          @homework.total_score = params[:total_score]
           @homework.work_efficiency = params[:work_efficiency]
           @homework.eff_score = params[:work_efficiency] ? params[:eff_score].to_i : 0
 

app/controllers/student_works_controller.rb

@@ -534,7 +534,9 @@ class StudentWorksController < ApplicationController
   # 作品调分
   def adjust_score
     tip_exception("分数不能为空") if params[:score].blank?
-    tip_exception("分数不能超过0-100") if params[:score].to_f < 0 || params[:score].to_f > 100
+    tip_exception("分数不能超过0-100") if @homework.homework_type != "practice" && (params[:score].to_f < 0 || params[:score].to_f.round(1) > 100.round(1))
+    tip_exception("已提交的作品请去评阅页进行调分") if @homework.homework_type == "practice" && @work.work_status > 0
+    tip_exception("分数不能超过总分值#{@homework.total_score}") if @homework.homework_type == "practice" && (params[:score].to_f < 0 || params[:score].to_f.round(1) > @homework.total_score.round(1))
     ActiveRecord::Base.transaction do
       begin
         # 分数不为空的历史评阅都置为失效

app/models/exercise_user.rb

@@ -1,8 +1,10 @@
 class ExerciseUser < ApplicationRecord
-  # commit_method 0 为默认， 1为学生的手动提交，2为倒计时结束后自动提交，3为试卷定时截止的自动提交, 4为教师手动的立即截止
+  # commit_method 0 为默认， 1为学生的手动提交，2为倒计时结束后自动提交，3为试卷定时截止的自动提交, 4为教师手动的立即截止, 5为老师调分
   belongs_to :user
   belongs_to :exercise
 
+  has_many :exercise_user_scores, dependent: :destroy
+
   scope :commit_exercise_by_status, lambda { |s| where(commit_status: s) }
   scope :exercise_user_committed, -> {where("commit_status != ?",0) }
   scope :current_exercise_user, lambda { |user_id,exercise_id| where(user_id: user_id,exercise_id:exercise_id)}

app/models/exercise_user_score.rb

@@ -0,0 +1,5 @@
+class ExerciseUserScore < ApplicationRecord
+  belongs_to :exercise
+  belongs_to :exercise_user
+  belongs_to :user
+end

app/views/homework_commons/settings.json.jbuilder

@@ -5,7 +5,7 @@ json.partial! "homework_btn_check", locals: {identity: @user_course_identity, ho
 json.partial! "student_btn_check", locals: {identity: @user_course_identity, homework: @homework, work: @work}
 
 json.(@homework, :unified_setting, :publish_time, :end_time, :late_penalty, :allow_late, :late_time, :work_public,
-    :score_open, :answer_public)
+    :score_open, :answer_public, :total_score)
 
 json.group_settings @course_groups do |group|
   json.group_id group.id

app/views/homework_commons/works_list.json.jbuilder

@@ -86,7 +86,7 @@ if @homework.homework_type == "practice"
   json.work_efficiency @homework.work_efficiency
 
   json.student_works @student_works.each do |work|
-    json.(work, :id, :work_status, :update_time, :ultimate_score)
+    json.(work, :id, :work_status, :update_time, :ultimate_score, :myshixun_id)
 
     json.late_penalty work.late_penalty if @homework.allow_late
     json.work_score work_score_format(work.work_score, @current_user == work.user, @score_open)

config/routes.rb

@@ -510,7 +510,7 @@ Rails.application.routes.draw do
           post :join_exercise_banks  # 加入习题集
           post :publish   # 立即发布
           post :end_exercise  # 立即截止
-
+``
         end
       end
 
@@ -626,6 +626,7 @@ Rails.application.routes.draw do
         post :cancel_exercise
         get :begin_commit #提交前的弹窗
         get :publish_groups
+        post :adjust_score
       end
       resources :exercise_questions,only:[:new,:create,:index]
     end

db/migrate/20191029084344_add_total_score_to_homework_commons.rb

@@ -0,0 +1,5 @@
+class AddTotalScoreToHomeworkCommons < ActiveRecord::Migration[5.2]
+  def change
+    add_column :homework_commons, :total_score, :float, default: 100
+  end
+end

db/migrate/20191030062150_create_exercise_user_scores.rb

@@ -0,0 +1,13 @@
+class CreateExerciseUserScores < ActiveRecord::Migration[5.2]
+  def change
+    create_table :exercise_user_scores do |t|
+      t.references :exercise, index: true
+      t.references :exercise_user, index: true
+      t.float :score
+      t.text :comment
+      t.references :user, index: true
+
+      t.timestamps
+    end
+  end
+end

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

@@ -1017,7 +1017,6 @@ class Coursesleftnav extends Component{
                     return(
                         <div key={key} 	>
                             <a>
-															{item.type != "statistics" ?
 																<li title={item.name.length<7?"":item.name} onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}>
 																	<a onClick={(e)=>this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}>
 																		{
@@ -1051,7 +1050,7 @@ class Coursesleftnav extends Component{
 
 																		</Popover>:""}
 																	</a>
-																</li> : ""}
+																</li>
 
                             {/*下拉列表*/}
 
@@ -1154,8 +1153,8 @@ class Coursesleftnav extends Component{
                return(
                  <div key={key}>
                    {/*<Tooltip placement="bottom" title={"点击空白处展开二级菜单，点击模块名字跳转到对应模块"}>*/}
-                   <a >
-										 {item.type != "statistics" ?
+                   <a>
+
 											 <li className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"}
 													 onClick={(e)=>this.setnavid(e,key,item.id,item.type,item.category_url)} onMouseEnter={(e)=>this.showsandian(e,key)}
 													 title={item.name.length<7?"":item.name}
@@ -1172,14 +1171,15 @@ class Coursesleftnav extends Component{
 																					 item.type==="poll"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-wenjuan mr10 fl":"iconfont icon-wenjuan mr10 fl"}></i>:
 																						 item.type==="attachment"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-ziyuan mr10 fl":"iconfont icon-ziyuan mr10 fl"}  ></i>:
 																							 item.type==="board"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-taolun mr10 fl":"iconfont icon-taolun mr10 fl"}  ></i>:
-																								 item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:""
+																								 item.type==="course_group"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-fenban mr10 fl":"iconfont icon-fenban mr10 fl"}  ></i>:
+														 												item.type==="statistics"?<i className={this.props.location.pathname===item.category_url?"color-blue iconfont icon-tongji mr10 fl":"iconfont icon-tongji mr10 fl"}  ></i>:""
 													 }
 
 													 <span className={this.props.location.pathname===item.category_url?"color-blue task-hide activity-left-name":"task-hide activity-left-name"} onClick={(e)=>this.selectnavid(e,key,item.id,item.type,item.category_url)}>{item.name}</span>
 													 <span className={this.props.location.pathname===item.category_url?"color-blue fr mr20 font-14":"fr mr20 color999 font-14"}>{item.task_count===0?"":item.task_count}</span>
 
 												 </a>
-											 </li> : ""}
+											 </li>
                    </a>
 
                    <ul style={{display:key===this.props.indexs?"":"none"}} class="droppableul">

public/react/src/modules/courses/statistics/Statistics.js

@@ -281,14 +281,39 @@ class Statistics extends Component{
 			},
 		];
 
+
+		let shixun_homeworktype=false;
+		let common_homeworktype=false;
+		let group_homeworktype=false;
+		let graduationtype=false;
+		let exercisetype=false;
 		let course_grouptype=false;
 		if(this.props&&this.props.course_modules!=undefined){
 			{this.props&&this.props.course_modules.map((item,key)=>{
 				if(item.type==="course_group"){
 					course_grouptype=true
 				}
+
+				if(item.type==="shixun_homework"){
+					shixun_homeworktype=true
+				}
+				if(item.type==="common_homework"){
+					common_homeworktype=true
+				}
+				if(item.type==="group_homework"){
+					group_homeworktype=true
+				}		if(item.type==="graduation"){
+					graduationtype=true
+				}
+
+				if(item.type==="exercise"){
+					exercisetype=true
+				}
+
 			})}
 		}
+
+
     if(course_grouptype===false){
 			columns.some((item,key)=> {
 					if (item.title === "分班") {
@@ -298,25 +323,66 @@ class Statistics extends Component{
 				}
 			)
 		}
+
+		if(shixun_homeworktype===false){
+			columns.some((item,key)=> {
+					if (item.title === "实训作业") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(common_homeworktype===false){
+			columns.some((item,key)=> {
+					if (item.title === "普通作业") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(group_homeworktype===false){
+			columns.some((item,key)=> {
+					if (item.title === "分组作业") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(graduationtype===false){
+			columns.some((item,key)=> {
+					if (item.title === "毕设任务") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
+		if(exercisetype===false){
+			columns.some((item,key)=> {
+					if (item.title === "试卷") {
+						columns.splice(key, 1)
+						return true
+					}
+				}
+			)
+		}
+
 		// console.log(this.props.isAdmin)
 
 
-		// "user_login": "p94602358",
-		// 	"user_name": "卿前程",
-		// 	"course_group": "电气工程1805", // 分班
-		// 	"common_score": 0.0, // 普通作业
-		// 	"group_score": 0.0, // 分组作业
-		// 	"practice_score": 747.1000061035156, // 实训作业
-		// 	"exercise_score": 0.0, // 试卷成绩
-		// 	"graduation_score": 0.0, // 毕设成绩
-		// 	"total_score": 747.1000061035156, // 总成绩
-		// 	"rank": 1  // 排名，学生身份才传
 		const operations = <React.Fragment>
-			<Dropdownbox
+			{course_grouptype===false||this.state.course_groups.length===0?"":<Dropdownbox
 				{...this.props}
 				{...this.state}
 				postwork_scoredata={(group_idss)=>this.getwork_scoredata(1,group_idss,'desc')}
-			/>
+			/>}
 			<a className={"ml20 ant-btn-link"} onClick={()=>this.derivefun(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>导出</a>
 		</React.Fragment>;
 		return(

spec/models/exercise_user_score_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe ExerciseUserScore, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end