think_feel_do_engine 3.12.2 → 3.12.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d8e4d81a41dca2e08ff40240e59b0d66c127831e
-  data.tar.gz: 9ea3ae94bbe6ed2dedd7a57cdfda73369b8d5caf
+  metadata.gz: 294cb733b7d6aaab9041418769aadaf0af82f003
+  data.tar.gz: ea4ca81298e6edfc3f6d92fcd559910c195c71ee
 SHA512:
-  metadata.gz: f655994ab605059ff192c8afb13063446349629bd2a1f288f3d15c68d565825eabd6f72aa87c306398c8860c44c3004065a1c2970525f1c512a12049ac97fdee
-  data.tar.gz: 557b7979e7bd05a5ee513458cdb55b5815ed2871cae675c5ab28549547f5d6847c528c4a49d0a71897afd79914fe05fb8cc08cf6eb267a6b3336e3299498b5ba
+  metadata.gz: d82dfd3f54e0bbb82f27c16dd77f8e33d184a71df5598f5bba85c627e6988855645d857e06049f07b789277615fff3aed79b27a2c9c0df298cf2790e6d10abc3
+  data.tar.gz: 4c7a4ae3116ef79dd1495b5ef419b48db9482494eafdede5519f9aa5ce01550d69eb2ab7a270634e10ef3d75435e524cdf787f608588adca5b494347842a8882

data/Rakefile

@@ -25,9 +25,9 @@ end
 
 require "jshintrb/jshinttask"
 Jshintrb::JshintTask.new :jshint do |t|
-  t.pattern = "spec/dummy/spec/javascripts/**/*.js"
+  t.pattern = %w( spec/dummy/spec/javascripts/**/*.js app/assets/javascripts/think_feel_do_engine/**/mood.js )
   t.options = :defaults
-  t.globals = ["$".to_sym, :spyOn, :afterEach, :beforeEach, :describe, :expect, :it, :jasmine, :sc]
+  t.globals = ["$".to_sym, :spyOn, :afterEach, :beforeEach, :describe, :expect, :it, :jasmine, :sc, :Graph, :appendDateRange, :columnChart, :d3, :moment]
 end
 
 require "rubocop/rake_task"
@@ -44,6 +44,6 @@ task :default do
   Rake::Task["brakeman"].invoke
   Rake::Task["jshint"].invoke
   Rake::Task["rubocop"].invoke
-  Rake::Task["spec"].invoke
   Rake::Task["js_spec"].invoke
+  Rake::Task["spec"].invoke
 end

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

@@ -0,0 +1,63 @@
+(function () {
+  'use strict';
+
+  sc.calcStartOfDay = function(date) {
+    return moment(date.day, 'YYYY-MM-DDTHH:mm:ss.sssZ').startOf('day')._d;
+  };
+
+  sc.drawMoodEmotionGraphs = function(graphParameters) {
+    var NOTES = '*Click each day for more information.';
+
+    function clearContainers() {
+      $('div#mood, div#mood-legend, div#emotions, div#emotion-legend')
+        .empty();
+    }
+
+    function drawMoodViz(graphParameters) {
+      var GRAPH_DIV_ID = '#mood';
+      var GRAPH_TITLE = 'Mood*';
+      var LEGEND = [['Mood', '#4682B4'], ['Daily Average', 'green']];
+      var LEGEND_DIV_ID = '#mood-legend';
+      var PIXEL_HEIGHT = 300;
+      var Y_MAX = 10;
+      var Y_MIN = 0;
+      var YLABEL = 'mood';
+
+      d3.select(GRAPH_DIV_ID)
+        .datum(graphParameters.moodData)
+          .call(columnChart(graphParameters.startDate, graphParameters.endDate, Y_MIN, Y_MAX, GRAPH_TITLE, YLABEL)
+            .width(graphParameters.graphWidth)
+            .height(PIXEL_HEIGHT)
+            .x(function(date, i) {
+              return sc.calcStartOfDay(date);
+            })
+            .y(function(d, i) {
+              return d.intensity;
+            })
+            .drawLegend(LEGEND_DIV_ID, LEGEND, [NOTES]));
+    }
+
+    function drawEmotionViz(graphParameters) {
+      var GRAPH_DIV_ID = '#emotions';
+      var GRAPH_TITLE = 'Positive and Negative Emotions*';
+      var LEGEND = [['Positive', '#4682B4'], ['Negative', '#A52A2A'], ['Daily Average', 'green']];
+      var LEGEND_DIV_ID = '#emotion-legend';
+      var PIXEL_HEIGHT = 400;
+      var Y_MAX = 10;
+      var Y_MIN = -10;
+      var YLABEL = 'Intensity';
+
+      d3.select(GRAPH_DIV_ID)
+        .datum(graphParameters.emotionsData)
+          .call(columnChart(graphParameters.startDate, graphParameters.endDate, Y_MIN, Y_MAX, GRAPH_TITLE, YLABEL)
+            .width(graphParameters.graphWidth)
+            .height(PIXEL_HEIGHT)
+            .drawLegend(LEGEND_DIV_ID, LEGEND, [NOTES]));
+    }
+
+    clearContainers();
+    drawMoodViz(graphParameters);
+    drawEmotionViz(graphParameters);
+    return appendDateRange(graphParameters);
+  };
+})();

