Merge branch 'master' into statistics

This commit is contained in:
Ralf Teusner
2016-01-25 11:22:58 +01:00
7 changed files with 89 additions and 33 deletions

View File

@@ -1,20 +1,7 @@
<div class="list-group">
<h4 class="list-group-item-heading"><%= Exercise.find(@request_for_comment.exercise_id) %></h4>
<p class="list-group-item-text">
<%
user = @request_for_comment.user
submission_id = self.class.connection.execute("select id from submissions
where exercise_id =
#{@request_for_comment.exercise_id} AND
user_id = #{@request_for_comment.user_id} AND
#{@request_for_comment.user_id} > created_at
order by created_at desc
limit 1").first['id'].to_i
submission = Submission.find(submission_id)
%>
<%= user %> | <%= @request_for_comment.requested_at %>
<%= @request_for_comment.user %> | <%= @request_for_comment.requested_at %> | <%= @request_for_comment.submission.id %>
</p>
</div>