think_feel_do_engine 3.13.1 → 3.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58c305de820aec793aadb69da7198a9a55ae7ba8
-  data.tar.gz: 14e0d3e93f6285dacff773c99f1312ccb2b363fa
+  metadata.gz: 2e52d93a1e3df886b9a314e18e7199cea8e4487d
+  data.tar.gz: 194f71dad591970c846e5f9a62393ed0c88eb488
 SHA512:
-  metadata.gz: 61bfe1a0cf4290f0335de714a133be2e131eeebd8c9f4eb5bcd3f5b800330de6c592546a3d04e267fea247188a980197fee9cde56a3c64f359b88cd60a078197
-  data.tar.gz: a55df5197e857ff4b3cb2c813d146adc93e47ab09d65dd5bb3128313f4ecfcac3df550d1590a034d3c4f3605b63820c02a69b1eceb5bfb550b8ea2ceee0d9e0c
+  metadata.gz: f9caa87eb111f241458a6acf0a19ee2e83dfe763a6f091abd1a62f17dbd3ff3d1aea2b2cc089c638b96cfb2ab54db3eb0ed4a896f0e146bdec311092f972c214
+  data.tar.gz: 75139bbc0c7ce729689fada0addf65d294520c134209e3935c96465c696c6fe9a05135ff64a957d2a7745dc58101cd275e1022a9cee75ff4139ff63fd010e7c0

data/Rakefile

@@ -25,7 +25,11 @@ end
 
 require "jshintrb/jshinttask"
 Jshintrb::JshintTask.new :jshint do |t|
-  t.pattern = %w( spec/dummy/spec/javascripts/**/*.js app/assets/javascripts/think_feel_do_engine/**/draw_graphs.js )
+  t.pattern = %w(
+    spec/dummy/spec/javascripts/**/*.js
+    app/assets/javascripts/think_feel_do_engine/**/draw_graphs.js
+    app/assets/javascripts/think_feel_do_engine/feel/create_emotional_ratings.js
+  )
   t.options = :defaults
   t.globals = ["$".to_sym, :spyOn, :afterEach, :beforeEach, :describe, :expect, :it, :jasmine, :sc, :Graph, :appendDateRange, :columnChart, :d3, :moment]
 end

data/app/assets/javascripts/think_feel_do_engine/feel/create_emotional_ratings.js

@@ -0,0 +1,44 @@
+(function() {
+  'use strict';
+
+  sc.createEmotionalRating = function(options) {
+    var $tr = $(options.rows_of_emotions[options.index]);
+    var rating = $tr.find('input:checked').val();
+
+    function successCallback() {
+      rateEmotion(options);
+    }
+
+    options.index = options.index + 1;
+    if (rating) {
+      $.ajax({
+        type: 'post',
+        url: options.post_path,
+        data: {
+          emotional_rating: {
+            emotion_id: $tr.data('emotionId'),
+            is_positive: $tr.data('isPositive'),
+            participant_id: options.participant_id,
+            rating: rating
+          }
+        },
+        async: true,
+        dataType: 'script',
+        success: successCallback,
+        error: errorCallback
+      });
+    } else {
+      rateEmotion(options);
+    }
+  };
+
+  function errorCallback() {}
+
+  function rateEmotion(options) {
+    if (options.count === 0 || options.count === options.index) {
+      options._window.location = options.redirect_path;
+    } else {
+      sc.createEmotionalRating(options);
+    }
+  }
+})();

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

@@ -9,6 +9,8 @@ module ThinkFeelDoEngine
       before_action :authenticate_user!, :set_arm,
                     :set_content_modules, :set_slideshows
 
+      PROVIDER_NOT_FOUND = "The slide you are looking for no longer exists."
+
       def index
         authorize! :index, BitCore::ContentProvider
         @content_providers = BitCore::ContentProvider.all
@@ -16,10 +18,14 @@ module ThinkFeelDoEngine
 
       def show
         authorize! :show, BitCore::ContentProvider
-        @content_provider = find_content_provider
-
-        if @content_provider.source_content_id
-          @slideshow = @content_provider.source_content
+        begin
+          @content_provider = find_content_provider
+
+          if @content_provider.source_content_id
+            @slideshow = @content_provider.source_content
+          end
+        rescue ActiveRecord::RecordNotFound
+          redirect_to main_app.root_path, alert: PROVIDER_NOT_FOUND
         end
       end
 

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

@@ -71,12 +71,7 @@ module ThinkFeelDoEngine
       end
 
       def show
-        if @slideshow.has_table_of_contents? &&
-           FIRST_SLIDE_POSITION == @slide.position
-          render "think_feel_do_engine/slides/"
-        else
-          render "think_feel_do_engine/slides/show"
-        end
+        render "think_feel_do_engine/slides/show"
       end
 
       def edit

data/app/models/content_providers/emotions/new_yesterday_provider.rb

@@ -0,0 +1,95 @@
+module ContentProviders
+  module Emotions
+    # Allows participants to record all of yesterday's emotions
+    class NewYesterdayProvider < BitCore::ContentProvider
+      Description = Struct.new(:name, :is_positive)
+      Rating = Struct.new(:description, :value)
+
+      def render_current(options)
+        context = options.view_context
+        participant = options.participant
+
+        context.render(
+          template: "think_feel_do_engine/emotions/new_yesterday",
+          locals: {
+            create_path: context.participant_data_path,
+            emotional_ratings: emotional_ratings(participant),
+            participant: participant,
+            ratings: ratings
+          })
+      end
+
+      def data_attributes
+        [
+          :emotion_id,
+          :is_positive,
+          :participant_id,
+          :rating
+        ]
+      end
+
+      def data_class_name
+        "EmotionalRating"
+      end
+
+      def emotional_ratings(participant)
+        descriptions.map do |description|
+          participant
+            .emotional_ratings
+            .build(
+              emotion: emotions(participant)
+                        .find_or_create_by!(name: description.name),
+              is_positive: description.is_positive)
+        end
+      end
+
+      def show_nav_link?
+        false
+      end
+
+      private
+
+      def descriptions
+        [
+          Description.new("amused, fun-loving", true),
+          Description.new("angry, irritated, frustrated", false),
+          Description.new("anxious, scared", false),
+          Description.new("awe, wonder, inspiration", true),
+          Description.new("bored", false),
+          Description.new("contempt, score, disdain", false),
+          Description.new("content", false),
+          Description.new("disgusted", false),
+          Description.new("embarrassed", false),
+          Description.new("excited, eager, enthusiastic", true),
+          Description.new("grateful", true),
+          Description.new("guilty", false),
+          Description.new("happy", true),
+          Description.new("hatred, disgust, suspicion", false),
+          Description.new("hopeful, optimistic", true),
+          Description.new("interested", true),
+          Description.new("lonely, rejected", false),
+          Description.new("love, closeness, trust", true),
+          Description.new("proud, confident", true),
+          Description.new("sad", false),
+          Description.new("stressed, overwhelmed", false),
+          Description.new("sympathy, compassion", true),
+          Description.new("relieved", true)
+        ]
+      end
+
+      def emotions(participant)
+        @emotions ||= participant.emotions
+      end
+
+      def ratings
+        [
+          Rating.new("Not at all", 0),
+          Rating.new("A little bit", 1),
+          Rating.new("Sometimes", 2),
+          Rating.new("Frequently", 3),
+          Rating.new("All the time", 4)
+        ]
+      end
+    end
+  end
+end

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

@@ -0,0 +1,60 @@
+<h1>Over the PAST DAY, how much have you felt each of these emotions?</h1>
+
+<table class="table" style="background-color: #FFF;">
+  <thead>
+    <tr>
+      <th></th>
+      <% ratings.each do |rating| %>
+        <th>
+          <%= rating.description %>
+        </th>
+      <% end %>
+    </tr>
+  </thead>
+  <tbody>
+    <% emotional_ratings.each do |emotional_rating| %>
+      <tr
+        data-emotion-id="<%= emotional_rating.emotion_id %>"
+        data-is-positive="<%= emotional_rating.is_positive %>">
+        <th>
+          <label for="emotional_rating_<%= emotional_rating.emotion_id %>_<%= ratings.first.value %>">
+            <%= emotional_rating.name %>
+          </label>
+        </th>
+        <% ratings.each do |rating| %>
+          <td>
+            <input
+              id="emotional_rating_<%= emotional_rating.emotion_id %>_<%= rating.value %>"
+              name="emotional_rating_<%= emotional_rating.emotion_id %>"
+              type="radio"
+              value="<%= rating.value %>">
+          </td>
+        <% end %>
+      </tr>
+    <% end %>
+  </tbody>
+</table>
+
+<div class="btn-toolbar">
+  <%= submit_tag t(:next), class: "btn btn-primary", id: "submit_emotions" %>
+</div>
+
+<script type="text/javascript">
+  $(document).on("page:change", function() {
+    $('#submit_emotions').on('click', function() {
+      var $rows_of_emotions = $('table.table tbody tr');
+      var count = $rows_of_emotions.length;
+      var options = {
+        rows_of_emotions: $rows_of_emotions,
+        index: 0,
+        count: count,
+        participant_id: '<%= current_participant.id %>',
+        post_path: '<%= create_path %>',
+        redirect_path: '<%= main_app.root_path %>',
+        _window: window
+      };
+
+      sc.createEmotionalRating(options);
+    });
+  });
+</script>

data/lib/think_feel_do_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.13.1
+  version: 3.14.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-17 00:00:00.000000000 Z
+date: 2016-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -349,6 +349,7 @@ files:
 - app/assets/javascripts/think_feel_do_engine/dateWrapper.js
 - app/assets/javascripts/think_feel_do_engine/devise/passwords/edit.js.erb
 - app/assets/javascripts/think_feel_do_engine/event_capture/init.js
+- app/assets/javascripts/think_feel_do_engine/feel/create_emotional_ratings.js
 - app/assets/javascripts/think_feel_do_engine/feel/draw_graphs.js
 - app/assets/javascripts/think_feel_do_engine/feel/emotion_mood_viz.js
 - app/assets/javascripts/think_feel_do_engine/feel/emotions.js
@@ -459,6 +460,7 @@ files:
 - 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/emotions/new_yesterday_provider.rb
 - app/models/content_providers/evaluate_thoughts_provider.rb
 - app/models/content_providers/experiences/index_provider.rb
 - app/models/content_providers/experiences/new_provider.rb
@@ -680,6 +682,7 @@ files:
 - app/views/think_feel_do_engine/emotions/_form.html.erb
 - app/views/think_feel_do_engine/emotions/index.html.erb
 - app/views/think_feel_do_engine/emotions/new_current.html.erb
+- app/views/think_feel_do_engine/emotions/new_yesterday.html.erb
 - app/views/think_feel_do_engine/experiences/index_provider.html.erb
 - app/views/think_feel_do_engine/experiences/new_provider.html.erb
 - app/views/think_feel_do_engine/gratitude_recordings/index_provider.html.erb