Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

Browse Source
dev_bj
cxt 6 years ago
parent 82a9e0ac07 4e70f7f13a
commit dec81d01bc
7 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File

4
app/views/exercise/_exercise_student.html.erb
Unescape View File

@ -203,7 +203,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id"> <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl"> <div class="fl">
<%= convert_to_char((index + 1).to_s) %> <%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label> </label>
</li> </li>
<% end %> <% end %>
@ -250,7 +250,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id"> <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl"> <div class="fl">
<%= convert_to_char((index + 1).to_s) %> <%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label> </label>
</li> </li>
<% end %> <% end %>

4
app/views/exercise/_exercise_student_result.html.erb
Unescape View File

@ -156,7 +156,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id"> <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl"> <div class="fl">
<%= convert_to_char((index + 1).to_s) %> <%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label> </label>
</li> </li>
<% end %> <% end %>
@ -175,7 +175,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id"> <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl"> <div class="fl">
<%= convert_to_char((index + 1).to_s) %> <%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label> </label>
</li> </li>
<% end %> <% end %>

2
app/views/exercise/_show_MC.html.erb
Unescape View File

@ -23,7 +23,7 @@
<label class="fl color-grey3" for="sx_<%= exercise_choice.id %>"> <label class="fl color-grey3" for="sx_<%= exercise_choice.id %>">
<div class="fl"> <div class="fl">
<%= convert_to_char((index+1).to_s)%> <%= convert_to_char((index+1).to_s)%>
</div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text%></xmp>
</label> </label>
</li> </li>
<% end %> <% end %>

2
app/views/exercise/_show_MCQ.html.erb
Unescape View File

@ -23,7 +23,7 @@
<label class="fl color-grey3" for="dx_<%= exercise_choice.id %>"> <label class="fl color-grey3" for="dx_<%= exercise_choice.id %>">
<div class="fl"> <div class="fl">
<%= convert_to_char((index+1).to_s)%> <%= convert_to_char((index+1).to_s)%>
</div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text%></xmp>
</label> </label>
</li> </li>
<% end %> <% end %>

6
app/views/exercise/_statistics_result_table.html.erb
Unescape View File

@ -17,9 +17,9 @@
</li> </li>
<% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %> <% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>
<li class="clearfix"> <li class="clearfix">
<p class="pl5 <%= exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s.split('').include?(exercise_choice.choice_position.to_s) ? 'color-light-green' : '' %>"> <div class="width698 fl pl5 <%= exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s.split('').include?(exercise_choice.choice_position.to_s) ? 'color-light-green' : '' %>">
<%= exercise_choice.choice_text %> <xmp class="xmplist"><%= exercise_choice.choice_text %></xmp>
</p> </div>
<% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %> <% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %>
<p class="color-dark-grey"><%= count %></p> <p class="color-dark-grey"><%= count %></p>
<div class="panel-slider-bg mt13 fl"> <div class="panel-slider-bg mt13 fl">

4
app/views/exercise/student_exercise_list.html.erb
Unescape View File

@ -271,7 +271,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id"> <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl"> <div class="fl">
<%= convert_to_char((index + 1).to_s) %> <%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label> </label>
</div> </div>
<% end %> <% end %>
@ -288,7 +288,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id"> <label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl"> <div class="fl">
<%= convert_to_char((index + 1).to_s) %> <%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre> </div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label> </label>
</div> </div>
<% end %> <% end %>

8
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -3414,4 +3414,12 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
} }
.changebtn{ .changebtn{
width: 127px;font-size: 16px;height: 40px; line-height: 40px; width: 127px;font-size: 16px;height: 40px; line-height: 40px;
}
.xmplist{
margin-top:0px !important;
margin-bottom:0px !important;
}
.width698{
width: 698px;
} }
Write Preview
Loading…
Cancel
Save