think_feel_do_engine 3.19.6 → 3.19.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38fefce634cffdb4a6b618fbb51b9ae58c268eba
-  data.tar.gz: a7c064412e870d344ac4c2569bcd64c8cc8e7fb4
+  metadata.gz: ae2ac67360cf4936becc3201ca3116aa5a2746a6
+  data.tar.gz: 6014a2de830f98bd3a06736f46b528184bd8e185
 SHA512:
-  metadata.gz: f8c586eca19942ad7f3b8db29d306152afa3081c7b263cd011bf79bb8e2a0cc48691118295a0e0d9b85b6aed7e6836b97bf71e324f6a312ba66f7755640d9d99
-  data.tar.gz: d54b4c58324ce7950cfdc0797beaefd7b73a58d576e6e49d6fb1d4e79e276d7aa9432742be028d6e848f8a600c51becdca7e858fea5666174436b3d35eff8367
+  metadata.gz: ab49783f7ad4d0feaa1693cd618dcd4157eca182b13f51e2569a37f881f3e3f28fe8ea6917b61d1d5abab8928de922f2c35cbe9554625dd3aa1bec29adc45da1
+  data.tar.gz: 64611db3bd1672d9607c30d6fd26ecbe41647af500c1837ea23fa8ccae031b43e2aff6bc7523200b89cd0ef6ca299c1c1f60fd86961e80fd85b3cd44cb7c6610

data/app/controllers/think_feel_do_engine/bit_maker/content_providers_controller.rb

@@ -9,7 +9,7 @@ module ThinkFeelDoEngine
       before_action :authenticate_user!, :set_arm,
                     :set_content_modules, :set_slideshows
 
-      PROVIDER_NOT_FOUND = "The slide you are looking for no longer exists."
+      PROVIDER_NOT_FOUND = "Unable to find Content Provider"
 
       def index
         authorize! :index, BitCore::ContentProvider
@@ -18,14 +18,11 @@ module ThinkFeelDoEngine
 
       def show
         authorize! :show, BitCore::ContentProvider
-        begin
-          @content_provider = find_content_provider
-
-          if @content_provider.source_content_id
-            @slideshow = @content_provider.source_content
-          end
-        rescue ActiveRecord::RecordNotFound
-          redirect_to main_app.root_path, alert: PROVIDER_NOT_FOUND
+
+        @content_provider = find_content_provider
+        if @content_provider.is_a?(BitCore::ContentProvider) &&
+           @content_provider.source_content_id
+          @slideshow = @content_provider.source_content
         end
       end
 
@@ -92,6 +89,9 @@ module ThinkFeelDoEngine
 
       def find_content_provider
         ContentProviderDecorator.fetch(params[:id])
+      rescue ActiveRecord::RecordNotFound
+        redirect_to arm_bit_maker_content_providers_url(@arm),
+                    alert: PROVIDER_NOT_FOUND
       end
 
       def content_provider_params

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

@@ -30,13 +30,13 @@ module ThinkFeelDoEngine
         authorize! :destroy, @task
         group = @task.group
         if @task.complete_participant_list.present?
-          flash.now[:alert] = "Unable to delete task from group: "\
+          flash[: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."
+          flash[:success] = "Task unassigned from group."
         else
           errors = @task.errors.full_messages.join(", ")
-          flash[:error] = "Unable to delete task from group: #{ errors }"
+          flash[:alert] = "Unable to delete task from group: #{ errors }"
         end
         redirect_to arm_manage_tasks_group_path(group.arm, group)
       end

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

@@ -30,13 +30,13 @@ module ThinkFeelDoEngine
 
       def activities_planned_today(participant)
         participant
-          .activities.planned.created_for_day(Date.today).count +
+          .activities.planned.created_for_day(Time.zone.today).count +
           participant
             .activities
-            .reviewed_and_complete.created_for_day(Date.today).count +
+            .reviewed_and_complete.created_for_day(Time.zone.today).count +
           participant
             .activities
-            .reviewed_and_incomplete.created_for_day(Date.today).count
+            .reviewed_and_incomplete.created_for_day(Time.zone.today).count
       end
 
       def activities_planned_7_day(participant)

data/app/helpers/think_feel_do_engine/tasks_helper.rb

@@ -90,7 +90,7 @@ module ThinkFeelDoEngine
     end
 
     def name
-      icon.html_safe + " " +  available_module.title
+      icon.html_safe + " " + available_module.title
     end
 
     private

data/app/mailers/think_feel_do_engine/message_notifications.rb

@@ -5,7 +5,7 @@ module ThinkFeelDoEngine
       application_name = I18n.t(:application_name, default: "ThinkFeelDo")
       @group = group
       mail to:      coach.email,
-           subject: "#{application_name}: New message"
+           subject: "#{application_name}: You have a new message"
     end
 
     def new_for_participant(participant)
@@ -17,7 +17,7 @@ module ThinkFeelDoEngine
                       .find_by_type("Tools::Messages")
                       .title
       mail to:      participant.email,
-           subject: "#{application_name}: New message"
+           subject: "#{application_name}: You have a new message"
     end
   end
 end

data/app/models/arm.rb

@@ -22,7 +22,7 @@ class Arm < ActiveRecord::Base
           intervention utilizes social features or the \
           participant is currently enrolled in an arm that \
           requires a display name."
-        )
+      )
       false
     else
       true
@@ -42,6 +42,6 @@ class Arm < ActiveRecord::Base
     bit_core_tools
       .where(tools[:type].eq(nil)
         .or(tools[:type].not_eq("Tools::Home"))
-      )
+            )
   end
 end

data/app/models/concerns/accessibility.rb

@@ -2,7 +2,7 @@ module Concerns
   # Determines whether a participant can access a lesson
   module Accessibility
     def accessible?
-      available_for_learning_on <= Date.today
+      available_for_learning_on <= Time.zone.today
     end
 
     def available_for_learning_on

data/app/models/concerns/copier.rb

@@ -55,7 +55,8 @@ module Concerns
 
         def copy_content_modules_to(new_tool:)
           ContentModule.transaction do
-            content_modules.where(type: LESSON_MODULE).each do |content_module|
+            content_modules.where(type: LESSON_MODULE)
+              .find_each do |content_module|
               content_module.copy_content_providers_to(
                 new_tool: new_tool)
             end

data/app/models/content_providers/awake_period_form.rb

@@ -43,13 +43,15 @@ module ContentProviders
     def wake_up_range(last_awake_time)
       start_time = [
         # 1 hour after last going to sleep
-        last_awake_time ? (last_awake_time.end_time + 1.hour) : Time.at(0),
+        last_awake_time ? (last_awake_time.end_time + 1.hour) : Time.zone.at(0),
         # 12am yesterday
         (Time.current - 1.day).at_beginning_of_day
       ].max
       end_time = Time.current - 2.hours
 
-      (start_time.to_i..end_time.to_i).step(1.hour).to_a.map { |t| Time.at(t) }
+      (start_time.to_i..end_time.to_i).step(1.hour).to_a.map do |t|
+        Time.zone.at(t)
+      end
     end
 
     def go_to_sleep_range(last_awake_time)
@@ -57,11 +59,13 @@ module ContentProviders
         # 1am yesterday
         (Time.current - 1.day).at_beginning_of_day + 1.hour,
         # 2 hours after last going to sleep
-        last_awake_time ? (last_awake_time.end_time + 2.hours) : Time.at(0)
+        last_awake_time ? (last_awake_time.end_time + 2.hours) : Time.zone.at(0)
       ].max
       end_time = Time.current - 1.hour
 
-      (start_time.to_i..end_time.to_i).step(1.hour).to_a.map { |t| Time.at(t) }
+      (start_time.to_i..end_time.to_i).step(1.hour).to_a.map do |t|
+        Time.zone.at(t)
+      end
     end
   end
 end

data/app/models/content_providers/module_index_provider.rb

@@ -32,9 +32,9 @@ module ContentProviders
       AvailableContentModule
         .for_participant(options.participant)
         .for_tool(tool)
-        .available_by(Date.current)
+        .available_by(Time.zone.today)
         .excludes_module(bit_core_content_module_id)
-        .is_not_terminated_on(Date.current)
+        .is_not_terminated_on(Time.zone.today)
         .latest_duplicate
     end
   end

data/app/models/content_providers/show_message_provider.rb

@@ -51,10 +51,10 @@ module ContentProviders
 
       received_message =
         participant.received_messages
-        .where(message_id: view_context.params[:message_id]).first
+        .find_by(message_id: view_context.params[:message_id])
       sent_message =
         participant.messages
-        .where(id: view_context.params[:message_id]).first
+        .find_by(id: view_context.params[:message_id])
 
       received_message || sent_message
     end

data/app/models/content_providers/your_activities_provider.rb

@@ -78,14 +78,16 @@ module ContentProviders
 
     # dates with scheduled activities formatted for jquery datepicker
     def collect_dates_with_activities(options)
