Merge branch 'develop' into feature/setHideDefaultValueField

Author: mikepsinn

.idea/runConfigurations/GI_Test.xml

@@ -4388,10 +4388,10 @@ var qm = {
                     qm.qmLog.errorAndExceptionTestingOrDevelopment("Could not get unit for this measurement: ", m)
                 } else {
                     if(!m.unitAbbreviatedName){m.unitAbbreviatedName = unit.abbreviatedName;}
+                    if(unit.abbreviatedName === '/5'){m.roundedValue = Math.round(m.value);}
                 }
                 if(!m.variableName){m.variableName = m.variable;}
                 if(m.variableName === qm.getPrimaryOutcomeVariable().name){m.valence = qm.getPrimaryOutcomeVariable().valence;}
-                if(unit.abbreviatedName === '/5'){m.roundedValue = Math.round(m.value);}
                 m.displayValueAndUnitString = m.displayValueAndUnitString || m.value + " " + unit.abbreviatedName;
                 m.displayValueAndUnitString = qm.stringHelper.formatValueUnitDisplayText(m.displayValueAndUnitString)
                 m.valueUnitVariableName = m.displayValueAndUnitString + " " + m.variableName;

.idea/runConfigurations/GI_Test_API_Suite.xml

@@ -2876,8 +2876,10 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
                                         if(!notificationExists && queue[0].reminderFrequency && !queue[0].stopTrackingDate){
                                             qmLog.error("Notification not found for reminder we just created!", null, {'reminder': queue[0]});
                                         }
-                                        qmLog.info("Got " + notifications.length + " notifications to from postTrackingRemindersDeferred response", null, {notifications: notifications});
-                                        qm.storage.setTrackingReminderNotifications(notifications);
+                                        qmLog.info("Got " + notifications.length +
+                                            " notifications to from postTrackingRemindersDeferred response",
+                                            null, {notifications: notifications});
+                                        putTrackingReminderNotificationsInLocalStorageAndUpdateInbox(notifications);
                                     }
                                 }else{
                                     qmLog.error("No postTrackingRemindersToApi response.data!");