think_feel_do_engine 3.16.3 → 3.17.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89d1464ca97c531f291297d3c164f3b0a2a0ffc2
-  data.tar.gz: 9170ef2da22aa467905f9fb68cb6467e3100e153
+  metadata.gz: a1aeba41ab19d644e3b61f35f1a0b5a12599b44b
+  data.tar.gz: f5ab432d31659ccc124231abcd98314d4840238e
 SHA512:
-  metadata.gz: 0cf15943099b8b433d21795cc55f9a2afbdcc674896f8e6967fc25250efd8d7ed9f7bf2832d624e8f1525a5cad1ca9aa8a849fe5e8a079d0f867472fc942438e
-  data.tar.gz: 8ce320ff11c63852a30ed6350ef61db7cc6c0f098024f120a6c694f0e18906cd8709e86e66f55a083d2a5bf9ef8fde56cde9aed27cef41c7a1f3dd80cbc34d7f
+  metadata.gz: d8999ed4d317cb5c7537d140ea008179e170e52b345d56fa3ce3db6431bf5c0f3dd92c9a0865373ede0acbcf5ac678ceb1e6a5be058a04786b5420c3cc8c1558
+  data.tar.gz: c7f36ad1f51765a3c90befd9b873d4a0840fff5a62c56708ddf655cfb24576aebc246a857f7bcf9c3953ec520d1312fa526886dae2b5e986deb3edb8d52e15ef

data/app/assets/javascripts/think_feel_do_engine/participants.js

@@ -8,5 +8,4 @@
 //= require_tree ./forms
 //= require_tree ./thought_patterns
 //= require_tree ./thoughts
-//= require think_feel_do_engine/task_status
 //= require think_feel_do_engine/responsive-table

data/app/controllers/think_feel_do_engine/navigator_controller.rb

@@ -25,6 +25,9 @@ module ThinkFeelDoEngine
         provider_id: params[:provider_id],
         content_position: params[:content_position]
       )
+
+      complete_task_status(params[:module_id])
+
       render "show_content"
     rescue ActiveRecord::RecordNotFound, ActionView::Template::Error
       @navigator.initialize_context(home_tool.title)
@@ -33,7 +36,6 @@ module ThinkFeelDoEngine
     end
 
     def show_next_content
-      mark_engagement_completed
       @navigator.fetch_next_content
 
       if @navigator.current_module
@@ -75,20 +77,17 @@ module ThinkFeelDoEngine
 
     private
 
-    def last_engagment
-      current_participant
-        .active_membership
-        .task_statuses
-        .for_content_module(navigator_content_module)
-        .try(:last)
-        .try(:engagements)
-        .try(:last)
-    end
-
-    def mark_engagement_completed
-      if navigator_content_module && last_engagment
-        last_engagment.update_attributes(completed_at: DateTime.current)
-      end
+    def complete_task_status(module_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)
+      @task_status.mark_complete unless @task_status.nil?
     end
 
     def module_exist?

data/app/models/task_status.rb

@@ -6,7 +6,6 @@ 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,

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

@@ -94,8 +94,8 @@
   <% end %>
 
   <div class="btn-group pull-right">
-    <%= submit_tag t(:next), class: "btn btn-primary", id: "submit_activities" %>
     <%= link_to t(:skip), navigator_next_content_path, class: "btn btn-warning" %>
+    <%= submit_tag t(:next), class: "btn btn-primary", id: "submit_activities" %>
   </div>
 <% end # form_for %>
 

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

@@ -42,7 +42,7 @@
     <%= render partial: "think_feel_do_engine/coach/group_dashboard/comments", locals: {group: @group} %>
 
     <a name="goals_table"></a>
-    <%= render partial: "think_feel_do_engine/coach/group_dashboard/goals", locals: {group: @group} %>
+    <%= render partial: "think_feel_do_engine/coach/group_dashboard/goals", locals: { group: @group} %>
 
     <a name="likes_table"></a>
     <%= render partial: "think_feel_do_engine/coach/group_dashboard/likes", locals: {group: @group} %>

data/app/views/think_feel_do_engine/emotions/new_current.html.erb

@@ -15,8 +15,8 @@
 </div>
 
 <div class="btn-toolbar">
-  <%= submit_tag t(:next), class: 'btn btn-primary', id: "submit-forms" %>
   <%= link_to t(:skip), navigator_next_content_path, class: "btn btn-warning" %>
+  <%= submit_tag t(:next), class: 'btn btn-primary', id: "submit-forms" %>
 </div>
 
 <script>

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

@@ -57,6 +57,6 @@
     </div>
   </div>
 
-  <%= f.submit t(:next), class: "btn btn-primary" %>
   <%= link_to t(:skip), navigator_next_content_path, class: "btn btn-warning" %>
+  <%= f.submit t(:next), class: "btn btn-primary" %>
 <% end %>

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

@@ -23,6 +23,6 @@
     </div>
   </div>
 
-  <%= f.submit t(:next), class: "btn btn-primary" %>
   <%= link_to t(:skip), navigator_next_content_path, class: "btn btn-warning" %>
+  <%= f.submit t(:next), class: "btn btn-primary" %>
 <% end %>

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

@@ -33,7 +33,7 @@
               <% release_date = ts.available_for_learning_on %>
               <% 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 %>
