think_feel_do_engine 3.20.1 → 3.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c3b3775063e21d489dcf856ddef6e179cd34e8c2
-  data.tar.gz: 2ea4750cceba7cd1786b7c3c795dd2f1aaa3201e
+  metadata.gz: b3bcad632eb10037be393711c01e5b9c62f00081
+  data.tar.gz: dd748908ba0ebf80bc86c672b08674b2cf102445
 SHA512:
-  metadata.gz: 12a9befe18ff9028e706a304f6723ae0569f76fb6e1ab5987bc5cc9d309e52383888aebff8b0bea25f87698a784aa2c2ac44209084e0ea1b2981197bd4686226
-  data.tar.gz: dc32b56ca3eb64cf1184f73cd9330db7daf4ec4b3eb2e108ffadf3724e6064044403018a75949886a8ae10cc0bb02b0bbe08abff26597c342adcbc1efc963312
+  metadata.gz: 5a85a6b07d8f54f14325bdfe0e27a39f56bb7fd27f38246136eef69237cb7b94c706f14215332ac280a55290d6bffb43684f46800be6cfb6ba8b25102c7e44bc
+  data.tar.gz: 3d34f12e972f003b2a80dc845235fd1356cd92d235a925fa3bce3783081122e4cc1267b68bea2905d8a8c2f7560958b92941925d59227361a6cead68e16a648b

data/app/controllers/think_feel_do_engine/coach/group_dashboard_controller.rb

@@ -18,4 +18,4 @@ module ThinkFeelDoEngine
       end
     end
   end
-end
+end

data/app/controllers/think_feel_do_engine/participants/passwords_controller.rb

@@ -22,7 +22,7 @@ module ThinkFeelDoEngine
 
       def create
         @participant = Participant.find_by(email: resource_params[:email])
-        if @participant.try(:is_not_allowed_in_site)
+        if @participant.try(:not_allowed_in_site?)
           msg = "New password cannot be sent; this account is not active."
           redirect_to new_participant_session_path, alert: msg
         else

data/app/controllers/think_feel_do_engine/users/registrations_controller.rb

@@ -14,4 +14,4 @@ class RegistrationsController < Devise::RegistrationsController
     end
   end
   # rubocop:enable Lint/UnusedMethodArgument
-end
+end

data/app/helpers/think_feel_do_engine/activities_helper.rb

@@ -51,4 +51,4 @@ module ThinkFeelDoEngine
       pluralize(scheduled_count(activities), "activity")
     end
   end
-end
+end

data/app/helpers/think_feel_do_engine/brand_helper.rb

@@ -34,4 +34,4 @@ module ThinkFeelDoEngine
         current_page?(Engine.routes.url_helpers.new_user_password_path)
     end
   end
-end
+end

data/app/helpers/think_feel_do_engine/presenters_helper.rb

@@ -6,4 +6,4 @@ module ThinkFeelDoEngine
       yield klass.new(options)
     end
   end
-end
+end

data/app/models/available_content_module.rb

@@ -18,27 +18,27 @@ class AvailableContentModule < ActiveRecord::Base
     where bit_core_tool_id: tool.id
   end
 
-  def self.is_viz
+  def self.visualization
     where is_viz: true
   end
 
-  def self.is_not_viz
+  def self.non_visualization
     where is_viz: false
   end
 
-  def self.is_completed
+  def self.completed
     where.not completed_at: nil
   end
 
-  def self.is_not_completed
+  def self.not_completed
     where completed_at: nil
   end
 
-  def self.is_didactic
+  def self.didactic
     where has_didactic_content: true
   end
 
-  def self.is_not_didactic
+  def self.not_didactic
     where has_didactic_content: false
   end
 
@@ -58,7 +58,7 @@ class AvailableContentModule < ActiveRecord::Base
       )
   end
 
-  def self.is_terminated_on(date)
+  def self.terminated_on(date)
     where(arel_table[:terminates_on].lt(date))
   end
 
@@ -70,7 +70,7 @@ class AvailableContentModule < ActiveRecord::Base
       )
   end
 
