Skip to content

Commit a487b13

Browse files
authored
Merge branch 'develop' into feature/justUseBuiltInHttpCache
2 parents 37cf882 + 9ca2950 commit a487b13

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

src/js/services/qmService.js

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2959,6 +2959,12 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
29592959
text: 'Add Reminder',
29602960
stateParams: {skipReminderSettingsIfPossible: true}
29612961
},
2962+
reminderEdit: {
2963+
state: qm.stateNames.reminderAdd,
2964+
icon: ionIcons.reminder,
2965+
text: 'Reminder Settings',
2966+
stateParams: {}
2967+
},
29622968
reminderSearch: {
29632969
state: qm.stateNames.reminderSearch,
29642970
icon: ionIcons.reminder,
@@ -3067,7 +3073,7 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
30673073
}
30683074
b.state = b.state || b.stateName;
30693075
if(b.state){
3070-
if(b.state === qm.stateNames.reminderAdd && v){
3076+
if(b.state === qm.stateNames.reminderAdd && v && !v.trackingReminderId){
30713077
qmService.reminders.addToRemindersUsingVariableObject(v, {
30723078
doneState: qm.stateNames.remindersList,
30733079
skipReminderSettingsIfPossible: true
@@ -3114,7 +3120,11 @@ angular.module('starter').factory('qmService', ["$http", "$q", "$rootScope", "$i
31143120
}
31153121
var allButtons = qmService.actionSheets.actionSheetButtons;
31163122
buttons.push(allButtons.measurementAddVariable);
3117-
buttons.push(allButtons.reminderAdd);
3123+
if(v.trackingReminderId){
3124+
buttons.push(allButtons.reminderEdit);
3125+
} else {
3126+
buttons.push(allButtons.reminderAdd);
3127+
}
31183128
var hasMeasurements = v.userId && v.numberOfRawMeasurements;
31193129
if(hasMeasurements){
31203130
buttons.push(allButtons.charts);

0 commit comments

Comments
 (0)