Merge branch 'master' of https://github.com/openHPI/codeocean

app/views/execution_environments/statistics.html.slim

@@ -1,15 +1,25 @@
 h1 = @execution_environment
 
 .table-responsive
-  table.table
+  table.table.table-striped.sortable
     thead
       tr
-        - ['.exercise', '.score', '.runs', '.worktime'].each do |title|
+        - ['.exercise', '.users', '.score', '.maximum_score', '.stddev_score', '.percentage_correct', '.runs', '.worktime', '.stddev_worktime'].each do |title|
           th.header = t(title)
     tbody
       - @execution_environment.exercises.each do |exercise|
+        - us = user_statistics[exercise.id]
+        - if not us then us = {"users" => 0, "average_score" => 0.0, "maximum_score" => 0, "stddev_score" => 0.0, "percent_correct" => nil, "average_submission_count" => 0}
+        - wts = working_time_statistics[exercise.id]
+        - if wts then average_time = wts["average_time"] else 0
+        - if wts then stddev_time = wts["stddev_time"] else 0
         tr
           td = link_to exercise.title, controller: "exercises", action: "statistics", id: exercise.id
-          td = exercise.average_score
-          td = exercise.average_number_of_submissions
-          td = exercise.average_working_time
+          td = us["users"]
+          td = us["average_score"].to_f.round(4)
+          td = us["maximum_score"].to_f.round(2)
+          td = us["stddev_score"].to_f.round(4)
+          td = (us["percent_correct"].to_f or 0).round(4)
+          td = us["average_submission_count"].to_f.round(2)
+          td = average_time
+          td = stddev_time

app/views/exercises/external_users/statistics.html.slim

@@ -1,5 +1,5 @@
 h1 = "#{@exercise} (external user #{@external_user})"
-- submissions = Submission.where("user_id = ?  AND exercise_id = ?", @external_user.id, @exercise.id)
+- submissions = Submission.where("user_id = ?  AND exercise_id = ?", @external_user.id, @exercise.id).order("created_at")
 - current_submission = submissions.first
 - if current_submission
   - initial_files = current_submission.files.to_a

app/views/exercises/statistics.html.slim

@@ -1,9 +1,9 @@
 h1 = @exercise
 
-= row(label: '.participants', value: @exercise.users.count)
+= row(label: '.participants', value: @exercise.users.distinct.count)
 - [:intermediate, :final].each do |scope|
   = row(label: ".#{scope}_submissions") do
-    = "#{@exercise.submissions.send(scope).count} (#{t('.users', count: @exercise.submissions.send(scope).distinct.count(:user_id, :user_type))})"
+    = "#{@exercise.submissions.send(scope).count} (#{t('.users', count: @exercise.submissions.send(scope).distinct.count(:user_id))})"
 = row(label: '.average_score') do
   p == @exercise.average_score ? t('shared.out_of', maximum_value: @exercise.maximum_score, value: @exercise.average_score.round(2)) : empty
   p = progress_bar(@exercise.average_percentage)
@@ -14,16 +14,16 @@ h1 = @exercise
 - Hash[:internal_users => t('.internal_users'), :external_users => t('.external_users')].each_pair do |symbol, label|
   strong = label
   .table-responsive
-    table.table
+    table.table.table-striped.sortable
       thead
         tr
           - ['.user', '.score', '.runs', '.worktime'].each do |title|
             th.header = t(title)
       tbody
         - @exercise.send(symbol).distinct().each do |user|
+          - if user_statistics[user.id] then us = user_statistics[user.id] else us = {"maximum_score" => nil, "runs" => nil}
           tr
-            - submissions = @exercise.submissions.where('user_id=?', user.id)
             td = link_to_if symbol==:external_users, "#{user.name} (#{user.email})", {controller: "exercises", action: "statistics", external_user_id: user.id, id: @exercise.id}
-            td = submissions.maximum('score') or 0
-            td = submissions.count('id')
+            td = us['maximum_score'] or 0
+            td = us['runs']
             td = @exercise.average_working_time_for(user.id) or 0

app/views/external_users/show.html.slim

@@ -3,3 +3,6 @@ h1 = @user.name
 = row(label: 'external_user.name', value: @user.name)
 = row(label: 'external_user.email', value: @user.email)
 = row(label: 'external_user.consumer', value: link_to(@user.consumer, @user.consumer))
+
+br
+= link_to(t('shared.statistics'), statistics_external_user_path(@user))

app/views/external_users/statistics.html.slim

@@ -10,9 +10,9 @@ h1 = t('.title')
           th.header = t(title)
     tbody
       - exercises.each do |exercise|
-        - submissions = @user.submissions.where(:exercise_id => exercise.id, :cause => ['submit', 'run'])
+        - if statistics[exercise.id] then stats = statistics[exercise.id] else stats = {"working_time" => 0, "runs" => 0, "score" => 0}
         tr
           td = link_to exercise, controller: "exercises", action: "statistics", external_user_id: @user.id, id: exercise.id
-          td = submissions.maximum(:score) or 0
-          td = submissions.count
-          td = exercise.average_working_time_for_only(@user.id) or 0
+          td = stats["maximum_score"] or 0
+          td = stats["runs"] or 0
+          td = stats["working_time"] or 0