-      past_activities(options).where("start_time <= ?", Time.now)
+      past_activities(options).where("start_time <= ?", Time.zone.now)
         .uniq
         .map { |activity| activity.start_time.to_date.strftime("%Y-%m-%d") }
     end
 
     def local_time(options)
-      if options.view_context.params[:date]
-        options.view_context.params[:date].to_time
+      date = options.view_context.params[:date]
+
+      if date
+        Time.zone.parse(date)
       else
         Time.zone.now
       end

data/app/models/group_metrics/weekly_count.rb

@@ -18,7 +18,7 @@ module GroupMetrics
             - memberships.start_date ) ) / 604800 ) + 1
           )::int AS week, COUNT(1)
         SQL
-        )
+               )
         .merge(Participant.not_moderator)
         .merge(Membership.where(group_id: group_id))
         .group(:week)

data/app/models/media_access_event.rb

@@ -16,9 +16,9 @@ class MediaAccessEvent < ActiveRecord::Base
   def task_release_day(group)
     module_id = slide.slideshow.content_provider.bit_core_content_module_id
 
-    Task.where(
+    Task.find_by(
       bit_core_content_module_id: module_id,
       group_id: group.id
-    ).first.release_day
+    ).release_day
   end
 end

data/app/models/membership.rb

@@ -33,16 +33,16 @@ class Membership < ActiveRecord::Base
 
   scope :active, lambda {
     where(
-      arel_table[:start_date].lteq(Date.current)
-      .and(arel_table[:end_date].gteq(Date.current))
+      arel_table[:start_date].lteq(Time.zone.today)
+      .and(arel_table[:end_date].gteq(Time.zone.today))
       .or(arel_table[:is_complete].eq(true))
     )
   }
 
   scope :inactive, lambda {
     where(
-      arel_table[:start_date].gt(Date.current)
-      .or(arel_table[:end_date].lt(Date.current))
+      arel_table[:start_date].gt(Time.zone.today)
+      .or(arel_table[:end_date].lt(Time.zone.today))
     )
   }
 
@@ -80,7 +80,7 @@ class Membership < ActiveRecord::Base
   end
 
   def day_in_study(date = nil)
-    ((date || Date.current) - start_date).to_i + 1
+    ((date || Time.zone.today) - start_date).to_i + 1
   end
 
   def length_of_study
@@ -101,7 +101,7 @@ class Membership < ActiveRecord::Base
 
   def flag_complete
     self.is_complete = true
-    self.end_date = Date.yesterday
+    self.end_date = 1.day.ago
 
     save validate: false
   end
@@ -122,9 +122,9 @@ class Membership < ActiveRecord::Base
     participant
       .participant_login_events
       .where(participant_login_events[:created_at]
-                 .gteq(Date.current.beginning_of_day))
+                 .gteq(Time.zone.today.beginning_of_day))
       .where(participant_login_events[:created_at]
-                 .lt(Date.current.end_of_day))
+                 .lt(Time.zone.today.end_of_day))
   end
 
   def lessons_read
@@ -151,13 +151,13 @@ class Membership < ActiveRecord::Base
   def withdraw
     return false unless valid?
 
-    update_column(:end_date, Date.current - 1.day)
+    update_column(:end_date, Time.zone.today - 1.day)
   end
 
   def discontinue
     return false unless valid?
 
-    update_columns(end_date: Date.current - 1.day, is_complete: true)
+    update_columns(end_date: Time.zone.today - 1.day, is_complete: true)
   end
 
   def week_start_day(week_number)
@@ -192,18 +192,18 @@ class Membership < ActiveRecord::Base
   end
 
   def not_complete_in_the_future
-    return unless end_date && end_date > Date.today && is_complete == true
+    return unless end_date && end_date > Time.zone.today && is_complete == true
 
     errors.add :is_complete, "cannot be set to true for end dates in the future"
   end
 
   def not_ending_in_the_past
-    return unless end_date && end_date_changed? && end_date < Date.current
+    return unless end_date && end_date_changed? && end_date < Time.zone.today
 
     errors.add :end_date, "must not be in the past"
   end
 
   def start_date_with_zone
-    start_date.to_time
+    Time.zone.local(start_date.year, start_date.month, start_date.day)
   end
 end

data/app/models/message.rb

@@ -53,6 +53,6 @@ class Message < ActiveRecord::Base
   end
 
   def populate_sent_at
-    self.sent_at = Time.new
+    self.sent_at = Time.zone.now
   end
 end

data/app/models/participant.rb

@@ -276,8 +276,8 @@ class Participant < ActiveRecord::Base
   end
 
   def in_study?
-    if active_membership.start_date <= Date.today &&
-       active_membership.end_date >= Date.today
+    if active_membership.start_date <= Time.zone.today &&
+       active_membership.end_date >= Time.zone.today
       true
     else
       false
@@ -293,7 +293,7 @@ class Participant < ActiveRecord::Base
   def recent_period
     @recent_period ||= (
       # when no awake period return an empty set to allow chaining
-      now = Time.new
+      now = Time.zone.now
       start_time = recent_awake_period.try(:start_time) || now
       end_time = recent_awake_period.try(:end_time) || now
 

data/app/models/participant_metrics/weekly_count.rb

@@ -18,7 +18,7 @@ module ParticipantMetrics
             - 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")

data/app/models/phq_stepping.rb

@@ -69,7 +69,7 @@ class PhqStepping
     @skip_flag = [false]
     @assessments = assessments
     @study_start_date = study_start_date
-    @week = ((Date.current + 1 - study_start_date).days / 1.week).ceil
+    @week = ((Time.zone.today + 1 - study_start_date).days / 1.week).ceil
     @upper_limit = FIRST_PERIOD_STEPPING_CUTOFF
     @upper_prev_limit = FIRST_PERIOD_STEPPING_CUTOFF
     @lower_limit = DEFAULT_PERIOD_DISCONTINUE_CUTOFF

data/app/models/phq_stepping_assessment.rb

@@ -31,7 +31,7 @@ class PhqSteppingAssessment
                              date,
                              score,
                              study_start_date
-                           )
+      )
                           )
     end
     converted_array
@@ -47,7 +47,7 @@ class PhqSteppingAssessment
                              nil,
                              false,
                              assessment
-                           )
+      )
                           )
     end
     converted_array

data/app/models/task_status.rb

@@ -89,7 +89,7 @@ class TaskStatus < ActiveRecord::Base
   end
 
   def notify_today?
-    today = Time.now
+    today = Time.zone.now
     start_day == ((today.to_date - membership.start_date.to_date).to_i + 1)
   end
 end

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

@@ -30,9 +30,11 @@ module ThinkFeelDoEngine
 
       def to_csv(csv = [])
         csv << @collector.columns
+        # rubocop:disable Rails/FindEach
         @collector.all.each do |s|
           csv << @collector.columns.map { |c| s[c.to_sym] }
         end
+        # rubocop:enable Rails/FindEach
       end
 
       private

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

@@ -14,8 +14,7 @@ module ThinkFeelDoEngine
             provider_id = m ? m[1] : -1
             position = m ? m[2] : -1
             video = BitCore::ContentProvider
-                    .where(id: provider_id)
-                    .first
+                    .find_by(id: provider_id)
                     .try(:source_content)
                     .try(:slides)
                     .try(:find_by_position, position)

data/app/models/tool_nav_item.rb

@@ -41,7 +41,7 @@ class ToolNavItem
     available_content_modules
       .position_greater_than(1)
       .is_not_viz
-      .available_by(Date.today)
+      .available_by(Time.zone.today)
       .order_by_position
       .latest_duplicate
   end
@@ -50,7 +50,7 @@ class ToolNavItem
     available_content_modules
       .is_not_viz
       .is_not_completed
-      .available_on(Date.today)
+      .available_on(Time.zone.today)
       .exists?
   end
 
@@ -60,6 +60,6 @@ class ToolNavItem
     AvailableContentModule
       .for_tool(@tool)
       .for_participant(@participant)
-      .is_not_terminated_on(Date.today)
+      .is_not_terminated_on(Time.zone.today)
   end
 end

data/app/presenters/think_feel_do_engine/media_access_event_presenter.rb

@@ -30,7 +30,8 @@ module ThinkFeelDoEngine
     end
 
     def sortable(group)
-      relased_on(group).to_time.to_i
+      date = relased_on(group)
+      Time.zone.local(date.year, date.month, date.day).to_i
     end
 
     def title

data/app/views/think_feel_do_engine/activities/past_activity_form.html.erb

@@ -2,7 +2,7 @@
 
 <div id="past_activities_container">	
 <% timestamps.each_with_index do |timestamp, index| %>
-  <% start_time = Time.at(timestamp); end_time = start_time + 1.hour %>
+  <% start_time = Time.zone.at(timestamp); end_time = start_time + 1.hour %>
   <%= form_for(
         activity,
         url: create_path,

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.19.6"
+  VERSION = "3.19.7"
 end

metadata

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