think_feel_do_engine 3.17.2 → 3.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5a174dc3e190c93463eac43b6c0e3421c541cf3
-  data.tar.gz: 3d945de61e14aa35446c16b30593f1c1fa53f118
+  metadata.gz: 248328db1d28d096496e611d71c7d38ca0973c7c
+  data.tar.gz: bab9c20b14380eb6a3fdf3ac120ba369b591025e
 SHA512:
-  metadata.gz: 0ac05c42703dc7cf0bb411fc6bc09486184e6b2779c1463860b79311d04c55edbce62568d927b448e78afdc3853a2b453c94fba88682f4c99b0f68319c9e4e43
-  data.tar.gz: e76b60425459ce2f536c49048d4a305aac9932561edc1892aa8647bc51a44c583c1a2706a23348aeefdc9e07200dfb380975d98c820a678a0efe55daef3f7b0f
+  metadata.gz: 09d990df0b6015ef3e3c5d7061eff9c0d901f99d43bdd210975fcd4d480f342aa43ac9e9b828faf38894070334f8956f12b392882eec1a0ec9823531d6ca1b28
+  data.tar.gz: 1c3c09c80590ccf1966a11f4ab71b2894fcb1922176bf8bbc797c2d08de6da410608546984e2cea89ca7247fd0c6d8827afa511680db1b0c984b32506863b80d

data/README.md

@@ -1,7 +1,7 @@
 # Think Feel Do Engine
 
