social_networking 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 562a5d9e0f09da43d280eaae54d06447cbe971c4
-  data.tar.gz: c938b4d0e22b13e87fd2fead7a21ac92db8cfccc
+  metadata.gz: e4c9e53e10a7efdc383a840020e97a30b7a76ff8
+  data.tar.gz: b5b9592f3d7eece79b1bb73a3a76f5b6dfa3614d
 SHA512:
-  metadata.gz: 8af7f5a40babb7399dc55137870c74c4c48247d9bf981ed1e9ba19a2661d1b4fdee7016efe6ca131a8f6442336bb10cb10cd6dcae2df91b8b182a233d8757856
-  data.tar.gz: ef9c729fa5fc0960771033328947eb229d2a6f0a68c5425af937f7c951a84d3c67b68c4b8d54b013cd0b9f676fc3557cfa4a1a88bb06eb04abd79856630e8d1c
+  metadata.gz: e4c1c8395f1f56448f07f5b985ae6775a52bfa049f73a6018db1d2fac2d1796bdb7fd070e45ac7ead4f3d60b1aa7efcdb2462c40d46489f38c56e1e363fd1500
+  data.tar.gz: 4da319a05791ddd171aec41c0ed01f9f643dff89a3c21b8f3f4a8c90bca444b15d3aa836ada30b68fd20accfcdc76ebfb7528ddb1fcc8b43f9ccaac88ac62cff

data/app/assets/javascripts/social_networking/app.js

@@ -7,7 +7,10 @@ angular.module('socialNetworking', [
   'socialNetworking.directives',
   'socialNetworking.services',
   'socialNetworking.values'
-]);
+]).constant("SN_CONSTANTS", {
+  TEXT_MAX_LENGTH: 1000,
+  INPUT_CLASS: '.form-control'
+});
 
 // Define submodules.
 angular.module('socialNetworking.controllers', []);

data/app/assets/javascripts/social_networking/controllers/goal-controller.js

@@ -3,10 +3,11 @@
 
   // Provides management of goals.
   function GoalCtrl(GoalService, goalTool, currentGoals,
-                    studyEndDate, noticesEnabled, noticeUtility) {
+                    studyEndDate, noticesEnabled, noticeUtility, SN_CONSTANTS) {
     this._goals = GoalService;
     this._goalTool = goalTool;
     this.goalModel = this._goalTool.getModel();
+    this.textMaxLength = SN_CONSTANTS.TEXT_MAX_LENGTH;
     this.participantGoals = currentGoals;
     this.studyEndDate = studyEndDate;
     this.noticesEnabled = noticesEnabled;
@@ -154,6 +155,13 @@
     this._goalTool.setFilter(type);
   };
 
+  GoalCtrl.prototype.showCharLimit = function(inputTag) {
+    $(inputTag)
+      .showCharLimit({
+        maxlength: this.textMaxLength
+      });
+  };
+
   GoalCtrl.prototype.getFilter = function() {
     return this._goalTool.getFilter();
   };
@@ -162,5 +170,5 @@
   angular.module('socialNetworking.controllers')
     .controller('GoalCtrl', ['Goals', 'goalTool', 'currentGoals',
                 'participantStudyEndDate', 'noticesEnabled',
-                'noticeUtility', GoalCtrl]);
+                'noticeUtility', 'SN_CONSTANTS', GoalCtrl]);
 })();

data/app/assets/javascripts/social_networking/controllers/home-controller.js

@@ -7,9 +7,11 @@
   function HomeCtrl(OnYourMindResource, CommentResource, LikeResource,
                     homeTool, participantId, actionItems, feedItems,
                     memberProfiles, $filter, $http, $location, $scope,
-                    noticesEnabled, noticeUtility, resource) {
+                    noticesEnabled, noticeUtility, resource, SN_CONSTANTS) {
     this.actionItems = actionItems;
     this.feedItems = feedItems;
+    this.textMaxLength = SN_CONSTANTS.TEXT_MAX_LENGTH;
+    this.bootstrapInputClass = SN_CONSTANTS.INPUT_CLASS;
     this.page = 0;
     this.feedDisabled = false;
     this._memberProfiles = memberProfiles;
@@ -176,6 +178,8 @@
 
   // Is the tool in On Your Mind Entry Mode?
   HomeCtrl.prototype.inOnYourMindEntryMode = function() {
+    this.resetAllCharCountText(this.bootstrapInputClass);
+
     return this._homeTool.getMode() ===
            this._homeTool.MODES.ON_YOUR_MIND_ENTRY;
   };
@@ -224,6 +228,20 @@
     }
   };
 
+  HomeCtrl.prototype.resetAllCharCountText = function(inputClass) {
+    $(inputClass)
+      .trigger('check.show-char-limit');
+  };
+
+  HomeCtrl.prototype.showCharLimit = function(inputTag) {
+    this.resetAllCharCountText(this.bootstrapInputClass);
+
+    $(inputTag)
+      .showCharLimit({
+        maxlength: this.textMaxLength
+      });
+  };
+
   HomeCtrl.prototype.taskVisited = function(item) {
     $.ajax({
       async: false,
@@ -256,5 +274,5 @@
     .controller('HomeCtrl', ['OnYourMindResource', 'CommentResource',
         'LikeResource', 'homeTool', 'participantId', 'actionItems',
         'feedItems', 'memberProfiles', '$filter', '$http', '$location',
-        '$scope', 'noticesEnabled', 'noticeUtility', 'resource', HomeCtrl]);
+        '$scope', 'noticesEnabled', 'noticeUtility', 'resource', 'SN_CONSTANTS', HomeCtrl]);
 })();

