think_feel_do_engine 3.22.1 → 3.22.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9226f60443fffcf77453879ba71a2e9a86d2a63c
-  data.tar.gz: 51638e452bdde31e2231c839b0da49bc1f4797da
+  metadata.gz: 3aa2a878a30d337e8fd22ee814574dfc725b5006
+  data.tar.gz: 6f5f24ee50fb06d34a17f91c9ce2153c584e2b0c
 SHA512:
-  metadata.gz: 9b27db1d3da8fbd403d1c574c3d1c39dd61e96244b7a96c9feafd7791021f9ad8ccffe58f443f0058d3cf7361910725cfa67155ab1ec2383bc21521c0466617f
-  data.tar.gz: 332db4b947789f9b5eb5e3a69cce66725a1893d66eecf6ca48dd3b95cdc273c072ed8b73313c190d2f8bcf5610ef69e10988ce936884a441cd3d7f1c7409caf2
+  metadata.gz: f39199f43e878cf2617871e3e42dd7cde00d4f558f67a1647006361bcd1f0782e13a79ae302205c432be5207fb225399cad4f1697a0473e2a15e5a17b54b19cf
+  data.tar.gz: 88e2318d37a91db31f485c1c7a28c35a66350fad3380a91c6b8c61ce071b65d570af540e4d1b083bb1be79be4b32cae1ebe84647e16fe4bddb79cff8b2724f15

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

@@ -4,7 +4,7 @@ module ThinkFeelDoEngine
     # Collect metadata for all Participant Emotional Ratings.
     class EmotionalRating
       def self.columns
-        %w( participant_id name rating created_at )
+        %w( participant_id name rating created_at is_positive )
       end
 
       def self.all
@@ -14,7 +14,8 @@ module ThinkFeelDoEngine
               participant_id: participant.study_id,
               name: emotional_rating.name,
               rating: emotional_rating.rating,
-              created_at: emotional_rating.created_at.iso8601
+              created_at: emotional_rating.created_at.iso8601,
+              is_positive: emotional_rating.is_positive
             }
           end
         end.flatten

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

@@ -8,8 +8,8 @@ module ThinkFeelDoEngine
       DEFAULT_LESSON_MODULE_POSTFIX = %r{\/providers\/.*}
 
       def self.columns
-        %w( participant_id lesson_id page_headers lesson_selected_at
-            last_page_number_opened last_page_opened_at )
+        %w( participant_id lesson_id url page_headers lesson_selected_at
+            last_page_number_opened completed last_page_opened_at )
       end
 
       def self.participant_ids(ids)
@@ -86,9 +86,12 @@ module ThinkFeelDoEngine
         {
           participant_id: participant.study_id,
           lesson_id: lesson_id,
+          url: event.current_url,
           page_headers: event.headers,
           lesson_selected_at: event.emitted_at.iso8601,
           last_page_number_opened: last_page_opened[:number].to_i,
+          completed: last_page_opened[:number].to_i ==
+            ContentModules::LessonModule.find(lesson_id).slides.count,
           last_page_opened_at: last_page_opened[:opened_at].iso8601
         }
       end

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

@@ -4,7 +4,10 @@ module ThinkFeelDoEngine
     # Collect metadata for each Participant Activity.
     class PatientActivity
       def self.columns
-        %w( participant_id activity_title created_at )
+        %w( participant_id activity_title created_at start_time end_time
+            actual_accomplishment_intensity actual_pleasure_intensity
+            predicted_accomplishment_intensity predicted_pleasure_intensity
+            noncompliance_reason is_reviewed )
       end
 
       def self.all
@@ -13,7 +16,18 @@ module ThinkFeelDoEngine
             {
               participant_id: participant.study_id,
               activity_title: activity.title,
-              created_at: activity.created_at.iso8601
+              created_at: activity.created_at.iso8601,
+              start_time: activity.start_time,
+              end_time: activity.end_time,
+              actual_accomplishment_intensity:
+                activity.actual_accomplishment_intensity,
+              actual_pleasure_intensity: activity.actual_pleasure_intensity,
+              predicted_accomplishment_intensity:
+                activity.predicted_accomplishment_intensity,
+              predicted_pleasure_intensity:
+                activity.predicted_pleasure_intensity,
+              noncompliance_reason: activity.noncompliance_reason,
+              is_reviewed: activity.is_reviewed
             }
           end
         end.flatten

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

@@ -4,7 +4,8 @@ module ThinkFeelDoEngine
     # Collect metadata for all Participant Thoughts.
     class PatientThought
       def self.columns
-        %w( participant_id content created_at )
+        %w( participant_id content effect created_at pattern challenging_thought
+            act_as_if )
       end
 
       def self.all
@@ -14,7 +15,11 @@ module ThinkFeelDoEngine
             {
               participant_id: participant.study_id,
               content: thought.content,
-              created_at: thought.created_at.iso8601
+              effect: thought.effect,
+              created_at: thought.created_at.iso8601,
+              pattern: thought.pattern.try(:title),
+              challenging_thought: thought.challenging_thought,
+              act_as_if: thought.act_as_if
             }
           end
         end.flatten

data/app/views/think_feel_do_engine/coach/group_dashboard/_summary.html.erb

@@ -13,7 +13,7 @@
   <%= render "weekly_counts", klass: GroupMetrics::WeeklyThoughtsCount, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
-  <td><a href="#activities_future_table">activities monitored</a></td>
+  <td><a href="#activities_past_table">activities monitored</a></td>
   <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.monitored, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>

data/lib/think_feel_do_engine/version.rb

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

metadata

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