From 5a099a42b8711b79cc317f287ebbd5afe84dd7b8 Mon Sep 17 00:00:00 2001 From: Thomas Hille Date: Mon, 3 Apr 2017 18:09:30 +0200 Subject: [PATCH] changed working time calculation to only consider submissions within 5 minutes instead of 30 --- app/controllers/execution_environments_controller.rb | 2 +- app/controllers/external_users_controller.rb | 2 +- app/models/exercise.rb | 6 +++--- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/controllers/execution_environments_controller.rb b/app/controllers/execution_environments_controller.rb index 89470996..c220ae74 100644 --- a/app/controllers/execution_environments_controller.rb +++ b/app/controllers/execution_environments_controller.rb @@ -40,7 +40,7 @@ class ExecutionEnvironmentsController < ApplicationController FROM (SELECT user_id, exercise_id, - CASE WHEN working_time >= '0:30:00' THEN '0' ELSE working_time END AS working_time_new + CASE WHEN working_time >= '0:05:00' THEN '0' ELSE working_time END AS working_time_new FROM (SELECT user_id, exercise_id, diff --git a/app/controllers/external_users_controller.rb b/app/controllers/external_users_controller.rb index 5c6619cb..22d70988 100644 --- a/app/controllers/external_users_controller.rb +++ b/app/controllers/external_users_controller.rb @@ -27,7 +27,7 @@ class ExternalUsersController < ApplicationController score, id, CASE - WHEN working_time >= '0:30:00' THEN '0' + WHEN working_time >= '0:05:00' THEN '0' ELSE working_time END AS working_time_new FROM diff --git a/app/models/exercise.rb b/app/models/exercise.rb index d3025bed..58d328ae 100644 --- a/app/models/exercise.rb +++ b/app/models/exercise.rb @@ -67,7 +67,7 @@ class Exercise < ActiveRecord::Base sum(working_time_new) AS working_time FROM (SELECT user_id, - CASE WHEN working_time >= '0:30:00' THEN '0' ELSE working_time END AS working_time_new + CASE WHEN working_time >= '0:05:00' THEN '0' ELSE working_time END AS working_time_new FROM (SELECT user_id, id, @@ -169,7 +169,7 @@ class Exercise < ActiveRecord::Base exercise_id, max_score, CASE - WHEN working_time >= '0:30:00' THEN '0' + WHEN working_time >= '0:05:00' THEN '0' ELSE working_time END AS working_time_new FROM all_working_times_until_max ), result AS @@ -263,7 +263,7 @@ class Exercise < ActiveRecord::Base FILTERED_TIMES_UNTIL_MAX AS ( - SELECT user_id,exercise_id, max_score, CASE WHEN working_time >= '0:30:00' THEN '0' ELSE working_time END AS working_time_new + SELECT user_id,exercise_id, max_score, CASE WHEN working_time >= '0:05:00' THEN '0' ELSE working_time END AS working_time_new FROM ALL_WORKING_TIMES_UNTIL_MAX ) SELECT e.external_id AS external_user_id, f.user_id, exercise_id, MAX(max_score) AS max_score, sum(working_time_new) AS working_time