From 6f432dbfc878607872219c04ede3c3ac71895b29 Mon Sep 17 00:00:00 2001
From: Chris Brame <polonel@gmail.com>
Date: Wed, 19 Sep 2018 20:35:03 -0400
Subject: [PATCH] fix(group): undefined text when deleting group fix(group):
 trailing white space was allowed fix(dashboard): error when no tickets were
 in cache revert(overdue): JavaScript implementation using velocity

---
 src/models/group.js                           |  6 ++++++
 src/public/js/angularjs/controllers/groups.js |  2 +-
 src/public/js/pages/dashboard.js              |  8 ++++----
 src/public/js/pages/tickets.js                | 15 +++++++--------
 src/sass/_settings.sass                       |  2 +-
 src/sass/partials/tickets.sass                |  5 -----
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/src/models/group.js b/src/models/group.js
index c72b1b2e7..4b766e55e 100644
--- a/src/models/group.js
+++ b/src/models/group.js
@@ -35,6 +35,12 @@ var groupSchema = mongoose.Schema({
     public:     { type: Boolean, required: true, default: false }
 });
 
+groupSchema.pre('save', function(next) {
+    this.name = this.name.trim();
+
+    next();
+});
+
 groupSchema.methods.addMember = function(memberId, callback) {
     if (_.isUndefined(memberId)) return callback('Invalid MemberId - $Group.AddMember()');
 
diff --git a/src/public/js/angularjs/controllers/groups.js b/src/public/js/angularjs/controllers/groups.js
index d55423a0e..e94ebf6f9 100644
--- a/src/public/js/angularjs/controllers/groups.js
+++ b/src/public/js/angularjs/controllers/groups.js
@@ -111,7 +111,7 @@ define(['angular', 'underscore', 'jquery', 'modules/helpers', 'uikit', 'history'
 
             $scope.deleteGroup = function(event) {
                 event.preventDefault();
-                var self = $(event.target);
+                var self = $(event.currentTarget);
                 var groupID = self.attr('data-group-id');
                 var card = self.parents('.tru-card-wrapper');
                 if (groupID) {
diff --git a/src/public/js/pages/dashboard.js b/src/public/js/pages/dashboard.js
index 65036081a..1477159dd 100644
--- a/src/public/js/pages/dashboard.js
+++ b/src/public/js/pages/dashboard.js
@@ -150,22 +150,22 @@ define('pages/dashboard', [
 
                         //QuickStats
                         var mostRequester = $('#mostRequester');
-                        if (_data.mostRequester !== null)
+                        if (_data.mostRequester)
                             mostRequester.text(_data.mostRequester.name + ' (' + _data.mostRequester.value + ')');
                         var mostCommenter = $('#mostCommenter');
-                        if (_data.mostCommenter !== null)
+                        if (_data.mostCommenter)
                             mostCommenter.text(_data.mostCommenter.name + ' (' + _data.mostCommenter.value + ')');
                         else
                             mostCommenter.text('--');
 
                         var mostAssignee = $('#mostAssignee');
-                        if (_data.mostAssignee !== null)
+                        if (_data.mostAssignee)
                             mostAssignee.text(_data.mostAssignee.name + ' (' + _data.mostAssignee.value + ')');
                         else
                             mostAssignee.text('--');
 
                         var mostActiveTicket = $('#mostActiveTicket');
-                        if (_data.mostActiveTicket !== null)
+                        if (_data.mostActiveTicket)
                             mostActiveTicket.attr('href', '/tickets/' + _data.mostActiveTicket.uid).text('T#' + _data.mostActiveTicket.uid);
                     },
                     error: function(err) {
diff --git a/src/public/js/pages/tickets.js b/src/public/js/pages/tickets.js
index 850be1a91..6823d2c27 100644
--- a/src/public/js/pages/tickets.js
+++ b/src/public/js/pages/tickets.js
@@ -15,6 +15,7 @@
 define('pages/tickets', [
     'jquery',
     'modules/helpers',
+    'velocity',
     'datatables',
     'dt_responsive',
     'dt_grouping',
@@ -22,7 +23,7 @@ define('pages/tickets', [
     'dt_scroller',
     'history'
 
-], function($, helpers) {
+], function($, helpers, velocity) {
     var ticketsPage = {};
 
     ticketsPage.init = function(callback) {
@@ -73,13 +74,11 @@ define('pages/tickets', [
                 return isNaN(x) ? '00' : hexDigits[(x - x % 16) / 16] + hexDigits[x % 16];
             }
 
-            setInterval(function() {
-                var $overDueTR = $('tr.overdue');
-                if ($overDueTR.hasClass('overdue-red'))
-                    $overDueTR.removeClass('overdue-red');
-                else
-                    $overDueTR.addClass('overdue-red');
-            }, 800);
+            $('tr.overdue td').velocity({backgroundColor: '#b71c1c', color: '#ffffff'}, {
+                loop: true,
+                easing: [1],
+                duration: 800
+            });
 
             if (typeof callback === 'function')
                 return callback();
diff --git a/src/sass/_settings.sass b/src/sass/_settings.sass
index 5199e5208..d54d4424a 100644
--- a/src/sass/_settings.sass
+++ b/src/sass/_settings.sass
@@ -49,7 +49,7 @@ $page_content_border_accent: 2px solid $page_content_title_bg
 $page_content_button_color: #FFFFFF
 $page_content_button_text_color: $sidebar_item_active
 
-$overdue_flash_color: #b71c1c
+//$overdue_flash_color: #b71c1c
 
 $ticket_status_new: $accent_success
 $ticket_status_open: $accent_danger
diff --git a/src/sass/partials/tickets.sass b/src/sass/partials/tickets.sass
index a23fff7e5..a118507b5 100644
--- a/src/sass/partials/tickets.sass
+++ b/src/sass/partials/tickets.sass
@@ -2,11 +2,6 @@
   @media only screen and (min-width: 40.063em) and (max-width: 64em)
     padding: 0 0 0 55px !important
 
-.overdue-red
-  background: $overdue_flash_color !important
-  td
-    color: white !important
-
 .ticketList,
 .accountList
   overflow: hidden