Merge branch 'staging' of github.com:web-cat/code-workout into staging

Author: ayaankazerouni

app/controllers/exercises_controller.rb

@@ -71,7 +71,7 @@ def download_attempt_data
 
         code_states_file = "CodeStates.csv"
         zos.put_next_entry code_states_file
-        zos.write code_states 
+        zos.write code_states
       end
 
       compressed_filestream.rewind
@@ -434,7 +434,7 @@ def practice
       # Re-check workout-offering permission in case the URL was entered directly.
       authorize! :practice, @workout_offering
       authorize! :practice, @exercise
-    elsif !@workout 
+    elsif !@workout
       # are they trying to practice the exercise in the gym?
       authorize! :gym_practice, @exercise
     end
@@ -517,7 +517,7 @@ def practice
           'longer accepting submissions.'
         student_review = true
       else
-        @user_deadline = @workout_score.created_at + @user_time_limit.minutes
+        @user_deadline = @workout_score.started_at + @user_time_limit.minutes
         if @workout_score.workout_offering.hard_deadline_for(current_user)
           @user_deadline = [@user_deadline,
             @workout_score.workout_offering.hard_deadline_for(current_user)].min
@@ -649,7 +649,7 @@ def evaluate
     if @workout_offering
       @workout_score = @workout_offering.score_for(@student_drift_user)
     elsif @workout
