think_feel_do_engine 3.18.0 → 3.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 248328db1d28d096496e611d71c7d38ca0973c7c
-  data.tar.gz: bab9c20b14380eb6a3fdf3ac120ba369b591025e
+  metadata.gz: de032421673efdc9d72b69a4d3d521507a88247c
+  data.tar.gz: f40b0c0509e23bb16a22a3d39bc9190f88140caa
 SHA512:
-  metadata.gz: 09d990df0b6015ef3e3c5d7061eff9c0d901f99d43bdd210975fcd4d480f342aa43ac9e9b828faf38894070334f8956f12b392882eec1a0ec9823531d6ca1b28
-  data.tar.gz: 1c3c09c80590ccf1966a11f4ab71b2894fcb1922176bf8bbc797c2d08de6da410608546984e2cea89ca7247fd0c6d8827afa511680db1b0c984b32506863b80d
+  metadata.gz: 2da3064e7e903cfbb7e3c5ab36470877b7fd187f5dc3bba00a1467da76d048a3afc1576bcc7bbd4252becf2b3e39a35e1c39925aa9c74f1deaba3deb023ea407
+  data.tar.gz: b7492b5eeda1ed6fb273813d86252a0949215229a7688b2499318180bbe03464132fb3a1f8f29304ee5c8b6bd7145ed656dbb41bca5cf620047d8bc838ea65a8

data/app/assets/javascripts/think_feel_do_engine/feel/draw_graphs.js

@@ -25,6 +25,9 @@
         .call(columnChart(graphParameters.startDate, graphParameters.endDate, Y_MIN, Y_MAX, GRAPH_TITLE, YLABEL)
           .width(graphParameters.graphWidth)
           .height(PIXEL_HEIGHT)
+          .x(function(date, i) {
+            return moment(date.day, 'YYYY-MM-DD').startOf('day').toDate();
+          })
           .drawLegend(LEGEND_DIV_ID, LEGEND, ['*Click each day for more information.']));
   };
 
@@ -44,6 +47,9 @@
         .call(columnChart(graphParameters.startDate, graphParameters.endDate, Y_MIN, Y_MAX, GRAPH_TITLE, YLABEL)
           .width(graphParameters.graphWidth)
           .height(PIXEL_HEIGHT)
+          .x(function(date, i) {
+            return moment(date.day, 'YYYY-MM-DD').startOf('day').toDate();
+          })
           .y(function(date, i) {
             return date.intensity;
           })

data/app/controllers/think_feel_do_engine/application_controller.rb

@@ -13,13 +13,15 @@ module ThinkFeelDoEngine
     INACTIVE_MESSAGE = "We're sorry, but you can't sign in yet "\
               "because you are not assigned to an active group."
 
-    protect_from_forgery with: :exception
+    protect_from_forgery with: :exception, except: :raise_not_found!
 
     before_action :detect_browser, :verify_active_membership
     after_action :set_csrf_cookie_for_ng
 
     layout "application"
 
+    rescue_from ActionController::RoutingError, with: :render_not_found
+
     def after_sign_in_path_for(resource)
       if resource.class == User
         if defined?(think_feel_do_dashboard)
@@ -57,6 +59,17 @@ module ThinkFeelDoEngine
       end
     end
 
+    # Called by last route matching unmatched routes. Raises an exception that
+    # is expected to be rescued.
+    def raise_not_found!
+      fail ActionController::RoutingError,
+           "No route matches #{params[:unmatched_route]}"
+    end
+
+    def render_not_found(_)
+      render file: "#{Rails.root}/public/404.html",  status: 404
+    end
+
     protected
 
     def verified_request?

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

@@ -19,7 +19,7 @@ module ThinkFeelDoEngine
       end
 
       def new
-        @participants = current_user.participants_for_group(@group)
+        set_participants
         redirect_to(coach_group_site_messages_path(@group),
                     alert: "A group must have participants in order "\
                             " to send site message.") if @participants.empty?
@@ -27,11 +27,12 @@ module ThinkFeelDoEngine
 
       def create
         if @site_message.save
-          SiteMessageMailer.general(@site_message).deliver
+          SiteMessageMailer.general(@site_message).deliver_now
 
           redirect_to coach_group_site_message_path(@group, @site_message),
                       notice: "Site message was successfully created."
         else
+          set_participants
           render :new
         end
       end
@@ -49,6 +50,10 @@ module ThinkFeelDoEngine
       def set_group
         @group = Group.find(params[:group_id])
       end
+
+      def set_participants
+        @participants = current_user.participants_for_group(@group)
+      end
     end
   end
 end

data/app/controllers/think_feel_do_engine/manage/tasks_controller.rb

@@ -29,14 +29,16 @@ module ThinkFeelDoEngine
       def destroy
         authorize! :destroy, @task
         group = @task.group
-        if @task.destroy
+        if @task.complete_participant_list.present?
+          flash.now[:alert] = "Unable to delete task from group: "\
+          "at least one related task status is complete."
+        elsif @task.destroy
           flash.now[:success] = "Task unassigned from group."
-          redirect_to arm_manage_tasks_group_path(group.arm, group)
         else
           errors = @task.errors.full_messages.join(", ")
           flash[:error] = "Unable to delete task from group: #{ errors }"
-          redirect_to arm_manage_tasks_group_path(group.arm, group)
         end
+        redirect_to arm_manage_tasks_group_path(group.arm, group)
       end
 
       private

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

@@ -145,10 +145,10 @@ module ThinkFeelDoEngine
       private
 
       def week_of_task(task)
-        if (task.task_statuses.first.start_day / 7.0).ceil == 0
+        if (task.release_day / 7.0).ceil == 0
           1
         else
-          (task.task_statuses.first.start_day / 7.0).ceil
+          (task.release_day / 7.0).ceil
         end
       end
     end

data/app/models/arm.rb

@@ -38,7 +38,7 @@ class Arm < ActiveRecord::Base
   end
 
   def non_home_tools
-    tools = Arel::Table.new(:bit_core_tools)
+    tools = BitCore::Tool.arel_table
     bit_core_tools
       .where(tools[:type].eq(nil)
         .or(tools[:type].not_eq("Tools::Home"))

data/app/models/content_providers/index_past_feel_provider.rb

@@ -7,12 +7,16 @@ module ContentProviders
 
     def render_current(options)
       participant = options.view_context.current_participant
+      visualization_service = MoodAndEmotionVisualizationService
+                              .new(participant)
 
       options.view_context.render(
         template: "think_feel_do_engine/emotions/index",
         locals: {
-          emotional_ratings: participant.emotional_rating_daily_averages,
-          mood_ratings: participant.mood_rating_daily_averages
+          emotional_ratings: visualization_service
+                               .emotional_rating_daily_averages,
+          mood_ratings: visualization_service
+                          .mood_rating_daily_averages
         }
       )
     end

data/app/models/delivered_message.rb

@@ -15,7 +15,7 @@ class DeliveredMessage < ActiveRecord::Base
   scope :sent_from, lambda { |sender_id|
     joins(:message)
       .where(
-        Arel::Table.new(:messages)[:sender_id]
+        Message.arel_table[:sender_id]
         .eq(sender_id)
       )
   }

data/app/models/group.rb

@@ -23,112 +23,11 @@ class Group < ActiveRecord::Base
     tasks
       .joins(:bit_core_content_module)
       .where(
-        Arel::Table.new(:bit_core_content_modules)[:type]
+        BitCore::ContentModule.arel_table[:type]
         .eq("ContentModules::LessonModule")
       )
   end
 
-  def logins_by_week(week_number)
-    non_moderator_memberships.map do |membership|
-      membership
-        .logins_by_week(week_number)
-    end.inject(:+)
-  end
-
-  def thoughts_by_week(week_number)
-    thoughts = Arel::Table.new(:thoughts)
-
-    non_moderator_memberships.map do |membership|
-      membership
-        .participant
-        .thoughts
-        .where(thoughts[:created_at]
-          .gteq(membership.week_start_day(week_number)))
-        .where(thoughts[:created_at]
-          .lt(membership.week_end_day(week_number)))
-    end.map(&:count).sum
-  end
-
-  def activities_past_by_week(week_number)
-    activities = Arel::Table.new(:activities)
-
-    non_moderator_memberships.map do |membership|
-      membership
-        .participant
-        .activities
-        .in_the_past
-        .where(activities[:start_time]
-          .gteq(membership.week_start_day(week_number)))
-    end.map(&:count).sum
-  end
-
-  def activities_future_by_week(week_number)
-    activities = Arel::Table.new(:activities)
-
-    non_moderator_memberships.map do |membership|
-      membership
-        .participant
-        .activities
-        .unscheduled_or_in_the_future
-        .where(activities[:start_time]
-          .lt(membership.week_end_day(week_number)))
-    end.map(&:count).sum
-  end
-
-  def goals_by_week(week_number)
-    social_networking_goals = Arel::Table.new(:social_networking_goals)
-
-    non_moderator_memberships.map do |membership|
-      SocialNetworking::Goal
-        .where(participant: membership.participant)
-        .where(social_networking_goals[:created_at]
-                 .gteq(membership.week_start_day(week_number)))
-        .where(social_networking_goals[:created_at]
-                 .lt(membership.week_end_day(week_number)))
-    end.map(&:count).sum
-  end
-
-  def comments_by_week(week_number)
-    social_networking_comments = Arel::Table.new(:social_networking_comments)
-
-    non_moderator_memberships.map do |membership|
-      SocialNetworking::Comment
-        .where(participant: membership.participant)
-        .where(social_networking_comments[:created_at]
-                 .gteq(membership.week_start_day(week_number)))
-        .where(social_networking_comments[:created_at]
-                 .lt(membership.week_end_day(week_number)))
-    end.map(&:count).sum
-  end
-
-  def on_the_mind_statements_by_week(week_number)
-    social_networking_on_the_mind_statements =
-      Arel::Table.new(:social_networking_on_the_mind_statements)
-
-    non_moderator_memberships.map do |membership|
-      SocialNetworking::OnTheMindStatement
-        .where(participant: membership.participant)
-        .where(social_networking_on_the_mind_statements[:created_at]
-                 .gteq(membership.week_start_day(week_number)))
-        .where(social_networking_on_the_mind_statements[:created_at]
-                 .lt(membership.week_end_day(week_number)))
-    end.map(&:count).sum
-  end
-
-  def likes_by_week(week_number)
-    social_networking_likes =
-      Arel::Table.new(:social_networking_likes)
-
-    non_moderator_memberships.map do |membership|
-      SocialNetworking::Like
-        .where(participant: membership.participant)
-        .where(social_networking_likes[:created_at]
-                 .gteq(membership.week_start_day(week_number)))
-        .where(social_networking_likes[:created_at]
-                 .lt(membership.week_end_day(week_number)))
-    end.map(&:count).sum
-  end
-
   def non_moderator_memberships
     memberships.joins(:participant)
       .merge(Participant.not_moderator)

data/app/models/group_metrics/weekly_activities_count.rb

@@ -0,0 +1,20 @@
+module GroupMetrics
+  # Tabulate count of Activities (within a study week) for a Group.
+  class WeeklyActivitiesCount < WeeklyCount
+    self.table_name = "activities"
+
+    scope :in_the_past, lambda {
+      where arel_table[:end_time].lt(Time.zone.now)
+    }
+
+    # 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 {
+      where(
+        arel_table[:start_time].eq(nil)
+        .or(arel_table[:end_time].gt(Time.zone.now))
+      )
+    }
+  end
+end

data/app/models/group_metrics/weekly_comments_count.rb

@@ -0,0 +1,12 @@
+module GroupMetrics
+  # Tabulate count of Comments within a study week for a Group.
+  class WeeklyCommentsCount < WeeklyCount
+    self.table_name = "social_networking_comments"
+
+    def self.fetch(group_id)
+      return {} unless ActiveRecord::Base.connection.table_exists?(table_name)
+
+      super
+    end
+  end
+end

data/app/models/group_metrics/weekly_count.rb

@@ -0,0 +1,35 @@
+module GroupMetrics
+  # Tabulate count of records (within a study week) for a Group.
+  class WeeklyCount < ActiveRecord::Base
+    self.abstract_class = true
+
+    has_many :memberships,
+             foreign_key: :participant_id,
+             primary_key: :participant_id
+
+    def self.fetch(group_id)
+      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
+              AT TIME ZONE 'UTC' ) AT TIME ZONE #{connection.quote(pg_timezone)}
+            - memberships.start_date ) ) / 604800 ) + 1
+          )::int AS week, COUNT(1)
+        SQL
+        )
+        .merge(Participant.not_moderator)
+        .merge(Membership.where(group_id: group_id))
+        .group(:week)
+    end
+
+    def week
+      attributes["week"]
+    end
+
+    def count
+      attributes["count"]
+    end
+  end
+end

data/app/models/group_metrics/weekly_goals_count.rb

@@ -0,0 +1,12 @@
+module GroupMetrics
+  # Tabulate count of Goals within a study week for a Group.
+  class WeeklyGoalsCount < WeeklyCount
+    self.table_name = "social_networking_goals"
+
+    def self.fetch(group_id)
+      return {} unless ActiveRecord::Base.connection.table_exists?(table_name)
+
+      super
+    end
+  end
+end

data/app/models/group_metrics/weekly_likes_count.rb

@@ -0,0 +1,12 @@
+module GroupMetrics
+  # Tabulate count of Likes within a study week for a Group.
+  class WeeklyLikesCount < WeeklyCount
+    self.table_name = "social_networking_likes"
+
+    def self.fetch(group_id)
+      return {} unless ActiveRecord::Base.connection.table_exists?(table_name)
+
+      super
+    end
+  end
+end

data/app/models/group_metrics/weekly_logins_count.rb

@@ -0,0 +1,6 @@
+module GroupMetrics
+  # Tabulate count of Logins (within a study week) for a Group.
+  class WeeklyLoginsCount < WeeklyCount
+    self.table_name = "participant_login_events"
+  end
+end

data/app/models/group_metrics/weekly_on_the_mind_statements_count.rb

@@ -0,0 +1,12 @@
+module GroupMetrics
+  # Tabulate count of OnTheMindStatements within a study week for a Group.
+  class WeeklyOnTheMindStatementsCount < WeeklyCount
+    self.table_name = "social_networking_on_the_mind_statements"
+
+    def self.fetch(group_id)
+      return {} unless ActiveRecord::Base.connection.table_exists?(table_name)
+
+      super
+    end
+  end
+end

