think_feel_do_engine 3.12.3 → 3.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 294cb733b7d6aaab9041418769aadaf0af82f003
-  data.tar.gz: ea4ca81298e6edfc3f6d92fcd559910c195c71ee
+  metadata.gz: d2f279384413ae9527ed63dccf63ac46f933d377
+  data.tar.gz: aa19128c6c22d29d07d829ec1cf65e9eb67c8303
 SHA512:
-  metadata.gz: d82dfd3f54e0bbb82f27c16dd77f8e33d184a71df5598f5bba85c627e6988855645d857e06049f07b789277615fff3aed79b27a2c9c0df298cf2790e6d10abc3
-  data.tar.gz: 4c7a4ae3116ef79dd1495b5ef419b48db9482494eafdede5519f9aa5ce01550d69eb2ab7a270634e10ef3d75435e524cdf787f608588adca5b494347842a8882
+  metadata.gz: 28b0dc6f1d139ee57be4f1eee004dba48269bfaa606f171dd8f89077f8077404d0696b3e81ea45f836e9626475f54f4d4374e29b6ed05090c193c4c9d8e2847c
+  data.tar.gz: 3a664d335ad7e15538aeaf5c9f1ef22db659d8d245eb1bb0400f7af99a34467196ae8c5c2b2df6c0103b5e32164231a5dd739d956aa46a24519bee28e051f75e

data/Rakefile

@@ -25,7 +25,7 @@ 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/**/mood.js )
+  t.pattern = %w( spec/dummy/spec/javascripts/**/*.js app/assets/javascripts/think_feel_do_engine/**/draw_graphs.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/draw_graphs.js

@@ -0,0 +1,78 @@
+(function () {
+  'use strict';
+
+  sc.appendDateRange = function (graphParameters) {
+    var FORMAT = 'MMM DD YYYY';
+
+    $('div#date-range strong')
+      .empty()
+      .append(graphParameters.startDate.format(FORMAT) + ' - ' + graphParameters.endDate.format(FORMAT));
+  };
+
+  sc.drawEmotionViz = function(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';
+
+    $('div#emotions, div#emotion-legend').empty();
+    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, ['*Click each day for more information.']));
+  };
+
+  sc.drawMoodViz = function(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';
+
+    $('div#mood, div#mood-legend').empty();
+    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)
+          .y(function(date, i) {
+            return date.intensity;
+          })
+          .drawLegend(LEGEND_DIV_ID, LEGEND, ['*Click each day for more information.']));
+  };
+
+  sc.drawPHQViz = function(graphParameters) {
+    var GRAPH_DIV_ID = '#phq';
+    var GRAPH_TITLE = "PHQ9";
+    var PIXEL_HEIGHT = 300;
+    var Y_MAX = 27;
+    var Y_MIN = 0;
+    var YLABEL = 'Score';
+
+    $(GRAPH_DIV_ID).empty();
+    d3.select(GRAPH_DIV_ID)
+      .datum(graphParameters.phqData)
+        .call(columnChart(graphParameters.startDate, graphParameters.endDate, Y_MIN, Y_MAX, GRAPH_TITLE, YLABEL)
+          .width(graphParameters.graphWidth)
+          .height(PIXEL_HEIGHT)
+          .y(function(date, i) {
+            return date.intensity;
+          }));
+  };
+
+  sc.drawGraphs = function(graphParameters) {
+    sc.drawPHQViz(graphParameters);
+    sc.drawMoodViz(graphParameters);
+    sc.drawEmotionViz(graphParameters);
+    sc.appendDateRange(graphParameters);
+  };
+})();

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

@@ -11,7 +11,7 @@
       graphParameters.interval = input.val();
       graphParameters.offset = 1;
       sc.offsetInterval(graphParameters);
-      sc.drawGraphs();
+      sc.drawGraphs(graphParameters);
     });
 
     $('.offset').on('click', function(event) {
@@ -24,7 +24,7 @@
       } else {
         graphParameters.offset += parseInt($(this).data('value'), 10);
         sc.offsetInterval(graphParameters);
-        sc.drawGraphs();
+        sc.drawGraphs(graphParameters);
       }
     });
   };

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

@@ -438,13 +438,6 @@ sc.offsetInterval = function (graphParameters) {
   graphParameters.endDate = moment().subtract(endOffset, 'days').startOf('day');
 }
 
-function appendDateRange (graphParameters) {
-  var FORMAT = 'MMM DD YYYY'
-  $('div#date-range strong')
-    .empty()
-    .append(graphParameters.startDate.format(FORMAT) + ' - ' + graphParameters.endDate.format(FORMAT));
-}
-
 function maxOffset (activationDate, interval) {
   return Math.ceil(moment().diff(activationDate, 'days')/interval)
 }

