think_feel_do_engine 3.15.7 → 3.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82fd6931e56fd0ca02083d81c60d1dae7cc4a699
-  data.tar.gz: 90ab4c007f486dc3219a5d4a88944754bc9a1c1d
+  metadata.gz: 34d63772ced14e7d7761f7ba2c12d9d0b8766fcf
+  data.tar.gz: 5c384494bf24e725d4bf70583710dee49256bb64
 SHA512:
-  metadata.gz: f1d9d992f0955896f46e3a2af431fa0cf1403ba4765bea6138a442dc7f2c1b6319ca51323e8567d3d7bacfbf75e1ee0bc136c96fd1b3e3c609dea1392de2b17e
-  data.tar.gz: c3199a97efa3e2a8823f543ec4a03015b796c85940400f44a92d938f327187679440a2edfed465125721f6ac0ec9ebdfb8063aec18fb52278fc43cce02b3d071
+  metadata.gz: 4e807caf2b79b77bf1328bcf4d20f4a315a9fc6f0bd9af28608f16b5e6186d3758f7614ff954ab99d8a1048ed2434c62bd88dd3e6f8c559b42fa117ff79bdd29
+  data.tar.gz: 5f8bee00a72e0799bd89f76fe74de0b747326c13b17ac4949daa5914295a179da126f9d8dc7f4b48f014f766ccc32558b0ac4043bdff6cf4e6d5232b097ee4f5

data/app/controllers/think_feel_do_engine/coach/participant_activities_visualizations_controller.rb

@@ -5,6 +5,7 @@ module ThinkFeelDoEngine
     # Present Participant Activities Visualization to the Coach.
     class ParticipantActivitiesVisualizationsController < ApplicationController
       before_action :authenticate_user!
+      rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
 
       RenderOptions = Struct.new(
         :view_context, :app_context, :position, :participant
@@ -12,6 +13,7 @@ module ThinkFeelDoEngine
 
       def show
         @participant = Participant.find(params[:participant_id])
+        @group = @participant.groups.find(params[:group_id])
         provider = ContentProviders::YourActivitiesProvider.new
         options = RenderOptions.new(
           self,
@@ -21,6 +23,12 @@ module ThinkFeelDoEngine
         )
         provider.render_current(options)
       end
+
+      def record_not_found
+        redirect_to main_app.root_path,
+                    alert: "The activities visualization you were "\
+                    "looking does not exist."
+      end
     end
   end
 end

data/app/controllers/think_feel_do_engine/coach/participant_thoughts_visualizations_controller.rb

@@ -5,13 +5,21 @@ module ThinkFeelDoEngine
     # Present Participant Thoughts Visualization to the Coach.
     class ParticipantThoughtsVisualizationsController < ApplicationController
       before_action :authenticate_user!
+      rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
 
       def show
         @participant = Participant.find(params[:participant_id])
+        @group = @participant.groups.find(params[:group_id])
         thoughts = @participant.thoughts.harmful
         render "think_feel_do_engine/thoughts/distortion_viz",
                locals: { thoughts: thoughts, link_to_view: nil }
       end
+
+      def record_not_found
+        redirect_to main_app.root_path,
+                    alert: "The thoughts visualization you were "\
+                    "looking does not exist."
+      end
     end
   end
 end

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

@@ -11,7 +11,7 @@ module ThinkFeelDoEngine
         return unless VISUALIZATION_CONTROLLERS.include?(controller_name)
 
         dashboard_path = coach_group_patient_dashboard_path(
-          @participant.active_group,
+          @group,
           @participant
         )
 

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

@@ -10,10 +10,10 @@
   <li class="list-group-item"><a href="#logins-container">Logins</a></li>
   <li class="list-group-item"><a href="#lessons-container">Lessons</a></li>
   <li class="list-group-item"><a href="#media-access-container">Audio Access</a></li>
-  <li class="list-group-item"><%= link_to "Activities visualization", coach_participant_activities_visualization_path(@participant) %></li>
+  <li class="list-group-item"><%= link_to "Activities visualization", coach_participant_activities_visualization_path(participant_id: @participant.id, group_id: @group.id) %></li>
   <li class="list-group-item"><a href="#activities-future-container">Activities - Future</a></li>
   <li class="list-group-item"><a href="#activities-past-container">Activities - Past</a></li>
-  <li class="list-group-item"><%= link_to "Thoughts visualization", coach_participant_thoughts_visualization_path(@participant) %></li>
+  <li class="list-group-item"><%= link_to "Thoughts visualization", coach_participant_thoughts_visualization_path(participant_id: @participant.id, group_id: @group.id) %></li>
   <li class="list-group-item"><a href="#thoughts-container">Thoughts</a></li>
   <li class="list-group-item"><a href="#messages-container">Messages</a></li>
   <li class="list-group-item"><a href="#tasks-container">Tasks</a></li>

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

@@ -12,11 +12,11 @@
 <%= render "think_feel_do_engine/coach/patient_dashboards/tables/lessons_table" %>
 <%= render "think_feel_do_engine/coach/patient_dashboards/tables/audio_access_table" %>
 
-<h3><%= link_to "Activities visualization", coach_participant_activities_visualization_path(@participant) %></h3>
+<h3><%= link_to "Activities visualization", coach_participant_activities_visualization_path(participant_id: @participant.id, group_id: @group.id) %></h3>
 <%= render "think_feel_do_engine/coach/patient_dashboards/tables/future_activities_table" %>
 <%= render "think_feel_do_engine/coach/patient_dashboards/tables/past_activities_table" %>
 
-<h3><%= link_to "Thoughts visualization", coach_participant_thoughts_visualization_path(@participant) %></h3>
+<h3><%= link_to "Thoughts visualization", coach_participant_thoughts_visualization_path(participant_id: @participant.id, group_id: @group.id) %></h3>
 <%= render "think_feel_do_engine/coach/patient_dashboards/tables/thoughts_table" %>
 
 <%= render "think_feel_do_engine/coach/patient_dashboards/tables/messages_table" %>

data/config/routes.rb

@@ -68,10 +68,10 @@ ThinkFeelDoEngine::Engine.routes.draw do
       resources :site_messages, only: [:index, :show, :new, :create]
       resources :memberships, only: :update
     end
-    get "participant_activities_visualization/:participant_id",
+    get "participant_activities_visualization/:participant_id/group/:group_id",
         to: "participant_activities_visualizations#show",
         as: "participant_activities_visualization"
-    get "participant_thoughts_visualization/:participant_id",
+    get "participant_thoughts_visualization/:participant_id/group/:group_id",
         to: "participant_thoughts_visualizations#show",
         as: "participant_thoughts_visualization"
   end

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.15.7"
+  VERSION = "3.16.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.15.7
+  version: 3.16.0
 platform: ruby
 authors:
 - Eric Carty-Fickes