think_feel_do_engine 3.12.9 → 3.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8fd57584708f23a8f047fc4aed47c20e363502ff
-  data.tar.gz: f1df634f26cad35b8e4338920d613285f4071a8a
+  metadata.gz: 0b9447779076494b47bf120de758af87edc143f4
+  data.tar.gz: c27cbe732bbcfd29d29663bfadec457eadcacf0e
 SHA512:
-  metadata.gz: 6ec28318f88ee80afd83c90c244db9fb6b06f630f6758d3a55332cfa87bfa7e1ee5e1b0782efe9e0ae93d7a87e1c44629c57a5485bfe46b1d12720fc7a9059b3
-  data.tar.gz: 10adfc2c6f29728f66e567051dca203a94032e0876d18f20aad876f20e4ae1f3e8e742938b3300fc22ffcb278c791c7552a75799e3001205f2910ecd3ab4e6d8
+  metadata.gz: 1acc06e132534b5f98fc39eb90697aaa358e109b9c8405701bbac641f1061302fcdf16e67a9e2f199f9d20b33d122f1822f2af1fee312a2f2ebbfb25f01b68b0
+  data.tar.gz: c7bd1e6be19e7f61cbd0f5da8936ab6b91a1a38c732d2a2c0a70c2705f6c20462bec9cd3f2ef505b6dcb1df9642e4542a716fa5540dada710c844e520d76b28e

data/app/controllers/think_feel_do_engine/navigator_controller.rb

@@ -7,6 +7,9 @@ module ThinkFeelDoEngine
     include Concerns::NavigatorEnabled
     before_action :authenticate_participant!, :instantiate_navigator
 
+    URL_GENERATION_ALERT = "We're sorry, the content you were looking "\
+                           " for couldn't be found."
+
     layout "tool"
 
     def show_context
@@ -32,11 +35,16 @@ module ThinkFeelDoEngine
     def show_next_content
       mark_engagement_completed
       @navigator.fetch_next_content
-      redirect_to navigator_location_path(
-        module_id: @navigator.current_module.try(:id),
-        provider_id: @navigator.current_content_provider.try(:id),
-        content_position: @navigator.content_position
-      )
+
+      if @navigator.current_module
+        redirect_to navigator_location_path(
+          module_id: @navigator.current_module.try(:id),
+          provider_id: @navigator.current_content_provider
+                         .try(:id),
+          content_position: @navigator.content_position)
+      else
+        next_content_not_found
+      end
     end
 
     def show_previous_content
@@ -106,5 +114,14 @@ module ThinkFeelDoEngine
         .arm
         .bit_core_tools.find_by_type("Tools::Home")
     end
+
+    def next_content_not_found
+      Raven.capture_message "URL Generation error in NavigatorController",
+                            extra: {
+                              participant_id: current_participant.try(:id),
+                              params: params
+                            } if defined?(Raven)
+      redirect_to main_app.root_path, alert: URL_GENERATION_ALERT
+    end
   end
 end

data/app/helpers/think_feel_do_engine/tasks_helper.rb

@@ -100,7 +100,7 @@ module ThinkFeelDoEngine
         .for_content_module(available_module)
         .order(start_day: :asc)
         .last
-        .completed_at
+        .try(:completed_at)
     end
 
     def completion_status

data/app/models/available_content_module.rb

@@ -41,10 +41,31 @@ class AvailableContentModule < ActiveRecord::Base
     where has_didactic_content: false
   end
 
+  def self.for_current_week(membership)
+    study_week_number = membership.week_in_study
+    membership_start_date = membership.start_date
+    available_on = arel_table[:available_on]
+
+    for_participant(membership.participant)
+      .where(
+        available_on
+        .lt(membership_start_date + study_week_number.weeks)
+        .and(
+          available_on
+          .gteq(membership_start_date + (study_week_number - 1).weeks)))
+  end
+
   def self.is_terminated_on(date)
     where(arel_table[:terminates_on].lt(date))
   end
 
+  def self.for_past_weeks(membership)
+    for_participant(membership.participant)
+      .where(
+        arel_table[:available_on]
+        .lt(membership.start_date + (membership.week_in_study - 1).weeks))
+  end
+
   def self.is_not_terminated_on(date)
     where(arel_table[:terminates_on].eq(nil)
           .or(arel_table[:terminates_on].gteq(date)))

data/app/models/content_providers/current_modules/index_provider.rb

