think_feel_do_engine 3.21.0 → 3.21.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3bcad632eb10037be393711c01e5b9c62f00081
-  data.tar.gz: dd748908ba0ebf80bc86c672b08674b2cf102445
+  metadata.gz: 20f20efba264a83a66b5d1824cae5ec07e8ef288
+  data.tar.gz: c30f8503fa62eb29007585f29f0c8cc6dfe66c39
 SHA512:
-  metadata.gz: 5a85a6b07d8f54f14325bdfe0e27a39f56bb7fd27f38246136eef69237cb7b94c706f14215332ac280a55290d6bffb43684f46800be6cfb6ba8b25102c7e44bc
-  data.tar.gz: 3d34f12e972f003b2a80dc845235fd1356cd92d235a925fa3bce3783081122e4cc1267b68bea2905d8a8c2f7560958b92941925d59227361a6cead68e16a648b
+  metadata.gz: d77b928f8354233495ac71d69f461b41664089c3561c08e2dc70814d2e37c633f43123c09c5addbea86f8f544ef578528f209aaa3d92fdeea41ee7a4f96b656d
+  data.tar.gz: bb916dabaf273b4e6c552d58760d28476b69b2e51a9769fdf7dc9e92640e710bc2739fb5fdfb4411a39fb3dcf8f4ebd54dd7f93f0e12b7f83f8011c897166b43

data/app/controllers/think_feel_do_engine/quick_sign_ins_controller.rb

@@ -13,9 +13,10 @@ module ThinkFeelDoEngine
         ParticipantLoginEvent.create(participant_id: params[:participant_id])
         resource = Participant.where(id: params[:participant_id]).first
       end
-      if resource
-        sign_in_and_redirect resource
-      end
+
+      return unless resource
+
+      sign_in_and_redirect resource
     end
   end
 end

data/app/helpers/think_feel_do_engine/coach/moods_and_phq_viz_helper.rb

@@ -6,9 +6,7 @@ module ThinkFeelDoEngine
       def emotional_ratings(participant)
         ratings = {}
         participant.emotional_ratings.order(:created_at).each do |rating|
-          unless ratings[rating.name.to_sym]
-            ratings[rating.name.to_sym] = []
-          end
+          ratings[rating.name.to_sym] = ratings[rating.name.to_sym] || []
           ratings[rating.name.to_sym] << [rating.created_at.to_i, rating.rating]
         end
         ratings.keys.map { |key| [key.to_sym, ratings[key.to_sym]] }

data/app/helpers/think_feel_do_engine/coach/patient_dashboard_helper.rb

@@ -3,10 +3,10 @@ module ThinkFeelDoEngine
   module Coach
     # Displays navigational information in the form of breadcrumbs
     module PatientDashboardHelper
-      VISUALIZATION_CONTROLLERS = [
-        "participant_activities_visualizations",
-        "participant_thoughts_visualizations"
-      ].freeze
+      VISUALIZATION_CONTROLLERS = %w(
+        participant_activities_visualizations
+        participant_thoughts_visualizations
+      ).freeze
 
       def breadcrumbs
         return unless VISUALIZATION_CONTROLLERS.include?(controller_name)

data/app/models/emotion.rb

@@ -25,8 +25,8 @@ class Emotion < ActiveRecord::Base
   private
 
   def normalize_name
-    if name.respond_to?(:strip)
-      self.name = self.class.normalized_name(name)
-    end
+    return unless name.respond_to?(:strip)
+
+    self.name = self.class.normalized_name(name)
   end
 end

data/app/models/emotional_rating.rb

@@ -39,8 +39,8 @@ class EmotionalRating < ActiveRecord::Base
   private
 
   def associate_emotion
-    if @name.present?
-      self.emotion = Emotion.associate(participant, @name)
-    end
+    return unless @name.present?
+
+    self.emotion = Emotion.associate(participant, @name)
   end
 end

data/app/models/group_metrics/weekly_activities_count.rb

@@ -4,18 +4,58 @@ module GroupMetrics
   class WeeklyActivitiesCount < WeeklyCount
     self.table_name = "activities"
 
