From 8fd8da2e8ca329378573bbaf911148c95e078d3b Mon Sep 17 00:00:00 2001 From: SylorHuang Date: Tue, 16 Jul 2019 16:00:56 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E9=97=AE=E9=A2=98=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0ABCD..?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/exercises_controller.rb | 7 ------- .../exercise_questions/_exercise_questions.json.jbuilder | 3 +-- 2 files changed, 1 insertion(+), 9 deletions(-) diff --git a/app/controllers/exercises_controller.rb b/app/controllers/exercises_controller.rb index 0bc7658c5..4319f2e4a 100644 --- a/app/controllers/exercises_controller.rb +++ b/app/controllers/exercises_controller.rb @@ -732,13 +732,6 @@ class ExercisesController < ApplicationController ex_unified = true e_time = ex_end_time end - # if exercise.end_time.blank? - # e_time = ex_end_time - # elsif exercise.exercise_group_settings.end_time_no_null.count > 0 # 该试卷分组有结束时间为空的 - # e_time = exercise.exercise_group_settings.end_time_no_null.map(&:end_time).max - # else - # e_time = ex_end_time - # end ex_status = set_exercise_status(Time.now,e_time) exercise_params = { diff --git a/app/views/exercise_questions/_exercise_questions.json.jbuilder b/app/views/exercise_questions/_exercise_questions.json.jbuilder index 4cdd97f3c..bfaf6b736 100644 --- a/app/views/exercise_questions/_exercise_questions.json.jbuilder +++ b/app/views/exercise_questions/_exercise_questions.json.jbuilder @@ -1,5 +1,4 @@ json.question_id question.id -# json.question_number question.question_number q_positon = question.question_number if ques_position.present? q_positon = ques_position @@ -22,7 +21,7 @@ if question.question_type <= 2 #当为选择题或判断题时，只显示选 user_answer_b = user_answer.include?(a.id) json.c_position (index+1) if ex_choice_random_boolean #当选项随机时，选项位置以此为准，否则不出现 json.choice_id a.id - json.choice_text a.choice_text + json.choice_text "#{(index+65).chr}.#{a.choice_text}" json.choice_position a.choice_position if exercise_type == 1 || exercise_type == 4 #1为教师编辑/预览 试卷或问题，2为空白试卷，即标准答案和用户答案都不显示，3为用户开始答题的显示，4为老师评阅试卷或学生在截止后查看试卷 json.standard_boolean standard_answer_b