-      @workout_score = @workout.score_for(@student_drift_user, nil, 
+      @workout_score = @workout.score_for(@student_drift_user, nil,
                                           params[:lis_outcome_service_url],
                                           params[:lis_result_sourcedid])
     end

app/models/workout_offering.rb

@@ -225,7 +225,7 @@ def rescore_all
       exercise_versions = workout_score.attempts.map(&:exercise_version)
       exercise_versions.each do |ex|
         if most_recent
-          att = workout_score.attempts.where(exercise_version: ex).max_by(&:created_at)
+          att = workout_score.attempts.where(exercise_version: ex).max_by(&:started_at)
         else
           att = workout_score.attempts.where(exercise_version: ex).max_by(&:score)
         end

app/models/workout_score.rb

@@ -11,6 +11,7 @@
 #  lis_outcome_service_url :string(255)
 #  lis_result_sourcedid    :string(255)
 #  score                   :float(24)
+#  started_at              :datetime
 #  created_at              :datetime
 #  updated_at              :datetime
 #  lti_workout_id          :integer
@@ -110,14 +111,29 @@ def closed?
     end
 
     now = Time.zone.now
-    minutes_open = (now - self.created_at)/60.0
+    minutes_open = (now - self.started_at)/60.0
     time_limit = workout_offering.time_limit_for(user)
     hard_deadline = workout_offering.hard_deadline_for(user)
 
-    (time_limit && self.created_at && minutes_open >= time_limit) ||
+    (time_limit && self.started_at && minutes_open >= time_limit) ||
         (hard_deadline && now > hard_deadline)
   end
 
+
+  # -------------------------------------------------------------
+  def started_at
+    val = self.read_attribute(:started_at)
+    if !val
+      # If started_at is null, set it to current time on first access
+      # and save to database
+      val = Time.zone.now
+      write_attribute(:started_at, val)
+      save
+    end
+    val
+  end
+
+
   # -------------------------------------------------------------
   # Increase the score of a workout by a specified amount
   # FIXME: misnamed method.  Used in ExerciseVersion code, though.
@@ -127,6 +143,7 @@ def rescore(delta)
     self.save!
   end
 
+
   # -------------------------------------------------------------
   def time_remaining
     if !workout_offering
@@ -136,7 +153,7 @@ def time_remaining
 
     if time_limit
       now = Time.zone.now
-      remaining = time_limit - (now - self.created_at)/60.0
+      remaining = time_limit - (now - self.started_at)/60.0
       hard_deadline = workout_offering.hard_deadline_for(user)
 
       if hard_deadline
@@ -165,15 +182,19 @@ def show_feedback?
       if workout_offering.shutdown?
         # FIXME: ???
         # true
-        !workout_offering.andand.workout_policy.andand.hide_feedback_in_review_before_close
+        !workout_offering.andand.workout_policy.andand.
+          hide_feedback_in_review_before_close
       else
-        !workout_offering.andand.workout_policy.andand.hide_feedback_in_review_before_close
+        !workout_offering.andand.workout_policy.andand.
+          hide_feedback_in_review_before_close
       end
     else
-      !workout_offering.andand.workout_policy.andand.hide_feedback_before_finish
+      !workout_offering.andand.workout_policy.andand.
+        hide_feedback_before_finish
     end
   end
 
+
   # -------------------------------------------------------------
   def attempts_left_for_exercise_version(exercise_version)
     if self.workout_offering.andand.attempt_limit
@@ -187,6 +208,7 @@ def attempts_left_for_exercise_version(exercise_version)
     return nil
   end
 
+
   # -------------------------------------------------------------
   def scoring_attempt_for(exercise)
     workout_score = self
@@ -218,6 +240,7 @@ def update_attempt(attempt, old_score)
     end
   end
 
+
   # -------------------------------------------------------------
   def record_attempt(attempt)
     self.with_lock do
@@ -266,6 +289,8 @@ def record_attempt(attempt)
     end
   end
 
+
+  # ------------------------------------------------------------
   def recalculate_score!(options = {})
     self.with_lock do
       attempt = options[:attempt]
@@ -319,7 +344,7 @@ def self.late(options={})
     WorkoutScore.joins{ workout_offering }
       .joins('inner join student_extensions on student_extensions.workout_offering_id = workout_offerings.id
              and student_extensions.user_id = workout_scores.user_id')
-      .where('workout_scores.last_attempted_at > 
+      .where('workout_scores.last_attempted_at >
         coalesce(student_extensions.hard_deadline, workout_offerings.hard_deadline, "2030-12-31")')
   end
 
@@ -402,6 +427,7 @@ def self.grade_unprocessed_attempts(exercise_version_id)
     end
   end
 
+
   # Sends scores to the appropriate LTI consumer
   # -------------------------------------------------------------
   def update_lti
@@ -424,4 +450,13 @@ def update_lti
       tp.post_replace_result!(result)
     end
   end
+
+
+  # -------------------------------------------------------------
+  # Initialize the started_at field for new objects only
+  after_initialize do |ws|
+    if ws.new_record? && ws.has_attribute?(:started_at) && !ws.started_at
+      ws.started_at = Time.zone.now
+    end
+  end
 end

db/migrate/20201216191207_add_started_at_to_workout_scores.rb

@@ -0,0 +1,15 @@
+class AddStartedAtToWorkoutScores < ActiveRecord::Migration
+  def change
+    add_column :workout_scores, :started_at, :datetime
+
+    reversible do |dir|
+      dir.up do
+        WorkoutScore.update_all('started_at = created_at')
+      end
+      dir.down do
+        # Nothing
+      end
+    end
+
+  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: 20200929144816) do
+ActiveRecord::Schema.define(version: 20201216191207) do
 
   create_table "active_admin_comments", force: :cascade do |t|
     t.string   "namespace",     limit: 255
@@ -679,6 +679,7 @@
     t.string   "lis_outcome_service_url", limit: 255
     t.string   "lis_result_sourcedid",    limit: 255
     t.integer  "lti_workout_id",          limit: 4
+    t.datetime "started_at"
   end
 
   add_index "workout_scores", ["lti_workout_id"], name: "index_workout_scores_on_lti_workout_id", using: :btree

spec/factories/workout_scores.rb

@@ -11,6 +11,7 @@
 #  lis_outcome_service_url :string(255)
 #  lis_result_sourcedid    :string(255)
 #  score                   :float(24)
+#  started_at              :datetime
 #  created_at              :datetime
 #  updated_at              :datetime
 #  lti_workout_id          :integer