think_feel_do_engine 3.14.1 → 3.14.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1e391e94351aed9559325f99b1e2c873a7a90051
-  data.tar.gz: 60fd151c40b2bea03832755032f577b081541488
+  metadata.gz: 87a27bee53ec55a100c20dbd9b2102aea9b1675f
+  data.tar.gz: e6f94f97ace1fc6b05545d9e4ba305a2fc89f632
 SHA512:
-  metadata.gz: 1687e2ae569ac8b8780293c7d9b2a939df6870c20f8284bcdffbc5223df29c36260f408129b6d2e10d9c306a21b4de510a6b33d6561d0aa55be634929b314f0d
-  data.tar.gz: d4e7897f71c5e1e180df68844b7283e4c64bf581199494044ad28b8122d625127c779fa450881a464e605b16a8e0436e6b5c20f1e7eb950a0fa4621de6f77376
+  metadata.gz: 3717a2bb4678d29db736dcbd06e02ce415615bf87b642c96770bb1fbf07a266601fd26f87ce43d5c912e59eb9ec9662a781d9668bad71684618ac30b4f9e420f
+  data.tar.gz: 645338da6fdf28927ab8158bd7eec544568abfd1c19bfc7ba294298b8196eeb7b8c0e32a570a1222cada4cf53e4fc9b528b0cd4a95a0f84be92eac393fa85ac6

data/app/models/concerns/accessibility.rb

@@ -0,0 +1,43 @@
+module Concerns
+  # Determines whether a participant can access a lesson
+  module Accessibility
+    def accessible?
+      available_for_learning_on <= Date.today
+    end
+
+    def available_for_learning_on
+      membership.start_date + release_day - 1
+    end
+
+    def completed?
+      completed_at.present?
+    end
+
+    def previous_completed?
+      return false unless learning_task_status_index
+      return true if learning_task_status_first?
+      self
+        .class
+        .find_by_id(learning_task_statuses.ids[learning_task_status_index - 1])
+        .completed?
+    end
+
+    private
+
+    def learning_task_status_first?
+      learning_task_status_index.zero?
+    end
+
+    def learning_task_status_index
+      learning_task_statuses
+        .ids
+        .find_index(id)
+    end
+
+    def learning_task_statuses
+      membership
+        .ordered_task_statuses
+        .for_learning
+    end
+  end
+end

data/app/models/membership.rb

@@ -59,11 +59,10 @@ class Membership < ActiveRecord::Base
       .by_position
   end
 
-  def ordered_task_status_ids
+  def ordered_task_statuses
     task_statuses
       .joins(:task)
       .order("tasks.release_day ASC")
-      .ids
   end
 
   def incomplete_tasks

data/app/models/task_status.rb

@@ -1,5 +1,8 @@
 # Holds the completion status of a task for each participant
 class TaskStatus < ActiveRecord::Base
+  include Concerns::Accessibility
+  LESSON_MODULE_TYPE = "ContentModules::LessonModule"
+
   belongs_to :membership
   belongs_to :task
   has_one :participant, through: :membership
@@ -31,6 +34,11 @@ class TaskStatus < ActiveRecord::Base
       .order("bit_core_content_modules.position ASC")
   }
 
+  scope :for_learning, lambda {
+    joins(:task, task: :bit_core_content_module)
+      .where("bit_core_content_modules.type = '#{LESSON_MODULE_TYPE}'")
+  }
+
   scope :available_by_day, lambda { |day_in_study|
     where(arel_table[:start_day].lteq(day_in_study))
   }
@@ -56,22 +64,6 @@ class TaskStatus < ActiveRecord::Base
       )
   }
 
-  def accessible?
-    available_for_learning_on <= Date.today
-  end
-
-  def completed?
-    completed_at.present?
-  end
-
-  def previous_completed?
-    return true if is_first?
-    self
-      .class
-      .find_by_id(membership_task_status_ids[index_for_membership - 1])
-      .completed?
-  end
-
   def provider_viz?
     try(:bit_core_content_module).try(:is_viz)
   end
@@ -85,31 +77,11 @@ class TaskStatus < ActiveRecord::Base
   end
 
   def is_lesson?
-    task.bit_core_content_module.type == "ContentModules::LessonModule"
+    task.bit_core_content_module.instance_of? ContentModules::LessonModule
   end
 
   def notify_today?
     today = Time.now
     start_day == ((today.to_date - membership.start_date.to_date).to_i + 1)
   end
-
-  def available_for_learning_on
-    membership.start_date + release_day - 1
-  end
-
-  private
-
-  def index_for_membership
-    membership_task_status_ids
-      .find_index(id)
-  end
-
-  def is_first?
-    index_for_membership.zero?
-  end
-
-  def membership_task_status_ids
-    membership
-      .ordered_task_status_ids
-  end
 end

data/app/views/think_feel_do_engine/activities/_past_due_table.erb

@@ -16,10 +16,12 @@
 
         <table class="table responsive <%=table_name%>">
           <thead>
-            <th>Activity Test</th>
-            <th>Planned For</th>
-            <th>Predicted Pleasure Value</th>
-            <th>Predicted Accomplishment Value</th>
+            <tr>
+              <th>Activity Test</th>
+              <th>Planned For</th>
+              <th>Predicted Pleasure Value</th>
+              <th>Predicted Accomplishment Value</th>
+            </tr>
           </thead>
           <tbody>
             <%= render partial: 'think_feel_do_engine/activities/past_due_rows', collection: activity_list, as: :activity %>

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

@@ -1,9 +1,11 @@
 <table class="table table-condensed" id="previous_activities">
   <thead>
-    <th>Activity</th>
-    <th>Planned For</th>
-    <th>Predicted Pleasure Value</th>
-    <th>Predicted Accomplishment Value</th>
+    <tr>
+      <th>Activity</th>
+      <th>Planned For</th>
+      <th>Predicted Pleasure Value</th>
+      <th>Predicted Accomplishment Value</th>
+    </tr>
   </thead>
   <tbody>
     <%= render partial: "think_feel_do_engine/activities/previously_planned", collection: activities_list, as: :activity

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

@@ -4,10 +4,12 @@
 
 <table class="table table-condensed" id="previous_activities">
   <thead>
-    <th>Activity</th>
-    <th>Planned For</th>
-    <th>Predicted Pleasure Value</th>
-    <th>Predicted Accomplishment Value</th>
+    <tr>
+      <th>Activity</th>
+      <th>Planned For</th>
+      <th>Predicted Pleasure Value</th>
+      <th>Predicted Accomplishment Value</th>
+    </tr>
   </thead>
   <tbody>
     <%= render partial: "think_feel_do_engine/activities/previously_planned", collection: already_sched_activities, as: :activity %>

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

@@ -28,9 +28,11 @@
         <% else %>
           <table class="table table-hover">
             <thead>
-              <th>Week #</th>
-              <th>Date</th>
-              <th>PHQ-9 Score</th>
+              <tr>
+                <th>Week #</th>
+                <th>Date</th>
+                <th>PHQ-9 Score</th>
+              </tr>
             </thead>
             <tbody>
               <%= render partial: "think_feel_do_engine/coach/patient_dashboards/phq_summary", collection: suggestion.assessments, as: :tested_weeks, locals: { test_summary: suggestion.results } %>

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

@@ -2,8 +2,10 @@
 
 <table class="table table-hover">
   <thead>
-    <th>Test</th>
-    <th>Result</th>
+    <tr>
+      <th>Test</th>
+      <th>Result</th>
+    </tr>
   </thead>
   <tbody>
     <tr>

data/app/views/think_feel_do_engine/manage/groups/edit_tasks.html.erb

@@ -52,12 +52,14 @@
 
   <table class="table table-hover" id="tasks">
     <thead>
-      <th>Title</th>
-      <th>Release day</th>
-      <th>Is recurring?</th>
-      <th>Termination day</th>
-      <th>Has didactic content?</th>
-      <th></th>
+      <tr>
+        <th>Title</th>
+        <th>Release day</th>
+        <th>Is recurring?</th>
+        <th>Termination day</th>
+        <th>Has didactic content?</th>
+        <th></th>
+      </tr>
     </thead>
     <tbody>
       <% @group.tasks.each do |task|%>

data/app/views/think_feel_do_engine/thoughts/thoughts_table.html.erb

@@ -11,13 +11,15 @@
 <%= form_tag participants_thoughts_path, remote: true do %>
 <table class="table table-hover data-table responsive" id="thoughts">
   <thead>
-    <th class="not-displayed"></th>
-    <th>Thought</th>
-    <th>Pattern</th>
-    <th>Challenging Thought</th>
-    <th>As If Action</th>
-    <th>Date</th>
-    <th></th>
+    <tr>
+      <th class="not-displayed"></th>
+      <th>Thought</th>
+      <th>Pattern</th>
+      <th>Challenging Thought</th>
+      <th>As If Action</th>
+      <th>Date</th>
+      <th></th>
+    </tr>
   </thead>
   <tbody>
     <%= render partial: "think_feel_do_engine/thoughts/mutable_thought", collection: thoughts.order(created_at: :desc) %>

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.14.1"
+  VERSION = "3.14.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.14.1
+  version: 3.14.2
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-23 00:00:00.000000000 Z
+date: 2016-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -448,6 +448,7 @@ files:
 - app/models/awake_period.rb
 - app/models/bit_core/slide_observer.rb
 - app/models/coach_assignment.rb
+- app/models/concerns/accessibility.rb
 - app/models/concerns/copier.rb
 - app/models/content_modules.rb
 - app/models/content_modules/lesson_module.rb