Merge remote-tracking branch 'origin/master' into feature/more-statistics

app/controllers/exercise_collections_controller.rb

@@ -10,6 +10,7 @@ class ExerciseCollectionsController < ApplicationController
   end
 
   def show
+    @exercises = @exercise_collection.exercises.paginate(:page => params[:page])
   end
 
   def new
@@ -55,6 +56,6 @@ class ExerciseCollectionsController < ApplicationController
   end
 
   def exercise_collection_params
-    params[:exercise_collection].permit(:name, :exercise_ids => [])
+    params[:exercise_collection].permit(:name, :use_anomaly_detection, :user_id, :user_type, :exercise_ids => []).merge(user_type: InternalUser.name)
   end
 end

app/controllers/user_exercise_feedbacks_controller.rb

@@ -69,7 +69,8 @@ class UserExerciseFeedbacksController < ApplicationController
     @texts = comment_presets.to_a
     @times = time_presets.to_a
     @uef = UserExerciseFeedback.new
-    @exercise = Exercise.find(params[:user_exercise_feedback][:exercise_id])
+    exercise_id = if params[:user_exercise_feedback].nil? then params[:exercise_id] else params[:user_exercise_feedback][:exercise_id] end
+    @exercise = Exercise.find(exercise_id)
     authorize!
   end
 

app/mailers/user_mailer.rb

@@ -37,4 +37,18 @@ class UserMailer < ActionMailer::Base
     @rfc_link = request_for_comment_url(request_for_comments)
     mail(subject: t('mailers.user_mailer.send_thank_you_note.subject', author: @author), to: receiver.email)
   end
+  
+  def exercise_anomaly_detected(exercise_collection, anomalies)
+    @receiver_displayname = exercise_collection.user.displayname
+    @collection = exercise_collection
+    @anomalies = anomalies
+    mail(subject: t('mailers.user_mailer.exercise_anomaly_detected.subject'), to: exercise_collection.user.email)
+  end
+
+  def exercise_anomaly_needs_feedback(user, exercise, link)
+    @receiver_displayname = user.displayname
+    @exercise_title = exercise.title
+    @link = link
+    mail(subject: t('mailers.user_mailer.exercise_anomaly_needs_feedback.subject'), to: user.email)
+  end
 end

app/models/anomaly_notification.rb

@@ -0,0 +1,5 @@
+class AnomalyNotification < ActiveRecord::Base
+  belongs_to :user, polymorphic: true
+  belongs_to :exercise
+  belongs_to :exercise_collection
+end

app/models/exercise.rb

@@ -36,6 +36,7 @@ class Exercise < ActiveRecord::Base
   validates :token, presence: true, uniqueness: true
 
   @working_time_statistics = nil
+  attr_reader :working_time_statistics
 
   MAX_EXERCISE_FEEDBACKS = 20
 
@@ -65,21 +66,27 @@ class Exercise < ActiveRecord::Base
   end
 
   def user_working_time_query
-    """
+    "
       SELECT user_id,
-             sum(working_time_new) AS working_time
+             user_type,
+             SUM(working_time_new) AS working_time,
+             MAX(score) AS score
       FROM
         (SELECT user_id,
+                user_type,
+                score,
                 CASE WHEN working_time >= '0:05:00' THEN '0' ELSE working_time END AS working_time_new
          FROM
             (SELECT user_id,
+                    user_type,
+                    score,
                     id,
                     (created_at - lag(created_at) over (PARTITION BY user_id, exercise_id
                                                         ORDER BY created_at)) AS working_time
             FROM submissions
             WHERE exercise_id=#{id}) AS foo) AS bar
-      GROUP BY user_id
-    """
+      GROUP BY user_id, user_type
+    "
   end
 
   def get_quantiles(quantiles)
@@ -202,7 +209,7 @@ class Exercise < ActiveRecord::Base
   def retrieve_working_time_statistics
     @working_time_statistics = {}
     self.class.connection.execute(user_working_time_query).each do |tuple|
-      @working_time_statistics[tuple["user_id"].to_i] = tuple
+      @working_time_statistics[tuple['user_id'].to_i] = tuple
     end
   end
 
@@ -368,4 +375,15 @@ class Exercise < ActiveRecord::Base
     user_exercise_feedbacks.size <= MAX_EXERCISE_FEEDBACKS
   end
 
+  def last_submission_per_user
+    Submission.joins("JOIN (
+          SELECT
+              user_id,
+              user_type,
+              first_value(id) OVER (PARTITION BY user_id ORDER BY created_at DESC) AS fv
+          FROM submissions
+          WHERE exercise_id = #{id}
+        ) AS t ON t.fv = submissions.id").distinct
+  end
+
 end

app/models/exercise_collection.rb

@@ -1,6 +1,7 @@
 class ExerciseCollection < ActiveRecord::Base
 
   has_and_belongs_to_many :exercises
