think_feel_do_engine 3.14.4 → 3.14.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5940e0066d83f969fdcd434baeae9580c5f12168
-  data.tar.gz: c2d1eb6206d633fe3a1d198f40bd8eb0168f3cd5
+  metadata.gz: e59b95ffeeb1d59fe8b52cb34f6b2f4fd54b3ff5
+  data.tar.gz: 0d21a6b0f371c12617d5e1f865fa4d23c9855654
 SHA512:
-  metadata.gz: ba48a876b2d94fc46545684ac2cb493ba89c122b628d846257f6b7020515eab8394c8244bfdf7ca601e19874127c26ab8c5393e88c903889e5138f4b54f06a87
-  data.tar.gz: 0e6c44ab7e0426cd3e67af398305b132e5089368b473ef7768e46cb769c858310735dcfb42e0c8f7bb3cbc4c8596c60bbef383ad719f74a443b034e813613ac2
+  metadata.gz: efbc3e970c1676e73996abbd77ad07171101415778c0cc98325e8438c215e6a8a94967a684c289dd6fd5404a80fc2565488c14ef00e9b995b98ddec9c5795329
+  data.tar.gz: 5c14feacac0c0a5f32abbf60847202604a058b04ccf32f6b028d4bf6e6c84b49af1b7a73a5283bf4553b3a3fb734923f4187c2afe0789267b12860f93b24625b

data/app/controllers/think_feel_do_engine/manage/groups_controller.rb

@@ -6,6 +6,7 @@ module ThinkFeelDoEngine
     class GroupsController < ApplicationController
       before_action :authenticate_user!, :set_arm
       load_and_authorize_resource except: :edit_tasks
+      rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
 
       def index
       end
@@ -26,6 +27,11 @@ module ThinkFeelDoEngine
       def set_arm
         @arm = Arm.find(params[:arm_id])
       end
+
+      def record_not_found
+        redirect_to main_app.root_path,
+                    alert: "The group you are looking for no longer exists."
+      end
     end
   end
 end

data/app/models/think_feel_do_engine/reports/lesson_viewing.rb

@@ -4,6 +4,8 @@ module ThinkFeelDoEngine
     class LessonViewing
       include LessonModule
 
+      DEFAULT_LESSON_MODULE_POSTFIX = /\/providers\/.*/
+
       def self.columns
         %w( participant_id lesson_id page_headers lesson_selected_at
             last_page_number_opened last_page_opened_at )
@@ -23,21 +25,17 @@ module ThinkFeelDoEngine
             .where(participant_id: participant.id, kind: "render")
             .select(:participant_id, :emitted_at, :payload)
             .to_a.select do |e|
-              lessons.keys.include?(e.current_url.gsub(URL_ROOT_RE, ""))
+              lessons.keys.include?(e.current_url.gsub(URL_ROOT_RE, "")) ||
+              lessons_with_default_urls
+              .keys.include?(e.current_url.gsub(URL_ROOT_RE, ""))
             end
 
           lesson_select_events.map do |e|
-            lesson_id = lessons[e.current_url.gsub(URL_ROOT_RE, "")]
+            lesson_id = lessons[e.current_url.gsub(URL_ROOT_RE, "")] ||
+                        lessons_with_default_urls[e.current_url
+                                                  .gsub(URL_ROOT_RE, "")]
             last_page_opened = last_page_opened(e, lesson_id)
-
-            {
-              participant_id: participant.study_id,
-              lesson_id: lesson_id,
-              page_headers: e.headers,
-              lesson_selected_at: e.emitted_at.iso8601,
-              last_page_number_opened: last_page_opened[:number].to_i,
-              last_page_opened_at: last_page_opened[:opened_at].iso8601
-            }
+            event_hash(participant, lesson_id, e, last_page_opened)
           end
         end.flatten
       end
@@ -55,10 +53,39 @@ module ThinkFeelDoEngine
         last_event = (lesson_events.last || first_session_event)
 
         {
-          number: last_event.current_url[/\d+$/],
+          number: event_lesson_page_number(last_event),
           opened_at: last_event.emitted_at
         }
       end
+
+      def self.event_lesson_page_number(event)
+        if event.current_url.include? "providers"
+          event.current_url[/\d+$/]
+        else
+          1
+        end
+      end
+
+      def self.lessons_with_default_urls
+        lessons_with_default_path = lesson_entries_map.each.map do |lesson|
+          default_lesson_url =
+            lesson[0].gsub(URL_ROOT_RE, "")
+            .gsub(DEFAULT_LESSON_MODULE_POSTFIX, "")
+          [default_lesson_url, lesson[1]]
+        end
+        Hash[lessons_with_default_path]
+      end
+
+      def self.event_hash(participant, lesson_id, event, last_page_opened)
+        {
+          participant_id: participant.study_id,
+          lesson_id: lesson_id,
+          page_headers: event.headers,
+          lesson_selected_at: event.emitted_at.iso8601,
+          last_page_number_opened: last_page_opened[:number].to_i,
+          last_page_opened_at: last_page_opened[:opened_at].iso8601
+        }
+      end
     end
   end
 end

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.14.4"
+  VERSION = "3.14.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.14.4
+  version: 3.14.5
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-04 00:00:00.000000000 Z
+date: 2016-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails