think_feel_do_engine 3.17.0 → 3.17.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1aeba41ab19d644e3b61f35f1a0b5a12599b44b
-  data.tar.gz: f5ab432d31659ccc124231abcd98314d4840238e
+  metadata.gz: f5570eaecc8f5761108504851cff534b4affc478
+  data.tar.gz: f4bf721ad515aa07b14583738741830d40b7b006
 SHA512:
-  metadata.gz: d8999ed4d317cb5c7537d140ea008179e170e52b345d56fa3ce3db6431bf5c0f3dd92c9a0865373ede0acbcf5ac678ceb1e6a5be058a04786b5420c3cc8c1558
-  data.tar.gz: c7f36ad1f51765a3c90befd9b873d4a0840fff5a62c56708ddf655cfb24576aebc246a857f7bcf9c3953ec520d1312fa526886dae2b5e986deb3edb8d52e15ef
+  metadata.gz: 49ee0eb5def617f3789c8d5070473c262cee74d83656b3ce73c8eef237d25396567129351fe8bcc41c6f75ab04972c71f16ba5b3de1c0e1be13e31dd72355f62
+  data.tar.gz: e1673c9bad39b0c395636811198c33b8a83ea42b693ba52b66a43057839f37f5159dc4d5629f91719092ad4ff8ac195daef5e7b57590017cfd047dcc9c7a74f6

data/app/controllers/think_feel_do_engine/navigator_controller.rb

@@ -9,6 +9,7 @@ module ThinkFeelDoEngine
 
     URL_GENERATION_ALERT = "We're sorry, the content you were looking "\
                            " for couldn't be found."
+    FIRST_CONTENT_POSITION = 1
 
     layout "tool"
 
@@ -26,7 +27,9 @@ module ThinkFeelDoEngine
         content_position: params[:content_position]
       )
 
-      complete_task_status(params[:module_id])
+      complete_task_status(params[:module_id],
+                           params[:provider_id],
+                           params[:content_position])
 
       render "show_content"
     rescue ActiveRecord::RecordNotFound, ActionView::Template::Error
@@ -36,6 +39,7 @@ module ThinkFeelDoEngine
     end
 
     def show_next_content
+      mark_engagement_completed
       @navigator.fetch_next_content
 
       if @navigator.current_module
@@ -77,19 +81,54 @@ module ThinkFeelDoEngine
 
     private
 
-    def complete_task_status(module_id)
+    def last_engagment
+      current_participant
+        .active_membership
+        .task_statuses
+        .for_content_module(navigator_content_module)
+        .try(:last)
+        .try(:engagements)
+        .try(:last)
+    end
+
+    def complete_task_status(module_id, provider_id, content_id)
       content_module = BitCore::ContentModule.find(module_id)
       membership = current_participant
                    .active_membership
       @task_status = membership
                      .task_statuses
-                     .for_content_module(content_module)
-                     .available_by_day(membership.day_in_study)
-                     .try(:order, "start_day DESC")
-                     .try(:first)
+                     .most_recent_for_content_module(content_module,
+                                                     membership.day_in_study)
+                     .first
+      if @task_status &&
+         (!content_specified?(provider_id, content_id) ||
+         first_content_slide?(content_module, provider_id, content_id))
+        @task_status
+          .engagements
+          .build
+      end
       @task_status.mark_complete unless @task_status.nil?
     end
 
+    def first_content_slide?(content_module, provider_id, content_id)
+      first_content_provider = content_module
+                               .content_providers
+                               .order(:position)
+                               .first
+      provider_id == first_content_provider.id.to_s &&
+        content_id == FIRST_CONTENT_POSITION
+    end
+
+    def mark_engagement_completed
+      if navigator_content_module && last_engagment
+        last_engagment.update_attributes(completed_at: DateTime.current)
+      end
+    end
+
+    def content_specified?(provider_id, content_id)
+      !provider_id.blank? && !content_id.blank?
+    end
+
     def module_exist?
       @navigator
         .current_module

data/app/models/engagement.rb

@@ -0,0 +1,7 @@
+# Used to determine when a patient starts and completes learn task_statuses
+class Engagement < ActiveRecord::Base
+  belongs_to :task_status
+
+  delegate :participant_id, to: :task_status, prefix: false
+  delegate :participant, to: :task_status, prefix: false
+end

data/app/models/task_status.rb

@@ -6,6 +6,7 @@ class TaskStatus < ActiveRecord::Base
   belongs_to :membership
   belongs_to :task
   has_one :participant, through: :membership
+  has_many :engagements, dependent: :destroy
 
   delegate :bit_core_content_module,
            :bit_core_content_module_id,
@@ -65,6 +66,12 @@ class TaskStatus < ActiveRecord::Base
       )
   }
 
+  scope :most_recent_for_content_module, lambda {|content_module, day_in_study|
+    for_content_module(content_module)
+      .available_by_day(day_in_study)
+      .order("start_day DESC")
+  }
+
   def provider_viz?
     try(:bit_core_content_module).try(:is_viz)
   end

data/app/views/think_feel_do_engine/experiences/index_provider.html.erb

@@ -29,3 +29,7 @@
     </li>
   <% end %>
 </ul>
+
+<div class="btn-group pull-right">
+  <%= link_to t(:next), main_app.root_url, class: "btn btn-default" %>
+</div>

data/app/views/think_feel_do_engine/gratitude_recordings/index_provider.html.erb

@@ -10,3 +10,7 @@
     </li>
   <% end %>
 </ul>
+
+<div class="btn-group pull-right">
+  <%= link_to t(:next), main_app.root_url, class: "btn btn-default" %>
+</div>

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.17.0"
+  VERSION = "3.17.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.17.0
+  version: 3.17.1
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2016-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -503,6 +503,7 @@ files:
 - app/models/delivered_message.rb
 - app/models/emotion.rb
 - app/models/emotional_rating.rb
+- app/models/engagement.rb
 - app/models/experience.rb
 - app/models/gratitude_recording.rb
 - app/models/group.rb