diff --git a/.idea/runConfigurations/GI_Test.xml b/.idea/runConfigurations/GI_Test.xml deleted file mode 100644 index 87010b6b61..0000000000 --- a/.idea/runConfigurations/GI_Test.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/GI_Test_API_Suite.xml b/.idea/runConfigurations/GI_Test_API_Suite.xml deleted file mode 100644 index b4da46483c..0000000000 --- a/.idea/runConfigurations/GI_Test_API_Suite.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/GI_Test_Ionic_Suite.xml b/.idea/runConfigurations/GI_Test_Ionic_Suite.xml deleted file mode 100644 index 7a2a3c7ee8..0000000000 --- a/.idea/runConfigurations/GI_Test_Ionic_Suite.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/runConfigurations/ionic_pull.xml b/.idea/runConfigurations/ionic_pull.xml deleted file mode 100644 index fcb6d34eeb..0000000000 --- a/.idea/runConfigurations/ionic_pull.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - \ No newline at end of file diff --git a/src/js/qmHelpers.js b/src/js/qmHelpers.js index 0f1a1a09c3..8765d3f2be 100644 --- a/src/js/qmHelpers.js +++ b/src/js/qmHelpers.js @@ -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; diff --git a/src/js/services/qmService.js b/src/js/services/qmService.js index b4f8ae63ce..fb077091d6 100644 --- a/src/js/services/qmService.js +++ b/src/js/services/qmService.js @@ -2877,8 +2877,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!");