-[![Build Status](https://travis-ci.org/cbitstech/think_feel_do_engine.svg)](https://travis-ci.org/cbitstech/think_feel_do_engine)
-[![security](https://hakiri.io/github/cbitstech/think_feel_do_engine/master.svg)](https://hakiri.io/github/cbitstech/think_feel_do_engine/master)
+[![Build Status](https://travis-ci.org/NU-CBITS/think_feel_do_engine.svg)](https://travis-ci.org/NU-CBITS/think_feel_do_engine)
+[![security](https://hakiri.io/github/NU-CBITS/think_feel_do_engine/master.svg)](https://hakiri.io/github/NU-CBITS/think_feel_do_engine/master)
 
 Provides the tools and administrative interface for Think Feel Do.
 

data/app/controllers/think_feel_do_engine/navigator_controller.rb

@@ -81,7 +81,7 @@ module ThinkFeelDoEngine
 
     private
 
-    def last_engagment
+    def last_engagement
       current_participant
         .active_membership
         .task_statuses
@@ -116,12 +116,14 @@ module ThinkFeelDoEngine
                                .order(:position)
                                .first
       provider_id == first_content_provider.id.to_s &&
-        content_id == FIRST_CONTENT_POSITION
+        content_id == FIRST_CONTENT_POSITION.to_s
     end
 
     def mark_engagement_completed
-      if navigator_content_module && last_engagment
-        last_engagment.update_attributes(completed_at: DateTime.current)
+      if navigator_content_module && last_engagement &&
+         !@navigator.current_content_provider.exists?(
+           @navigator.content_position + 1)
+        last_engagement.update_attributes(completed_at: DateTime.current)
       end
     end
 

data/app/models/concerns/copier.rb

@@ -3,10 +3,26 @@ module Concerns
   # Copies lesson content from one arm's learning tool
   # (i.e., LEARN tool) to another arm's learning tool
   module Copier
-    LEARN_TOOL = "Tools::Learn"
+    LESSON_MODULE = ContentModules::LessonModule.to_s
+    LEARN_TOOL = Tools::Learn.to_s
     TOOL_TITLE = "LEARN"
 
     Arm.class_eval do
+      def copy_all_to(new_arm)
+        new_tools = new_arm.bit_core_tools
+
+        bit_core_tools.each do |tool|
+          new_tool = new_tools
+                     .create!(
+                       position: new_tools.count,
+                       title: tool.title,
+                       type: tool.type)
+
+          tool.copy_all_to(
+            new_tool: new_tool)
+        end
+      end
+
       def copy_lessons_to(new_arm)
         new_tools = new_arm.bit_core_tools
         new_tool = new_tools.find_by(type: LEARN_TOOL) ||
@@ -20,7 +36,6 @@ module Concerns
         bit_core_tools
           .find_by(type: LEARN_TOOL)
           .copy_content_modules_to(
-            new_arm: new_arm,
             new_tool: new_tool)
       end
     end
@@ -29,13 +44,19 @@ module Concerns
     # rubocop:disable ClassAndModuleChildren
     module ::BitCore
       Tool.class_eval do
-        LESSON_MODULE = "ContentModules::LessonModule"
+        def copy_all_to(new_tool:)
+          ContentModule.transaction do
+            content_modules.each do |content_module|
+              content_module.copy_content_providers_to(
+                new_tool: new_tool)
+            end
+          end
+        end
 
-        def copy_content_modules_to(new_arm:, new_tool:)
+        def copy_content_modules_to(new_tool:)
           ContentModule.transaction do
             content_modules.where(type: LESSON_MODULE).each do |content_module|
               content_module.copy_content_providers_to(
-                new_arm: new_arm,
                 new_tool: new_tool)
             end
           end
@@ -43,7 +64,7 @@ module Concerns
       end
 
       ContentModule.class_eval do
-        def copy_content_providers_to(new_arm:, new_tool:)
+        def copy_content_providers_to(new_tool:)
           ContentModule.transaction do
             new_content_module =
               ContentModule.create!(
@@ -57,7 +78,7 @@ module Concerns
             content_providers.each do |content_provider|
               content_provider
                 .copy_source_content_to!(
-                  new_arm: new_arm,
+                  new_arm: new_tool.arm,
                   new_content_module: new_content_module)
             end
 
@@ -69,14 +90,12 @@ module Concerns
       ContentProvider.class_eval do
         def copy_source_content_to!(new_arm:, new_content_module:)
           ContentProvider.transaction do
-            # rubocop:disable DoubleNegation
             ContentProvider.create!(
               content_module: new_content_module,
               position: position,
-              show_next_nav: !!show_next_nav,
+              show_next_nav: show_next_nav,
               type: type,
               source_content: source_content.try(:copy_to, new_arm))
-            # rubocop:enable DoubleNegation
           end
         end
       end
@@ -84,35 +103,35 @@ module Concerns
       Slideshow.class_eval do
         def copy_to(new_arm)
           Slideshow.transaction do
-            slideshow = Slideshow.create!(arm: new_arm, title: title)
-
-            copy_slides_to!(slideshow)
-
-            slideshow
+            slideshow = Slideshow
+                        .find_or_create_by!(arm_id: new_arm.id, title: title)
+            copy_slides_to(slideshow)
           end
         end
 
         private
 
-        def copy_slides_to!(slideshow)
+        def copy_slides_to(slideshow)
           Slide.transaction do
             slides.each do |slide|
               slide.copy_to!(slideshow)
             end
           end
+
+          slideshow
         end
       end
 
       Slide.class_eval do
         def copy_to!(slideshow)
-          Slide.create!(
-            body: body,
-            is_title_visible: is_title_visible,
-            options: options,
-            position: position,
-            slideshow: slideshow,
-            title: title,
-            type: type)
+          slideshow.slides
+            .find_or_create_by!(
+              body: body,
+              is_title_visible: is_title_visible,
+              position: position,
+              title: title,
+              type: type)
+            .update_attributes!(options: options)
         end
       end
     end

data/app/models/emotion.rb

@@ -6,6 +6,7 @@ class Emotion < ActiveRecord::Base
   validates :creator, presence: true
   validates :name, presence: true
   validates :name, uniqueness: { scope: :creator_id }
+  validates :name, length: { maximum: 255 }
 
   before_validation :normalize_name
 

data/app/models/group.rb

@@ -29,7 +29,7 @@ class Group < ActiveRecord::Base
   end
 
   def logins_by_week(week_number)
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       membership
         .logins_by_week(week_number)
     end.inject(:+)
@@ -38,7 +38,7 @@ class Group < ActiveRecord::Base
   def thoughts_by_week(week_number)
     thoughts = Arel::Table.new(:thoughts)
 
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       membership
         .participant
         .thoughts
@@ -52,7 +52,7 @@ class Group < ActiveRecord::Base
   def activities_past_by_week(week_number)
     activities = Arel::Table.new(:activities)
 
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       membership
         .participant
         .activities
@@ -65,7 +65,7 @@ class Group < ActiveRecord::Base
   def activities_future_by_week(week_number)
     activities = Arel::Table.new(:activities)
 
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       membership
         .participant
         .activities
@@ -78,7 +78,7 @@ class Group < ActiveRecord::Base
   def goals_by_week(week_number)
     social_networking_goals = Arel::Table.new(:social_networking_goals)
 
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       SocialNetworking::Goal
         .where(participant: membership.participant)
         .where(social_networking_goals[:created_at]
@@ -91,7 +91,7 @@ class Group < ActiveRecord::Base
   def comments_by_week(week_number)
     social_networking_comments = Arel::Table.new(:social_networking_comments)
 
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       SocialNetworking::Comment
         .where(participant: membership.participant)
         .where(social_networking_comments[:created_at]
@@ -105,7 +105,7 @@ class Group < ActiveRecord::Base
     social_networking_on_the_mind_statements =
       Arel::Table.new(:social_networking_on_the_mind_statements)
 
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       SocialNetworking::OnTheMindStatement
         .where(participant: membership.participant)
         .where(social_networking_on_the_mind_statements[:created_at]
@@ -119,7 +119,7 @@ class Group < ActiveRecord::Base
     social_networking_likes =
       Arel::Table.new(:social_networking_likes)
 
-    memberships.map do |membership|
+    non_moderator_memberships.map do |membership|
       SocialNetworking::Like
         .where(participant: membership.participant)
         .where(social_networking_likes[:created_at]
@@ -128,4 +128,9 @@ class Group < ActiveRecord::Base
                  .lt(membership.week_end_day(week_number)))
     end.map(&:count).sum
   end
+
+  def non_moderator_memberships
+    memberships.joins(:participant)
+      .merge(Participant.not_moderator)
+  end
 end

data/app/models/participant.rb

@@ -61,8 +61,6 @@ class Participant < ActiveRecord::Base
            -> { where(kind: "click") },
            class_name: "EventCapture::Event",
            foreign_key: :participant_id
-  has_many :experiences, dependent: :destroy
-  has_many :gratitude_recordings, dependent: :destroy
 
   delegate :end_date, to: :active_membership, prefix: true, allow_nil: true
 
@@ -92,6 +90,10 @@ class Participant < ActiveRecord::Base
       )
   }
 
+  scope :not_moderator, lambda {
+    where(is_admin: false)
+  }
+
   def is_not_allowed_in_site
     # participant not set to is_complete (hence withdrawal or termination)
     # and who have no active memberships

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

@@ -7,7 +7,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           participant.emotional_ratings.map do |emotional_rating|
             {
               participant_id: participant.study_id,

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

@@ -8,7 +8,8 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id, :is_admin).map do |participant|
+        Participant.not_moderator
+          .select(:id, :study_id, :is_admin).map do |participant|
           EventCapture::Event.where(participant_id: participant.id)
             .map do |event|
             {

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

@@ -38,7 +38,7 @@ module ThinkFeelDoEngine
       def self.all_slide_interactions
         lessons = lessons_map
 
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           slide_view_events(lessons, participant.id).map do |lesson_event|
             e = lesson_event[1]
             lesson_id = lesson_event[0]

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

@@ -12,14 +12,14 @@ module ThinkFeelDoEngine
       end
 
       def self.participant_ids(ids)
-        ids.empty? ? Participant.ids : ids
+        ids.empty? ? Participant.not_moderator.ids : ids
       end
 
       def self.all(*ids)
         lessons = lesson_entries_map
         lessons_default = lessons_with_default_urls
 
-        Participant.select(:id, :study_id)
+        Participant.not_moderator.select(:id, :study_id)
           .where(id: participant_ids(ids)).map do |participant|
           lesson_select_events =
             EventCapture::Event

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

@@ -7,7 +7,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           ParticipantLoginEvent
             .where(participant_id: participant.id).map do |event|
               {

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

@@ -12,7 +12,7 @@ module ThinkFeelDoEngine
       def self.all
         modules = modules_map
 
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           slide_render_events_for(participant, modules).map do |module_event|
             e = module_event[1]
             mod = module_event[0]

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

@@ -50,7 +50,7 @@ module ThinkFeelDoEngine
           end
         end
 
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           events = time_sorted_render_events_for(participant)
 
           events.map do |e|

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

@@ -7,7 +7,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           participant.activities.map do |activity|
             {
               participant_id: participant.study_id,

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

@@ -7,7 +7,8 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map.map do |participant|
+        Participant.not_moderator
+          .select(:id, :study_id).map.map do |participant|
           participant.thoughts.map do |thought|
             {
               participant_id: participant.study_id,

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

@@ -8,7 +8,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           participant.phq_assessments.map do |assessment|
             {
               participant_id: participant.study_id,

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

@@ -9,7 +9,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           earliest_click_time = latest_click_time = nil
           times = click_times(participant.id)
           times.map do |click_time|

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

@@ -7,7 +7,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id)
+        Participant.not_moderator.select(:id, :study_id)
           .includes(:memberships).map do |participant|
           next unless participant.active_membership
 

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

@@ -7,7 +7,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           tool_access_events(participant).map do |tool_access|
             {
               participant_id: participant.study_id,

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

@@ -9,7 +9,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           user_agents = EventCapture::Event
                         .where(participant_id: participant.id)
                         .map { |event| event.payload[:ua] }

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

@@ -8,7 +8,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           video_play_events(participant.id).map do |e|
             m = e.current_url.match(/.*\/providers\/(\d+)\/(\d+)$/)
             provider_id = m ? m[1] : -1

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

@@ -8,7 +8,7 @@ module ThinkFeelDoEngine
       end
 
       def self.all
-        Participant.select(:id, :study_id).map do |participant|
+        Participant.not_moderator.select(:id, :study_id).map do |participant|
           participant.wai_assessments.map do |assessment|
             {
               participant_id: participant.study_id,

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

@@ -26,7 +26,7 @@
           </thead>
           <tbody>
 
-          <% group.memberships.each do |membership| %>
+          <% group.non_moderator_memberships.each do |membership| %>
             <% membership.participant.activities.unscheduled_or_in_the_future.each do |activity| %>
               <tr>
                 <td class="not-displayed">

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

@@ -29,7 +29,7 @@
           </thead>
           <tbody>
 
-          <% group.memberships.each do |membership| %>
+          <% group.non_moderator_memberships.each do |membership| %>
             <% membership.participant.activities.in_the_past.each do |activity| %>
               <tr>
                 <td class="not-displayed">

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

@@ -23,7 +23,7 @@
           </thead>
           <tbody>
 
-          <% group.memberships.each do |membership| %>
+          <% group.non_moderator_memberships.each do |membership| %>
             <% membership_comments(membership).each do |comment| %>
               <tr>
                 <td class="not-displayed">

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

@@ -27,7 +27,7 @@
           </thead>
           <tbody>
 
-          <% group.memberships.each do |membership| %>
+          <% group.non_moderator_memberships.each do |membership| %>
             <% membership_goals(membership).each do |goal| %>
               <tr>
                 <td class="not-displayed">

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

@@ -23,7 +23,7 @@
           </thead>
           <tbody>
 
-          <% group.memberships.includes(:participant).each do |membership| %>
+          <% group.non_moderator_memberships.includes(:participant).each do |membership| %>
             <% membership_likes(membership).each do |like| %>
               <tr>
                 <td class="not-displayed">

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

@@ -11,7 +11,7 @@
           <th>week <%= current_week %></th>
         <% end %>
       </tr>
-      <% group.memberships.each do | membership | %>
+      <% group.non_moderator_memberships.each do | membership | %>
         <tr>
           <td><%= membership.participant.display_name %></td>
           <% (1..study_length_in_weeks).each do |current_week| %>

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

@@ -25,7 +25,7 @@
           </tr>
           </thead>
           <tbody>
-          <% group.memberships.each do |membership| %>
+          <% group.non_moderator_memberships.each do |membership| %>
             <% membership.participant.thoughts.each do |thought| %>
               <tr>
                 <td class="not-displayed">

data/app/views/think_feel_do_engine/emotions/_form.html.erb

@@ -6,7 +6,7 @@
   </div>
   <div class="emotion-name-group form-group written-option">
     <%= f.label :name, "Emotion" %>
-    <input class="form-control" id="emotional_rating_name" name="emotional_rating[name]" type="text">
+    <input class="form-control" id="emotional_rating_name" name="emotional_rating[name]" type="text", maxlength: 255 >
   </div>
   <div class="form-group">
     <%= f.label("Emotion Type") %>

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.17.2"
+  VERSION = "3.18.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.17.2
+  version: 3.18.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-16 00:00:00.000000000 Z
+date: 2016-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -955,7 +955,7 @@ files:
 - vendor/assets/stylesheets/bootstrap-timepicker.min.css
 - vendor/assets/stylesheets/jplayer.blue.monday.css.scss
 - vendor/assets/stylesheets/snap.css.scss
-homepage: https://github.com/cbitstech/think_feel_do_engine
+homepage: https://github.com/NU-CBITS/think_feel_do_engine
 licenses:
 - MIT
 metadata: {}