think_feel_do_engine 3.14.0 → 3.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e52d93a1e3df886b9a314e18e7199cea8e4487d
-  data.tar.gz: 194f71dad591970c846e5f9a62393ed0c88eb488
+  metadata.gz: 1e391e94351aed9559325f99b1e2c873a7a90051
+  data.tar.gz: 60fd151c40b2bea03832755032f577b081541488
 SHA512:
-  metadata.gz: f9caa87eb111f241458a6acf0a19ee2e83dfe763a6f091abd1a62f17dbd3ff3d1aea2b2cc089c638b96cfb2ab54db3eb0ed4a896f0e146bdec311092f972c214
-  data.tar.gz: 75139bbc0c7ce729689fada0addf65d294520c134209e3935c96465c696c6fe9a05135ff64a957d2a7745dc58101cd275e1022a9cee75ff4139ff63fd010e7c0
+  metadata.gz: 1687e2ae569ac8b8780293c7d9b2a939df6870c20f8284bcdffbc5223df29c36260f408129b6d2e10d9c306a21b4de510a6b33d6561d0aa55be634929b314f0d
+  data.tar.gz: d4e7897f71c5e1e180df68844b7283e4c64bf581199494044ad28b8122d625127c779fa450881a464e605b16a8e0436e6b5c20f1e7eb950a0fa4621de6f77376

data/app/controllers/think_feel_do_engine/bit_maker/content_modules_controller.rb

@@ -9,6 +9,8 @@ module ThinkFeelDoEngine
       before_action :set_content_module, only: [:show, :edit, :update, :destroy]
       load_and_authorize_resource only: [:show, :edit, :update, :destroy]
 
+      rescue_from ActiveRecord::RecordNotFound, with: :record_not_found
+
       # GET /content_modules
       def index
         authorize! :index, BitCore::ContentModule
@@ -112,6 +114,11 @@ module ThinkFeelDoEngine
       def tasks_destroyed
         Task.where(bit_core_content_module_id: @content_module.id).destroy_all
       end
+
+      def record_not_found
+        redirect_to arm_bit_maker_content_modules_path(@arm),
+                    alert: "Unable to find content module."
+      end
     end
   end
 end

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

@@ -14,9 +14,13 @@ module ThinkFeelDoEngine
                        .task_statuses
                        .find(params[:id])
 
-        if @task_status.engagements.build && @task_status.mark_complete
-          render nothing: true, status: 200
-        else
+        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

data/app/models/media_access_event.rb

@@ -13,12 +13,12 @@ class MediaAccessEvent < ActiveRecord::Base
 
   delegate :title, to: :slide, prefix: true
 
-  def task_release_day
+  def task_release_day(group)
     module_id = slide.slideshow.content_provider.bit_core_content_module_id
 
     Task.where(
       bit_core_content_module_id: module_id,
-      group_id: participant.active_group.id
+      group_id: group.id
     ).first.release_day
   end
 end

data/app/presenters/think_feel_do_engine/media_access_event_presenter.rb

@@ -12,8 +12,8 @@ module ThinkFeelDoEngine
       end_time
     end
 
-    def available_on
-      relased_on
+    def available_on(group)
+      relased_on(group)
         .to_s(:user_date)
     end
 
@@ -29,8 +29,8 @@ module ThinkFeelDoEngine
       created_at.to_s(:standard)
     end
 
-    def sortable
-      relased_on.to_time.to_i
+    def sortable(group)
+      relased_on(group).to_time.to_i
     end
 
     def title
@@ -43,8 +43,8 @@ module ThinkFeelDoEngine
       event.created_at
     end
 
-    def relased_on
-      start_date + (event.task_release_day - 1)
+    def relased_on(group)
+      start_date + (event.task_release_day(group) - 1)
     end
 
     def end_time

data/app/views/devise/sessions/new.html.erb

@@ -39,7 +39,7 @@
 <br/>
 <%= render "devise/shared/links" %>
 
-<% if (slideshow = SlideshowAnchor.fetch(:home_intro)) %>
+<% if (slideshow = SlideshowAnchor.fetch(:home_intro)) && slideshow.slides.first %>
   <br/>
   <%= link_to "Introduction to #{t 'application_name', default: 'ThinkFeelDo'}", ThinkFeelDoEngine::Engine.routes.url_helpers
     .participants_public_slideshow_slide_path(

data/app/views/think_feel_do_engine/lessons/_form.html.erb

@@ -2,7 +2,4 @@
   <%= form.label :title %>
   <%= form.text_field :title, class: "form-control" %>
 </div>
-<div class="form-group">
-  <%= form.label :position %>
-  <%= form.number_field :position, class: "form-control" %>
-</div>
+

data/app/views/think_feel_do_engine/lessons/index.html.erb

@@ -19,8 +19,7 @@
 		<% @lessons.each do |lesson| %>
 			<tr id="lesson-<%= lesson.id %>">
 				<td>
-					<span class="handle"><%= fa_icon("sort", class: "fa-lg") %></span>
-					<%= lesson.position %>
+					<span class="handle"><%= fa_icon("reorder", class: "fa-lg") %></span>
 				</td>
 				<td>
 					<%= link_to lesson.pretty_title, arm_lesson_path(@arm, lesson) %>

data/app/views/think_feel_do_engine/media_access_events/_access_data.html.erb

@@ -1,10 +1,10 @@
 <% present({ event: event, start_date: view_membership(@participant, @group).start_date }, ThinkFeelDoEngine::MediaAccessEventPresenter) do |presenter| %>
   <tr>
     <td class="not-displayed">
-      <%= presenter.sortable %>
+      <%= presenter.sortable(@group) %>
     </td>
     <td><%= presenter.title %></td>
-    <td><%= presenter.available_on %></td>
+    <td><%= presenter.available_on(@group) %></td>
     <td><%= presenter.formatted_start_time %></td>
     <td>
       <% if presenter.completed %>

data/config/routes.rb

@@ -51,7 +51,7 @@ ThinkFeelDoEngine::Engine.routes.draw do
 
     resources :lessons do
       collection { post :sort }
-      resources :lesson_slides do
+      resources :lesson_slides, only: [:new, :create, :show, :edit, :update, :destroy, :sort] do
         collection { post :sort }
       end
     end

data/lib/think_feel_do_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.14.0
+  version: 3.14.1
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-21 00:00:00.000000000 Z
+date: 2016-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails