Merge branch 'develop' into feature/getVariableCategoryName

Author: mikepsinn

src/js/controllers/remindersInboxCtrl.js

@@ -107,24 +107,13 @@ angular.module('starter').controller('RemindersInboxCtrl', ["$scope", "$state",
             $rootScope.hideBackButton = false;
         });
         var setPageTitle = function(){
-            if($stateParams.today){
-                if(getVariableCategoryName() === 'Treatments'){
-                    $scope.state.title = "Today's Scheduled Meds";
-                    $scope.state.favoritesTitle = "As-Needed Meds";
-                }else if(getVariableCategoryName()){
-                    $scope.state.title = "Today's Scheduled " + getVariableCategoryName();
-                }else{
-                    $scope.state.title = "Today's Reminder Notifications";
-                }
+            if(getVariableCategoryName() === 'Treatments'){
+                $scope.state.title = 'Overdue Meds';
+                $scope.state.favoritesTitle = "As-Needed Meds";
+            }else if(getVariableCategoryName()){
+                $scope.state.title = $filter('wordAliases')(getVariableCategoryName()) + " " + $filter('wordAliases')("Reminder Inbox");
             }else{
-                if(getVariableCategoryName() === 'Treatments'){
-                    $scope.state.title = 'Overdue Meds';
-                    $scope.state.favoritesTitle = "As-Needed Meds";
-                }else if(getVariableCategoryName()){
-                    $scope.state.title = $filter('wordAliases')(getVariableCategoryName()) + " " + $filter('wordAliases')("Reminder Inbox");
-                }else{
-                    $scope.state.title = 'Inbox';
-                }
+                $scope.state.title = 'Inbox';
             }
         };
         var lastButtonPressTimeStamp, lastClientY, lastClientX;
@@ -456,17 +445,11 @@ angular.module('starter').controller('RemindersInboxCtrl', ["$scope", "$state",
         };
         $rootScope.$on('broadcastGetTrackingReminderNotifications', function(){
             qmLog.info('getTrackingReminderNotifications broadcast received..');
-            if(!$stateParams.today){
-                getFilteredTrackingReminderNotificationsFromLocalStorage();
-            }
+            getFilteredTrackingReminderNotificationsFromLocalStorage();
         });
         var getTrackingReminderNotifications = function(){
             qmLog.info('RemindersInboxCtrl called getTrackingReminderNotifications: ' + window.location.href);
-            if($stateParams.today){
-                getFilteredTodayTrackingReminderNotifications();
-            }else{
-                getFilteredTrackingReminderNotificationsFromLocalStorage();
-            }
+            getFilteredTrackingReminderNotificationsFromLocalStorage();
         };
         function shouldWeShowZeroButton(trackingReminderNotification){
             return trackingReminderNotification.inputType === 'defaultValue' ||

src/js/services/qmService.js

@@ -2960,6 +2960,12 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
                     text: 'Add Reminder',
                     stateParams: {skipReminderSettingsIfPossible: true}
                 },
+                reminderEdit: {
+                    state: qm.stateNames.reminderAdd,
+                    icon: ionIcons.reminder,
+                    text: 'Reminder Settings',
+                    stateParams: {}
+                },
                 reminderSearch: {
                     state: qm.stateNames.reminderSearch,
                     icon: ionIcons.reminder,
@@ -3068,7 +3074,7 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
                 }
                 b.state = b.state || b.stateName;
                 if(b.state){
-                    if(b.state === qm.stateNames.reminderAdd && v){
+                    if(b.state === qm.stateNames.reminderAdd && v && !v.trackingReminderId){
                         qmService.reminders.addToRemindersUsingVariableObject(v, {
                             doneState: qm.stateNames.remindersList,
                             skipReminderSettingsIfPossible: true
@@ -3115,7 +3121,11 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
                     }
                     var allButtons = qmService.actionSheets.actionSheetButtons;
                     buttons.push(allButtons.measurementAddVariable);
-                    buttons.push(allButtons.reminderAdd);
+                    if(v.trackingReminderId){
+                        buttons.push(allButtons.reminderEdit);
+                    } else {
+                        buttons.push(allButtons.reminderAdd);
+                    }
                     var hasMeasurements = v.userId && v.numberOfRawMeasurements;
                     if(hasMeasurements){
                         buttons.push(allButtons.charts);

src/templates/reminder-add.html

@@ -22,10 +22,10 @@ <h2 class="md-toolbar-tools"><span style="color: white;">{{state.trackingReminde
                         <md-select id="categorySelectorMaterial"
                                    ng-model="state.trackingReminder.variableCategoryName"
                                    ng-change="variableCategorySelectorChange(state.trackingReminder.variableCategoryName)">
-                            <md-option ng-repeat="variableCategory in state.variableCategories"
-                                       ng-if="variableCategory.manualTracking && variableCategory.variableCategoryNameSingular"
-                                       value="{{variableCategory.name}}">
-                                {{variableCategory.variableCategoryNameSingular}}
+                            <md-option ng-repeat="cat in state.variableCategories"
+                                       ng-if="cat.manualTracking !== false"
+                                       value="{{cat.name}}">
+                                {{cat.variableCategoryNameSingular}}
                             </md-option>
                         </md-select>
                     </md-input-container>