Merge branch 'staging' into merge-branch

Author: awhicks

.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "makefile.configureOnOpen": false
+}

app/controllers/odsa_exercise_attempts_controller.rb

@@ -141,9 +141,9 @@ def create
     end
   end
 
-  # -------------------------------------------------------------
-  # POST /odsa_exercise_attempts/pe
-  def create_pe
+  # POST /odsa_exercise_attempts/new
+  def create_attempt
+    
     unless user_logged_in?
       return
     end
@@ -162,151 +162,14 @@ def create_pe
         "inst_book_id=? and inst_section_id=? and inst_exercise_id=?",
         params[:inst_book_id], params[:inst_section_id], inst_exercise.id
       ).first
-      if inst_book_section_exercise.blank?
-        respond_to do |format|
-          msg = {:status => "fail", :message => "Fail!"}
-          format.json { render :json => msg }
-        end
-        return
-      end
-      threshold = inst_book_section_exercise.threshold
-    elsif is_standalone_module
-      inst_exercise = InstExercise.find_by(short_name: params[:exercise])
-      inst_module_section_exercise = InstModuleSectionExercise.find_by(
-                                                        inst_exercise_id: inst_exercise.id,
-                                                        inst_module_version_id: params[:inst_module_version_id])
-      threshold = inst_module_section_exercise.threshold
-    else
-      inst_course_offering_exercise = InstCourseOfferingExercise.find_by(
-        id: params[:inst_course_offering_exercise_id],
-      )
-      threshold = inst_course_offering_exercise.threshold
-    end
-
-    if inst_book_section_exercise != nil or inst_course_offering_exercise != nil or inst_module_section_exercise != nil
-      if hasBook
-        unless exercise_progress = OdsaExerciseProgress.where("user_id=? and
-                                                    inst_book_section_exercise_id=?",
-                                                              current_user.id,
-                                                              inst_book_section_exercise.id).first
-          exercise_progress = OdsaExerciseProgress.new(user: current_user,
-                                                       inst_book_section_exercise: inst_book_section_exercise)
-          exercise_progress.save
-        end
-      elsif is_standalone_module
-        unless exercise_progress = OdsaExerciseProgress.where("user_id=? and
-                                                      inst_module_section_exercise_id=?",
-                                                              current_user.id,
-                                                              inst_module_section_exercise.id).first
-          exercise_progress = OdsaExerciseProgress.new(user: current_user,
-                          inst_module_section_exercise: inst_module_section_exercise)
-          exercise_progress.save
-        end
-      else
-        unless exercise_progress = OdsaExerciseProgress.where("user_id=? and
-                                                    inst_course_offering_exercise_id=?",
-                                                              current_user.id,
-                                                              inst_course_offering_exercise.id).first
-          exercise_progress = OdsaExerciseProgress.new(user: current_user,
-                                                       inst_course_offering_exercise: inst_course_offering_exercise)
-          exercise_progress.save
-        end
-      end
-
-      already_proficient = exercise_progress.proficient?
-      correct = params[:score].to_f >= params[:threshold].to_f
-
-      exercise_attempt = OdsaExerciseAttempt.new(
-        inst_book_id: params[:inst_book_id],
-        user: current_user,
-        inst_section: inst_section,
-        inst_book_section_exercise: inst_book_section_exercise,
-        inst_course_offering_exercise: inst_course_offering_exercise,
-        inst_module_section_exercise: inst_module_section_exercise,
-        worth_credit: correct,
-        correct: correct,
-        time_done: Time.now,
-        time_taken: (params[:total_time].to_f / 1000).round,
-        count_hints: 0,
-        count_attempts: params[:uiid],
-        hint_used: 0,
-        question_name: params[:exercise],
-        request_type: "PE",
-        ip_address: request.ip,
-        pe_score: params[:score],
-        pe_steps_fixed: params[:steps_fixed],
-      )
-
+    if inst_book_section_exercise.blank?
       respond_to do |format|
-        if exercise_attempt.save
-          if hasBook
-            exercise_progress = OdsaExerciseProgress.where(
-              "user_id=? and inst_book_section_exercise_id=?",
-              current_user.id,
-              inst_book_section_exercise.id
-            ).first
-          elsif is_standalone_module
-            exercise_progress = OdsaExerciseProgress.find_by(user_id: current_user.id,
-              inst_module_section_exercise_id: inst_module_section_exercise.id)
-          else
-            exercise_progress = OdsaExerciseProgress.find_by(user_id: current_user.id,
-              inst_course_offering_exercise_id: inst_course_offering_exercise.id)
-          end
-          if !already_proficient and exercise_progress.proficient? and
-            exercise_progress.has_inst_course_offering_exercise?()
-
-            exercise_progress.post_course_offering_exercise_score_to_lms()
-          end
-          format.json {
-            render :json => {
-                     :exercise_progress => exercise_progress,
-                     :threshold => threshold,
-                     :was_proficient => already_proficient,
-                     :is_proficient => exercise_progress.proficient?,
-                   }
-          }
-        else
-          msg = {:status => "fail", :message => "Fail!"}
-          format.json { render :json => msg }
+        format.json do
+          render json: { status: "fail", message: "Unable to find inst_book_section_exercise!" }, status: :bad_request
         end
       end
