think_feel_do_engine 3.15.2 → 3.15.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e83ae6fd9a710a062c4abad4f5294fd8fa398be
-  data.tar.gz: 30db304fb47b40b0c49dfe62fe6ac93190f29d3f
+  metadata.gz: 1c112288214be133c2d67a051e11b527a383ca8c
+  data.tar.gz: fffba0d56a2d9988017b1b9139e198c1458f75e9
 SHA512:
-  metadata.gz: 7f37cee0fb9d4c0b54951d1e4df53cd2d6840c261dda81c2c20218ee27725db866c23c1f472a2d6489c638b24b74a19ae3fcea9106ad9cbe2e6ffd387939e6fe
-  data.tar.gz: 0d4676397eea5e1ce4a3873abe315adb4d49098c54177efd3cd7c063944f19e1c860fca8677ea197bdf185c593e31b09da45151d41f43ae47dde3f111c589442
+  metadata.gz: f42ec636df2f603354c3fceb06f629ba6d48d36cb7ffa604b0d26b9c1fbdf836b9d2c33c407cb244d5f6e03e229a755954e7ad94965455ba9eea396bfd52e21d
+  data.tar.gz: 488227e76b5054c0f970cd280d4068e06d05226cf4a0934a1b58f9e3255b7d3f081508a9b6e2f359bc30d7fa93841f82c17839e98b4c9d5e288ca07b3a87d03d

data/Rakefile

@@ -28,7 +28,6 @@ Jshintrb::JshintTask.new :jshint do |t|
   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]

data/app/models/content_providers/experiences/new_provider.rb

@@ -17,11 +17,13 @@ module ContentProviders
       end
 
       def render_current(options)
+        view_context = options.view_context
+
         options.view_context.render(
           template: "think_feel_do_engine/experiences/new_provider",
           locals: {
-            create_path: options.view_context.participant_data_path,
-            participant: options.view_context.current_participant
+            create_path: view_context.participant_data_path,
+            participant: view_context.current_participant
           })
       end
 

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

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

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

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

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

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

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

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

data/app/views/think_feel_do_engine/navigator/_before_content.html.erb

@@ -1,5 +1,5 @@
 <% if current_provider_skippable?(@navigator) %>
   <div class="btn-toolbar">
-    <%= link_to "Skip", navigator_next_provider_path, class: "btn btn-default next-button" %>
+    <%= link_to t(:skip), navigator_next_provider_path, class: "btn btn-default next-button" %>
   </div>
 <% end %>

data/config/locales/en.yml

@@ -2,3 +2,4 @@ en:
   back: Back
   finish: Finish
   next: Next
+  skip: Skip

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.15.2"
+  VERSION = "3.15.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.15.2
+  version: 3.15.3
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-15 00:00:00.000000000 Z
+date: 2016-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -355,7 +355,6 @@ 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
@@ -467,7 +466,6 @@ 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
@@ -689,7 +687,6 @@ 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

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

@@ -1,44 +0,0 @@
-(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/models/content_providers/emotions/new_yesterday_provider.rb

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

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