+                  <%= link_to create_task_path(ts), class: "task-status", id: "task-status-#{ ts.id }" do %>
                     <h4 class="list-group-item-heading">
                       <span class="lesson <%= ts.completed_at ? "read" : "unread" %>"><%= ts.task.bit_core_content_module.pretty_title %></span>
                     </h4>
@@ -53,7 +53,7 @@
                   </p>
                 </span>
               <% else %>
-                <span class="list-group-item task-status disabled" id="task-status-<%= ts.id %>" data-task-status-id="<%= ts.id %>">
+                <span class="list-group-item task-status disabled" id="task-status-<%= ts.id %>">
                   <h4 class="list-group-item-heading">
                     <span class="lesson unread"><%= ts.task.bit_core_content_module.pretty_title %></span>
                   </h4>

data/app/views/think_feel_do_engine/shared/participant/_nav_items.html.erb

@@ -28,8 +28,7 @@
           <li>
             <%= link_to think_feel_do_engine.navigator_location_path(module_id: module_nav_item.id),
                         class: "task-status",
-                        id: "task-status-#{ module_nav_item.task_status_id }",
-                        data: { :"task-status-id" => module_nav_item.task_status_id } do %>
+                        id: "task-status-#{ module_nav_item.task_status_id }" do %>
               <%= module_nav_item.has_didactic_content? ? fa_icon("book") : fa_icon("pencil") %> <%= module_nav_item.title %>
             <% end %>
           </li>

data/db/migrate/20140722172101_add_missing_fk_constraints.rb

@@ -1,4 +1,9 @@
 class AddMissingFkConstraints < ActiveRecord::Migration
+  class MigrationEngagement < ActiveRecord::Base
+    self.table_name = :engagements
+    belongs_to :task_status
+  end
+
   def change
     EmotionalRating.where(emotion_id: nil).destroy_all
     EmotionalRating.all.each do |r|
@@ -10,7 +15,7 @@ class AddMissingFkConstraints < ActiveRecord::Migration
     ContentProviderPolicy.all.each do |p|
       p.destroy if p.content_provider.nil?
     end
-    Engagement.all.each do |e|
+    MigrationEngagement.all.each do |e|
       e.destroy if e.task_status.nil?
     end
     Task.all.each do |t|

data/lib/think_feel_do_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.16.3
+  version: 3.17.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-03 00:00:00.000000000 Z
+date: 2016-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -371,7 +371,6 @@ files:
 - app/assets/javascripts/think_feel_do_engine/shared/detect_timeout.js
 - app/assets/javascripts/think_feel_do_engine/slideshows.js
 - app/assets/javascripts/think_feel_do_engine/stepped_care.js
-- app/assets/javascripts/think_feel_do_engine/task_status.js
 - app/assets/javascripts/think_feel_do_engine/thought_patterns/index.js.erb
 - app/assets/javascripts/think_feel_do_engine/thoughts/edit_bulk.js
 - app/assets/javascripts/think_feel_do_engine/thoughts/scThoughtTrackerMenuViz.js
@@ -419,7 +418,6 @@ files:
 - app/controllers/think_feel_do_engine/participants/passwords_controller.rb
 - app/controllers/think_feel_do_engine/participants/public_slides_controller.rb
 - app/controllers/think_feel_do_engine/participants/sessions_controller.rb
-- app/controllers/think_feel_do_engine/participants/task_status_controller.rb
 - app/controllers/think_feel_do_engine/participants/thoughts_controller.rb
 - app/controllers/think_feel_do_engine/password_entropy_bits_controller.rb
 - app/controllers/think_feel_do_engine/privacy_policies_controller.rb
@@ -505,7 +503,6 @@ 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

data/app/assets/javascripts/think_feel_do_engine/task_status.js

@@ -1,19 +0,0 @@
-;(function() {
-  "use strict";
-
-  // Report actions associated with task statuses
-  $(document).on("page:change", function() {
-    $("a.task-status").not(".disabled").on("click", function(event) {
-      var $target, $taskStatusId;
-      
-      $target = $(event.currentTarget);
-      $taskStatusId = $target.data("task-status-id");
-      $.ajax({
-        async: false,
-        dataType: "script",
-        type: "PUT",
-        url: "/participants/task_status/" + $taskStatusId
-      });
-    });
-  });
-})();

data/app/controllers/think_feel_do_engine/participants/task_status_controller.rb

@@ -1,35 +0,0 @@
-require_dependency "think_feel_do_engine/application_controller"
-
-module ThinkFeelDoEngine
-  module Participants
-    # Updates the completion of assigned tasks for a participant
-    class TaskStatusController < ApplicationController
-      before_action :authenticate_participant!
-
-      rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
-
-      def update
-        @task_status = current_participant
-                       .active_membership
-                       .task_statuses
-                       .find(params[:id])
-
-        begin
-          if @task_status.engagements.build && @task_status.mark_complete
-            render nothing: true, status: 200
-          else
-            render nothing: true, status: 400
-          end
-        rescue ActiveRecord::InvalidForeignKey
-          render nothing: true, status: 400
-        end
-      end
-
-      private
-
-      def record_not_found
-        render nothing: true, status: 404
-      end
-    end
-  end
-end

data/app/models/engagement.rb

@@ -1,7 +0,0 @@
-# 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