-    scope :in_the_past, lambda {
-      where arel_table[:end_time].lt(Time.zone.now)
+    def self.fetch(group_id)
+      super(group_id, "start_time")
+    end
+
+    scope :monitored, lambda {
+      where(is_reviewed: false)
+        .where
+        .not(
+          actual_accomplishment_intensity: nil,
+          actual_pleasure_intensity: nil
+        )
+        .where(
+          predicted_accomplishment_intensity: nil,
+          predicted_pleasure_intensity: nil
+        )
     }
 
-    # To Do: fix naming and/or what is going on here
-    # change to start_time and is_scheduled
-    # and updated tests
-    scope :unscheduled_or_in_the_future, lambda {
+    scope :planned, lambda {
       where(
-        arel_table[:start_time].eq(nil)
-        .or(arel_table[:end_time].gt(Time.zone.now))
+        is_reviewed: false,
+        actual_accomplishment_intensity: nil,
+        actual_pleasure_intensity: nil
       )
+        .where
+        .not(
+          predicted_accomplishment_intensity: nil,
+          predicted_pleasure_intensity: nil
+        )
+    }
+
+    scope :reviewed_and_complete, lambda {
+      where(is_reviewed: true)
+        .where
+        .not(
+          predicted_accomplishment_intensity: nil,
+          predicted_pleasure_intensity: nil,
+          actual_accomplishment_intensity: nil,
+          actual_pleasure_intensity: nil
+        )
+    }
+
+    scope :reviewed_and_incomplete, lambda {
+      where(is_reviewed: true)
+        .where(
+          actual_accomplishment_intensity: nil,
+          actual_pleasure_intensity: nil
+        )
+        .where
+        .not(
+          predicted_accomplishment_intensity: nil,
+          predicted_pleasure_intensity: nil
+        )
     }
   end
 end

data/app/models/group_metrics/weekly_count.rb

@@ -8,13 +8,13 @@ module GroupMetrics
              foreign_key: :participant_id,
              primary_key: :participant_id
 
-    def self.fetch(group_id)
+    def self.fetch(group_id, timestamp_column = "created_at")
       pg_timezone = ActiveSupport::TimeZone[Time.zone.name].tzinfo.name
 
       joins(memberships: :participant)
         .select(<<-SQL
           ( FLOOR ( EXTRACT ( EPOCH FROM (
-            ( #{connection.quote_table_name(table_name)}.created_at
+            ( #{connection.quote_table_name(table_name)}.#{connection.quote_table_name(timestamp_column)}
               AT TIME ZONE 'UTC' ) AT TIME ZONE #{connection.quote(pg_timezone)}
             - memberships.start_date ) ) / 604800 ) + 1
           )::int AS week, COUNT(1)

data/app/models/media_access_event.rb

@@ -6,7 +6,7 @@ class MediaAccessEvent < ActiveRecord::Base
   belongs_to :slide,
              class_name: "BitCore::Slide",
              foreign_key: :bit_core_slide_id
-  validates :media_type, inclusion: { in: ["audio", "video"] }
+  validates :media_type, inclusion: { in: %w(audio video) }
   validates :media_link,
             :participant,
             :slide,

data/app/models/message_sms_notification.rb

@@ -41,9 +41,7 @@ class MessageSmsNotification
       body: body
     }
 
-    if status_callback_url
-      params[:status_callback] = status_callback_url
-    end
+    params[:status_callback] = status_callback_url if status_callback_url
 
     params
   end

data/app/models/participant.rb

@@ -119,19 +119,19 @@ class Participant < ActiveRecord::Base
   end
 
   def populate_emotions
-    emotions_array = [
-      "Anxious",
-      "Enthusiastic",
-      "Grateful",
-      "Happy",
-      "Irritable",
-      "Upset",
-      "Sad",
-      "Guilty",
-      "Calm",
-      "Concentrated",
-      "Relaxed"
-    ]
+    emotions_array = %w(
+      Anxious
+      Enthusiastic
+      Grateful
+      Happy
+      Irritable
+      Upset
+      Sad
+      Guilty
+      Calm
+      Concentrated
+      Relaxed
+    )
     emotions_array.each do |e|
       emotions.find_or_create_by(name: e)
     end
@@ -162,7 +162,7 @@ class Participant < ActiveRecord::Base
   end
 
   def current_group
-    active_membership.group
+    active_membership.try(:group)
   end
 
   def fetch_data_record(association, id)
@@ -257,21 +257,17 @@ class Participant < ActiveRecord::Base
   end
 
   def positive_emotions(emotion_array)
-    emotions = emotion_array.collect do |emotion|
-      if emotion.is_positive
-        [emotion.rating, emotion.created_at, emotion.name]
-      end
-    end
-    emotions.compact
+    emotion_array.collect do |emotion|
+      [emotion.rating, emotion.created_at, emotion.name] if emotion.is_positive
+    end.compact
   end
 
   def negative_emotions(emotion_array)
-    emotions = emotion_array.collect do |emotion|
+    emotion_array.collect do |emotion|
       unless emotion.is_positive
         [emotion.rating, emotion.created_at, emotion.name]
       end
-    end
-    emotions.compact
+    end.compact
   end
 
   def most_recent_membership

data/app/models/phq_stepping.rb

@@ -151,9 +151,8 @@ class PhqStepping
   end
 
   def filter_assessments(start)
-    if start == @week
-      start -= 1
-    end
+    start -= 1 if start == @week
+
     @assessments.select! do |assessment|
       assessment.week_of_assessment.to_i >= start &&
         assessment.week_of_assessment.to_i <= @week

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

@@ -3,7 +3,7 @@ module ThinkFeelDoEngine
   module Reports
     # Shared Lesson Module behavior.
     module LessonModule
-      URL_ROOT_RE = /^[^\/]*\/\/[^\/]+/
+      URL_ROOT_RE = %r{^[^\/]*\/\/[^\/]+}
       # Disabling method length due to nested methods.
       # rubocop:disable Metrics/MethodLength,Lint/NestedMethodDefinition
       def self.included(klass)

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

@@ -69,7 +69,7 @@ module ThinkFeelDoEngine
           .order(:emitted_at)
           .to_a.map do |e|
             key = lessons.keys.find do |l|
-              !e.current_url.match(/#{ l }(\/.*)?$/).nil?
+              !e.current_url.match(%r{#{ l }(\/.*)?$}).nil?
             end
 
             key ? [lessons[key], e] : nil
@@ -88,11 +88,11 @@ module ThinkFeelDoEngine
       end
 
       def self.find_slide_by_url(slides, url)
-        slide_position = 1
-
-        if url.match(/modules\/\d+$/).nil?
-          slide_position = url[/\d+$/].to_i
-        end
+        slide_position = if url.match(%r{modules\/\d+$}).nil?
+                           url[/\d+$/].to_i
+                         else
+                           1
+                         end
 
         slides.find_by_position(slide_position) unless slides.empty?
       end

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

@@ -5,7 +5,7 @@ module ThinkFeelDoEngine
     class LessonViewing
       include LessonModule
 
-      DEFAULT_LESSON_MODULE_POSTFIX = /\/providers\/.*/
+      DEFAULT_LESSON_MODULE_POSTFIX = %r{\/providers\/.*}
 
       def self.columns
         %w( participant_id lesson_id page_headers lesson_selected_at

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

@@ -38,7 +38,7 @@ module ThinkFeelDoEngine
           .select(:participant_id, :emitted_at, :payload)
           .to_a.map do |e|
             key = modules.keys.find do |l|
-              !e.current_url.match(/#{ l }(\/.*)?$/).nil?
+              !e.current_url.match(%r{#{ l }(\/.*)?$}).nil?
             end
 
             key ? [modules[key], e] : nil

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

@@ -88,7 +88,7 @@ module ThinkFeelDoEngine
           .drop_while { |e| e.id != first_session_event.id }
           .take_while do |e|
             e.emitted_at - latest_event_time < THRESHOLD &&
-              e.current_url.match(/modules\/#{ module_id }(\/.*)?$/) &&
+              e.current_url.match(%r{modules\/#{ module_id }(\/.*)?$}) &&
               (latest_event_time = e.emitted_at)
           end
         last_event = (module_events.last || first_session_event)

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

@@ -4,7 +4,7 @@ module ThinkFeelDoEngine
     # Helper methods for reporting on modules.
     # rubocop:disable Lint/NestedMethodDefinition
     module ToolModule
-      URL_ROOT_RE = /^[^\/]*\/\/[^\/]+/
+      URL_ROOT_RE = %r{^[^\/]*\/\/[^\/]+}
 
       def self.included(klass)
         class << klass

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

@@ -11,7 +11,7 @@ module ThinkFeelDoEngine
       def self.all
         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+)$/)
+            m = e.current_url.match(%r{.*\/providers\/(\d+)\/(\d+)$})
             provider_id = m ? m[1] : -1
             position = m ? m[2] : -1
             video = BitCore::ContentProvider

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

@@ -13,10 +13,18 @@
   <%= render "weekly_counts", klass: GroupMetrics::WeeklyThoughtsCount, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
-  <td><a href="#activities_past_table">activities past</a></td>
-  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.in_the_past, group_id: group.id, weeks: study_length_in_weeks %>
+  <td><a href="#activities_future_table">activities monitored</a></td>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.monitored, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
-  <td><a href="#activities_future_table">activities future</a></td>
-  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.unscheduled_or_in_the_future, group_id: group.id, weeks: study_length_in_weeks %>
+  <td><a href="#activities_past_table">activities planned</a></td>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.planned, group_id: group.id, weeks: study_length_in_weeks %>
+</tr>
+<tr>
+  <td><a href="#activities_future_table">activities reviewed and complete</a></td>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.reviewed_and_complete, group_id: group.id, weeks: study_length_in_weeks %>
+</tr>
+<tr>
+  <td><a href="#activities_future_table">activities reviewed and incomplete</a></td>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.reviewed_and_incomplete, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>

data/lib/think_feel_do_engine/version.rb

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

metadata

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