data/app/models/activity.rb

@@ -355,8 +355,7 @@ class Activity < ActiveRecord::Base
   end
 
   def set_end_time
-    unless start_time.nil?
-      self.end_time = start_time + 1.hour
-    end
+    return unless end_time.nil? && start_time.present?
+    self.end_time = start_time + 1.hour
   end
-end
+end

data/app/models/delivered_message.rb

@@ -32,7 +32,7 @@ class DeliveredMessage < ActiveRecord::Base
     if recipient.instance_of? User
       ThinkFeelDoEngine::MessageNotifications
         .new_for_coach(recipient, sender.active_group)
-        .deliver
+        .deliver_now
     elsif recipient.notify_by_sms?
       MessageSmsNotification
         .new(
@@ -42,7 +42,7 @@ class DeliveredMessage < ActiveRecord::Base
     else
       ThinkFeelDoEngine::MessageNotifications
         .new_for_participant(recipient)
-        .deliver
+        .deliver_now
     end
   rescue => exception
     ::Raven.capture_message(exception)

data/app/models/group.rb

@@ -42,8 +42,10 @@ class Group < ActiveRecord::Base
       membership
         .participant
         .thoughts
-        .where(thoughts[:created_at].gteq(week_start_day(week_number)))
-        .where(thoughts[:created_at].lt(week_end_day(week_number)))
+        .where(thoughts[:created_at]
+          .gteq(membership.week_start_day(week_number)))
+        .where(thoughts[:created_at]
+          .lt(membership.week_end_day(week_number)))
     end.map(&:count).sum
   end
 
@@ -55,8 +57,8 @@ class Group < ActiveRecord::Base
         .participant
         .activities
         .in_the_past
-        .where(activities[:created_at].gteq(week_start_day(week_number)))
-        .where(activities[:created_at].lt(week_end_day(week_number)))
+        .where(activities[:start_time]
+          .gteq(membership.week_start_day(week_number)))
     end.map(&:count).sum
   end
 
@@ -68,8 +70,8 @@ class Group < ActiveRecord::Base
         .participant
         .activities
         .unscheduled_or_in_the_future
-        .where(activities[:created_at].gteq(week_start_day(week_number)))
-        .where(activities[:created_at].lt(week_end_day(week_number)))
+        .where(activities[:start_time]
+          .lt(membership.week_end_day(week_number)))
     end.map(&:count).sum
   end
 
@@ -80,9 +82,9 @@ class Group < ActiveRecord::Base
       SocialNetworking::Goal
         .where(participant: membership.participant)
         .where(social_networking_goals[:created_at]
-                 .gteq(week_start_day(week_number)))
+                 .gteq(membership.week_start_day(week_number)))
         .where(social_networking_goals[:created_at]
-                 .lt(week_end_day(week_number)))
+                 .lt(membership.week_end_day(week_number)))
     end.map(&:count).sum
   end
 
@@ -93,9 +95,9 @@ class Group < ActiveRecord::Base
       SocialNetworking::Comment
         .where(participant: membership.participant)
         .where(social_networking_comments[:created_at]
-                 .gteq(week_start_day(week_number)))
+                 .gteq(membership.week_start_day(week_number)))
         .where(social_networking_comments[:created_at]
-                 .lt(week_end_day(week_number)))
+                 .lt(membership.week_end_day(week_number)))
     end.map(&:count).sum
   end
 
@@ -107,9 +109,9 @@ class Group < ActiveRecord::Base
       SocialNetworking::OnTheMindStatement
         .where(participant: membership.participant)
         .where(social_networking_on_the_mind_statements[:created_at]
-                 .gteq(week_start_day(week_number)))
+                 .gteq(membership.week_start_day(week_number)))
         .where(social_networking_on_the_mind_statements[:created_at]
-                 .lt(week_end_day(week_number)))
+                 .lt(membership.week_end_day(week_number)))
     end.map(&:count).sum
   end
 
@@ -121,24 +123,9 @@ class Group < ActiveRecord::Base
       SocialNetworking::Like
         .where(participant: membership.participant)
         .where(social_networking_likes[:created_at]
-                 .gteq(week_start_day(week_number)))
+                 .gteq(membership.week_start_day(week_number)))
         .where(social_networking_likes[:created_at]
-                 .lt(week_end_day(week_number)))
+                 .lt(membership.week_end_day(week_number)))
     end.map(&:count).sum
   end
