think_feel_do_engine 3.11.3 → 3.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c610316f9c19471a999dd44c70b243876b0cb5df
-  data.tar.gz: 4863c457916cac39399a06ec5f86c20ae8b60d6a
+  metadata.gz: 168393840c2fef0447215d3de3a95e560ef72fd3
+  data.tar.gz: 576c8c0552e7569ae3fbe39db6d45efcb5bb3766
 SHA512:
-  metadata.gz: 5e4fba71fede93a2bdedeb4478d07b868ad0abbe3497862dd56fa8e1ec43541a6b621426c1f9ff47368d2c5c2f46af15de168079f05def91bd20bf91a0455fd5
-  data.tar.gz: 575ae1e4bfd48f1fcddca86b5ee702f004cf543b0ede765822b2d901a1186ec6a6bb56c5700523b409fab5a836575ec4b8bedfe07cc69b641aacf8a3d1a86081
+  metadata.gz: 499a25b1234896ddac1018bed287c31580401a6f7ce3cbd4450d7904aa1c45b2f71cc1a8a4af6ae3e2168d8eef3b173d599300d7e248c6fa7f2096b0a5cdb766
+  data.tar.gz: 60d03bcaaf66c131b52c696be7df908565f128601724765cfc9b46a04d682de6b0c5a73896ac4f7c0bbe9ed518c7ba0cf3e1b047cbe9d589d33cd4e2165a858e

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

@@ -3,7 +3,13 @@ module ContentProviders
     # Allows participants to record a positive experiences/events
     class NewProvider < BitCore::ContentProvider
       def data_attributes
-        [:challenging_amplification, :description]
+        [
+          :body_feelings,
+          :challenging_amplification,
+          :description,
+          :emotions,
+          :thoughts
+        ]
       end
 
       def data_class_name

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

@@ -10,10 +10,26 @@
       <h4 class="list-group-item-heading">
         <%= experience.description %>
       </h4>
-      <p class="list-group-item-text">
-        How you amplifed/savored this experience:
-        <%= experience.challenging_amplification %>
-      </p>
+      <% if experience.emotions.present? %>
+        <p class="list-group-item-text">
+          Your emotions during the experience: <%= experience.emotions %>
+        </p>
+      <% end %>
+      <% if experience.thoughts.present? %>
+        <p class="list-group-item-text">
+          Your thoughts during the experience: <%= experience.thoughts %>
+        </p>
+      <% end %>
+      <% if experience.body_feelings.present? %>
+        <p class="list-group-item-text">
+          How your body felt: <%= experience.body_feelings %>
+        </p>
+      <% end %>
+      <% if experience.challenging_amplification.present? %>
+        <p class="list-group-item-text">
+          How you amplifed/savored this experience: <%= experience.challenging_amplification %>
+        </p>
+      <% end %>
     </li>
   <% end %>
 </ul>

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

@@ -5,9 +5,6 @@
     <%= f.label :description, "Describe something good that happened in the past day.", class: "control-label" %>
     <%= f.text_area :description, class: "form-control" %>
 
-    <%= f.label :challenging_amplification, "Did you do anything to amplify or savor it? You can also think of an opportunity to do something right now!", class: "control-label" %>
-    <%= f.text_area :challenging_amplification, class: "form-control" %>
-
     <a data-toggle="collapse" href="#collapse-experience-examples">see some examples</a>
 
     <div class="collapse" id="collapse-experience-examples">
@@ -26,5 +23,39 @@
     </div>
   </div>
 
+  <div class="form-group">
+    <%= f.label :emotions, "What feelings did you have while it was happening?", class: "control-label" %>
+    <%= f.text_field :emotions, class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :thoughts, "What thoughts did you have while it was happening?", class: "control-label" %>
+    <%= f.text_field :thoughts, class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :body_feelings, "How did your body feel?", class: "control-label" %>
+    <%= f.text_field :body_feelings, class: "form-control" %>
+  </div>
+
+  <div class="form-group">
+    <%= f.label :challenging_amplification, "Did you do anything to amplify or savor it? You can also think of an opportunity to do something right now!", class: "control-label" %>
+    <%= f.text_area :challenging_amplification, class: "form-control" %>
+
+    <a data-toggle="collapse" href="#collapse-amplify-examples">see some examples for amplifying positive events</a>
+
+    <div class="collapse" id="collapse-amplify-examples">
+      <div class="well">
+        <ul>
+          <li>Telling a friend or loved one</li>
+          <li>Writing about it in a journal or online</li>
+          <li>Celebrating (cheering, pumping your fist, smiling)</li>
+          <li>Taking a minute to savor it</li>
+          <li>Stopping to appreciate it and make sure you don't get distracted</li>
+        </ul>
+      </div>
+    </div>
+  </div>
+
   <%= f.submit t(:next), class: "btn btn-primary" %>
 <% end %>

data/db/migrate/20160209225643_add_emotions_thoughts_body_feelings_to_experience.rb

@@ -0,0 +1,7 @@
+class AddEmotionsThoughtsBodyFeelingsToExperience < ActiveRecord::Migration
+  def change
+    add_column :experiences, :emotions, :text
+    add_column :experiences, :thoughts, :text
+    add_column :experiences, :body_feelings, :text
+  end
+end

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.11.3"
+  VERSION = "3.12.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.11.3
+  version: 3.12.0
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-09 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -917,6 +917,7 @@ files:
 - db/migrate/20151104152804_update_think_tool_type_to_tools_think.rb
 - db/migrate/20160203222002_create_gratitude_recordings.rb
 - db/migrate/20160205212840_create_experiences.rb
+- db/migrate/20160209225643_add_emotions_thoughts_body_feelings_to_experience.rb
 - lib/tasks/lesson_notifications.rake
 - lib/tasks/seed.rake
 - lib/tasks/think_feel_do_engine_tasks.rake