data/app/models/group_metrics/weekly_thoughts_count.rb

@@ -0,0 +1,6 @@
+module GroupMetrics
+  # Tabulate count of Thoughts (within a study week) for a Group.
+  class WeeklyThoughtsCount < WeeklyCount
+    self.table_name = "thoughts"
+  end
+end

data/app/models/membership.rb

@@ -107,7 +107,7 @@ class Membership < ActiveRecord::Base
   end
 
   def logins_by_week(week_number)
-    participant_login_events = Arel::Table.new(:participant_login_events)
+    participant_login_events = ParticipantLoginEvent.arel_table
     participant
       .participant_login_events
       .where(participant_login_events[:created_at]
@@ -118,7 +118,7 @@ class Membership < ActiveRecord::Base
   end
 
   def logins_today
-    participant_login_events = Arel::Table.new(:participant_login_events)
+    participant_login_events = ParticipantLoginEvent.arel_table
     participant
       .participant_login_events
       .where(participant_login_events[:created_at]

data/app/models/participant.rb

@@ -77,7 +77,7 @@ class Participant < ActiveRecord::Base
   scope :stepped, lambda {
     joins(:memberships)
       .where(
-        Arel::Table.new(:memberships)[:stepped_on]
+        Membership.arel_table[:stepped_on]
         .not_eq(nil)
       )
   }
@@ -85,7 +85,7 @@ class Participant < ActiveRecord::Base
   scope :not_stepped, lambda {
     joins(:memberships)
       .where(
-        Arel::Table.new(:memberships)[:stepped_on]
+        Membership.arel_table[:stepped_on]
         .eq(nil)
       )
   }
@@ -253,10 +253,6 @@ class Participant < ActiveRecord::Base
     "sms" == contact_preference || "phone" == contact_preference
   end
 
-  def average_rating(array)
-    array.reduce(0) { |a, e| a.to_f + e[0] } / array.size
-  end
-
   def positive_emotions(emotion_array)
     emotions = emotion_array.collect do |emotion|
       if emotion.is_positive
@@ -279,37 +275,6 @@ class Participant < ActiveRecord::Base
     memberships.order(end_date: :desc).first
   end
 
-  def emotional_rating_daily_averages
-    averaged_ratings = []
-
-    daily_ratings = emotional_ratings.group_by(&:created_at)
-    # rubocop:disable all
-    daily_ratings.each do |day, emotion_array|
-    # rubocop:enable all
-      positive_ratings = positive_emotions(emotion_array)
-      if positive_ratings.size > 0
-        daily_positive = { day: day,
-                           intensity: average_rating(positive_ratings),
-                           is_positive: true,
-                           drill_down: positive_ratings,
-                           data_type: "Emotion"
-                         }
-        averaged_ratings << daily_positive
-      end
-      negative_ratings = negative_emotions(emotion_array)
-      if negative_ratings.size > 0
-        daily_negative = {  day: day,
-                            intensity: average_rating(negative_ratings),
-                            is_positive: false,
-                            drill_down: negative_ratings,
-                            data_type: "Emotion"
-                         }
-        averaged_ratings << daily_negative
-      end
-    end
-    averaged_ratings
-  end
-
   def in_study?
     if active_membership.start_date <= Date.today &&
        active_membership.end_date >= Date.today
@@ -319,27 +284,6 @@ class Participant < ActiveRecord::Base
     end
   end
 
-  def mood_rating_daily_averages
-    averaged_ratings = []
-    daily_ratings = moods.group_by(&:created_at)
-    # rubocop:disable all
-    daily_ratings.each do |day, moods_array|
-    # rubocop:enable all
-      ratings = moods_array.collect do |mood|
-        [mood.rating, mood.created_at].compact
-      end
-      if ratings.size > 0
-        averaged_ratings << { day: day,
-                              intensity: average_rating(ratings),
-                              is_positive: true,
-                              drill_down: ratings,
-                              data_type: "Mood"
-                            }
-      end
-    end
-    averaged_ratings
-  end
-
   private
 
   def recent_awake_period

data/app/models/participant_metrics/weekly_count.rb

@@ -0,0 +1,39 @@
+module ParticipantMetrics
+  # Calculate weekly (by enrollment week) of records.
+  class WeeklyCount < ActiveRecord::Base
+    self.abstract_class = true
+
+    has_many :memberships,
+             foreign_key: :participant_id,
+             primary_key: :participant_id
+
+    def self.fetch(group_id)
+      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
+              AT TIME ZONE 'UTC' ) AT TIME ZONE #{connection.quote(pg_timezone)}
+            - memberships.start_date ) ) / 604800 ) + 1
+          )::int AS week, memberships.participant_id, COUNT(1)
+        SQL
+        )
+        .merge(Participant.not_moderator)
+        .merge(Membership.where(group_id: group_id))
+        .group("week, memberships.participant_id")
+    end
+
+    def week
+      attributes["week"]
+    end
+
+    def participant_id
+      attributes["participant_id"]
+    end
+
+    def count
+      attributes["count"]
+    end
+  end
+end

