diff --git a/src/js/controllers/reminderAddCtrl.js b/src/js/controllers/reminderAddCtrl.js index 0a41fdfa40..b94548da27 100644 --- a/src/js/controllers/reminderAddCtrl.js +++ b/src/js/controllers/reminderAddCtrl.js @@ -112,6 +112,10 @@ angular.module('starter').controller('ReminderAddCtrl', ["$scope", "$state", "$s return qm.variableCategoryHelper.getVariableCategoryNameFromStateParamsOrUrl( $scope.state.trackingReminder, $stateParams, $stateParams.variableObject); } + function getVariableCategory(){ + return qm.variableCategoryHelper.getVariableCategoryFromStateParamsOrUrl( + $scope.state.trackingReminder, $stateParams, $stateParams.variableObject); + } $scope.openReminderStartTimePicker = function(order){ var a = new Date(); setupReminderTimes(order, a); @@ -530,6 +534,8 @@ angular.module('starter').controller('ReminderAddCtrl', ["$scope", "$state", "$s if(!$scope.state.showMoreOptions){ var number = getNumberOfUniqueValues($scope); if(number && number > 30){hide = true;} + var cat = getVariableCategory(); + if(cat && number === null && cat.name === "Sleep"){hide = true;} } $scope.state.hideDefaultValueField = hide; } diff --git a/src/js/qmHelpers.js b/src/js/qmHelpers.js index baec36baa6..bd124c7cc6 100644 --- a/src/js/qmHelpers.js +++ b/src/js/qmHelpers.js @@ -4459,6 +4459,7 @@ var qm = { if(!Array.isArray(measurements)){measurements = Object.values(measurements);} qm.measurements.checkMeasurements(measurements); function parseJsonIfPossible(str){ + if(str === "{}"){return false;} var object = false; if(str === "{}"){return false;} try{ @@ -9970,6 +9971,12 @@ var qm = { if(name){name = qm.variableCategoryHelper.replaceCategoryAliasWithActualNameIfNecessary(name);} return name; }, + getVariableCategoryFromStateParamsOrUrl: function(obj1, obj2, obj3){ + var name = qm.variableCategoryHelper.getVariableCategoryNameFromStateParamsOrUrl( + $scope.state.trackingReminder, $stateParams, $stateParams.variableObject); + if(!$name){return null;} + return qm.variableCategoryHelper.getVariableCategory(name); + }, getByNameOrId: function(nameOrId){ var cats = qm.variableCategoryHelper.getVariableCategories(); if(isNaN(nameOrId)){