data/app/assets/javascripts/social_networking/controllers/profile-answer-controller.js

@@ -2,10 +2,11 @@
     "use strict";
 
     // Provide interaction with a participant's profile answers to profile questions.
-    function ProfileAnswerCtrl($window, ProfileAnswers) {
+    function ProfileAnswerCtrl($window, ProfileAnswers, SN_CONSTANTS) {
       this._answerResource = ProfileAnswers;
       this.answerModels = {};
       this._answerStates = {};
+      this.textMaxLength = SN_CONSTANTS.TEXT_MAX_LENGTH;
       this.$window = $window;
     }
 
@@ -30,6 +31,13 @@
         });
     };
 
+    ProfileAnswerCtrl.prototype.showCharLimit = function(inputTag) {
+      $(inputTag)
+        .showCharLimit({
+          maxlength: this.textMaxLength
+        });
+    };
+
     ProfileAnswerCtrl.prototype.ifAnswered = function(questions) {
       var self, states = [];
 
@@ -100,5 +108,5 @@
 
     // Create a module and register the controllers.
     angular.module('socialNetworking.controllers')
-      .controller('ProfileAnswerCtrl', ['$window', 'ProfileAnswers', ProfileAnswerCtrl]);
+      .controller('ProfileAnswerCtrl', ['$window', 'ProfileAnswers', 'SN_CONSTANTS', ProfileAnswerCtrl]);
 })();

data/app/assets/javascripts/social_networking.js

@@ -6,5 +6,6 @@
 //= require bootstrap/tooltip
 //= require bootstrap/popover
 //= require bootstrap/modal
+//= require jquery.show_char_limit
 //= require jquery.toaster
 //= require_tree .

data/app/views/social_networking/goals/tool.html.erb

@@ -31,7 +31,7 @@
 
     <div class="form-group col-lg-8 col-md-8">
       <label for="new-goal-description">What is your goal?</label>
-      <input type="text" class="form-control" id="new-goal-description" ng-model="goal.goalModel.description" ng-maxlength="255" required focus-on="new-goal">
+      <input type="text" class="form-control" id="new-goal-description" ng-model="goal.goalModel.description" ng-maxlength="goal.textMaxLength" required focus-on="new-goal" ng-focus="goal.showCharLimit('input#new-goal-description')">
     </div>
 
     <div class="form-group col-lg-8 col-md-8">

data/app/views/social_networking/homes/show.html.erb

@@ -23,13 +23,13 @@
   </div>
   <ul class="list-group profile-icon-top" ng-show="home.inFeedBrowseMode()">
     <li class="list-group-item">
-      <button class="btn-link faded" ng-click="home.newOnYourMindStatement()">What's on your mind?</button>
+      <button class="btn-link faded" ng-click="home.newOnYourMindStatement();">What's on your mind?</button>
     </li>
   </ul>
   <form novalidate role="form" name="onYourMindForm" class="row" ng-show="home.inOnYourMindEntryMode()">
     <div class="form-group col-lg-8 col-md-8">
       <label for="new-on-your-mind-description">What's on your mind?</label>
-      <input type="text" class="form-control" id="new-on-your-mind-description" ng-model="home.onYourMindModel.description" ng-maxlength="255" required focus-on="new-goal">
+      <input type="text" class="form-control" id="new-on-your-mind-description" ng-model="home.onYourMindModel.description" ng-maxlength="home.textMaxLength" required focus-on="new-goal" ng-focus="home.showCharLimit('input#new-on-your-mind-description')">
     </div>
 
     <div class="form-group col-lg-8 col-md-8">

data/app/views/social_networking/profile_pages/_profile_questions.html.erb

@@ -39,7 +39,13 @@
                 <input type="hidden" name="id" ng-if="answer.answerModels[question.id].id !== null">
 
                 <div class="form-group col-lg-8 col-md-8">
-                  <input type="text" class="form-control" id="new-answer-description-{{question.id}}" ng-model="answer.answerModels[question.id].answer_text" ng-maxlength="255">
+                  <input
+                    class="form-control"
+                    id="new-answer-description-{{question.id}}"
+                    ng-focus="answer.showCharLimit('#new-answer-description-' + question.id)"
+                    ng-maxlength="answer.textMaxLength"
+                    ng-model="answer.answerModels[question.id].answer_text"
+                    type="text">
                 </div>
 
                 <div class="form-group col-lg-8 col-md-8">
@@ -71,7 +77,6 @@
         <div class="panel-body">
           <div ng-repeat="question in profileQuestions.questions | orderBy:'order'" class="panel panel-<%= panel_class %>" ng-init="answer.storeAnswer(<%= @profile.id %>, question.id, answer)">
             <div class="panel-heading"><strong class="panel-title">{{ question.question_text }}</strong></div>