data/app/models/participant_metrics/weekly_logins_count.rb

@@ -0,0 +1,6 @@
+module ParticipantMetrics
+  # Tabulate count of Logins within a study week for a Participant.
+  class WeeklyLoginsCount < WeeklyCount
+    self.table_name = "participant_login_events"
+  end
+end

data/app/models/task.rb

@@ -23,7 +23,7 @@ class Task < ActiveRecord::Base
   scope :learning, lambda {
     joins(:bit_core_content_module)
       .where(
-        Arel::Table.new(:bit_core_content_modules)[:type]
+        BitCore::ContentModule.arel_table[:type]
         .eq("ContentModules::LessonModule")
       )
   }

data/app/models/task_status.rb

@@ -37,7 +37,7 @@ class TaskStatus < ActiveRecord::Base
   scope :for_learning, lambda {
     joins(:task, task: :bit_core_content_module)
       .where(
-        Arel::Table.new(:bit_core_content_modules)[:type]
+        BitCore::ContentModule.arel_table[:type]
         .eq(LESSON_MODULE_TYPE))
   }
 
@@ -56,7 +56,7 @@ class TaskStatus < ActiveRecord::Base
   }
 
   scope :not_terminated_by_day, lambda { |day_in_study|
-    tasks = Arel::Table.new(:tasks)
+    tasks = Task.arel_table
     joins(:task)
       .where(
         tasks[:termination_day].eq(nil)

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

@@ -12,7 +12,7 @@ module ThinkFeelDoEngine
         Participant.not_moderator.select(:id, :study_id).map do |participant|
           user_agents = EventCapture::Event
                         .where(participant_id: participant.id)
-                        .map { |event| event.payload[:ua] }
+                        .map { |event| event.payload["ua"] }
                         .uniq
 
           user_agents.map do |agent|

data/app/support/mood_and_emotion_visualization_service.rb

@@ -0,0 +1,66 @@
+# Grouping logic for the visualization of participant mood and emotion data.
+class MoodAndEmotionVisualizationService
+  def initialize(participant)
+    @participant = participant
+  end
+
+  def mood_rating_daily_averages
+    averaged_ratings = []
+    daily_ratings = @participant
+                    .moods
+                    .group_by { |x| x.created_at.strftime("%Y-%m-%d") }
+    # rubocop:disable all
+    daily_ratings.each do |day, moods_array|
+      # rubocop:enable all
+      ratings = moods_array.collect do |mood|
+        [mood.rating, mood.created_at].compact
+      end
+      if ratings.size > 0
+        averaged_ratings << { day: day,
+                              intensity: average_rating(ratings),
+                              is_positive: true,
+                              drill_down: ratings,
+                              data_type: "Mood"
+        }
+      end
+    end
+    averaged_ratings
+  end
+
+  def emotional_rating_daily_averages
+    averaged_ratings = []
+
+    daily_ratings = @participant.emotional_ratings
+                    .group_by { |x| x.created_at.strftime("%Y-%m-%d") }
+    # rubocop:disable all
+    daily_ratings.each do |day, emotion_array|
+      # rubocop:enable all
+      positive_ratings = @participant.positive_emotions(emotion_array)
+      if positive_ratings.size > 0
+        daily_positive = { day: day,
+                           intensity: average_rating(positive_ratings),
+                           is_positive: true,
+                           drill_down: positive_ratings,
+                           data_type: "Emotion"
+        }
+        averaged_ratings << daily_positive
+      end
+      negative_ratings = @participant.negative_emotions(emotion_array)
+      if negative_ratings.size > 0
+        daily_negative = {  day: day,
+                            intensity: average_rating(negative_ratings),
+                            is_positive: false,
+                            drill_down: negative_ratings, data_type: "Emotion"
+        }
+        averaged_ratings << daily_negative
+      end
+    end
+    averaged_ratings
+  end
+
+  private
+
+  def average_rating(array)
+    array.reduce(0) { |a, e| a.to_f + e[0] } / array.size
+  end
+end

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

@@ -26,7 +26,7 @@
           </thead>
           <tbody>
 
-          <% group.non_moderator_memberships.each do |membership| %>
+          <% group.non_moderator_memberships.includes(participant: :activities).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.non_moderator_memberships.each do |membership| %>
+          <% group.non_moderator_memberships.includes(participant: :activities).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/_lessons.html.erb

@@ -4,10 +4,11 @@
   </div>
 
   <div class="panel-body">
+    <% tasks = group.learning_tasks %>
     <% (1..study_length_in_weeks).each do |week_number| %>
       <h2>Week <%= week_number %></h2>
       <table class="table">
-        <% group.learning_tasks.each do |task| %>
+        <% tasks.each do |task| %>
           <% if week_number == week_of_task(task) %>
             <%= render partial: "think_feel_do_engine/coach/group_dashboard/learning_lesson_row",
                        collection: task.bit_core_content_module.content_providers,
@@ -18,4 +19,4 @@
       </table>
     <% end %>
   </div>
-</div>
+</div>

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

@@ -11,14 +11,15 @@
           <th>week <%= current_week %></th>
         <% end %>
       </tr>
+      <% counts = ParticipantMetrics::WeeklyLoginsCount.fetch(group.id).map { |l| [[l.participant_id, l.week], l.count] }.to_h %>
       <% group.non_moderator_memberships.each do | membership | %>
         <tr>
           <td><%= membership.participant.display_name %></td>
           <% (1..study_length_in_weeks).each do |current_week| %>
-            <td><%= membership.logins_by_week(current_week) %></td>
+            <td><%= counts[[membership.participant_id, current_week]] || 0 %></td>
           <% end %>
         </tr>
       <% end %>
     </table>
   </div>
-</div>
+</div>

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

@@ -6,25 +6,17 @@
 </tr>
 <tr>
   <td><a href="#login_table">logins</a></td>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.logins_by_week(current_week) %></td>
-  <% end %>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyLoginsCount, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
   <td><a href="#thoughts_table">thoughts</a></td>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.thoughts_by_week(current_week) %></td>
-  <% end %>
+  <%= 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>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.activities_past_by_week(current_week) %></td>
-  <% end %>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.in_the_past, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
   <td><a href="#activities_future_table">activities future</a></td>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.activities_future_by_week(current_week) %></td>
-  <% end %>
-</tr>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyActivitiesCount.unscheduled_or_in_the_future, group_id: group.id, weeks: study_length_in_weeks %>
+</tr>

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

@@ -1,24 +1,16 @@
 <tr>
   <td><a href="#on_the_mind_statements_table">on the mind statements</a></td>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.on_the_mind_statements_by_week(current_week) %></td>
-  <% end %>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyOnTheMindStatementsCount, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
   <td><a href="#comments_table">comments</a></td>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.comments_by_week(current_week) %></td>
-  <% end %>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyCommentsCount, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
   <td><a href="#goals_table">goals</a></td>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.goals_by_week(current_week) %></td>
-  <% end %>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyGoalsCount, group_id: group.id, weeks: study_length_in_weeks %>
 </tr>
 <tr>
   <td><a href="#likes_table">likes</a></td>
-  <% (1..study_length_in_weeks).each do |current_week| %>
-    <td><%= group.likes_by_week(current_week) %></td>
-  <% end %>
-</tr>
+  <%= render "weekly_counts", klass: GroupMetrics::WeeklyLikesCount, group_id: group.id, weeks: study_length_in_weeks %>
+</tr>

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

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

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

@@ -0,0 +1,4 @@
+<% counts_by_week = klass.fetch(group_id).map { |c| [c.week, c.count] }.to_h %>
+<% (1..study_length_in_weeks).each do |current_week| %>
+  <td><%= counts_by_week[current_week] || 0 %></td>
+<% end %>

data/app/views/think_feel_do_engine/coach/patient_dashboards/_vizs.html.erb

@@ -28,8 +28,8 @@
   // starting graph parameters assume 7 day view ending in today
   var activationDate = activation("<%= patient.created_at %>")
   var graphParameters = new Graph(
-        <%= sanitize(patient.mood_rating_daily_averages.to_json) %>,
-        <%= sanitize(patient.emotional_rating_daily_averages.to_json) %>,
+        <%= sanitize(MoodAndEmotionVisualizationService.new(patient).mood_rating_daily_averages.to_json) %>,
+        <%= sanitize(MoodAndEmotionVisualizationService.new(patient).emotional_rating_daily_averages.to_json) %>,
         <%= phq_features? ? sanitize(patient.phq_scores.to_json) : "null" %>,
         $("div#viz-container")
       );

data/config/initializers/event_capture.rb

@@ -1,43 +1,60 @@
 require "event_capture/events_controller"
-
-# Augment/override behavior.
-class EventCapture::EventsController
-  before_action :authenticate_participant!
-
-  def event_params
-    {
-      kind: params[:kind],
-      payload: params[:payload].merge(remote_ip: request.remote_ip),
-      emitted_at: params[:emittedAt],
-      participant_id: current_participant.id
-    }
-  end
-end
-
 require "event_capture/event"
 
-class EventCapture::Event
-  belongs_to :participant
-
-  def self.next_event_for(event)
-    where(participant_id: event.participant_id)
-    .where.not(kind: "videoPlay")
-    .where("emitted_at > ?", event.emitted_at)
-    .select(:participant_id, :kind, :emitted_at)
-    .order(:emitted_at)
-    .limit(1)
-    .first
-  end
-
-  def current_url
-    payload[:currentUrl]
-  end
-
-  def button_html
-    payload[:buttonHtml]
+module EventCapture
+  # Augment/override behavior.
+  class EventsController
+    before_action :authenticate_participant!
+
+    def event_params
+      {
+        kind: params[:kind],
+        payload: payload_params.to_h.merge(remote_ip: request.remote_ip),
+        emitted_at: params[:emittedAt],
+        participant_id: current_participant.id
+      }
+    end
+
+    private
+
+    # Permit payload parameters defined in
+    # app/assets/javascripts/think_feel_do_engine/event_capture/init.js
+    def payload_params
+      params.require(:payload).permit(
+        :currentUrl,
+        :headers,
+        :ua,
+        :buttonHtml,
+        :parentHtml,
+        :headers
+      )
+    end
   end
 
-  def headers
-    payload[:headers]
+  # Augment behavior.
+  class Event
+    belongs_to :participant
+
+    def self.next_event_for(event)
+      where(participant_id: event.participant_id)
+        .where.not(kind: "videoPlay")
+        .where("emitted_at > ?", event.emitted_at)
+        .select(:participant_id, :kind, :emitted_at)
+        .order(:emitted_at)
+        .limit(1)
+        .first
+    end
+
+    def current_url
+      payload["currentUrl"]
+    end
+
+    def button_html
+      payload["buttonHtml"]
+    end
+
+    def headers
+      payload["headers"]
+    end
   end
 end

data/config/routes.rb

@@ -41,8 +41,8 @@ ThinkFeelDoEngine::Engine.routes.draw do
         resources :slides do
           collection { post :sort }
         end
-        get 'create_table_of_contents', controller: :slides
-        get 'destroy_table_of_contents', controller: :slides
+        get "create_table_of_contents", controller: :slides
+        get "destroy_table_of_contents", controller: :slides
         resources :slideshow_anchors, only: [:create, :destroy]
       end
     end
@@ -85,7 +85,6 @@ ThinkFeelDoEngine::Engine.routes.draw do
   namespace :participants do
     resources :assessments, only: [:new, :create]
     resources :received_messages, only: :index
-    resources :task_status, only: [:update]
     get "public_slideshows/:slideshow_id/slides/:id", to: "public_slides#show", as: "public_slideshow_slide"
     resources :thoughts, only: :create
     resources :activities, only: [:create, :update]
@@ -102,6 +101,5 @@ ThinkFeelDoEngine::Engine.routes.draw do
   end
 
   # catch all for unrecognized routes
-  get "*unknown", to: redirect("/404")
-  post "*unknown", to: redirect("/404")
+  match "/(*unmatched_route)", to: "application#raise_not_found!", via: :all
 end

data/lib/tasks/lesson_notifications.rake

@@ -24,7 +24,7 @@ namespace :lesson_notifications do
                     participant_email: participant.email,
                     lesson_module: content_module,
                     application_name: application_name)
-                  .deliver
+                  .deliver_now
 
           next unless defined?(Raven)
           Raven.capture_message "failed to email lesson notification",

data/lib/think_feel_do_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.18.0
+  version: 3.19.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-25 00:00:00.000000000 Z
+date: 2016-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -500,6 +500,14 @@ files:
 - app/models/emotional_rating.rb
 - app/models/engagement.rb
 - app/models/group.rb
+- app/models/group_metrics/weekly_activities_count.rb
+- app/models/group_metrics/weekly_comments_count.rb
+- app/models/group_metrics/weekly_count.rb
+- app/models/group_metrics/weekly_goals_count.rb
+- app/models/group_metrics/weekly_likes_count.rb
+- app/models/group_metrics/weekly_logins_count.rb
+- app/models/group_metrics/weekly_on_the_mind_statements_count.rb
+- app/models/group_metrics/weekly_thoughts_count.rb
 - app/models/media_access_event.rb
 - app/models/membership.rb
 - app/models/message.rb
@@ -507,6 +515,8 @@ files:
 - app/models/mood.rb
 - app/models/participant.rb
 - app/models/participant_login_event.rb
+- app/models/participant_metrics/weekly_count.rb
+- app/models/participant_metrics/weekly_logins_count.rb
 - app/models/participant_token.rb
 - app/models/phq_assessment.rb
 - app/models/phq_stepping.rb
@@ -560,6 +570,7 @@ files:
 - app/presenters/think_feel_do_engine/harmful_thought_viz_presenter.rb
 - app/presenters/think_feel_do_engine/lesson_event/completion_data_presenter.rb
 - app/presenters/think_feel_do_engine/media_access_event_presenter.rb
+- app/support/mood_and_emotion_visualization_service.rb
 - app/views/devise/mailer/reset_password_instructions.html.erb
 - app/views/devise/passwords/edit.html.erb
 - app/views/devise/passwords/new.html.erb
@@ -632,6 +643,7 @@ files:
 - app/views/think_feel_do_engine/coach/group_dashboard/_summary.html.erb
 - app/views/think_feel_do_engine/coach/group_dashboard/_summary_social.html.erb
 - app/views/think_feel_do_engine/coach/group_dashboard/_thoughts.html.erb
+- app/views/think_feel_do_engine/coach/group_dashboard/_weekly_counts.html.erb
 - app/views/think_feel_do_engine/coach/group_dashboard/index.html.erb
 - app/views/think_feel_do_engine/coach/messages/index.html.erb
 - app/views/think_feel_do_engine/coach/messages/new.html.erb
@@ -975,7 +987,7 @@ 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.