-  def self.is_not_terminated_on(date)
+  def self.not_terminated_on(date)
     where(arel_table[:terminates_on].eq(nil)
           .or(arel_table[:terminates_on].gteq(date)))
   end

data/app/models/content_providers/module_index_provider.rb

@@ -11,8 +11,8 @@ module ContentProviders
         locals: {
           participant: participant,
           content_modules: content_modules,
-          didactic_modules: content_modules.is_not_viz.is_didactic,
-          non_didactic_modules: content_modules.is_not_viz.is_not_didactic,
+          didactic_modules: content_modules.non_visualization.didactic,
+          non_didactic_modules: content_modules.non_visualization.not_didactic,
           membership: options
                         .view_context
                         .view_membership(participant, participant.active_group)
@@ -35,7 +35,7 @@ module ContentProviders
         .for_tool(tool)
         .available_by(Time.zone.today)
         .excludes_module(bit_core_content_module_id)
-        .is_not_terminated_on(Time.zone.today)
+        .not_terminated_on(Time.zone.today)
         .latest_duplicate
     end
   end

data/app/models/membership.rb

@@ -129,7 +129,7 @@ class Membership < ActiveRecord::Base
   end
 
   def lessons_read
-    task_statuses.completed.select(&:is_lesson?)
+    task_statuses.completed.select(&:lesson?)
   end
 
   def lessons_read_for_day(time)
@@ -138,7 +138,7 @@ class Membership < ActiveRecord::Base
       .where("completed_at <= ? AND completed_at >= ?",
              time.end_of_day,
              time.beginning_of_day)
-      .select(&:is_lesson?)
+      .select(&:lesson?)
   end
 
   def lessons_read_for_week
@@ -146,7 +146,7 @@ class Membership < ActiveRecord::Base
       .completed
       .where("completed_at >= ?", Time.current.advance(days: -7)
                                       .beginning_of_day)
-      .select(&:is_lesson?)
+      .select(&:lesson?)
   end
 
   def withdraw

data/app/models/participant.rb

@@ -95,7 +95,7 @@ class Participant < ActiveRecord::Base
     where(is_admin: false)
   }
 
-  def is_not_allowed_in_site
+  def not_allowed_in_site?
     # participant not set to is_complete (hence withdrawal or termination)
     # and who have no active memberships
     active_membership.nil? && !memberships.where(is_complete: true).exists?

data/app/models/task.rb

@@ -35,29 +35,25 @@ class Task < ActiveRecord::Base
   end
 
   def incomplete_participant_list
-    task_statuses.collect do |status|
-      if status.completed_at.nil?
-        status.participant
-      end
-    end
+    Participant
+      .joins(memberships: :task_statuses)
+      .merge(task_statuses.non_moderator.incomplete)
   end
 
   def complete_participant_list
-    task_statuses.collect do |status|
-      unless status.completed_at.nil?
-        status.participant
-      end
-    end
+    Participant
+      .joins(memberships: :task_statuses)
+      .merge(task_statuses.non_moderator.completed)
   end
 
   # Returns a count of the number of times this task was assigned.
   def total_assigned
-    task_statuses.count
+    task_statuses.non_moderator.count
   end
 
   # Returns the count of the number of times this task was completed.
   def total_read
-    task_statuses.where.not(completed_at: nil).count
+    task_statuses.non_moderator.completed.count
   end
 
   private

data/app/models/task_status.rb

@@ -68,6 +68,11 @@ class TaskStatus < ActiveRecord::Base
       )
   }
 