-
             <div class="panel-body">
               {{ answer.answerModels[question.id].answer_text }}
             </div>

data/app/views/social_networking/shared/_comment_form.html.erb

@@ -6,8 +6,8 @@
   </ul>
 
   <div class="form-group col-lg-8 col-md-8">
-    <label for="comment-text">What do you think?</label>
-    <input type="text" class="form-control" id="comment-text" ng-model="home.commentModel.text" ng-maxlength="255" required focus-on="new-comment">
+    <label for="comment-text-{{home.commentModel.id}}">What do you think?</label>
+    <input type="text" class="form-control" id="comment-text-{{home.commentModel.id}}" ng-model="home.commentModel.text" ng-maxlength="home.textMaxLength" required focus-on="new-comment" ng-focus="home.showCharLimit('input#comment-text-' + home.commentModel.id)">
   </div>
 
   <div class="form-group col-lg-8 col-md-8">

data/app/views/social_networking/shared/_infinite_feed.html.erb

@@ -81,8 +81,8 @@
   <div ng-show="home.isCommentingOn(item)">
     <form novalidate role="form" >
       <div class="form-group">
-        <label for="comment-text">What do you think?</label>
-        <input type="text" class="form-control" id="comment-text" ng-model="home.commentModel.text" ng-maxlength="255" required focus-on="new-comment">
+        <label for="comment-text-{{ item.id }}">What do you think?</label>
+        <input type="text" class="form-control" id="comment-text-{{ item.id }}" ng-model="home.commentModel.text" ng-maxlength="home.textMaxLength" required focus-on="new-comment" ng-focus="home.showCharLimit('input#comment-text-' + item.id)">
       </div>
 
       <div class="form-group">

data/db/migrate/20160308201931_change_on_the_mind_statements_profile_answers_comments_text_length.rb

@@ -0,0 +1,8 @@
+class ChangeOnTheMindStatementsProfileAnswersCommentsTextLength < ActiveRecord::Migration
+  def change
+    change_column :social_networking_comments, :text, :string, limit: 1000
+    change_column :social_networking_goals, :description, :string, limit: 1000
+    change_column :social_networking_on_the_mind_statements, :description, :string, limit: 1000
+    change_column :social_networking_profile_answers, :answer_text, :string, limit: 1000
+  end
+end

data/lib/social_networking/version.rb

@@ -1,4 +1,4 @@
 # nodoc
 module SocialNetworking
-  VERSION = "0.10.0"
+  VERSION = "0.11.0"
 end

data/spec/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20151211204425) do
+ActiveRecord::Schema.define(version: 20160308201931) do
 
   # These are extensions that must be enabled in order to support this database
   enable_extension "plpgsql"
@@ -36,10 +36,10 @@ ActiveRecord::Schema.define(version: 20151211204425) do
   end
 
   create_table "social_networking_comments", force: :cascade do |t|
-    t.integer  "participant_id", null: false
-    t.string   "text",           null: false
-    t.integer  "item_id",        null: false
-    t.string   "item_type",      null: false
+    t.integer  "participant_id",              null: false
+    t.string   "text",           limit: 1000, null: false
+    t.integer  "item_id",                     null: false
+    t.string   "item_type",                   null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -47,8 +47,8 @@ ActiveRecord::Schema.define(version: 20151211204425) do
   add_index "social_networking_comments", ["item_id", "item_type"], name: "index_social_networking_comments_on_item_id_and_item_type", using: :btree
 
   create_table "social_networking_goals", force: :cascade do |t|
-    t.string   "description",    null: false
-    t.integer  "participant_id", null: false
+    t.string   "description",    limit: 1000, null: false
+    t.integer  "participant_id",              null: false
     t.date     "due_on"
     t.datetime "created_at"
     t.datetime "updated_at"
@@ -79,8 +79,8 @@ ActiveRecord::Schema.define(version: 20151211204425) do
   add_index "social_networking_nudges", ["recipient_id"], name: "index_social_networking_nudges_on_recipient_id", using: :btree
 
   create_table "social_networking_on_the_mind_statements", force: :cascade do |t|
-    t.text     "description",    null: false
-    t.integer  "participant_id", null: false
+    t.string   "description",    limit: 1000, null: false
+    t.integer  "participant_id",              null: false
     t.datetime "created_at"
     t.datetime "updated_at"
   end
@@ -89,9 +89,9 @@ ActiveRecord::Schema.define(version: 20151211204425) do
   add_index "social_networking_on_the_mind_statements", ["participant_id"], name: "on_the_mind_participant", using: :btree
 
   create_table "social_networking_profile_answers", force: :cascade do |t|
-    t.integer  "social_networking_profile_question_id", null: false
+    t.integer  "social_networking_profile_question_id",              null: false
     t.integer  "order"
-    t.string   "answer_text",                           null: false
+    t.string   "answer_text",                           limit: 1000, null: false
     t.datetime "created_at"
     t.datetime "updated_at"
     t.integer  "social_networking_profile_id"