data/app/models/content_modules/lesson_module.rb

@@ -1,6 +1,7 @@
 module ContentModules
   # Container for didactic content.
   class LessonModule < BitCore::ContentModule
+    SLIDESHOW_PROVIDER_TYPE = "BitCore::ContentProviders::SlideshowProvider"
     after_save :update_slideshow
 
     def self.sort(arm_id, lesson_ids)
@@ -39,9 +40,9 @@ module ContentModules
     end
 
     def lesson_provider
-      @lesson_provider ||= (content_providers.first ||
-        add_content_provider("BitCore::ContentProviders::SlideshowProvider")
-      )
+      @lesson_provider ||=
+        (content_providers.find_by_type(SLIDESHOW_PROVIDER_TYPE) ||
+        add_content_provider(SLIDESHOW_PROVIDER_TYPE))
     end
 
     def slides

data/app/models/participant.rb

@@ -280,7 +280,7 @@ class Participant < ActiveRecord::Base
   def emotional_rating_daily_averages
     averaged_ratings = []
 
-    daily_ratings = emotional_ratings.group_by { |er| er.created_at.to_date }
+    daily_ratings = emotional_ratings.group_by(&:created_at)
     # rubocop:disable all
     daily_ratings.each do |day, emotion_array|
     # rubocop:enable all

data/app/views/think_feel_do_engine/coach/patient_dashboards/_vizs.html.erb

@@ -25,49 +25,15 @@
 <div id="mood"></div>
 <div id="emotions"></div>
 <script>
-// starting graph parameters assume 7 day view ending in today
-var activationDate = activation("<%= patient.created_at %>")
-var graphParameters = new Graph(
-            <%= sanitize(patient.mood_rating_daily_averages.to_json) %>,
-            <%= sanitize(patient.emotional_rating_daily_averages.to_json) %>,
-            <%= phq_features? ? sanitize(patient.phq_scores.to_json) : "null" %>,
-            $("div#viz-container")
-          );
+  // starting graph parameters assume 7 day view ending in today
+  var activationDate = activation("<%= patient.created_at %>")
+  var graphParameters = new Graph(
+        <%= sanitize(patient.mood_rating_daily_averages.to_json) %>,
+        <%= sanitize(patient.emotional_rating_daily_averages.to_json) %>,
+        <%= phq_features? ? sanitize(patient.phq_scores.to_json) : "null" %>,
+        $("div#viz-container")
+      );
 
-sc.drawGraphs = function() {
-  $("div#mood, div#emotions").empty();
-
-  <% if phq_features? %>
-    $("div#phq").empty();
-    var phqGraphTitle = "PHQ9";
-    d3.select("#phq")
-      .datum(graphParameters.phqData)
-        .call(columnChart(graphParameters.startDate, graphParameters.endDate, 0, 27, phqGraphTitle, "Score")
-          .width(graphParameters.graphWidth)
-          .height(300)
-          .x(function(d, i) { return moment(d.day).startOf('day')._d; })
-          .y(function(d, i) { return d.intensity; }));
-  <% end %>
-
-  var moodGraphTitle = "Mood";
-  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(d.day).startOf('day')._d; })
-        .y(function(d, i) { return d.intensity; }));
-
-  var emotionGraphTitle = "Positive and Negative Emotions";
-  d3.select("#emotions")
-    .datum(graphParameters.emotionsData)
-      .call(columnChart(graphParameters.startDate, graphParameters.endDate, -10, 10, emotionGraphTitle, "Intensity")
-        .width(graphParameters.graphWidth)
-        .height(400));
-
-  appendDateRange(graphParameters);
-}
-
-sc.drawGraphs();
-sc.filterEmotionMoodViz(graphParameters);
+  sc.drawGraphs(graphParameters);
+  sc.filterEmotionMoodViz(graphParameters);
 </script>

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

@@ -32,6 +32,6 @@
 
   var graphParameters = new Graph(<%= sanitize(mood_ratings.to_json) %>, <%= sanitize(emotional_ratings.to_json) %>, null, $("#viz-container"));
 
-  sc.drawMoodEmotionGraphs(graphParameters);
+  sc.drawGraphs(graphParameters);
   sc.filterEmotionMoodViz(graphParameters);
 </script>

data/lib/think_feel_do_engine/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: think_feel_do_engine
 version: !ruby/object:Gem::Version
-  version: 3.12.3
+  version: 3.12.4
 platform: ruby
 authors:
 - Eric Carty-Fickes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -347,9 +347,9 @@ 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/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
-- 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

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

@@ -1,63 +0,0 @@
-(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);
-  };
-})();