+  scope :non_moderator, lambda {
+    joins(membership: :participant)
+      .merge(Participant.not_moderator)
+  }
+
   scope :most_recent_for_content_module, lambda {|content_module, day_in_study|
     for_content_module(content_module)
       .available_by_day(day_in_study)
@@ -86,7 +91,7 @@ class TaskStatus < ActiveRecord::Base
     end
   end
 
-  def is_lesson?
+  def lesson?
     task.bit_core_content_module.instance_of? ContentModules::LessonModule
   end
 

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

@@ -40,7 +40,7 @@ module ThinkFeelDoEngine
           day: enrollment_day,
           event_date: date_sent,
           event_time: time_sent.iso8601,
-          is_message_opened: is_message_read?,
+          is_message_opened: message_read?,
           message_opened_at: message_read_at.try(:iso8601),
           message_subject: @message.subject,
           message_content: @message.body
@@ -93,12 +93,12 @@ module ThinkFeelDoEngine
         @message.sent_at
       end
 
-      def is_message_read?
+      def message_read?
         received_message.try(:is_read)
       end
 
       def message_read_at
-        is_message_read? && received_message.try(:updated_at)
+        message_read? && received_message.try(:updated_at)
       end
 
       def received_message

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

@@ -95,8 +95,8 @@ module ThinkFeelDoEngine
 
         {
           opened_at: last_event.emitted_at,
-          is_last_module_page: is_last_module_page(last_event.current_url,
-                                                   module_id)
+          is_last_module_page: last_module_page?(last_event.current_url,
+                                                 module_id)
         }
       end
 
@@ -109,7 +109,7 @@ module ThinkFeelDoEngine
         interaction
       end
 
-      def self.is_last_module_page(url, module_id)
+      def self.last_module_page?(url, module_id)
         # last provider within module
         last_provider = BitCore::ContentModule.find(module_id)
                                               .content_providers

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

@@ -20,4 +20,4 @@ module ThinkFeelDoEngine
       end
     end
   end
-end
+end

data/app/models/tool_nav_item.rb

@@ -30,18 +30,18 @@ class ToolNavItem
     !%w(RELAX SUPPORT).include?(tool.title)
   end
 
-  def is_active?(current_module)
+  def active?(current_module)
     current_module.bit_core_tool_id == @tool.id
   end
 
-  def has_subnav?
+  def generic_tool?
     @tool.type.nil?
   end
 
   def module_nav_items
     available_content_modules
       .position_greater_than(1)
-      .is_not_viz
+      .non_visualization
       .available_by(Time.zone.today)
       .order_by_position
       .latest_duplicate
@@ -49,8 +49,8 @@ class ToolNavItem
 
   def any_incomplete_tasks_today?
     available_content_modules
-      .is_not_viz
-      .is_not_completed
+      .non_visualization
+      .not_completed
       .available_on(Time.zone.today)
       .exists?
   end
@@ -61,6 +61,6 @@ class ToolNavItem
     AvailableContentModule
       .for_tool(@tool)
       .for_participant(@participant)
-      .is_not_terminated_on(Time.zone.today)
+      .not_terminated_on(Time.zone.today)
   end
 end

data/app/models/values/accomplishment.rb

@@ -21,4 +21,4 @@ module Values
       @label.to_s
     end
   end
-end
+end

data/app/models/values/emotional_rating.rb

@@ -21,4 +21,4 @@ module Values
       @label.to_s
     end
   end
-end
+end

data/app/models/values/mood.rb

@@ -20,4 +20,4 @@ module Values
       @label.to_s
     end
   end
-end
+end

data/app/views/think_feel_do_engine/participants/content_modules/index.html.erb

@@ -18,7 +18,7 @@
   </div>
 <% end %>
 
-<% content_modules.is_viz.each do |available_module| %>
+<% content_modules.visualization.each do |available_module| %>
   <br>
   <%= available_module
       .content_providers

data/app/views/think_feel_do_engine/shared/participant/_hamburger_nav_items.html.erb

@@ -4,7 +4,7 @@
   <%= link_to fa_icon("home", text: "Home"), brand_location, data: { no_turbolink: true } %>
 </li>
 <% tool_navs.each do |tool_nav| %>
-  <li class="custom-snap-width <%= tool_nav.title %><%= tool_nav.is_active?(@navigator.current_module) ? " active" : "" %>">
+  <li class="custom-snap-width <%= tool_nav.title %><%= tool_nav.active?(@navigator.current_module) ? " active" : "" %>">
     <%= link_to think_feel_do_engine.navigator_context_path(context_name: tool_nav.title), data: { no_turbolink: true } do %>
       <%= tool_nav.title %>
       <% unless tool_nav.alert.nil? %>

data/app/views/think_feel_do_engine/shared/participant/_nav_items.html.erb

@@ -1,8 +1,8 @@
 <% tool_navs = ToolNavItem.for_participant(current_participant) %>
 
 <% tool_navs.each do |tool_nav| %>
-  <% if tool_nav.has_subnav? %>
-    <li class="<%= tool_nav.title %> dropdown hidden-xs<%= tool_nav.is_active?(@navigator.current_module) ? " active" : "" %>">
+  <% if tool_nav.generic_tool? %>
+    <li class="<%= tool_nav.title %> dropdown hidden-xs<%= tool_nav.active?(@navigator.current_module) ? " active" : "" %>">
       <%= link_to "#", class: "dropdown-toggle", data: { toggle: "dropdown" } do %>
         <%= tool_nav.title %>
         <% unless tool_nav.alert.nil? %>
@@ -36,7 +36,7 @@
       </ul>
     </li>
   <% else %>
-    <li class="<%= tool_nav.title %> hidden-xs<%= tool_nav.is_active?(@navigator.current_module) ? " active" : "" %>">
+    <li class="<%= tool_nav.title %> hidden-xs<%= tool_nav.active?(@navigator.current_module) ? " active" : "" %>">
       <%= link_to think_feel_do_engine.navigator_context_path(context_name: tool_nav.title), data: { no_turbolink: true } do %>
         <%= tool_nav.title %>
         <% unless tool_nav.alert.nil? %>

data/db/migrate/20160616162347_convert_slide_options.rb

@@ -0,0 +1,11 @@
+class ConvertSlideOptions < ActiveRecord::Migration
+  class MigrationSlide < ActiveRecord::Base
+    self.table_name = :bit_core_slides
+  end
+
+  def change
+    MigrationSlide.find_each do |slide|
+      slide.save!
+    end
+  end
+end

data/db/migrate/20160616201120_convert_event_payloads.rb

@@ -0,0 +1,23 @@
+class ConvertEventPayloads < ActiveRecord::Migration
+  class EventMigration < ActiveRecord::Base
+    self.table_name = :event_capture_events
+
+    serialize :payload
+  end
+
+  def up
+    EventMigration.find_each do |event|
+      next unless event.payload.respond_to?(:to_unsafe_h)
+
+      # Use 'update_column' because with 'update' ActiveRecord will try to
+      # deserialize the existing value first, and will detect that there are
+      # two identical Hashes. Use 'to_unsafe_h' because otherwise all keys
+      # will be deemed unsafe, having not been permitted via the strong
+      # parameters API.
+      event.update_column :payload, event.payload.to_unsafe_h
+    end
+  end
+
+  def down
+  end
+end

data/lib/tasks/lesson_notifications.rake

@@ -8,7 +8,7 @@ namespace :lesson_notifications do
     now = Time.now
     Membership.active.each do |membership|
       membership.task_statuses.each do |task_status|
-        next unless task_status.is_lesson? && task_status.notify_today?
+        next unless task_status.lesson? && task_status.notify_today?
 
         participant = task_status.participant
         content_module = task_status.task.bit_core_content_module

data/lib/think_feel_do_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.20.1
+  version: 3.21.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-15 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -963,6 +963,8 @@ files:
 - db/migrate/20160408185958_add_event_composite_index_participant_kind.rb
 - db/migrate/20160516143153_remove_gratitude_recording.rb
 - db/migrate/20160516143322_remove_experience.rb
+- db/migrate/20160616162347_convert_slide_options.rb
+- db/migrate/20160616201120_convert_event_payloads.rb
 - lib/tasks/lesson_notifications.rake
 - lib/tasks/seed.rake
 - lib/tasks/think_feel_do_engine_tasks.rake
@@ -1003,8 +1005,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Summary of ThinkFeelDoEngine.
 test_files: []
+has_rdoc: