think_feel_do_engine 3.22.7 → 3.22.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c76fcf5d08fa7146bb8abb321f1109ea70102751
-  data.tar.gz: c632c6bdc6adc6bd566492341f7c165b7f991d4b
+  metadata.gz: 27ea551693cb972a42270373b76e71ca81d5307c
+  data.tar.gz: b5b14c327bce27159755f2844e5e026a70843d4c
 SHA512:
-  metadata.gz: 1fda4b8ab9f2b39497a29042c87d4ee5d053db136641b94cee1768cf026ee5a13dc37b5e2d7a0a3e1577c01d9421aa6607201fca82fa1149349fb71ad0104eea
-  data.tar.gz: 3789fdce7d10d2407946fd2b8e4442af22370f921ba59785439be0b9c3e5b5c9234cc19afd985981cf0621d195b8d559722e34522f75e5556a8f0792323a9a87
+  metadata.gz: 88180cd31c5a16b43f5b3d49c01bfeb7371e9499a775ac54622f7c54110e4781d5dbff098e283829f839692dc153afadf9485fef5631414e3d23515447f8e1c3
+  data.tar.gz: 214335ed734265242233a01390d381acd5b7a4ec9d2d819bff75d7470139b00b53b3c00c017b5d83aed23aae25d2ee712e30bbbec9486440e84fc845c85f0489

data/app/models/membership.rb

@@ -143,6 +143,7 @@ class Membership < ActiveRecord::Base
 
   def lessons_read_for_week
     task_statuses
+      .includes(task: :bit_core_content_module)
       .completed
       .where("completed_at >= ?", Time.current.advance(days: -7)
                                       .beginning_of_day)

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

@@ -12,8 +12,9 @@ module ThinkFeelDoEngine
           # Module id.
           def lesson_entries_map
             lessons = ContentModules::LessonModule
-                      .includes(:content_providers).map do |m|
-              first_provider_id = m.provider(1).try(:id)
+                      .includes(:content_providers)
+                      .order("bit_core_content_providers.position").map do |m|
+              first_provider_id = m.content_providers.first.try(:id)
               next unless first_provider_id
               path = navigator_location_path(module_id: m.id,
                                              provider_id: first_provider_id,

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

@@ -18,14 +18,14 @@ module ThinkFeelDoEngine
 
       def self.all(*ids)
         lessons = lesson_entries_map
-        lessons_default = lessons_with_default_urls
+        lessons_default = lessons_with_default_urls(lessons)
 
         Participant.not_moderator.select(:id, :study_id)
                    .where(id: participant_ids(ids)).map do |participant|
+          participant_render_events = render_events
+                                      .where(participant_id: participant.id)
           lesson_select_events =
-            EventCapture::Event
-            .where(participant_id: participant.id, kind: "render")
-            .select(:participant_id, :emitted_at, :payload)
+            participant_render_events
             .to_a.select do |e|
               lessons.keys.include?(e.current_url.gsub(URL_ROOT_RE, "")) ||
                 lessons_default
@@ -35,26 +35,33 @@ module ThinkFeelDoEngine
             end
 
           lesson_select_events.map do |e|
-            lesson_id = lessons[e.current_url.gsub(URL_ROOT_RE, "")] ||
-                        lessons_default[e.current_url
-                        .gsub(URL_ROOT_RE, "")] ||
-                        lessons_default[e.current_url
-                        .gsub(URL_ROOT_RE, "")[0...-1]]
-            last_page_opened = last_page_opened(e, lesson_id)
-            event_hash(participant, lesson_id, e, last_page_opened)
+            lesson_id =
+              lessons[e.current_url.gsub(URL_ROOT_RE, "")] ||
+              lessons_default[e.current_url.gsub(URL_ROOT_RE, "")] ||
+              lessons_default[e.current_url.gsub(URL_ROOT_RE, "")[0...-1]]
+            last_page_opened_info =
+              last_page_opened(participant_render_events, e, lesson_id)
+            event_hash(participant, lesson_id, e, last_page_opened_info)
           end
         end.flatten
       end
 
+      def self.render_events
+        EventCapture::Event
+          .where(kind: "render")
+          .select(:participant_id, :emitted_at, :kind, :payload)
+      end
+
       # last event (click) with matching module id
-      def self.last_page_opened(first_session_event, lesson_id)
+      def self.last_page_opened(
+        participant_render_events,
+        first_session_event,
+        lesson_id
+      )
         lesson_events =
-          EventCapture::Event
-          .where(participant_id: first_session_event.participant_id,
-                 kind: "render")
+          participant_render_events
           .where("emitted_at > ?", first_session_event.emitted_at)
           .order(:emitted_at)
-          .select(:kind, :emitted_at, :payload)
           .to_a.take_while { |e| e.current_url.include?(lesson_id.to_s) }
         last_event = (lesson_events.last || first_session_event)
 
@@ -72,8 +79,8 @@ module ThinkFeelDoEngine
         end
       end
 
-      def self.lessons_with_default_urls
-        lessons_with_default_path = lesson_entries_map.each.map do |lesson|
+      def self.lessons_with_default_urls(lessons_map)
+        lessons_with_default_path = lessons_map.each.map do |lesson|
           default_lesson_url =
             lesson[0].gsub(URL_ROOT_RE, "")
                      .gsub(DEFAULT_LESSON_MODULE_POSTFIX, "")

data/app/views/think_feel_do_engine/coach/patient_dashboards/tables/_audio_access_table.html.erb

@@ -22,7 +22,7 @@
             </tr>
           </thead>
           <tbody>
-          <%= render partial: "think_feel_do_engine/media_access_events/access_data", collection: @participant.media_access_events, as: :event %>
+            <%= render partial: "think_feel_do_engine/media_access_events/access_data", collection: @participant.media_access_events.includes(slide: { slideshow: :content_provider }), as: :event %>
           </tbody>
         </table>
       </div>

data/app/views/think_feel_do_engine/coach/patient_dashboards/tables/_tasks_table.html.erb

@@ -20,7 +20,7 @@
           </tr>
           </thead>
           <tbody>
-          <%= render partial: "think_feel_do_engine/task_statuses/task_status", collection: view_membership(@participant, @group).try(:task_statuses) %>
+            <%= render partial: "think_feel_do_engine/task_statuses/task_status", collection: view_membership(@participant, @group).try(:task_statuses).try(:includes, { task: :bit_core_content_module }) %>
           </tbody>
         </table>
       </div>

data/lib/think_feel_do_engine/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.22.7"
+  VERSION = "3.22.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.22.7
+  version: 3.22.8
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-11 00:00:00.000000000 Z
+date: 2017-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -394,10 +394,10 @@ files:
 - app/assets/javascripts/think_feel_do_engine/validate_social_sharing.js
 - app/assets/stylesheets/think_feel_do_engine.css
 - app/assets/stylesheets/think_feel_do_engine/activities.css.scss
-- app/assets/stylesheets/think_feel_do_engine/base.css.scss
-- app/assets/stylesheets/think_feel_do_engine/dataTables-overrides.css.scss
-- app/assets/stylesheets/think_feel_do_engine/mobile.css.scss
-- app/assets/stylesheets/think_feel_do_engine/print.css.scss
+- app/assets/stylesheets/think_feel_do_engine/base.scss
+- app/assets/stylesheets/think_feel_do_engine/dataTables-overrides.scss
+- app/assets/stylesheets/think_feel_do_engine/mobile.scss
+- app/assets/stylesheets/think_feel_do_engine/print.scss
 - app/controllers/think_feel_do_engine/application_controller.rb
 - app/controllers/think_feel_do_engine/bit_maker/content_modules_controller.rb
 - app/controllers/think_feel_do_engine/bit_maker/content_providers_controller.rb
@@ -988,8 +988,8 @@ files:
 - vendor/assets/javascripts/moment.min.js
 - vendor/assets/javascripts/snap.js
 - vendor/assets/stylesheets/bootstrap-timepicker.min.css
-- vendor/assets/stylesheets/jplayer.blue.monday.css.scss
-- vendor/assets/stylesheets/snap.css.scss
+- vendor/assets/stylesheets/jplayer.blue.monday.scss
+- vendor/assets/stylesheets/snap.scss
 homepage: https://github.com/NU-CBITS/think_feel_do_engine
 licenses:
 - MIT
@@ -1010,7 +1010,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Summary of ThinkFeelDoEngine.