Mark points after soft deadline

Author: nygrenh

app/models/exercise.rb

@@ -228,11 +228,11 @@ def soft_deadline_for(user)
 
   # Whether the deadline has passed
   def expired_for?(user)
-    deadline_expired?(deadline_for(user))
+    Exercise.deadline_expired?(deadline_for(user))
   end
 
   def soft_deadline_expired_for?(user)
-    deadline_expired?(soft_deadline_for(user))
+    Exercise.deadline_expired?(soft_deadline_for(user))
   end
 
   # Whether a user has made a submission for this exercise
@@ -453,6 +453,10 @@ def toggle_submission_result_visiblity
     save!
   end
 
+  def deadline_expired?(deadline, time = Time.now)
+    deadline != nil && deadline < time
+  end
+
   private
 
   def new_deadline_spec_obj(spec)
@@ -463,10 +467,6 @@ def new_deadline_spec_obj(spec)
     end
   end
 
-  def deadline_expired?(deadline)
-    deadline != nil && deadline < Time.now
-  end
-
   def new_gdocs_sheet(enabled, sheetname)
     return nil unless enabled
     return sheetname.to_s unless sheetname.blank?

db/migrate/20180912080101_add_soft_deadline_multiplier.rb

@@ -0,0 +1,6 @@
+class AddSoftDeadlineMultiplier < ActiveRecord::Migration
+  def change
+    add_column :courses, :soft_deadline_point_multiplier, :float, null: false, default: 0.75
+    add_column :awarded_points, :awarded_after_soft_deadline, :boolean, null: false, default: false
+  end
+end

db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20180903081927) do
+ActiveRecord::Schema.define(version: 20180912080101) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -43,11 +43,12 @@
   add_index "available_points", ["exercise_id", "name"], name: "index_available_points_on_exercise_id_and_name", unique: true, using: :btree
 
   create_table "awarded_points", force: :cascade do |t|
-    t.integer  "course_id",     null: false
-    t.integer  "user_id",       null: false
+    t.integer  "course_id",                                   null: false
+    t.integer  "user_id",                                     null: false
     t.integer  "submission_id"
-    t.string   "name",          null: false
+    t.string   "name",                                        null: false
     t.datetime "created_at"
+    t.boolean  "awarded_after_soft_deadline", default: false, null: false
   end
 
   add_index "awarded_points", ["course_id", "user_id", "name"], name: "index_awarded_points_on_course_id_and_user_id_and_name", unique: true, using: :btree
@@ -114,6 +115,7 @@
     t.boolean  "initial_refresh_ready",                    default: false
     t.boolean  "hide_submissions",                         default: false, null: false
     t.boolean  "model_solution_visible_before_completion", default: false, null: false
+    t.float    "soft_deadline_point_multiplier",           default: 0.75,  null: false
   end
 
   add_index "courses", ["organization_id"], name: "index_courses_on_organization_id", using: :btree

lib/test_run_grader.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'point_comparison'
 require 'natsort'
 
@@ -67,9 +69,7 @@ def self.create_test_case_runs(submission, results)
 
   def validations_passed?(validations)
     if !validations.nil? && validations['strategy'] && validations['strategy'] == 'FAIL'
-      if validations['validationErrors'] && validations['validationErrors'].any?
-        return false
-      end
+      return false if validations['validationErrors']&.any?
     end
     true
   end
@@ -88,6 +88,9 @@ def self.award_points(submission, results, review_points)
     course = exercise.course
     available_points = exercise.available_points.to_a.map(&:name)
     awarded_points = AwardedPoint.course_user_points(course, user).map(&:name)
+    soft_deadline = exercise.sosft_deadline_for(user)
+    awarded_after_soft_deadline = false
+    awarded_after_soft_deadline = true if soft_deadline && Exercise.deadline_expired?(soft_deadline, submission.created_at)
 
     points = []
     ((available_points & points_from_test_results(results)) - review_points).each do |point_name|
@@ -97,7 +100,8 @@ def self.award_points(submission, results, review_points)
       submission.awarded_points << AwardedPoint.new(
         name: point_name,
         course: course,
-        user: user
+        user: user,
+        awarded_after_soft_deadline: awarded_after_soft_deadline
       )
     end