-
-  private
-
-  # Returns the earliest start date of all the group's memberships
-  def start_date
-    memberships.order(start_date: :asc).first.start_date
-  end
-
-  def week_start_day(week_number)
-    start_date + ((week_number - 1) * 7).days
-  end
-
-  def week_end_day(week_number)
-    start_date + (week_number * 7).days
-  end
 end

data/app/models/membership.rb

@@ -154,6 +154,14 @@ class Membership < ActiveRecord::Base
     update_columns(end_date: Date.current - 1.day, is_complete: true)
   end
 
+  def week_start_day(week_number)
+    start_date_with_zone + ((week_number - 1) * 7).days
+  end
+
+  def week_end_day(week_number)
+    start_date_with_zone + (week_number * 7).days
+  end
+
   private
 
   def create_task_statuses
@@ -183,17 +191,13 @@ class Membership < ActiveRecord::Base
     errors.add :is_complete, "cannot be set to true for end dates in the future"
   end
 
-  def week_start_day(week_number)
-    start_date + ((week_number - 1) * 7).days
-  end
-
-  def week_end_day(week_number)
-    start_date + (week_number * 7).days
-  end
-
   def not_ending_in_the_past
     return unless end_date && end_date_changed? && end_date < Date.current
 
     errors.add :end_date, "must not be in the past"
   end
+
+  def start_date_with_zone
+    start_date.to_time
+  end
 end

data/app/models/participant.rb

@@ -319,7 +319,7 @@ class Participant < ActiveRecord::Base
 
   def mood_rating_daily_averages
     averaged_ratings = []
-    daily_ratings = moods.group_by { |mood| mood.created_at.to_date }
+    daily_ratings = moods.group_by(&:created_at)
     # rubocop:disable all
     daily_ratings.each do |day, moods_array|
     # rubocop:enable all

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

@@ -31,45 +31,7 @@
   var activationDate = activation("<%= current_participant.created_at %>")
 
   var graphParameters = new Graph(<%= sanitize(mood_ratings.to_json) %>, <%= sanitize(emotional_ratings.to_json) %>, null, $("#viz-container"));
-  var yLabel = "Intensity"
 
-  sc.drawGraphs = function() {
-    var emotionGraphTitle,
-        emotionLegendJSON,
-        emotionLegendNotes,
-        moodGraphTitle,
-        moodLegendJSON,
-        moodLegendNotes;
-
-    $("div#mood, div#mood-legend, div#emotions, div#emotion-legend").empty();
-
-    // mood viz
-    moodGraphTitle = "Mood*";
-    moodLegendJSON = [["Mood", "#4682B4"], ["Daily Average", "green"]];
-    moodLegendNotes = ["*Click each day for more information."];
-    d3.select("#mood")
-      .datum(graphParameters.moodData)
-        .call(columnChart(graphParameters.startDate, graphParameters.endDate, 0, 10, moodGraphTitle, "mood")
-          .width(graphParameters.graphWidth)
-          .height(300)
-          .x(function(d, i) { return moment(new Date(d.day)).startOf("day")._d; })
-          .y(function(d, i) { return d.intensity; })
-          .drawLegend("#mood-legend", moodLegendJSON, moodLegendNotes));
-
-    // emotion viz
-    emotionGraphTitle = "Positive and Negative Emotions*";
-    emotionLegendJSON = [["Positive", "#4682B4"], ["Negative", "#A52A2A"], ["Daily Average", "green"]];
-    emotionLegendNotes = ["*Click each day for more information."];
-    d3.select("#emotions")
-      .datum(graphParameters.emotionsData)
-        .call(columnChart(graphParameters.startDate, graphParameters.endDate, -10, 10, emotionGraphTitle, yLabel)
-          .width(graphParameters.graphWidth)
-          .height(400)
-          .drawLegend("#emotion-legend", emotionLegendJSON, emotionLegendNotes));
-
-    return appendDateRange(graphParameters);
-  };
-
-  sc.drawGraphs();
+  sc.drawMoodEmotionGraphs(graphParameters);
   sc.filterEmotionMoodViz(graphParameters);
 </script>

data/lib/think_feel_do_engine/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module ThinkFeelDoEngine
-  VERSION = "3.12.2"
+  VERSION = "3.12.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.12.2
+  version: 3.12.3
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-17 00:00:00.000000000 Z
+date: 2016-02-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
@@ -349,6 +349,7 @@ files:
 - app/assets/javascripts/think_feel_do_engine/event_capture/init.js
 - app/assets/javascripts/think_feel_do_engine/feel/emotion_mood_viz.js
 - app/assets/javascripts/think_feel_do_engine/feel/emotions.js
+- app/assets/javascripts/think_feel_do_engine/feel/mood.js
 - app/assets/javascripts/think_feel_do_engine/feel/timeago.js
 - app/assets/javascripts/think_feel_do_engine/forms/multi_page.js.erb
 - app/assets/javascripts/think_feel_do_engine/forms/multi_page_thought.js.erb