From b019c751dfd8dd7fd7a58c4c215e7b6d29df232e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sun, 5 May 2019 20:03:43 +0800
Subject: [PATCH 1/6] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E7=99=BE?=
=?UTF-8?q?=E5=88=86=E6=AF=94=E9=99=90=E5=88=B6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/views/challenges/_edit_evaluating_page.html.erb | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/app/views/challenges/_edit_evaluating_page.html.erb b/app/views/challenges/_edit_evaluating_page.html.erb
index 3dd94163..777fbfd8 100644
--- a/app/views/challenges/_edit_evaluating_page.html.erb
+++ b/app/views/challenges/_edit_evaluating_page.html.erb
@@ -191,7 +191,7 @@
-
+
@@ -330,7 +330,9 @@
function startSystem_score_percentage(){
getpercentage()
}
-
+ // function customSystem_score_percentage(){
+ //
+ // }
$(function(){
//填写百分比初始化
//$("#All_tests").attr('checked', 'checked');
@@ -426,12 +428,11 @@
if ($("#Custom_ratio").is(":checked")) {
for (var i = 0; i < percentagelist.length; i++) {
maxnum = maxnum+parseInt($(percentagelist[i]).val());
-
}
}
}
- if(maxnum != 100){
+ if(maxnum<100||maxnum>100){
$("#occupy_type").show()
return
}
From 17685891d44d64d037cfaf783d66553775c83373 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sun, 5 May 2019 20:08:08 +0800
Subject: [PATCH 2/6] 1
---
app/views/challenges/_edit_evaluating_page.html.erb | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/views/challenges/_edit_evaluating_page.html.erb b/app/views/challenges/_edit_evaluating_page.html.erb
index 777fbfd8..425f3b2f 100644
--- a/app/views/challenges/_edit_evaluating_page.html.erb
+++ b/app/views/challenges/_edit_evaluating_page.html.erb
@@ -431,8 +431,8 @@
}
}
}
-
- if(maxnum<100||maxnum>100){
+ console.log("######"+maxnum);
+ if(maxnum<100 || maxnum>100){
$("#occupy_type").show()
return
}
From 5076773be1a31242cfcbcd04994a4d9f6606abed Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sun, 5 May 2019 20:18:07 +0800
Subject: [PATCH 3/6] 1
---
app/views/challenges/_edit_evaluating_page.html.erb | 8 +++-----
1 file changed, 3 insertions(+), 5 deletions(-)
diff --git a/app/views/challenges/_edit_evaluating_page.html.erb b/app/views/challenges/_edit_evaluating_page.html.erb
index 425f3b2f..10d23e58 100644
--- a/app/views/challenges/_edit_evaluating_page.html.erb
+++ b/app/views/challenges/_edit_evaluating_page.html.erb
@@ -424,11 +424,9 @@
var maxnum=0;
var percentagelist = document.getElementsByName("test_set[score][]");
- if($("#Partial_test").is(":checked")) {
- if ($("#Custom_ratio").is(":checked")) {
- for (var i = 0; i < percentagelist.length; i++) {
- maxnum = maxnum+parseInt($(percentagelist[i]).val());
- }
+ if ($("#Partial_test").is(":checked")) {
+ for (var i = 0; i < percentagelist.length; i++) {
+ maxnum = maxnum + parseInt($(percentagelist[i]).val());
}
}
console.log("######"+maxnum);
From be6620c3a38b27d083634b00b41bcea146ef6ffe Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Sun, 5 May 2019 20:18:29 +0800
Subject: [PATCH 4/6] 1
---
app/views/challenges/_edit_evaluating_page.html.erb | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/app/views/challenges/_edit_evaluating_page.html.erb b/app/views/challenges/_edit_evaluating_page.html.erb
index 10d23e58..33e22610 100644
--- a/app/views/challenges/_edit_evaluating_page.html.erb
+++ b/app/views/challenges/_edit_evaluating_page.html.erb
@@ -430,7 +430,7 @@
}
}
console.log("######"+maxnum);
- if(maxnum<100 || maxnum>100){
+ if(maxnum != 100){
$("#occupy_type").show()
return
}
From ec416ba374b5319f3b1f3f0ae1c64681980d0c6f Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Mon, 6 May 2019 14:44:25 +0800
Subject: [PATCH 5/6] =?UTF-8?q?=E6=92=A4=E9=94=80=E5=8F=91=E5=B8=83?=
=?UTF-8?q?=E7=9A=84=E8=AF=95=E5=8D=B7=E8=A6=81=E5=88=A0=E9=99=A4=E4=B9=8B?=
=?UTF-8?q?=E5=89=8D=E5=81=9A=E8=BF=87=E7=9A=84=E9=A2=98=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
app/controllers/exercise_controller.rb | 1 +
1 file changed, 1 insertion(+)
diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 07234e17..3dae6420 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -728,6 +728,7 @@ class ExerciseController < ApplicationController
ExerciseShixunAnswer.where(:exercise_question_id => @exercise.exercise_questions.pluck(:id)).destroy_all
@exercise.update_attributes(:exercise_status => 1, :publish_time => nil, :end_time => nil, :unified_setting => 1)
@exercise.exercise_group_settings.destroy_all
+ @exercise.exercise_user_questions.destroy_all
@exercise.course_acts.destroy_all
@exercise.tidings.destroy_all
create_exercises_list @exercise
From dfc7ed119dc22ae41fac5c79148807a2a4d466d4 Mon Sep 17 00:00:00 2001
From: daiao <358551898@qq.com>
Date: Tue, 7 May 2019 10:10:35 +0800
Subject: [PATCH 6/6] 1
---
app/models/exercise.rb | 1 +
...6070751_migrate_exercise_user_questions.rb | 30 +++++++++++++++++++
2 files changed, 31 insertions(+)
create mode 100644 db/migrate/20190506070751_migrate_exercise_user_questions.rb
diff --git a/app/models/exercise.rb b/app/models/exercise.rb
index f0343311..5b81b1b3 100644
--- a/app/models/exercise.rb
+++ b/app/models/exercise.rb
@@ -30,6 +30,7 @@ class Exercise < ActiveRecord::Base
end
def create_user_question_list exercise_user_id
+ self.exercise_user_questions.where(exercise_user_id: exercise_user_id).destroy_all
self.exercise_questions.where("question_type != 5").each do |question|
ExerciseUserQuestion.create(exercise_id: self.id, exercise_user_id: exercise_user_id, exercise_question_id: question.id)
end
diff --git a/db/migrate/20190506070751_migrate_exercise_user_questions.rb b/db/migrate/20190506070751_migrate_exercise_user_questions.rb
new file mode 100644
index 00000000..3417cf67
--- /dev/null
+++ b/db/migrate/20190506070751_migrate_exercise_user_questions.rb
@@ -0,0 +1,30 @@
+class MigrateExerciseUserQuestions < ActiveRecord::Migration
+ def up
+ exercise = Exercise.where(:id => 1031).first
+ if exercise.present?
+ exercise.exercise_users.each do |exercise_user|
+ # 分配的实训题数量多于6个的（撤销发布过的学生会有12个题）则删除前六个题
+ if exercise_user.exercise_user_questions.where(:exercise_id => exercise.id).count > 6
+ exercise_user.exercise_user_questions[0..5].each do |question|
+ question.destroy
+ end
+ end
+
+ # 分数超过一百分的需要重新计算得分
+ if exercise_user.objective_score > 100.0
+ score = 0
+ ExerciseUserQuestion.where(exercise_user_id: exercise_user.id, exercise_id: exercise.id).each do |question|
+ question.exercise_shixun_challenges.each do |exercise_cha|
+ score += exercise_cha.exercise_shixun_answers.where(user_id => exercise_user.user_id).try(:score).to_f
+ end
+ end
+
+ exercise_user.update_attributes(score: score, objective_score: score)
+ end
+ end
+ end
+ end
+
+ def down
+ end
+end