fix export exercise pdf

dev_forum
SylorHuang 5 years ago
parent 63e058e7ed
commit f755a2dca8

@ -83,7 +83,6 @@ class AccountsController < ApplicationController
email = params[:login]
verifi_code = VerificationCode.where(email: email, code: code, code_type: 3).last
user = User.find_by_mail(email) #这里有问题应该是为email,而不是mail 6.13-hs
end
check_code = (verifi_code.try(:code) == code.strip && (Time.now.to_i - verifi_code.created_at.to_i) <= 10*60)
unless check_code

@ -47,7 +47,7 @@ class ExerciseUserPdfService
end
def load_data
@exercise_questions = exercise.exercise_questions
@exercise_questions = exercise.exercise_questions.joins(:exercise_choices,:exercise_shixun_challenges,:exercise_answers,:exercise_shixun_answers,:exercise_answer_comments)
@exercise_ques_count = @exercise_questions.count # 全部的题目数
@exercise_ques_scores = @exercise_questions.pluck(:question_score).sum
@ -81,9 +81,9 @@ class ExerciseUserPdfService
@exercise_ques_shixun_count = exercise_ques_shixun.all.count
@exercise_ques_shixun_scores = exercise_ques_shixun.pluck(:question_score).sum
challenge_ids = @exercise_questions.joins(:exercise_shixun_challenges).pluck("exercise_shixun_challenges.challenge_id")
challenge_ids = @exercise_questions.pluck("exercise_shixun_challenges.challenge_id")
get_each_student_exercise(exercise.id,@exercise_questions,@ex_user_user.id)
@games = @exercise_user.user.games.ch_games(challenge_ids)
# @games = @exercise_user.user.games.ch_games(challenge_ids)
end
end

@ -231,7 +231,7 @@ p{
position: absolute;
display: inline-block;
bottom: 9px;
left: 1px;
left: 2px;
}
.circle-right:after{
color:#fff;

@ -112,6 +112,7 @@
<div class="mbt10">
<% @exercise_questions.each do |q| %>
<% q_type = q.question_type %>
<% games =( q_type == 5 ? @ex_user_user.games.ch_games(q.exercise_shixun_challenges.pluck(:challenge_id)) : nil) %>
<% user_answer = (q_type == 5 ? q.exercise_shixun_answers.where(user_id: @ex_user_user.id) : q.exercise_answers.where(user_id: @ex_user_user.id)) %>
<% this_ques_status = @ex_obj_array.detect{|f| f[:q_id] == q.id} %>
<% main_ques_status = @ex_sub_array.detect{|f| f[:q_id] == q.id} %>
@ -247,8 +248,8 @@
<th width="13%">得分/满分</th>
</thead>
<tbody>
<% if @games.size > 0 %>
<% @games.each_with_index do |game, index| %>
<% if games.present? %>
<% games&.each_with_index do |game, index| %>
<% game_score = q.exercise_shixun_challenges.where(challenge_id:game.challenge.id) %>
<% user_score = q.exercise_shixun_answers.where(exercise_shixun_challenge_id: game_score&.first&.id,user_id: @ex_user_user.id) %>
<tr>
@ -286,7 +287,7 @@
<p class="text-gray mbt10">
<span class="fl font-bd">实训详情</span>
</p>
<% @games.each_with_index do |game, index| %>
<% games&.each_with_index do |game, index| %>
<div class="mbt10">
<p class="clearfix">
<span class="fl mt3"><span class="font-bd mr15">第<%= index+1 %>关</span><%= game.challenge.subject %></span>

Loading…
Cancel
Save