@@ -0,0 +1,56 @@
+module ContentProviders
+  module CurrentModules
+    # Provides a set of links to other ContentProviders.
+    class IndexProvider < BitCore::ContentProvider
+      def render_current(options)
+        participant = options.participant
+        context = options.view_context
+
+        context.render(
+          template: "think_feel_do_engine/current_modules/index",
+          locals: {
+            content_modules: content_modules(options),
+            current_practice_modules: current_practice_modules(options),
+            past_practice_modules: past_practice_modules(options),
+            membership: context
+              .view_membership(participant, participant.active_group)
+          })
+      end
+
+      def show_nav_link?
+        false
+      end
+
+      private
+
+      def content_modules(options)
+        participant = options.participant
+        arm_id = participant.active_group.arm_id
+        tool = BitCore::Tool
+               .find_by_arm_id_and_title(arm_id, options.app_context)
+
+        @content_modules ||=
+          AvailableContentModule
+          .for_participant(participant)
+          .for_tool(tool)
+          .available_by(Date.current)
+          .excludes_module(bit_core_content_module_id)
+          .latest_duplicate
+      end
+
+      def current_practice_modules(options)
+        participant = options.participant
+
+        content_modules(options)
+          .for_current_week(participant.active_membership)
+      end
+
+      def past_practice_modules(options)
+        participant = options.participant
+
+        content_modules(options)
+          .for_past_weeks(participant.active_membership)
+      end
+    end
+  end
+end

data/app/models/membership.rb

@@ -59,6 +59,13 @@ class Membership < ActiveRecord::Base
       .by_position
   end
 
+  def ordered_task_status_ids
+    task_statuses
+      .joins(:task)
+      .order("tasks.release_day ASC")
+      .ids
+  end
+
   def incomplete_tasks
     available_task_statuses
       .incomplete_by_day(day_in_study)

data/app/models/task_status.rb

@@ -22,17 +22,6 @@ class TaskStatus < ActiveRecord::Base
       .where(tasks: { bit_core_content_module_id: ids })
   }
 
-  # To Do: should this be renamed or removed?
-  # Is this being used anymore?
-  scope :available_for_learning, lambda { |membership|
-    joins(:task, task: :bit_core_content_module)
-      .by_position
-      .where(
-        arel_table[:start_day]
-        .lteq(membership.day_in_study)
-      )
-  }
-
   scope :completed, -> { where(arel_table[:completed_at].not_eq(nil)) }
 
   scope :incomplete, -> { where(arel_table[:completed_at].eq(nil)) }
@@ -67,6 +56,22 @@ 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
@@ -91,4 +96,20 @@ class TaskStatus < ActiveRecord::Base
   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/current_modules/index.html.erb

@@ -0,0 +1,19 @@
+<% if (description = content_modules.first.try(:bit_core_tool).try(:description)) %>
+  <% content_for(:tool_description) { sanitize(description).gsub(/\n/, "<br><br>").html_safe } %>
+<% end %>
+
+<% content_for :left do %>
+  <div class="list-group left">
+    <% current_practice_modules.each do |m| %>
+      <%= task_status_link(available_module: m, icon: "", membership: membership) %>
+    <% end %>
+  </div>
+<% end %>
+
+<% content_for :right do %>
+  <div class="list-group right">
+    <% past_practice_modules.each do |m| %>
+      <%= task_status_link(available_module: m, icon: "", membership: membership) %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/think_feel_do_engine/learn/lessons_index.html.erb

@@ -31,7 +31,7 @@
           <% else %>
             <% tasks[:tasks].each do |ts| %>
               <% release_date = ts.available_for_learning_on %>
-              <% if release_date <= Date.today %>
+              <% if ts.accessible? %>
                 <span class="list-group-item task-status enabled">
                   <%= link_to create_task_path(ts), class: "task-status", id: "task-status-#{ ts.id }", data: { :"task-status-id" => ts.id } do %>
                     <h4 class="list-group-item-heading">

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.12.9"
+  VERSION = "3.13.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.12.9
+  version: 3.13.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2016-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -455,6 +455,7 @@ files:
 - app/models/content_providers/augmented_thoughts_table_provider.rb
 - app/models/content_providers/awake_period_form.rb
 - app/models/content_providers/create_activity.rb
+- app/models/content_providers/current_modules/index_provider.rb
 - app/models/content_providers/edit_past_feel_provider.rb
 - app/models/content_providers/evaluate_thoughts_provider.rb
 - app/models/content_providers/experiences/index_provider.rb
@@ -672,6 +673,7 @@ files:
 - app/views/think_feel_do_engine/coach/site_messages/index.html.erb
 - app/views/think_feel_do_engine/coach/site_messages/new.html.erb
 - app/views/think_feel_do_engine/coach/site_messages/show.html.erb
+- app/views/think_feel_do_engine/current_modules/index.html.erb
 - app/views/think_feel_do_engine/emotions/_emotion_coach_view.html.erb
 - app/views/think_feel_do_engine/emotions/_form.html.erb
 - app/views/think_feel_do_engine/emotions/index.html.erb