-    else
-      respond_to do |format|
-        msg = {:status => "fail", :message => "Fail!"}
-        format.json { render :json => msg }
-      end
-    end
-  end
-
-
-  # -------------------------------------------------------------
-  # POST /odsa_exercise_attempts/ae
-  def create_ae
-    unless user_logged_in?
       return
     end
-
-    hasBook = params.key?(:inst_book_id)
-    is_standalone_module = params.key?(:inst_module_version_id)
-    if params.key?(:inst_book_section_exercise_id)
-      inst_book_section_exercise = InstBookSectionExercise.find(params[:inst_book_section_exercise_id])
-      inst_section = inst_book_section_exercise.inst_section
-      threshold = inst_book_section_exercise.threshold
-    elsif hasBook
-      inst_book = InstBook.find_by(id: params[:inst_book_id])
-      inst_exercise = InstExercise.find_by(short_name: params[:exercise])
-      inst_section = InstSection.find_by(id: params[:inst_section_id])
-      inst_book_section_exercise = InstBookSectionExercise.where(
-        "inst_book_id=? and inst_section_id=? and inst_exercise_id=?",
-        params[:inst_book_id], params[:inst_section_id], inst_exercise.id
-      ).first
-      if inst_book_section_exercise.blank?
-        respond_to do |format|
-          msg = {:status => "fail", :message => "Fail!"}
-          format.json { render :json => msg }
-        end
-        return
-      end
       threshold = inst_book_section_exercise.threshold
     elsif is_standalone_module
       inst_exercise = InstExercise.find_by(short_name: params[:exercise])
@@ -353,8 +216,12 @@ def create_ae
 
       already_proficient = exercise_progress.proficient?
 
-      correct = 1
-      #correct = params[:score].to_f >= params[:threshold].to_f
+      
+      correct = 1 #params[:score][:correct]
+      request_type = params[:type]
+      if request_type == "PE"
+        correct = params[:score][:correct].to_f >= params[:threshold].to_f
+      end
 
       exercise_attempt = OdsaExerciseAttempt.new(
         inst_book_id: params[:inst_book_id],
@@ -371,7 +238,7 @@ def create_ae
         count_attempts: params[:uiid],
         hint_used: 0,
         question_name: params[:exercise],
-        request_type: "AE",
+        request_type: request_type,
         ip_address: request.ip,
         pe_score: params[:score],
         pe_steps_fixed: params[:steps_fixed],

app/models/odsa_module_progress.rb

@@ -139,7 +139,6 @@ def update_proficiency(inst_exercise, force_send = false)
 
   def post_score_to_lms()
     if self.lis_outcome_service_url and self.lis_result_sourcedid
-
       consumer_key = nil
       consumer_secret = nil
       lms_instance = nil
@@ -192,6 +191,7 @@ def post_score_to_lms()
 
   def post_score_to_lti_13(lms_instance)
     begin
+      puts params
       lti_launch = LtiLaunch.where(user_id: self.user_id, lms_instance_id: lms_instance.id).order(created_at: :desc).first
 
       if lti_launch.nil?

config/routes.rb

@@ -11,6 +11,7 @@
   get 'lti/launch_extrtool/:exercise_id', to: 'lti#launch_extrtool', as: :lti_launch_extrtool
   post 'lti/outcomes', to: 'lti#grade_passback', as: :lti_grade_passback
 
+  get '/odsa_user_interactions/latest_state' => 'odsa_user_interactions#get_latest_state'
   resources :odsa_user_interactions
   resources :odsa_user_time_tracking
   resources :odsa_exercise_attempts do
@@ -32,9 +33,12 @@
   get '/odsa_exercise_progresses/:inst_course_offering_exercise_id' =>
     'odsa_exercise_progresses#show_exercise',
     constraints: { inst_course_offering_exercise_id: /\d+/ }
-  post '/odsa_exercise_attempts/pe' => 'odsa_exercise_attempts#create_pe'
-  post '/odsa_exercise_attempts/ae' => 'odsa_exercise_attempts#create_ae'
+  post '/odsa_exercise_attempts/pe' => 'odsa_exercise_attempts#create_attempt'
+  post '/odsa_exercise_attempts/ae' => 'odsa_exercise_attempts#create_attempt'
   post '/odsa_exercise_attempts/pi' => 'odsa_exercise_attempts#create_pi'
+  post '/odsa_exercise_attempts/new' => 'odsa_exercise_attempts#create_attempt'
+  post '/odsa_exercise_attempts/new/pe' => 'odsa_exercise_attempts#create_attempt'
+  post '/odsa_exercise_attempts/new/ka' => 'odsa_exercise_attempts#create'
   post '/odsa_exercise_attempts/get_attempts' => 'odsa_exercise_attempts#get_attempts'
   post '/odsa_exercise_attempts/get_checkpoint' => 'odsa_exercise_attempts#get_checkpoint'
   post '/odsa_exercise_attempts/get_progress' => 'odsa_exercise_attempts#get_progress'