+  belongs_to :user, polymorphic: true
 
   def to_s
     "#{I18n.t('activerecord.models.exercise_collection.one')}: #{name} (#{id})"

app/views/exercise_collections/_form.html.slim

@@ -1,11 +1,18 @@
 - exercises = Exercise.order(:title)
+- users = InternalUser.order(:name)
 
-= form_for(@exercise_collection, data: {exercises: exercises}, multipart: true) do |f|
+= form_for(@exercise_collection, data: {exercises: exercises, users: users}, multipart: true) do |f|
   = render('shared/form_errors', object: @exercise_collection)
   .form-group
-    = f.label(:name)
+    = f.label(t('activerecord.attributes.exercise_collections.name'))
     = f.text_field(:name, class: 'form-control', required: true)
   .form-group
-    = f.label(:exercises)
+    = f.label(t('activerecord.attributes.exercise_collections.use_anomaly_detection'))
+    = f.check_box(:use_anomaly_detection, {class: 'form-control'})
+  .form-group
+    = f.label(t('activerecord.attributes.exercise_collections.user'))
+    = f.collection_select(:user_id, users, :id, :name, {}, {class: 'form-control'})
+  .form-group
+    = f.label(t('activerecord.attributes.exercise_collections.exercises'))
     = f.collection_select(:exercise_ids, exercises, :id, :title, {}, {class: 'form-control', multiple: true})
   .actions = render('shared/submit_button', f: f, object: @exercise_collection)

app/views/exercise_collections/show.html.slim

@@ -3,9 +3,25 @@ h1
   = render('shared/edit_button', object: @exercise_collection)
 
 = row(label: 'exercise_collections.name', value: @exercise_collection.name)
+= row(label: 'exercise_collections.user', value: link_to(@exercise_collection.user.name, @exercise_collection.user)) unless @exercise_collection.user.nil?
+= row(label: 'exercise_collections.use_anomaly_detection', value: @exercise_collection.use_anomaly_detection)
 = row(label: 'exercise_collections.updated_at', value: @exercise_collection.updated_at)
 
 h4 = t('activerecord.attributes.exercise_collections.exercises')
-ul.list-unstyled
-  - @exercise_collection.exercises.sort_by{|c| c.title}.each do |exercise|
-    li = link_to(exercise, exercise)
+.table-responsive
+  table.table
+    thead
+      tr
+        th = t('activerecord.attributes.exercise.title')
+        th = t('activerecord.attributes.exercise.execution_environment')
+        th = t('activerecord.attributes.exercise.user')
+        th = t('shared.actions')
+    tbody
+      - @exercises.sort_by{|c| c.title}.each do |exercise|
+        tr
+          td = link_to(exercise.title, exercise)
+          td = link_to_if(exercise.execution_environment && policy(exercise.execution_environment).show?, exercise.execution_environment, exercise.execution_environment)
+          td = exercise.user.name
+          td = link_to(t('shared.statistics'), statistics_exercise_path(exercise))
+        
+= render('shared/pagination', collection: @exercises)

app/views/user_mailer/exercise_anomaly_detected.html.slim

@@ -0,0 +1,38 @@
+== t('mailers.user_mailer.exercise_anomaly_detected.body1',
+        receiver_displayname: @receiver_displayname,
+        collection_name: @collection.name)
+
+table(border=1)
+  thead
+    tr
+      td = t('activerecord.attributes.exercise.title', locale: :de)
+      td = t('exercises.statistics.average_worktime', locale: :de)
+      td = t('shared.actions', locale: :de)
+  tbody
+    - @anomalies.keys.each do | id |
+      - exercise = Exercise.find(id)
+      tr
+        td = link_to(exercise.title, exercise_path(exercise))
+        td = @anomalies[id]
+        td = link_to(t('shared.statistics', locale: :de), statistics_exercise_path(exercise))
+
+
+== t('mailers.user_mailer.exercise_anomaly_detected.body2',
+        receiver_displayname: @receiver_displayname,
+        collection_name: @collection.name)
+
+table(border=1)
+  thead
+    tr
+      td = t('activerecord.attributes.exercise.title', locale: :en)
+      td = t('exercises.statistics.average_worktime', locale: :en)
+      td = t('shared.actions', locale: :en)
+  tbody
+    - @anomalies.keys.each do | id |
+      - exercise = Exercise.find(id)
+      tr
+        td = link_to(exercise.title, exercise_path(exercise))
+        td = @anomalies[id]
+        td = link_to(t('shared.statistics', locale: :en), statistics_exercise_path(exercise))
+
+== t('mailers.user_mailer.exercise_anomaly_detected.body3')

app/views/user_mailer/exercise_anomaly_needs_feedback.html.slim

@@ -0,0 +1 @@
+== t('mailers.user_mailer.exercise_anomaly_needs_feedback.body', receiver_displayname: @receiver_displayname, exercise: @exercise_title, link: link_to(@link, @link))